diff options
Diffstat (limited to 'view.py')
| -rwxr-xr-x | view.py | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -9,12 +9,12 @@ import pygame from pygame.locals import * import src -from camera import Camera +from camera import get_rays from geometry import Mesh, Solid, Geometry from transform import rotate from optics import * -from pycuda import autoinit +#from pycuda import autoinit from pycuda.compiler import SourceModule from pycuda import gpuarray import pycuda.driver as cuda @@ -158,6 +158,8 @@ def view(viewable, size=(800,600), name='', bits=8, load_bvh=False): scale = np.linalg.norm(upper_bound-lower_bound) + from pycuda import autoinit + print 'device %s' % autoinit.device.name() module = SourceModule(src.kernel, options=['-I' + src.dir], no_extern_c=True, cache_dir=False) @@ -171,7 +173,7 @@ def view(viewable, size=(800,600), name='', bits=8, load_bvh=False): screen = pygame.display.set_mode(size) pygame.display.set_caption(name) - camera = Camera(size) + #camera = Camera(size) diagonal = np.linalg.norm(upper_bound-lower_bound) @@ -179,9 +181,9 @@ def view(viewable, size=(800,600), name='', bits=8, load_bvh=False): axis1 = np.array([1,0,0], dtype=np.double) axis2 = np.array([0,0,1], dtype=np.double) - camera.position(point) + #camera.position(point) - origins, directions = camera.get_rays() + origins, directions = get_rays(point, size) origins_gpu = gpuarray.to_gpu(origins.astype(np.float32).view(gpuarray.vec.float3)) |