Re-reverse coordinate system to match OpenGL.

[python-bulletml.git] / bulletml / parser.py

diff --git a/bulletml/parser.py b/bulletml/parser.py
index 8f253fe..c4b3e04 100644 (file)
--- a/bulletml/parser.py
+++ b/bulletml/parser.py
@@ -13,6 +13,12 @@ import math
 
 from xml.etree.ElementTree import ElementTree
 
+# Python 3 moved this for no really good reason.
+try:
+    from sys import intern
+except ImportError:
+    pass
+
 try:
     from io import StringIO
 except ImportError:
@@ -25,7 +31,7 @@ from bulletml.errors import Error
 from bulletml.expr import NumberDef, INumberDef
 
 
-__all_ = ["ParseError", "BulletML"]
+__all__ = ["ParseError", "BulletML"]
 
 class ParseError(Error):
     """Raised when an error occurs parsing the XML structure."""
@@ -64,7 +70,7 @@ class Direction(object):
     def __init__(self, type, value):
         if type not in self.VALID_TYPES:
             raise ValueError("invalid type %r" % type)
-        self.type = type
+        self.type = intern(type)
         self.value = value
 
     def __getstate__(self):
@@ -132,7 +138,7 @@ class Speed(object):
     def __init__(self, type, value):
         if type not in self.VALID_TYPES:
             raise ValueError("invalid type %r" % type)
-        self.type = type
+        self.type = intern(type)
         self.value = value
 
     def __getstate__(self):
@@ -248,6 +254,23 @@ class Untag(object):
         """Construct using an ElementTree-style element."""
         return cls(element.text)
 
+class Appearance(object):
+    """Set a bullet appearance."""
+
+    def __init__(self, appearance):
+        self.appearance = appearance
+
+    def __getstate__(self):
+        return dict(appearance=self.appearance)
+
+    def __setstate__(self, state):
+        self.__init__(state["appearance"])
+
+    @classmethod
+    def FromXML(cls, doc, element):
+        """Construct using an ElementTree-style element."""
+        return cls(element.text)
+
 class Vanish(object):
     """Make the owner disappear."""
 
@@ -355,14 +378,13 @@ class Accel(object):
 class BulletDef(object):
     """Bullet definition."""
 
-    direction = None
-    speed = None
-
-    def __init__(self, actions=[], direction=None, speed=None, tags=()):
+    def __init__(self, actions=(), direction=None, speed=None, tags=(),
+                 appearance=None):
         self.direction = direction
         self.speed = speed
         self.actions = list(actions)
         self.tags = set(tags)
+        self.appearance = appearance
 
     def __getstate__(self):
         state = []
@@ -374,6 +396,8 @@ class BulletDef(object):
             state.append(("actions", self.actions))
         if self.tags:
             state.append(("tags", list(self.tags)))
+        if self.appearance:
+            state.append(("appearance", self.appearance))
         return state
 
     def __setstate__(self, state):
@@ -386,6 +410,7 @@ class BulletDef(object):
         actions = []
         speed = None
         direction = None
+        tags = set()
         for subelem in element.getchildren():
             tag = realtag(subelem)
             if tag == "direction":
@@ -397,8 +422,8 @@ class BulletDef(object):
             elif tag == "actionRef":
                 actions.append(ActionRef.FromXML(doc, subelem))
             elif tag == "tag":
-                self.tags.add(subelem.text)
-        dfn = cls(actions, direction, speed)
+                tags.add(subelem.text)
+        dfn = cls(actions, direction, speed, tags)
         doc._bullets[element.get("label")] = dfn
         return dfn
 
@@ -408,6 +433,7 @@ class BulletDef(object):
             self.direction and self.direction(params, rank),
             self.speed and self.speed(params, rank),
             self.tags,
+            self.appearance,
             actions)
 
     def __repr__(self):
@@ -536,7 +562,7 @@ class Offset(object):
     def __init__(self, type, x, y):
         if type not in self.VALID_TYPES:
             raise ValueError("invalid type %r" % type)
-        self.type = type
+        self.type = intern(type)
         self.x = x
         self.y = y
 
@@ -550,7 +576,9 @@ class Offset(object):
 
     def __setstate__(self, state):
         state = dict(state)
-        self.__init__(state["type"], state.get("x"), state.get("y"))
+        x = NumberDef(state["x"]) if "x" in state else None
+        y = NumberDef(state["y"]) if "y" in state else None
+        self.__init__(state["type"], x, y)
 
     @classmethod
     def FromXML(cls, doc, element):
@@ -573,13 +601,14 @@ class Offset(object):
 class FireDef(object):
     """Fire definition (creates a bullet)."""
 
-    def __init__(
-        self, bullet, direction=None, speed=None, offset=None, tags=()):
+    def __init__(self, bullet, direction=None, speed=None, offset=None,
+                 tags=(), appearance=None):
         self.bullet = bullet
         self.direction = direction
         self.speed = speed
         self.offset = offset
         self.tags = set(tags)
+        self.appearance = appearance
 
     def __getstate__(self):
         state = []
@@ -591,6 +620,8 @@ class FireDef(object):
             state.append(("offset", self.offset))
         if self.tags:
             state.append(("tags", list(self.tags)))
+        if self.appearance:
+            state.append(("appearance", self.appearance))
         try:
             params = self.bullet.params
         except AttributeError:
@@ -613,6 +644,8 @@ class FireDef(object):
         direction = None
         speed = None
         offset = None
+        tags = set()
+        appearance = None
 
         for subelem in element.getchildren():
             tag = realtag(subelem)
@@ -627,9 +660,11 @@ class FireDef(object):
             elif tag == "offset":
                 offset = Offset.FromXML(doc, subelem)
             elif tag == "tag":
-                self.tags.add(subelem.text)
+                tags.add(subelem.text)
+            elif tag == "appearance":
+                appearance = subelem.text
         try:
-            fire = cls(bullet, direction, speed, offset)
+            fire = cls(bullet, direction, speed, offset, tags, appearance)
         except UnboundLocalError as exc:
             raise ParseError(str(exc))
         else:
@@ -637,13 +672,15 @@ class FireDef(object):
             return fire
 
     def __call__(self, params, rank):
-        direction, speed, tags, actions = self.bullet(params, rank)
+        direction, speed, tags, appearance, actions = self.bullet(params, rank)
         if self.direction:
             direction = self.direction(params, rank)
         if self.speed:
             speed = self.speed(params, rank)
         tags = tags.union(self.tags)
-        return direction, speed, self.offset, tags, actions
+        if self.appearance:
+            appearance = self.appearance
+        return direction, speed, self.offset, tags, appearance, actions
 
     def __repr__(self):
         return "%s(direction=%r, speed=%r, bullet=%r)" % (
@@ -704,7 +741,7 @@ class BulletML(object):
         )
 
     def __init__(self, type="none", actions=None):
-        self.type = type
+        self.type = intern(type)
         self.actions = [] if actions is None else actions
 
     def __getstate__(self):
@@ -772,7 +809,7 @@ class BulletML(object):
         else:
             try:
                 return yaml.load(source)
-            except Exception, exc:
+            except Exception as exc:
                 raise ParseError(str(exc))
 
     @classmethod
@@ -806,6 +843,7 @@ ActionDef.CONSTRUCTORS = dict(
     wait=Wait,
     vanish=Vanish,
     tag=Tag,
+    appearance=Appearance,
     untag=Untag,
     action=ActionDef,
     actionRef=ActionRef)