Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
15c2097e
Commit
15c2097e
authored
Oct 21, 2016
by
Jan Möbius
Browse files
Fixed some warnings in nodes
parent
355021e6
Pipeline
#3272
canceled with stage
in 15 minutes and 47 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
ACG/Scenegraph/GlutPrimitiveNode.cc
View file @
15c2097e
...
...
@@ -438,7 +438,7 @@ getRenderObjects(IRenderer* _renderer, GLState& _state , const DrawModes::DrawM
//localMaterial.color(primitives_[i].color);
//localMaterial.ambientColor(primitives_[i].color);
localMaterial
.
diffuseColor
(
primitives_
[
i
].
color
);
localMaterial
.
baseColor
(
primitives_
[
i
].
color
*
.5
);
localMaterial
.
baseColor
(
primitives_
[
i
].
color
*
.5
f
);
}
ro
.
setMaterial
(
&
localMaterial
);
...
...
ACG/Scenegraph/TranslationManipulatorNode.cc
View file @
15c2097e
...
...
@@ -299,8 +299,8 @@ void TranslationManipulatorNode::updateTargetColors ()
element_
[
Origin
].
inactive_target_color_
=
colors
[
0
][
5
];
for
(
unsigned
int
i
=
1
;
i
<
NumElements
-
3
;
i
++
)
{
element_
[
i
].
active_target_color_
=
(
colors
[
0
][
2
]
*
0.5
)
+
(
colors
[((
i
-
1
)
%
3
)
+
1
][
2
]
*
0.5
);
element_
[
i
].
inactive_target_color_
=
(
colors
[
0
][
5
]
*
0.5
)
+
(
colors
[((
i
-
1
)
%
3
)
+
1
][
5
]
*
0.5
);
element_
[
i
].
active_target_color_
=
(
colors
[
0
][
2
]
*
static_cast
<
float
>
(
0.5
)
)
+
(
colors
[((
i
-
1
)
%
3
)
+
1
][
2
]
*
static_cast
<
float
>
(
0.5
)
)
;
element_
[
i
].
inactive_target_color_
=
(
colors
[
0
][
5
]
*
static_cast
<
float
>
(
0.5
)
)
+
(
colors
[((
i
-
1
)
%
3
)
+
1
][
5
]
*
static_cast
<
float
>
(
0.5
)
)
;
}
return
;
}
else
if
(
element_
[
Origin
].
over_
){
...
...
@@ -308,8 +308,8 @@ void TranslationManipulatorNode::updateTargetColors ()
element_
[
Origin
].
inactive_target_color_
=
colors
[
0
][
4
];
for
(
unsigned
int
i
=
1
;
i
<
NumElements
-
3
;
i
++
)
{
element_
[
i
].
active_target_color_
=
(
colors
[
0
][
1
]
*
0.5
)
+
(
colors
[((
i
-
1
)
%
3
)
+
1
][
1
]
*
0.5
);
element_
[
i
].
inactive_target_color_
=
(
colors
[
0
][
4
]
*
0.5
)
+
(
colors
[((
i
-
1
)
%
3
)
+
1
][
4
]
*
0.5
);
element_
[
i
].
active_target_color_
=
(
colors
[
0
][
1
]
*
static_cast
<
float
>
(
0.5
)
)
+
(
colors
[((
i
-
1
)
%
3
)
+
1
][
1
]
*
static_cast
<
float
>
(
0.5
)
)
;
element_
[
i
].
inactive_target_color_
=
(
colors
[
0
][
4
]
*
static_cast
<
float
>
(
0.5
)
)
+
(
colors
[((
i
-
1
)
%
3
)
+
1
][
4
]
*
static_cast
<
float
>
(
0.5
)
)
;
}
return
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment