From 1d21a17b94fdf809f3b7a8545043dad02eeaf09f Mon Sep 17 00:00:00 2001 From: Anthony LaTorre Date: Sat, 3 Sep 2011 16:42:58 -0400 Subject: Camera class accidentally used some global variables. --- camera.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/camera.py b/camera.py index fc2f4aa..ea76f28 100755 --- a/camera.py +++ b/camera.py @@ -26,6 +26,7 @@ import pycuda.driver as cuda from subprocess import call import shutil import tempfile +import inspect def buildable(identifier): """ @@ -122,15 +123,15 @@ class Camera(Thread): def init_gpu(self): self.gpu_instance = gpu.GPU(self.device_id) - self.gpu_geometry = gpu.GPUGeometry(self.gpu_instance, geometry) + self.gpu_geometry = gpu.GPUGeometry(self.gpu_instance, self.geometry) self.gpu_funcs = gpu.GPUFuncs(self.gpu_instance.module) - self.width, self.height = size + self.width, self.height = self.size self.npixels = self.width*self.height pygame.init() - self.screen = pygame.display.set_mode(size) + self.screen = pygame.display.set_mode(self.size) pygame.display.set_caption('') self.clock = pygame.time.Clock() @@ -663,6 +664,12 @@ class EventViewer(Camera): Camera.process_event(self, event) +def view(obj, size, **camera_kwargs): + geometry = build(obj, 8) + camera = Camera(geometry, size, **camera_kwargs) + camera.start() + camera.join() + if __name__ == '__main__': import optparse import inspect -- cgit