1 files changed, 9 insertions, 3 deletions
diff --git a/view.py b/view.py
index cc28355..1859195 100755
--- a/view.py
+++ b/view.py
@@ -6,9 +6,12 @@ from pygame.locals import *
 
 import src
 from camera import *
+from solid import *
 from geometry import *
 from transform import *
 
+import time
+
 from pycuda import autoinit
 from pycuda.compiler import SourceModule
 from pycuda import gpuarray
@@ -81,8 +84,12 @@ def view(geometry, name=''):
 
     def render():
         """Render the mesh and display to screen."""
+        t0 = time.time()
         cuda_raytrace(np.int32(pixels.size), origins_gpu, directions_gpu, np.int32(geometry.node_map.size-1), np.int32(geometry.first_node), pixels_gpu, texrefs=texrefs, **gpu_kwargs)
         cuda.Context.synchronize()
+        elapsed = time.time() - t0
+
+        print 'elapsed %f sec' % elapsed
 
         cuda.memcpy_dtoh(pixels, pixels_gpu)
         pygame.surfarray.blit_array(screen, pixels.reshape(size))
@@ -174,8 +181,7 @@ if __name__ == '__main__':
     import sys
     import optparse
 
-    from stl import *
-    from materials import *
+    from mesh import *
     import detectors
 
     parser = optparse.OptionParser('%prog filename.stl')
@@ -191,7 +197,7 @@ if __name__ == '__main__':
 
     if ext.lower() == '.stl':
         geometry = Geometry()
-        geometry.add_solid(Solid(read_stl(args[0]), vacuum, vacuum))
+        geometry.add_solid(Solid(0, mesh_from_stl(args[0])))
         geometry.build(options.bits)
         view(geometry, tail)
     else: