Commit e74095de authored by Sylvain Thery's avatar Sylvain Thery

Bug compil mac

parent 698176e3
...@@ -26,17 +26,19 @@ void main() ...@@ -26,17 +26,19 @@ void main()
//float lambertTerm = clamp(dot(N,L),0.0,1.0); //float lambertTerm = clamp(dot(N,L),0.0,1.0);
vec4 finalColor = materialAmbient; vec4 finalColor = materialAmbient;
vec4 currentColor = materialDiffuse;
if (!gl_FrontFacing) if (!gl_FrontFacing)
{ {
if (!doubleSided) if (!doubleSided)
discard; discard;
N *= -1.0; N *= -1.0;
currentColor = backColor;
} }
float lambertTerm = clamp(dot(N,L),0.0,1.0); float lambertTerm = clamp(dot(N,L),0.0,1.0);
#ifndef WITH_COLOR #ifndef WITH_COLOR
finalColor += materialDiffuse * lambertTerm; finalColor += currentColor * lambertTerm;
#else #else
finalColor += vec4((Color*lambertTerm),0.0) ; finalColor += vec4((Color*lambertTerm),0.0) ;
#endif #endif
......
...@@ -137,7 +137,7 @@ float MapHandlerGen::getBBdiagSize() const ...@@ -137,7 +137,7 @@ float MapHandlerGen::getBBdiagSize() const
return m_bbDiagSize; return m_bbDiagSize;
} }
inline Utils::Drawer* MapHandlerGen::getBBDrawer() const Utils::Drawer* MapHandlerGen::getBBDrawer() const
{ {
return m_bbDrawer; return m_bbDrawer;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment