Commit 8d5e0624 authored by Matthias Möller's avatar Matthias Möller
Browse files

double float conversion

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17168 383ad7c9-94d9-4d36-a494-682f7c89f535
parent daf8f391
......@@ -1043,7 +1043,7 @@ draw_textured_nurbs( GLState& /*_state*/)
gluNurbsProperty(theNurb, GLU_SAMPLING_METHOD, GLU_PARAMETRIC_ERROR);
#endif
gluNurbsProperty(theNurb, GLU_PARAMETRIC_TOLERANCE, 0.2);
gluNurbsProperty(theNurb, GLU_PARAMETRIC_TOLERANCE, 0.2f);
// get min/max knots of domain defining patch (partition of unity)
float minu( knots[bsplineCurve_.degree()]);
......
......@@ -140,12 +140,12 @@ void PlaneNode::drawPlane( ACG::GLState& _state) {
ACG::GLState::enable (GL_BLEND);
ACG::GLState::blendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
_state.set_color(ACG::Vec4f( 0.6, 0.15, 0.2, 0.5));
_state.set_color(ACG::Vec4f( 0.6f, 0.15f, 0.2f, 0.5f));
glDrawArrays(GL_QUADS,0,4);
//finally the green back side
_state.set_color(ACG::Vec4f(0.1, 0.8, 0.2, 0.5 ));
_state.set_color(ACG::Vec4f(0.1f, 0.8f, 0.2f, 0.5f ));
glDrawArrays(GL_QUADS,4,4);
......@@ -417,9 +417,9 @@ getRenderObjects(ACG::IRenderer* _renderer, ACG::GLState& _state , const ACG::S
// Just draw the quads here ( front )
//---------------------------------------------------
ro.debugName = (std::string("PlaneNode.plane_front")+name()).c_str();
localMaterial.ambientColor(ACG::Vec4f(0.6, 0.15, 0.2, 0.5 ));
localMaterial.diffuseColor(ACG::Vec4f(0.6, 0.15, 0.2, 0.5 ));
localMaterial.specularColor(ACG::Vec4f(0.6, 0.15, 0.2, 0.5 ));
localMaterial.ambientColor(ACG::Vec4f(0.6f, 0.15f, 0.2f, 0.5f ));
localMaterial.diffuseColor(ACG::Vec4f(0.6f, 0.15f, 0.2f, 0.5f ));
localMaterial.specularColor(ACG::Vec4f(0.6f, 0.15f, 0.2f, 0.5f ));
ro.setMaterial(&localMaterial);
ro.glDrawArrays(GL_QUADS, 0, 4);
_renderer->addRenderObject(&ro);
......@@ -428,9 +428,9 @@ getRenderObjects(ACG::IRenderer* _renderer, ACG::GLState& _state , const ACG::S
// Just draw the quads here ( back )
//---------------------------------------------------
ro.debugName = (std::string("PlaneNode.plane_back")+name()).c_str();
localMaterial.ambientColor( ACG::Vec4f(0.1, 0.8, 0.2, 0.5 ));
localMaterial.diffuseColor( ACG::Vec4f(0.1, 0.8, 0.2, 0.5 ));
localMaterial.specularColor(ACG::Vec4f(0.1, 0.8, 0.2, 0.5 ));
localMaterial.ambientColor( ACG::Vec4f(0.1f, 0.8f, 0.2f, 0.5f ));
localMaterial.diffuseColor( ACG::Vec4f(0.1f, 0.8f, 0.2f, 0.5f ));
localMaterial.specularColor(ACG::Vec4f(0.1f, 0.8f, 0.2f, 0.5f ));
ro.setMaterial(&localMaterial);
ro.glDrawArrays(GL_QUADS, 4, 4);
_renderer->addRenderObject(&ro);
......
Supports Markdown
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