| Line 326... |
Line 326... |
| 326 |
glUseProgram(prog);
|
326 |
glUseProgram(prog);
|
| 327 |
|
327 |
|
| 328 |
GLuint scalar_attrib = glGetAttribLocation(prog, "scalar");
|
328 |
GLuint scalar_attrib = glGetAttribLocation(prog, "scalar");
|
| 329 |
glUniform1fARB(glGetUniformLocationARB(prog, "scalar_max"), max_val);
|
329 |
glUniform1fARB(glGetUniformLocationARB(prog, "scalar_max"), max_val);
|
| 330 |
|
330 |
|
| 331 |
static CVar<float> gamma("display.scalar_field_renderer.gamma",2.2);
|
331 |
static CVar<float> gamma("display.scalar_field_renderer.gamma",2.2f);
|
| 332 |
glUniform1fARB(glGetUniformLocationARB(prog, "gamma"), gamma);
|
332 |
glUniform1fARB(glGetUniformLocationARB(prog, "gamma"), gamma);
|
| 333 |
glNewList(display_list,GL_COMPILE);
|
333 |
glNewList(display_list,GL_COMPILE);
|
| 334 |
|
334 |
|
| 335 |
for(FaceIter f=m.faces_begin(); f != m.faces_end(); ++f)
|
335 |
for(FaceIter f=m.faces_begin(); f != m.faces_end(); ++f)
|
| 336 |
{
|
336 |
{
|
| Line 537... |
Line 537... |
| 537 |
SimpleShaderRenderer(vss,fss), r(_r)
|
537 |
SimpleShaderRenderer(vss,fss), r(_r)
|
| 538 |
{
|
538 |
{
|
| 539 |
GLint old_prog;
|
539 |
GLint old_prog;
|
| 540 |
glGetIntegerv(GL_CURRENT_PROGRAM, &old_prog);
|
540 |
glGetIntegerv(GL_CURRENT_PROGRAM, &old_prog);
|
| 541 |
glUseProgram(prog);
|
541 |
glUseProgram(prog);
|
| 542 |
static CVar<float> curvature_lines_scale("display.line_field_renderer.line_length", .015);
|
542 |
static CVar<float> curvature_lines_scale("display.line_field_renderer.line_length", .015f);
|
| 543 |
static CVar<float> noise_scale("display.line_field_renderer.noise_scale", 12.0/r);
|
543 |
static CVar<float> noise_scale("display.line_field_renderer.noise_scale", 12.0f/r);
|
| 544 |
static CVar<float> noise_amplitude("display.line_field_renderer.noise_amplitude", .06);
|
544 |
static CVar<float> noise_amplitude("display.line_field_renderer.noise_amplitude", .06f);
|
| 545 |
glUniform1fARB(glGetUniformLocationARB(prog, "scale_line"),curvature_lines_scale);
|
545 |
glUniform1fARB(glGetUniformLocationARB(prog, "scale_line"),curvature_lines_scale);
|
| 546 |
glUniform1fARB(glGetUniformLocationARB(prog, "noise_scale"),noise_scale);
|
546 |
glUniform1fARB(glGetUniformLocationARB(prog, "noise_scale"),noise_scale);
|
| 547 |
glUniform1fARB(glGetUniformLocationARB(prog, "noise_amplitude"),noise_amplitude);
|
547 |
glUniform1fARB(glGetUniformLocationARB(prog, "noise_amplitude"),noise_amplitude);
|
| 548 |
glUniform1iARB(glGetUniformLocationARB(prog, "noise_tex"),0);
|
548 |
glUniform1iARB(glGetUniformLocationARB(prog, "noise_tex"),0);
|
| 549 |
GLuint direction = glGetAttribLocation(prog, "direction");
|
549 |
GLuint direction = glGetAttribLocation(prog, "direction");
|