djfroofy / Miru / changeset / 94c7af0a3cb5

@@ -423,6 +423,13 @@ class DirectionalLight(LightMixin, commo
         gl.glLightfv(lno, gl.GL_DIFFUSE, self.ldifs)
         gl.glLightfv(lno, gl.GL_AMBIENT, self.lambient)
     def clone(self):
         return DirectionalLight(ambient=tuple(self.ambient),
                 specular=tuple(self.specular),
                 diffuse=self.diffuse,
                 pos=tuple(self.pos),
                 angle=tuple(self.angle))
 class PositionalLight(LightMixin, common.PositionalMixin):
     """A positinal light's pos is the actual position in 3D space coords.
@@ -534,6 +541,18 @@ class PositionalLight(LightMixin, common
     spot_dir = property(_getspotdir, _setspotdir)
     spot_exponent = property(_getspotexponent, _setspotexponent)
     def clone(self):
         return PositionalLight(
                 pos=tuple(self.pos),
                 angle=tuple(self.angle),
                 diffuse=tuple(self.diffuse),
                 ambient=tuple(self.ambient),
                 kc=self.kc, kl=self.kl, kq=self.kq,
                 spot_cutoff=self.spot_cutoff,
                 spot_exponent=self.spot_exponent[0],
                 spot_dir=tuple(self.spot_dir))
     def _setdebug(self, debug):
         try:

@@ -70,7 +70,7 @@ class Reflection:
         if ls is None: ls = env.camera.lights
         self.lights = miru.camera.LightGroup()
         for l in ls:
-            self.lights.append(l)
+            self.lights.append(l.clone())
             l2 = self.lights[-1]
             p = (l2.pos.x, -l2.pos.y, l2.pos.z)
             l2.pos = tuple(p)

@@ -88,7 +88,14 @@ class ObjParser:
         self.materials = {}
         data = StringIO()
-        for line in fh:
+        def i_():
             n = 0
             while True:
                 yield n
                 n += 1
         it = i_()
         for (idx,line) in ((it.next(),l) for l in fh):
             data.write(line)
             if not line[:-1]:
                 continue
@@ -98,7 +105,10 @@ class ObjParser:
             directive = tks[0]
             try:
                 h = getattr(self, '_handle_%s' % directive)
-                h(tks[1:])
+                try:
                     h(tks[1:])
                 except Exception, e:
                     pass
             except AttributeError:
                 f = failure.Failure()
                 f.printTraceback()

@@ -108,17 +108,26 @@ class SSCameraTrack(Track):
     Assumption - view vector is parallel with the z-axis of the worldi.
     @param camera: the tracker
     @type  camera: miru.camera.Camera
     @param camera: the tracker Camera
     @type  camera: C{miru.camera.Camera}
     @param tracked: the object tracked by the camera
     @type  tracked: miru.mesh.Object
     @type  tracked: C{miru.common.PositionalMixin}
     @param window: view window
     @type  window: pyglet.window.Window
     @type  window: C{pyglet.window.Window}
     @param zminmax: optional (minimum, maximum) distance (delta z) between tracker and
                     tracked
     @type  zminmax: tuple
     @type  zminmax: C{tuple}
     @param edge: the edge factor in range [0,0.5] (default 0.2)
     @type  edge: float
     @type  edge: C{float}
     >>> from zope.interface.verify import verifyClass, verifyObject
     >>> verifyClass(ITrack, SSCameraTrack)