diff options
Diffstat (limited to 'geometry.py')
| -rw-r--r-- | geometry.py | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/geometry.py b/geometry.py index be31e4b..04be460 100644 --- a/geometry.py +++ b/geometry.py @@ -336,6 +336,9 @@ class Geometry(object): set_material = module.get_function('set_material') for i, material in enumerate(self.materials): if material is None: + if color is False: + print 'warning: some triangles have no associated material.' + continue refractive_index = np.interp(standard_wavelengths, material.refractive_index[:,0], material.refractive_index[:,1]).astype(np.float32) @@ -363,22 +366,6 @@ 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)) - self.material1_index_tex = module.get_texref('material1_lookup') - self.material2_index_tex = module.get_texref('material2_lookup') - self.surface_index_tex = module.get_texref('surface_lookup') - - self.material1_index_gpu = cuda.to_device(self.material1_index) - self.material2_index_gpu = cuda.to_device(self.material2_index) - self.surface_index_gpu = cuda.to_device(self.surface_index) - - self.material1_index_tex.set_address(self.material1_index_gpu, self.material1_index.nbytes) - self.material2_index_tex.set_address(self.material2_index_gpu, self.material2_index.nbytes) - self.surface_index_tex.set_address(self.surface_index_gpu, self.surface_index.nbytes) - - self.material1_index_tex.set_format(cuda.array_format.SIGNED_INT32, 1) - self.material2_index_tex.set_format(cuda.array_format.SIGNED_INT32, 1) - self.surface_index_tex.set_format(cuda.array_format.SIGNED_INT32, 1) - vertices = np.empty(len(self.mesh.vertices), dtype=gpuarray.vec.float4) vertices['x'] = self.mesh.vertices[:,0] vertices['y'] = self.mesh.vertices[:,1] @@ -393,7 +380,7 @@ class Geometry(object): if color: triangles['w'] = self.colors else: - triangles['w'] = (self.material1_index << 24) | (self.material2_index << 16) | (self.surface_index << 8) + triangles['w'] = ((self.material1_index & 0xff) << 24) | ((self.material2_index & 0xff) << 16) | ((self.surface_index & 0xff) << 8) lower_bounds = np.empty(self.lower_bounds.shape[0], dtype=gpuarray.vec.float4) lower_bounds['x'] = self.lower_bounds[:,0] |