...
 
Commits (5)
...@@ -11,6 +11,11 @@ ...@@ -11,6 +11,11 @@
- Switched to Qt command line parsing and removed SimpleOpt - Switched to Qt command line parsing and removed SimpleOpt
- Fix clang warning by avoiding GNU extension - Fix clang warning by avoiding GNU extension
- Do not automatically save file immediately after loading with ctrl-o - Do not automatically save file immediately after loading with ctrl-o
- Fixed NameClash on Windows OS if ProjectName was similar to cloned rootDirectory name
- Fixed OpenGL Format warning
- Parse command line before QApplication is instantiated
- Fixed missing output to stderr on windows
- Minor code cleanup
- <b>ACG</b> - <b>ACG</b>
- Clamp shininess in Materialnode (caused GL Errors) - Clamp shininess in Materialnode (caused GL Errors)
- Better Material support in Materialnode (emissive and refractive materials) - Better Material support in Materialnode (emissive and refractive materials)
......
...@@ -304,7 +304,7 @@ void MaterialNode::enter(GLState& _state, const DrawModes::DrawMode& _drawmode ...@@ -304,7 +304,7 @@ void MaterialNode::enter(GLState& _state, const DrawModes::DrawMode& _drawmode
if (material_.blending_) if (material_.blending_)
{ {
_state.set_depthFunc(GL_LEQUAL); _state.set_depthFunc(GL_LEQUAL);
ACG::GLState::blendFunc(material_.blendParam1_, material_.blendParam2_); ACG::GLState::blendFunc(material_.blendingParam1(), material_.blendingParam2());
ACG::GLState::enable(GL_BLEND); ACG::GLState::enable(GL_BLEND);
} }
else else
......