removed STL pmt models; pmt models are now built by calling rotate_extrude() on a profile of the PMT model (see build_pmt() in solids/pmts.py). triangle intersection now allows one of the two coefficients multiplying the vectors which span the triangle to float slightly negative (up to -EPSILON; EPSILON is defined in src/intersect.h) in order to eliminate rays passing through the line between two triangles. cleaned up a lot of unused code. pulled duplicate code in view() and render() into functions in view.py. in order to allow view.py and render.py to search pre-defined geometries, solids, meshes, etc. without requiring them to be pre-built, pre-defined geometries, solids, meshes, etc. should be returned by a function tagged by the decorator @buildable(identifier) defined in view.py, where identifier is a string used to identify the object as an argument to either view.py or render.py. optical materials and surfaces are now defined in optics.py. added an image directory to save cool screenshots.

3 files changed, 9 insertions, 125 deletions

diff --git a/src/intersect.h b/src/intersect.h
index 0b713c8..b1713d7 100644
--- a/src/intersect.h
+++ b/src/intersect.h
@@ -9,6 +9,8 @@
 #include "matrix.h"
 #include "rotate.h"
 
+#define EPSILON 1.0e-3f
+
 /* Test the intersection between a ray starting from `origin` traveling in the
    direction `direction` and a triangle defined by the vertices `v0`, `v1`, and
    `v2`. If the ray intersects the triangle, set `distance` to the distance
@@ -30,21 +32,21 @@ __device__ bool intersect_triangle(const float3 &origin, const float3 &direction
 		    (m.a02*m.a21 - m.a01*m.a22)*b.y +
 		    (m.a01*m.a12 - m.a02*m.a11)*b.z)/determinant;
 
-	if (u1 < 0.0f || u1 > 1.0f)
+	if (u1 < -EPSILON || u1 > 1.0f)
 		return false;
 
 	float u2 = ((m.a12*m.a20 - m.a10*m.a22)*b.x +
 		    (m.a00*m.a22 - m.a02*m.a20)*b.y +
 		    (m.a02*m.a10 - m.a00*m.a12)*b.z)/determinant;
 
-	if (u2 < 0.0f || u2 > 1.0f)
+	if (u2 < -EPSILON || u2 > 1.0f)
 		return false;
 
 	float u3 = ((m.a10*m.a21 - m.a11*m.a20)*b.x +
 		    (m.a01*m.a20 - m.a00*m.a21)*b.y +
 		    (m.a00*m.a11 - m.a01*m.a10)*b.z)/determinant;
 
-	if (u3 <= 0.0f || (1.0f-u1-u2) < 0.0f)
+	if (u3 <= 0.0f || (1.0f-u1-u2) < -EPSILON)
 		return false;
 
 	distance = u3;
diff --git a/src/kernel.cu b/src/kernel.cu
index aae6e95..44a6c03 100644
--- a/src/kernel.cu
+++ b/src/kernel.cu
@@ -12,9 +12,12 @@
 
 #define STACK_SIZE 500
 
+#define RED_WAVELENGTH 685
+#define BLUE_WAVELENGTH 465
+#define GREEN_WAVELENGTH 545
+
 enum
 {
-	DIFFUSE_HIT = -3,
 	DEBUG = -2,
 	INIT = -1,
 	NO_HIT,
@@ -152,12 +155,6 @@ __device__ void myAtomicAdd(float *addr, float data)
 		data = atomicExch(addr, data+atomicExch(addr, 0.0f));
 }
 
-
-
-
-
-
-
 __device__ int to_diffuse(curandState &rng, float3 position, float3 direction, float wavelength, float3 polarization, int start_node, int first_node, int max_steps)
 {
 	int last_hit_triangle = -1;
@@ -357,22 +354,6 @@ __device__ int to_diffuse(curandState &rng, float3 position, float3 direction, f
 
 } // to_diffuse
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 extern "C"
 {
 
@@ -405,11 +386,6 @@ __global__ void rotate(int nthreads, float3 *points, float phi, float3 axis)
 	points[id] = rotate(points[id], phi, axis);
 }
 
-#define RED_WAVELENGTH 685
-#define BLUE_WAVELENGTH 465
-#define GREEN_WAVELENGTH 545
-
-
 __global__ void build_rgb_lookup(int nthreads, curandState *rng_states, float3 *positions, float3 *directions, int start_node, int first_node, float3 *rgb_lookup, int runs, int max_steps)
 {
 	int id = blockIdx.x*blockDim.x + threadIdx.x;
@@ -508,94 +484,6 @@ __global__ void render(int nthreads, curandState *rng_states, float3 *positions,
 
 } // render
 
-#if 0
-
-__global__ void get_triangle(int nthreads, float3 *positions, float3 *directions, int start_node, int first_node, int *triangles)
-{
-	int id = blockIdx.x*blockDim.x + threadIdx.x;
-
-	if (id >= nthreads)
-		return;
-
-	float3 position = positions[id];
-	float3 direction = directions[id];
-	direction /= norm(direction);
-
-	float distance;
-
-	triangles[id] = intersect_mesh(position, direction, start_node, first_node, distance);
-}
-
-__global__ void get_cos_theta(int nthreads, float3 *positions, float3 *directions, int start_node, int first_node, int *triangle, float *cos_thetas)
-{
-	int id = blockIdx.x*blockDim.x + threadIdx.x;
-
-	if (id >= nthreads)
-		return;
-
-	float3 position = positions[id];
-	float3 direction = directions[id];
-	direction /= norm(direction);
-
-	uint4 triangle_data = triangles[triangle[id]];
-
-	float3 v0 = vertices[triangle_data.x];
-	float3 v1 = vertices[triangle_data.y];
-	float3 v2 = vertices[triangle_data.z];
-
-	float cos_theta = dot(normalize(cross(v1-v0, v2-v1)), -direction);
-
-	if (cos_theta < 0.0f)
-		cos_theta = dot(-normalize(cross(v1-v0, v2-v1)), -direction);
-
-	cos_thetas[id] = cos_theta;
-}
-
-#endif
-
-#if 0
-
-__global__ void to_diffuse(int nthreads, curandState *rng_states, float3 *positions, float3 *directions, float *wavelengths, float3 *polarizations, int *last_hit_triangles, int start_node, int first_node, int max_steps)
-{
-	int id = blockIdx.x*blockDim.x + threadIdx.x;
-
-	if (id >= nthreads)
-		return;
-
-	curandState rng = rng_states[id];
-	float3 poisiton = positions[id];
-	float3 direction = directions[id];
-	direction /= norm(direction);
-	float3 polarization = polarizations[id];
-	polarization /= norm(polarization);
-	float wavelength = wavelengths[id];
-	float last_hit_triangle = last_hit_triangles[id];
-
-	int steps = 0;
-	while (steps < max_steps)
-	{
-		steps++;
-
-		float distance;
-
-		last_hit_triangle = intersect_mesh(position, direction, start_node, first_node, distance, last_hit_triangle);
-
-		if (last_hit_triangle == -1)
-			break;
-
-		uint4 triangle_data = triangles[last_hit_triangle];
-
-		float3 v0 = vertices[triangle_data.x];
-		float3 v1 = vertices[triangle_data.y];
-		float3 v2 = vertices[triangle_data.z];
-
-		int material_in_index = convert(0xFF & (triangle_data.w >> 24));
-		int material_out_index = convert(0xFF & (triangle_data.w >> 16));
-		int surface_index = convert(0xFF & triangle_data.w >> 8);
-
-
-#endif
-
 /* Trace the rays starting at `positions` traveling in the direction `directions`
    to their intersection with the global mesh. If the ray intersects the mesh
    set the pixel associated with the ray to a 32 bit color whose brightness is
@@ -872,9 +760,4 @@ __global__ void propagate(int nthreads, curandState *rng_states, float3 *positio
 
 } // propagate
 
-#if 0
-
-
-#endif
-
 } // extern "c"
diff --git a/src/physical_constants.h b/src/physical_constants.h
index d591e93..2ff87cd 100644
--- a/src/physical_constants.h
+++ b/src/physical_constants.h
@@ -3,6 +3,5 @@
 
 #define SPEED_OF_LIGHT 2.99792458e8
 #define PI 3.141592653589793
-#define EPSILON 1.0e-3
 
 #endif