Subversion Repositories gelsvn

Rev

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

Rev 631 Rev 635
Line 342... Line 342...
342 
    "	{\n"
 342 
    "	{\n"
343 
    "       vec3 normal = normalize(_normal);\n"
 343 
    "       vec3 normal = normalize(_normal);\n"
344 
    "		float dot_ln = max(0.0,dot(light_dir, normal));\n"
 344 
    "		float dot_ln = max(0.0,dot(light_dir, normal));\n"
345 
    "		\n"
 345 
    "		\n"
346 
    "		float s_norm = s/scalar_max;\n"
 346 
    "		float s_norm = s/scalar_max;\n"
347 
    "		float stripe_signal = 100.0 * s_norm;\n"
 347 
    "		float stripe_signal = 10.0 * s_norm;\n"
348 
    "		vec4 stripe_col = abs(stripe_signal) < 3.14 ? vec4(-1.0,0,0,0) : vec4(.9,.9,.9,0);\n"
 348 
    "		vec4 stripe_col = abs(stripe_signal) < 3.14 ? vec4(-1.0,0,0,0) : vec4(.9,.9,.9,0);\n"
349 
    "		\n"
 349 
    "		\n"
350 
    "		gl_FragColor = s_norm * vec4(-1,0,1,0);\n"
 350 
    "		gl_FragColor = s_norm * vec4(-1,0,1,0);\n"
351 
    "       gl_FragColor *= dot_ln;\n"
 351 
    "       gl_FragColor *= dot_ln;\n"
352 
    "       gl_FragColor.r = pow(gl_FragColor.r, 1.0/gamma);\n"
 352 
    "       gl_FragColor.r = pow(gl_FragColor.r, 1.0/gamma);\n"
353 
    "       gl_FragColor.g = pow(gl_FragColor.g, 1.0/gamma);\n"
 353 
    "       gl_FragColor.g = pow(gl_FragColor.g, 1.0/gamma);\n"
354 
    "       gl_FragColor.b = pow(gl_FragColor.b, 1.0/gamma);\n"
 354 
    "       gl_FragColor.b = pow(gl_FragColor.b, 1.0/gamma);\n"
355 
    "		gl_FragColor += stripe_col * smoothstep(0.8,1.0,cos(stripe_signal));\n"
 355 
    "		//gl_FragColor += stripe_col * smoothstep(0.8,1.0,cos(stripe_signal));\n"
356 
    "	}\n";
 356 
    "	}\n";
357
357
358 
    ScalarFieldRenderer::ScalarFieldRenderer(const Manifold& m,
358 
    ScalarFieldRenderer::ScalarFieldRenderer(const Manifold& m,
359 
                                             bool smooth,
359 
                                             bool smooth,
360 
                                             VertexAttributeVector<double>& field,
360 
                                             VertexAttributeVector<double>& field,