Show
Ignore:
Timestamp:
09/02/10 11:52:26 (21 months ago)
Author:
farhi
Message:

samples: update call to off_intersect with support for orientation vectors, currently not used.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/nlib/samples/Single_crystal.comp

    r2837 r2923  
    807807    intersect = sphere_intersect(&t1, &t2, x, y, z, vx, vy, vz, radius); 
    808808  else if (hkl_info.shape == 3) 
    809     intersect = off_intersect(&t1, &t2, x, y, z, vx, vy, vz, offdata ); 
     809    intersect = off_intersect(&t1, &t2, NULL, NULL, x, y, z, vx, vy, vz, offdata ); 
    810810       
    811811  if (t2 < 0) intersect=0; /* we passed sample volume already */ 
    … …  
    835835        intersect = sphere_intersect(&t1, &t2, x, y, z, vx, vy, vz, radius); 
    836836      else if (hkl_info.shape == 3) 
    837         intersect = off_intersect(&t1, &t2, x, y, z, vx, vy, vz, offdata ); 
     837        intersect = off_intersect(&t1, &t2, NULL, NULL, x, y, z, vx, vy, vz, offdata ); 
    838838      if(!intersect || t2*v < -1e-9 || t1*v > 1e-9) 
    839839      {