diff options
| author | Stan Seibert <stan@mtrr.org> | 2011-08-03 11:25:05 -0400 |
|---|---|---|
| committer | Stan Seibert <stan@mtrr.org> | 2011-08-03 11:25:05 -0400 |
| commit | 1fd605da0024f85714f9451bb78d3a767788e811 (patch) | |
| tree | ad4069d02619d8a8d7a1239c1e47c3dd9778cbac /src/photon.h | |
| parent | 747d7cde79234775ac117cc58a47f5b2e91ccaaa (diff) | |
| parent | 42d2241948e04953788ce82bbeef25d0cba584fb (diff) | |
| download | chroma-1fd605da0024f85714f9451bb78d3a767788e811.tar.gz chroma-1fd605da0024f85714f9451bb78d3a767788e811.tar.bz2 chroma-1fd605da0024f85714f9451bb78d3a767788e811.zip | |
Merge with Tony
Diffstat (limited to 'src/photon.h')
| -rw-r--r-- | src/photon.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/photon.h b/src/photon.h index ad4c26c..f471866 100644 --- a/src/photon.h +++ b/src/photon.h @@ -19,8 +19,6 @@ struct Photon unsigned int history; int last_hit_triangle; - - //curandState rng; }; struct State @@ -51,14 +49,14 @@ enum enum {BREAK, CONTINUE, PASS}; // return value from propagate_to_boundary -__device__ int fill_state(State &s, Photon &p, curandState &rng) +__device__ void fill_state(State &s, Photon &p) { p.last_hit_triangle = intersect_mesh(p.position, p.direction, s.distance_to_boundary, p.last_hit_triangle); if (p.last_hit_triangle == -1) { p.history |= NO_HIT; - return BREAK; + return; } uint4 triangle_data = g_triangles[p.last_hit_triangle]; @@ -98,8 +96,6 @@ __device__ int fill_state(State &s, Photon &p, curandState &rng) s.absorption_length = interp_property(p.wavelength, material1.absorption_length); s.scattering_length = interp_property(p.wavelength, material1.scattering_length); - return PASS; - } // fill_state __device__ void rayleigh_scatter(Photon &p, curandState &rng) |