[Bf-extensions-cvs] [e94abd8] master: Fixes to strut & hub features & some clean up by pkhg

Brendon Murphy noreply at git.blender.org
Tue Jul 15 16:37:23 CEST 2014


Commit: e94abd8c1c2265ba02b5441497d8103e09e24229
Author: Brendon Murphy
Date:   Wed Jul 16 00:34:35 2014 +1000
https://developer.blender.org/rBACe94abd8c1c2265ba02b5441497d8103e09e24229

Fixes to strut & hub features & some clean up by pkhg

===================================================================

M	geodesic_domes/__init__.py
M	geodesic_domes/add_shape_geodesic.py
D	geodesic_domes/forms_259.py
A	geodesic_domes/forms_271.py
D	geodesic_domes/geodesic_classes_259.py
A	geodesic_domes/geodesic_classes_271.py
M	geodesic_domes/read_me.txt
D	geodesic_domes/third_domes_panel.py
A	geodesic_domes/third_domes_panel_271.py
M	geodesic_domes/tmp/GD_0.GD
D	geodesic_domes/vefm_259.py
A	geodesic_domes/vefm_271.py

===================================================================

diff --git a/geodesic_domes/__init__.py b/geodesic_domes/__init__.py
index 911f33b..4b71842 100644
--- a/geodesic_domes/__init__.py
+++ b/geodesic_domes/__init__.py
@@ -18,28 +18,23 @@
 
 bl_info = {
     "name": "Geodesic Domes",
-    "author": "PKHG , Meta Androcto, Kilon original for 2.49 from Andy Houston",
-    "version": (0, 2, 3),
-    "blender": (2, 71, 0),
-    "location": "View3D > Toolshelf > Addons Tab",
-    "description": "Choice for objects",
+    "author": "Noctumsolis, updated from 2.5 PKHG now for 2.71, Meta Androcto, original for 2.49 from Andy Houston",
+    "version": (0, 3, 2),
+    "blender": (2, 7, 1),
+    "location": "View3D > UI > Geodesic...",
+    "description": "Script, with GUI, to create geodesic dome objects.",
     "warning": "not yet finished",
-    "wiki_url": "http://wiki.blender.org/index.php?title=Extensions:2.6/Py/"
-        "Scripts/Modeling/Geodesic_Domes",
-    "tracker_url": "https://developer.blender.org/T29609",
-    "category": "Object"}
-
-"""
-Added save and load of parameters 14-12-2011 PKHG
-Added one possible *.bak for GD_0.GD (one time) 17-12-2011
-"""
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/Modeling/Geodesic_Domes",
+    "tracker_url": "",
+    "category": "Mesh"}
+
 if "bpy" in locals():
     import imp
-    imp.reload(third_domes_panel)
-
+    imp.reload(third_domes_panel_271)
+    
 else:
-    from geodesic_domes import third_domes_panel
-
+    from geodesic_domes import third_domes_panel_271
+   
 import bpy
 from bpy.props import *
 
diff --git a/geodesic_domes/add_shape_geodesic.py b/geodesic_domes/add_shape_geodesic.py
index 1fe3183..324ef94 100644
--- a/geodesic_domes/add_shape_geodesic.py
+++ b/geodesic_domes/add_shape_geodesic.py
@@ -65,7 +65,7 @@ def func_add_corrective_pose_shape_fast(source, target):
     return result
     
 class add_corrective_pose_shape_fast(bpy.types.Operator):   
-    """Add 1st object as shape to 2nd object as pose shape (only 1 armature)"""
+    '''Adds 1st object as shape to 2nd object as pose shape (only 1 armature)'''
     bl_idname = "object.add_corrective_pose_shape_fast"
     bl_label = "Add object as corrective shape faster"
     
diff --git a/geodesic_domes/forms_259.py b/geodesic_domes/forms_271.py
similarity index 63%
rename from geodesic_domes/forms_259.py
rename to geodesic_domes/forms_271.py
index 4e451a5..f077269 100644
--- a/geodesic_domes/forms_259.py
+++ b/geodesic_domes/forms_271.py
@@ -1,11 +1,14 @@
 import math
-from math import pi,sin,cos,atan,tan,fabs
-from geodesic_domes.vefm_259 import *
+#PKHG>TOOMUCH?? from math import pi, sin, cos, atan, tan, fabs
+from math import sin, cos
+from geodesic_domes.vefm_271 import *
 class form(mesh):
-    def __init__(self,uresolution,vresolution,uscale,vscale,upart,vpart,uphase,vphase,utwist,vtwist,xscale,yscale,sform):
+    def __init__(self, uresolution, vresolution, uscale, vscale, upart,\
+                 vpart, uphase, vphase, utwist, vtwist, xscale, yscale, sform):
         mesh.__init__(self)
-        #PKHG alredey in vefm259 mesh: self.a360 = pi * 2.0
-        self.PKHG_parameters = [uresolution,vresolution,uscale,vscale,upart,vpart,uphase,vphase,utwist,vtwist,xscale,yscale,sform]
+        #PKHG already in vefm271 mesh: self.a360 = pi * 2.0
+        self.PKHG_parameters = [uresolution, vresolution, uscale, vscale, upart,
+                                vpart, uphase, vphase, utwist, vtwist, xscale, yscale, sform]
         self.ures = uresolution
         self.vres = vresolution
         
@@ -57,19 +60,23 @@ class form(mesh):
                 u = self.ustep * i + self.uphase
                 v = self.vstep * j + self.vphase
             #    if self.xscaleflag:
-            #        u = self.ellipsecomp(self.xscale,u) 
+            #        u = self.ellipsecomp(self.xscale, u) 
             #    if self.yscaleflag:
-            #        v = self.ellipsecomp(self.yscale,v)            
+            #        v = self.ellipsecomp(self.yscale, v)            
                 if self.sform[12]:
-                    r1 = self.superform(self.sform[0],self.sform[1],self.sform[2],self.sform[3],self.sform[14] + u,self.sform[4],self.sform[5],self.sform[16] * v)
+                    r1 = self.superform(self.sform[0], self.sform[1], self.sform[2],\
+                                        self.sform[3], self.sform[14] + u, self.sform[4],\
+                    self.sform[5], self.sform[16] * v)
                 else:
                     r1 = 1.0
                 if self.sform[13]:
-                    r2 = self.superform(self.sform[6],self.sform[7],self.sform[8],self.sform[9],self.sform[15] + v,self.sform[10],self.sform[11],self.sform[17] * v)
+                    r2 = self.superform(self.sform[6], self.sform[7], self.sform[8],\
+                                        self.sform[9], self.sform[15] + v, self.sform[10],\
+                    self.sform[11], self.sform[17] * v)
                 else:
                     r2 = 1.0
-                x,y,z = self.formula(u,v,r1,r2)
-                point = vertex((x,y,z))
+                x, y, z = self.formula(u, v, r1, r2)
+                point = vertex((x, y, z))
                 row.append(point)
                 self.verts.append(point)
             self.rowlist.append(row)
@@ -83,7 +90,7 @@ class form(mesh):
         else:
             self.rowlist.append(self.rowlist[0])
 
-#    def formula(self,u,v,r1,r2):
+#    def formula(self, u, v, r1, r2):
 #        pass
 
     def generatefaces(self):
@@ -99,28 +106,30 @@ class form(mesh):
                 b = self.rowlist[top][right]
                 c = self.rowlist[bottom][right]
                 d = self.rowlist[bottom][left]
-                face1 = face([a,b,c,d])
+                face1 = face([a, b, c, d])
                 self.faces.append(face1)
-                edge1 = edge(a,b)
-                edge2 = edge(a,d)
+                edge1 = edge(a, b)
+                edge2 = edge(a, d)
                 self.edges.append(edge1)
                 self.edges.append(edge2)
                 if i + 1 == ufin:
-                    edge3 = edge(d,c)
+                    edge3 = edge(d, c)
                     self.edges.append(edge3)
                 if j + 1 == vfin:
-                    edge4 = edge(b,c)
+                    edge4 = edge(b, c)
                     self.edges.append(edge4)
     
 class grid(form):
-    def __init__(self,uresolution,vresolution,uscale,vscale,upart,vpart,uphase,vphase,utwist,vtwist,xscale,yscale,sform):
-        form.__init__(self,uresolution,vresolution,uscale,vscale,upart,vpart,uphase,vphase,utwist,vtwist,xscale,yscale,sform)
+    def __init__(self, uresolution, vresolution, uscale, vscale, upart, vpart,\
+                 uphase, vphase, utwist, vtwist, xscale, yscale, sform):
+        form.__init__(self, uresolution, vresolution, uscale, vscale, upart, vpart,\
+                        uphase, vphase, utwist, vtwist, xscale, yscale, sform)
         unit = 1.0 / self.a360
         if self.ures == 1 :            
-            print("\n***ERRORin forms_259.grid L121***, ures is  1, changed into 2\n\n")
+            print("\n***ERRORin forms_271.grid L121***, ures is  1, changed into 2\n\n")
             self.ures = 2
         if self.vres == 1 :            
-            print("\n***ERROR in grid forms_259.grid L124***, vres is 1, changed into 2\n\n")
+            print("\n***ERROR in grid forms_271.grid L124***, vres is 1, changed into 2\n\n")
             self.vres = 2            
         self.ustep = self.a360 / (self.ures - 1)
         self.vstep = self.a360 / (self.vres - 1)
@@ -141,16 +150,18 @@ class grid(form):
             self.verts[i].index = i
         self.connectivity()
                 
-    def formula(self,u,v,r1,r2):     
+    def formula(self, u, v, r1, r2):     
         x = u * self.uexpand - self.ushift
         y = v * self.vexpand - self.vshift
         z = r1 * r2 - 1.0         
-        return x,y,z
+        return x, y, z
     
     
 class cylinder(form):
-    def __init__(self,uresolution,vresolution,uscale,vscale,upart,vpart,uphase,vphase,utwist,vtwist,xscale,yscale,sform):
-        form.__init__(self,uresolution,vresolution,uscale,vscale,upart,vpart,uphase,vphase,utwist,vtwist,xscale,yscale,sform)
+    def __init__(self, uresolution, vresolution, uscale, vscale, upart, vpart,\
+                 uphase, vphase, utwist, vtwist, xscale, yscale, sform):
+        form.__init__(self, uresolution, vresolution, uscale, vscale, upart, vpart,\
+                      uphase, vphase, utwist, vtwist, xscale, yscale, sform)
         unit = 1.0 / self.a360
         self.vshift = self.vscale * 0.5
         self.vexpand = unit * self.vscale
@@ -161,15 +172,17 @@ class cylinder(form):
             self.verts[i].index = i
         self.connectivity()    
 
-    def formula(self,u,v,r1,r2):
+    def formula(self, u, v, r1, r2):
         x = sin(u) * self.uscale * r1 * r2 * self.xscale
         y = cos(u) * self.uscale * r1 * r2
         z = v * self.vexpand - self.vshift
-        return x,y,z
+        return x, y, z
 
 class parabola(form):
-    def __init__(self,uresolution,vresolution,uscale,vscale,upart,vpart,uphase,vphase,utwist,vtwist,xscale,yscale,sform):
-        form.__init__(self,uresolution,vresolution,uscale,vscale,upart,vpart,uphase,vphase,utwist,vtwist,xscale,yscale,sform)
+    def __init__(self, uresolution, vresolution, uscale, vscale, upart, vpart,\
+                 uphase, vphase, utwist, vtwist, xscale, yscale, sform):
+        form.__init__(self, uresolution, vresolution, uscale, vscale, upart, vpart,\
+                      uphase, vphase, utwist, vtwist, xscale, yscale, sform)
         unit = 1.0 / self.a360
         self.vshift = self.vscale * 0.5
         self.vexpand = unit * self.vscale
@@ -180,32 +193,35 @@ class parabola(form):
             self.verts[i].index = i
         self.connectivity()        
     
-    def formula(self,u,v,r1,r2):
+    def formula(self, u, v, r1, r2):
         factor = sqrt(v) + 0.001
         x = sin(u) * factor * self.uscale * r1 * r2 * self.xscale
         y = cos(u) * factor * self.uscale * r1 * r2
         z = - v * self.vexpand + self.vshift
-        return x,y,z
+      

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-extensions-cvs mailing list