Subversion Repositories gelsvn

Rev

Rev 601 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 601 Rev 607
Line 534... Line 534...
534
534
535
535
536 
    LineFieldRenderer::LineFieldRenderer(const Manifold& m, bool smooth, VertexAttributeVector<Vec3d>& lines, float _r):
536 
    LineFieldRenderer::LineFieldRenderer(const Manifold& m, bool smooth, VertexAttributeVector<Vec3d>& lines, float _r):
537 
    SimpleShaderRenderer(vss,fss), r(_r)
 537 
    SimpleShaderRenderer(vss,fss), r(_r)
538 
    {
 538 
    {
539 
        float noise_scale = 30.0/r;
 539 
        float noise_scale = 30.0f/r;
540 
        float line_scale = 0.05/r;
 540 
        float line_scale = 0.05f/r;
541 
        float noise_amplitude = 0.1;
 541 
        float noise_amplitude = 0.1f;
542
542
543 
        GLint old_prog;
 543 
        GLint old_prog;
544 
        glGetIntegerv(GL_CURRENT_PROGRAM, &old_prog);
 544 
        glGetIntegerv(GL_CURRENT_PROGRAM, &old_prog);
545 
        glUseProgram(prog);
545 
        glUseProgram(prog);
546 
        glUniform1fARB(glGetUniformLocationARB(prog, "scale_line"),line_scale);
 546 
        glUniform1fARB(glGetUniformLocationARB(prog, "scale_line"),line_scale);