new geometry class. beginning to implement physics by defining a material class; each triangle will have a material linked to both of its sides

1 files changed, 17 insertions, 1 deletions

diff --git a/src/intersect.cu b/src/kernel.cu
index 73b4483..02c52cf 100644
--- a/src/intersect.cu
+++ b/src/kernel.cu
@@ -7,6 +7,8 @@
 
 texture<float4, 1, cudaReadModeElementType> mesh;
 
+
+
 texture<float4, 1, cudaReadModeElementType> upper_bound_arr;
 texture<float4, 1, cudaReadModeElementType> lower_bound_arr;
 
@@ -51,7 +53,13 @@ __device__ bool intersect_triangle(const float3 &origin, const float3 &direction
 
 __device__ int get_color(const float3 &direction, const float3 &v0, const float3& v1, const float3 &v2)
 {
-	int rgb = floorf(255*dot(normalize(cross(v1-v0,v2-v0)),-direction));
+	float scale = 255*dot(normalize(cross(v1-v0,v2-v0)),-direction);
+	if (scale < 0.0f)
+		scale = 255*dot(-normalize(cross(v1-v0,v2-v0)),-direction);
+
+
+	int rgb = floorf(scale);
+
 
 	return rgb << 16 | rgb << 8 | rgb;
 }
@@ -189,6 +197,8 @@ __global__ void intersect_mesh(int max_idx, float3 *origin_arr, float3 *directio
 
 	int i;
 
+	bool show_leafs = false;
+
 	do
 	{
 		int child_map = tex1Dfetch(child_map_arr, *node);
@@ -206,6 +216,12 @@ __global__ void intersect_mesh(int max_idx, float3 *origin_arr, float3 *directio
 			node--;
 
 		}
+		else if (show_leafs)
+		{
+			hit = true;
+			*pixel = 255;
+			node--;
+		}
 		else // node is a leaf
 		{
 			for (i=0; i < child_len; i++)