[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2497] branches/geodesic_domes/vefm_259 .py: madd __add__ and __sub__ safe

[Peter K.H. Gragert]

Revision: 2497
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2497
Author:   pkhg
Date:     2011-10-21 05:25:09 +0000 (Fri, 21 Oct 2011)
Log Message:
-----------
madd __add__ and __sub__ safe
removing old test

Modified Paths:
--------------
    branches/geodesic_domes/vefm_259.py

Modified: branches/geodesic_domes/vefm_259.py
===================================================================
--- branches/geodesic_domes/vefm_259.py	2011-10-20 18:00:15 UTC (rev 2496)
+++ branches/geodesic_domes/vefm_259.py	2011-10-21 05:25:09 UTC (rev 2497)
@@ -83,11 +83,11 @@
 
     def clockwise(self):
         if self.boundary:
-            start = self.boundarystart()
+            start = self.boundarystart() #???PKHG TODO error
         else:
             start = self.faces[0]
         #PKHG TODO do understand
-        start = self.faces[0]   
+        start = self.faces[0]     #PKHG TODO see error above!
         start.docorners() #PKHG???? 
         self.tempedges = []
         self.tempfaces = []
@@ -112,11 +112,19 @@
         #PKHG not implemented, needed?
         pass
 
+#???PKHG TODO why are add and sub different?
     def __add__(self,other):
-        tmp = self.vector + other.vector
+        if "<class 'mathutils.Vector'>" == str(type(other)):
+            tmp = self.vector + other
+        else:
+            tmp = self.vector + other.vector
         return vertex(tmp)
 
     def __sub__(self,other):
+        if "<class 'mathutils.Vector'>" == str(type(other)):
+            tmp = self.vector -  other
+        else:
+            tmp = self.vector - other.vector
         tmp = self.vector - other.vector
         return vertex(tmp)
 
@@ -327,14 +335,16 @@
                             leftvect = edge.vectb
             corner.append(rightedge)
             corner.append(leftedge)
-            print("corner stuff  vert",current.index)
-            if rightedge:
-                print("rightedge",rightedge.index)
-            if leftedge:
-                print( "leftedge",leftedge.index)
-            print("corner",corner)
-            dotty = self.dotproduct(rightvect,leftvect)
-            corner.append(dotty)
+            print("\n===========---------dbg vefm L332corner stuff  vert",current.index)
+            print("corner nu =",corner)
+            if rightedge and leftedge:
+                if rightedge:
+                    print("rightedge",rightedge.index)
+                if leftedge:
+                    print( "leftedge",leftedge.index)
+                print("corner",corner)
+                dotty = self.dotproduct(rightvect,leftvect)
+                corner.append(dotty)
             self.corners.append(corner)
      
      
@@ -406,7 +416,7 @@
         self.a360 = pi * 2        
 
 #PKHG TODO dubbel use vefm_add_object!        
-    def add_object(self):
+    '''    def add_object(self):
         for i in range(len(self.verts)):
             self.verts[i].index = i
         v = [el.vector for el in self.verts]    
@@ -417,8 +427,8 @@
         # useful for development when the mesh may be invalid.
         m.validate(verbose = True)
         add_object_data(bpy.context, m, operator = None)
+    '''        
         
-        
     def power(self,a,b):         ## Returns a power, including negative numbers
         result = sgn(a)*(abs(a)**b)
         return result
@@ -1178,40 +1188,3 @@
                 f.append(a)
             target.faces.append(f)
 
-#PKHG use unittesting!            
-#def mytest():            
-        
-    '''
-    v = vertex()
-    print(v.length)
-    v1 = vertex((1,2,3))
-    print(v1.length)
-    v1.normalize()
-    #print(v1.x,v1.y,v1.z)
-    print(v1.vector)
-    #v1.findnormal()
-    #f = face([0,1,2,3])
-    #print(dir(f))
-    tmp = (v1 + v1)
-    print("sum" ,tmp.vector)
-    tmp = (v1 - v1)
-    print("difference",tmp.vector)
-    
-    tmp =  v1 * 4       
-    print(tmp.vector)
-    v2 = vertex((1,0,0))
-    res = crossp(v1,v2).docrossproduct()
-    print(res.vector)
-    '''
-    
-    #mymesh = importmesh('Triangle',0)
-    #mymesh = importmesh('Plane',0)
-    #mymesh = importmesh('BreakQuad',1)
-    #mymesh = importmesh('TwoTriangles',0)
-#    mymesh = importmesh('Cube',0)
-#    mymesh.hexify()
-#    mymesh.add_object()
-
-#    print(mymesh.edges[:])
-    #breakpoint(globals())                
-#mytest()