Skip to content
GitLab
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
99b1f1ce
Commit
99b1f1ce
authored
Jan 07, 2016
by
Hans-Christian Ebke
Browse files
Proper shading for GlutPrimitve in Shader Pipeline.
parent
7b1f0cfa
Pipeline
#685
passed with stage
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
ACG/Scenegraph/GlutPrimitiveNode.cc
View file @
99b1f1ce
...
...
@@ -435,13 +435,14 @@ getRenderObjects(IRenderer* _renderer, GLState& _state , const DrawModes::DrawM
Material
localMaterial
=
*
_mat
;
if
(
setColor_
)
{
localMaterial
.
color
(
primitives_
[
i
].
color
);
localMaterial
.
ambientColor
(
primitives_
[
i
].
color
);
//
localMaterial.color(primitives_[i].color);
//
localMaterial.ambientColor(primitives_[i].color);
localMaterial
.
diffuseColor
(
primitives_
[
i
].
color
);
localMaterial
.
baseColor
(
primitives_
[
i
].
color
);
localMaterial
.
baseColor
(
primitives_
[
i
].
color
*
.5
);
}
ro
.
setMaterial
(
&
localMaterial
);
ro
.
shaderDesc
.
shadeMode
=
SG_SHADE_PHONG
;
switch
(
primitives_
[
i
].
type
)
{
case
SPHERE
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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