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

SCM Repository

[diderot] Diff of /branches/charisee/ertest/vispaper/iso3d/fsamp.diderot
ViewVC logotype

Diff of /branches/charisee/ertest/vispaper/iso3d/fsamp.diderot

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

revision 2940, Wed Mar 4 11:21:52 2015 UTC revision 2941, Wed Mar 4 11:22:21 2015 UTC
# Line 38  Line 38 
38        real ww =  clamp(0, 1, lerp(0, 1, -1, 100*(rr-sig), 1));        real ww =  clamp(0, 1, lerp(0, 1, -1, 100*(rr-sig), 1));
39        real ret = (1-ww)*cap + ww*gss;        real ret = (1-ww)*cap + ww*gss;
40        return ret;        return ret;
41      } else {      } else if (3 == which) {
42         real x = pos[0];         real x = pos[0];
43         real y = pos[1];         real y = pos[1];
44         return atan2(y,x);         return atan2(y,x);
45        } else {
46           return 2*pos[0] + erf(10*(0.8-|pos|));
47      }      }
48  }  }
49    

Legend:
Removed from v.2940  
changed lines
  Added in v.2941

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