diff options
| author | Anthony LaTorre <telatorre@gmail.com> | 2011-06-02 16:06:32 -0400 |
|---|---|---|
| committer | Anthony LaTorre <telatorre@gmail.com> | 2011-06-02 16:06:32 -0400 |
| commit | 7a2b0f7ce547186acb87d13e7ba9d5184cb93d1f (patch) | |
| tree | 772ab2f7ab4b6427fd64314e5539def466e06001 | |
| parent | a0505450d281841a3e6d25a7510c98b58ef92281 (diff) | |
| download | chroma-7a2b0f7ce547186acb87d13e7ba9d5184cb93d1f.tar.gz chroma-7a2b0f7ce547186acb87d13e7ba9d5184cb93d1f.tar.bz2 chroma-7a2b0f7ce547186acb87d13e7ba9d5184cb93d1f.zip | |
oops; corrected material/surface code packing into fourth byte of triangle data in Geometry.build()
| -rw-r--r-- | geometry.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/geometry.py b/geometry.py index 5acbbc4..8f2196c 100644 --- a/geometry.py +++ b/geometry.py @@ -201,8 +201,7 @@ class Geometry(object): if color: triangles['w'] = self.colors else: - triangles['w'] = (self.material1 << 24) | \ - (self.material2 << 16) | (self.surface1 << 8) | self.surface2 + triangles['w'] = (self.material1_index << 24) | (self.material2_index << 16) | (self.surface1_index << 8) | self.surface2_index lower_bounds = np.empty(self.lower_bounds.shape[0], dtype=gpuarray.vec.float4) lower_bounds['x'] = self.lower_bounds[:,0] |