diff options
| -rw-r--r-- | geometry.py | 2 | ||||
| -rw-r--r-- | src/kernel.cu | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/geometry.py b/geometry.py index 704fdf6..32d6462 100644 --- a/geometry.py +++ b/geometry.py @@ -370,7 +370,7 @@ class Geometry(object): set_surface(np.int32(i), surface.absorption_gpu, surface.reflection_diffuse_gpu, surface.reflection_specular_gpu, block=(1,1,1), grid=(1,1)) - vertices = np.empty(len(self.mesh.vertices), dtype=gpuarray.vec.float4) + vertices = np.empty(len(self.mesh.vertices), dtype=gpuarray.vec.float3) vertices['x'] = self.mesh.vertices[:,0] vertices['y'] = self.mesh.vertices[:,1] vertices['z'] = self.mesh.vertices[:,2] diff --git a/src/kernel.cu b/src/kernel.cu index 98d3ca7..584c9e4 100644 --- a/src/kernel.cu +++ b/src/kernel.cu @@ -22,7 +22,7 @@ enum }; /* flattened triangle mesh */ -__device__ float4 *vertices; +__device__ float3 *vertices; __device__ uint4 *triangles; /* lower/upper bounds for the bounding box associated with each node/leaf */ @@ -110,9 +110,9 @@ __device__ int intersect_mesh(const float3 &origin, const float3& direction, con uint4 triangle_data = triangles[index+i]; - float3 v0 = make_float3(vertices[triangle_data.x]); - float3 v1 = make_float3(vertices[triangle_data.y]); - float3 v2 = make_float3(vertices[triangle_data.z]); + float3 v0 = vertices[triangle_data.x]; + float3 v1 = vertices[triangle_data.y]; + float3 v2 = vertices[triangle_data.z]; if (intersect_triangle(origin, direction, v0, v1, v2, distance)) { @@ -146,7 +146,7 @@ __device__ curandState rng_states[100000]; extern "C" { - __global__ void set_pointer(uint4 *triangle_ptr, float4 *vertex_ptr) + __global__ void set_pointer(uint4 *triangle_ptr, float3 *vertex_ptr) { triangles = triangle_ptr; vertices = vertex_ptr; @@ -214,9 +214,9 @@ __global__ void ray_trace(int nthreads, float3 *positions, float3 *directions, i { uint4 triangle_data = triangles[triangle_index]; - float3 v0 = make_float3(vertices[triangle_data.x]); - float3 v1 = make_float3(vertices[triangle_data.y]); - float3 v2 = make_float3(vertices[triangle_data.z]); + float3 v0 = vertices[triangle_data.x]; + float3 v1 = vertices[triangle_data.y]; + float3 v2 = vertices[triangle_data.z]; pixels[id] = get_color(direction, v0, v1, v2, triangle_data.w); } @@ -263,9 +263,9 @@ __global__ void propagate(int nthreads, float3 *positions, float3 *directions, f uint4 triangle_data = triangles[last_hit_triangle]; - float3 v0 = make_float3(vertices[triangle_data.x]); - float3 v1 = make_float3(vertices[triangle_data.y]); - float3 v2 = make_float3(vertices[triangle_data.z]); + 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)); |