[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2514] branches/geodesic_domes/ geodesic_classes_259.py: class definitions adjusted to what I need

Peter K.H. Gragert pkhgragert at gmail.com
Mon Oct 24 08:16:47 CEST 2011


Revision: 2514
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2514
Author:   pkhg
Date:     2011-10-24 06:16:47 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
class definitions adjusted to what I need

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

Modified: branches/geodesic_domes/geodesic_classes_259.py
===================================================================
--- branches/geodesic_domes/geodesic_classes_259.py	2011-10-24 06:15:46 UTC (rev 2513)
+++ branches/geodesic_domes/geodesic_classes_259.py	2011-10-24 06:16:47 UTC (rev 2514)
@@ -17,10 +17,9 @@
     print("\ncheck_contains finished\n\n")
 
 class geodesic(mesh):
-    def __init__(self,PKHG_parameters):
-
+    def __init__(self):
         mesh.__init__(self)
-        self.PKHG_parameters = PKHG_parameters
+        self.PKHG_parameters = None
 #        print("\n------ geodesic L11 PKHG_parameters",PKHG_parameters)
         self.panels = []
         self.vertsdone = []
@@ -66,8 +65,8 @@
 #        self.makegeodesic()
 #        self.connectivity()
 
-    def setparameters(self):
-        parameters = self.PKHG_parameters
+    def setparameters(self,params):
+        parameters = self.PKHG_parameters = params
         self.frequency = parameters[0]    ## How many subdivisions - up to 20.
         self.eccentricity = parameters[1]    ## Elliptical if >1.0.
         self.squish = parameters[2]        ## Flattened if < 1.0.
@@ -112,12 +111,13 @@
     def vertedgefacedata(self):
         pass
 
-    def config(self, frequency = 1): #???PKHG frequency problem  20 oct.
+#PKHG 23.1    def config(self, frequency = 1): #???PKHG frequency problem  20 oct.
+    def config(self): #???PKHG frequency problem  20 oct.
         for i in range(len(self.vertskeleton)):
             self.vertskeleton[i].index = i
         for edges in self.edgeskeleton:
 #???PKHG TODO            s = skeletonrow(self.frequency, edges, 0, self) #self a geodesic
-            s = skeletonrow(frequency, edges, 0, self) #self a geodesic
+            s = skeletonrow(self.frequency, edges, 0, self) #self a geodesic
             self.skeleton.append(s)
         for i in range(len( self.verts)):
             self.verts[i].index = i
@@ -150,6 +150,7 @@
             self.sphericalverts.append([u,v])
 
     def sphere2cartesian(self):
+        check_contains(self,"sphereto self",True)
         for i in range(len(self.verts)):
             if self.cart:
                 x = self.verts[i].x * self.radius * self.eccentricity
@@ -377,8 +378,13 @@
 #############################
 
 #for point on top?  YES!          
-class tetrahedron(geodesic):
-    def vertedgefacedata(self):
+class tetrahedron(geodesic,mesh):
+    def __init__(self,parameter):
+        geodesic.__init__(mesh)
+        geodesic.setparameters(self,parameter)
+        self.set_vert_edge_skeleons()
+        
+    def set_vert_edge_skeleons(self):
         self.vertskeleton=[        vertex(( 0.0 , 0.0 , 1.73205080757 )),
                             vertex(( 0.0 , -1.63299316185 , -0.577350269185 )),
                             vertex(( 1.41421356237 , 0.816496580927 , -0.57735026919 )),
@@ -399,7 +405,11 @@
 
 #for edge on top? YES
 class tetraedge(geodesic):
-    def vertedgefacedata(self):
+    def __init__(self,parameter):
+        geodesic.__init__(mesh)
+        geodesic.setparameters(self,parameter)
+        self.set_vert_edge_skeleons()
+    def set_vert_edge_skeleons(self):
         self.vertskeleton=[        vertex(( 0.0 , -1.41421356237 , 1.0 )),
                             vertex(( 0.0 , 1.41421356237 , 1.0 )),
                             vertex(( 1.41421356237 , 0.0 , -1.0 )),
@@ -420,7 +430,11 @@
 
 #for face on top? YES
 class tetraface(geodesic):
-    def vertedgefacedata(self):
+    def __init__(self,parameter):
+        geodesic.__init__(mesh)
+        geodesic.setparameters(self,parameter)
+        self.set_vert_edge_skeleons()
+    def set_vert_edge_skeleons(self):
         self.vertskeleton=[        vertex(( -1.41421356237 , -0.816496580927 , 0.57735026919 )),
                             vertex(( 1.41421356237 , -0.816496580927 , 0.57735026919 )),
                             vertex(( 0.0 , 1.63299316185 , 0.577350269185 )),
@@ -438,7 +452,11 @@
         self.vertsdone=[[0,0]] * len(self.vertskeleton)
 
 class octahedron(geodesic):
-    def vertedgefacedata(self):
+    def __init__(self,parameter):
+        geodesic.__init__(mesh)
+        geodesic.setparameters(self,parameter)
+        self.set_vert_edge_skeleons()
+    def set_vert_edge_skeleons(self):
         self.vertskeleton=[        vertex((0.0,0.0,1.0)),
                             vertex((0.0,1.0,0.0)),
                             vertex((-1.0,0.0,0.0)),
@@ -465,7 +483,11 @@
         self.edgelength=[]
         self.vertsdone=[[0,0]] * len(self.vertskeleton)
 class octaedge(geodesic):
-    def vertedgefacedata(self):
+    def __init__(self,parameter):
+        geodesic.__init__(mesh)
+        geodesic.setparameters(self,parameter)
+        self.set_vert_edge_skeleons()
+    def set_vert_edge_skeleons(self):
         self.vertskeleton=[        vertex(( 0.0 , -0.707106781187 , 0.707106781187 )),
                             vertex(( 0.0 , 0.707106781187 , 0.707106781187 )),
                             vertex(( 1.0 , 0.0 , 0.0 )),
@@ -490,7 +512,11 @@
         self.edgelength=[]
         self.vertsdone=[[0,0]] * len(self.vertskeleton)
 class octaface(geodesic):
-    def vertedgefacedata(self):
+    def __init__(self,parameter):
+        geodesic.__init__(mesh)
+        geodesic.setparameters(self,parameter)
+        self.set_vert_edge_skeleons()
+    def set_vert_edge_skeleons(self):
         self.vertskeleton=[        vertex(( 0.408248458663 , -0.707106781187 , 0.577350150255 )),
                             vertex(( 0.408248458663 , 0.707106781187 , 0.577350150255 )),
                             vertex(( -0.816496412728 , 0.0 , 0.577350507059 )),
@@ -515,7 +541,11 @@
         self.edgelength=[]
         self.vertsdone=[[0,0]] * len(self.vertskeleton)
 class icosahedron(geodesic):
-    def vertedgefacedata(self):
+    def __init__(self,parameter):
+        geodesic.__init__(mesh)
+        geodesic.setparameters(self,parameter)
+        self.set_vert_edge_skeleons()
+    def set_vert_edge_skeleons(self):
         self.vertskeleton=[        vertex(( 0.0 , 0.0 , 0.587785252292 )),
                             vertex(( 0.0 , -0.525731096637 , 0.262865587024 )),
                             vertex(( 0.5 , -0.162459832634 , 0.262865565628 )),
@@ -564,7 +594,11 @@
         self.edgelength=[]
         self.vertsdone=[[0,0]] * len(self.vertskeleton)
 class icoedge(geodesic):
-    def vertedgefacedata(self):
+    def __init__(self,parameter):
+        geodesic.__init__(mesh)
+        geodesic.setparameters(self,parameter)
+        self.set_vert_edge_skeleons()
+    def set_vert_edge_skeleons(self):
         self.vertskeleton=[        vertex(( 0 , 0.309016994375 , 0.5 )),
                             vertex(( 0 , -0.309016994375 , 0.5 )),
                             vertex(( -0.5 , 0 , 0.309016994375 )),
@@ -615,7 +649,11 @@
         self.edgelength=[]
         self.vertsdone=[[0,0]] * len(self.vertskeleton)
 class icoface(geodesic):
-    def vertedgefacedata(self):
+    def __init__(self,parameter):
+        geodesic.__init__(mesh)
+        geodesic.setparameters(self,parameter)
+        self.set_vert_edge_skeleons()
+    def set_vert_edge_skeleons(self):
         self.vertskeleton=[        vertex(( -0.17841104489 , 0.309016994375 , 0.46708617948 )),
                             vertex(( -0.17841104489 , -0.309016994375 , 0.46708617948 )),
                             vertex(( 0.35682208977 , 0.0 , 0.467086179484 )),
@@ -674,7 +712,7 @@
             #geo(parameters)
 #            geo.setparameters()
             my_tetrahedron = tetrahedron(geodesic)
-            my_tetrahedron.vertedgefacedata()
+            my_tetrahedron.set_vert_edge_skeleons()
             my_tetrahedron.config()            
             check_contains(my_tetrahedron,"my_tetra",True)
             vefm_add_object(geo)



More information about the Bf-extensions-cvs mailing list