diff options
Diffstat (limited to 'solid.py')
| -rw-r--r-- | solid.py | 19 |
1 files changed, 5 insertions, 14 deletions
@@ -1,9 +1,7 @@ import numpy as np class Solid(object): - def __init__(self, id, mesh, rotation=np.identity(3), displacement=(0,0,0), - material1=None, material2=None, surface1=None, surface2=None, - color=0xffffffff): + def __init__(self, id, mesh, rotation=np.identity(3), displacement=(0,0,0), material1=None, material2=None, surface=None, color=0xffffffff): self.id = id self.mesh = mesh @@ -33,19 +31,12 @@ class Solid(object): else: self.material2 = np.tile(material2, len(self.mesh)) - if np.iterable(surface1): - if len(surface1) != len(mesh): + if np.iterable(surface): + if len(surface) != len(mesh): raise ValueError('shape mismatch') - self.surface1 = np.array(surface1, dtype=np.object) + self.surface = np.array(surface, dtype=np.object) else: - self.surface1 = np.tile(surface1, len(self.mesh)) - - if np.iterable(surface2): - if len(surface2) != len(mesh): - raise ValueError('shape mismatch') - self.surface2 = np.array(surface2, dtype=np.object) - else: - self.surface2 = np.tile(surface2, len(self.mesh)) + self.surface = np.tile(surface, len(self.mesh)) if np.iterable(color): if len(color) != len(mesh): |