summaryrefslogtreecommitdiff
path: root/geometry.py
diff options
context:
space:
mode:
authorAnthony LaTorre <telatorre@gmail.com>2011-05-16 16:24:49 -0400
committerAnthony LaTorre <telatorre@gmail.com>2011-05-16 16:24:49 -0400
commit8a384792b296d0c4c4a51d0a7679bc3c5f24c2c2 (patch)
treedac07c7256a21ae43e0426b616f7894eac82a4c5 /geometry.py
parent2fc0386f58d296e044a7018316adf4810bd81e00 (diff)
downloadchroma-8a384792b296d0c4c4a51d0a7679bc3c5f24c2c2.tar.gz
chroma-8a384792b296d0c4c4a51d0a7679bc3c5f24c2c2.tar.bz2
chroma-8a384792b296d0c4c4a51d0a7679bc3c5f24c2c2.zip
typo
Diffstat (limited to 'geometry.py')
-rw-r--r--geometry.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/geometry.py b/geometry.py
index 48d19fc..cf92d53 100644
--- a/geometry.py
+++ b/geometry.py
@@ -33,7 +33,7 @@ def interleave(arr):
raise Exception('shape mismatch')
z = np.zeros(arr.shape[0], dtype=np.uint64)
- for i in range(arr[0][0].nbytes*8):
+ for i in range(arr.dtype.itemsize*8):
z |= (arr[:,2] & 1 << i) << (2*i) | (arr[:,1] & 1 << i) << (2*i+1) | (arr[:,0] & 1 << i) << (2*i+2)
return z
@@ -48,7 +48,7 @@ def morton_order(mesh, bits=3):
mean_positions = quantize(np.mean(mesh, axis=1))
- return interleave_arr(mean_positions)
+ return interleave(mean_positions)
class Solid(object):
def __init__(self, mesh, inside, outside):