Merge pull request #111 from aparrish/more_pvector_fixes

add support for multiple-arg PVector .add()/.sub()

Author: Jonathan Feinberg

runtime/src/jycessing/core.py

@@ -91,11 +91,17 @@
 # as static methods and instance methods.
 from processing.core import PVector as __pvector__
 class PVector(__pvector__):
-    def __instance_add__(self, o):
-        PVector.add(self, o, self)
+    def __instance_add__(self, *args):
+        if len(args) == 1:
+            return PVector.add(self, args[0], self)
+        else:
+            return PVector.add(self, PVector(*args), self)
 
-    def __instance_sub__(self, o):
-        PVector.sub(self, o, self)
+    def __instance_sub__(self, *args):
+        if len(args) == 1:
+            return PVector.sub(self, args[0], self)
+        else:
+            return PVector.sub(self, PVector(*args), self)
 
     def __instance_mult__(self, o):
         PVector.mult(self, o, self)

testing/resources/test_pvector.py

@@ -107,6 +107,16 @@
 d = v.dot(v2)
 assert d == 2200.0
 
+# PVector.add w/multiple arguments
+v = PVector(40, 20, 0)
+v.add(25, 50, 0)
+assert (v.x, v.y, v.z) == (65, 70, 0)
+
+# PVector.sub w/multiple arguments
+v = PVector(40, 20, 0)
+v.sub(25, 50, 0)
+assert (v.x, v.y, v.z) == (15, -30, 0)
+
 print 'OK'
 
 exit()