Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/pure-cfg/test/vr-curv-quad.diderot
ViewVC logotype

Diff of /branches/pure-cfg/test/vr-curv-quad.diderot

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1127, Thu May 5 14:06:32 2011 UTC revision 1297, Thu Jun 9 12:44:43 2011 UTC
# Line 66  Line 66 
66                real k1 = (trace(G) + disc)/2.0;                real k1 = (trace(G) + disc)/2.0;
67                real k2 = (trace(G) - disc)/2.0;                real k2 = (trace(G) - disc)/2.0;
68                // finished curvature computation; begin finding sample RGBA                // finished curvature computation; begin finding sample RGBA
69                k1 = max(-1.0, min(1.0, 6.0*k1));                k1 = clamp(-1.0, 1.0, 6.0*k1);
70                k2 = max(-1.0, min(1.0, 6.0*k2));                k2 = clamp(-1.0, 1.0, 6.0*k2);
71                vec3 matRGB = RGB([k1,k2]);                vec3 matRGB = RGB([k1,k2]);
72                real alpha = min(1.0, lerp(0.0, 1.0,                real alpha = min(1.0, lerp(0.0, 1.0,
73                                           valOpacMin, val, valOpacMax));                                           valOpacMin, val, valOpacMax));

Legend:
Removed from v.1127  
changed lines
  Added in v.1297

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0