Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Sreekanth Arikatla
iMSTK
Commits
5a15e3ae
Commit
5a15e3ae
authored
Aug 08, 2017
by
Sreekanth Arikatla
Browse files
Merge branch 'fixCompileError' into 'master'
BUG: Fixed compile error See merge request !211
parents
0ed65feb
e181c950
Changes
1
Hide whitespace changes
Inline
Side-by-side
Base/Rendering/imstkVTKCustomPolyDataMapper.cpp
View file @
5a15e3ae
...
...
@@ -208,7 +208,9 @@ VTKCustomPolyDataMapper::SetMapperShaderParameters(
if
(
this
->
GetOpenGLMode
(
actor
->
GetProperty
()
->
GetRepresentation
(),
helper
.
PrimitiveType
)
==
GL_TRIANGLES
)
{
auto
diffuseColorTemp
=
material
->
getDiffuseColor
();
float
diffuseColor
[
3
]
=
{
diffuseColorTemp
.
r
,
diffuseColorTemp
.
g
,
diffuseColorTemp
.
b
};
float
diffuseColor
[
3
]
=
{(
float
)
diffuseColorTemp
.
r
,
(
float
)
diffuseColorTemp
.
g
,
(
float
)
diffuseColorTemp
.
b
};
helper
.
Program
->
SetUniform3f
(
"diffuseColorUniform"
,
diffuseColor
);
auto
diffuseTexture
=
material
->
getTexture
(
Texture
::
DIFFUSE
);
...
...
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