[Bf-extensions-cvs] [810f8c4] master: Contrib: Geodesic Domes > code clean up for T48608
meta-androcto
noreply at git.blender.org
Mon Jun 13 01:27:01 CEST 2016
Commit: 810f8c4c3e257efd952de30163830b6e15e1185b
Author: meta-androcto
Date: Mon Jun 13 09:25:59 2016 +1000
Branches: master
https://developer.blender.org/rBAC810f8c4c3e257efd952de30163830b6e15e1185b
Contrib: Geodesic Domes > code clean up for T48608
===================================================================
M geodesic_domes/__init__.py
M geodesic_domes/add_shape_geodesic.py
M geodesic_domes/forms_271.py
M geodesic_domes/geodesic_classes_271.py
D geodesic_domes/read_me.txt
M geodesic_domes/third_domes_panel_271.py
D geodesic_domes/tmp/GD_0.GD
D geodesic_domes/tmp/GD_start.GD
M geodesic_domes/vefm_271.py
===================================================================
diff --git a/geodesic_domes/__init__.py b/geodesic_domes/__init__.py
index 2345e8b..711de18 100644
--- a/geodesic_domes/__init__.py
+++ b/geodesic_domes/__init__.py
@@ -17,13 +17,13 @@
# ##### END GPL LICENSE BLOCK #####
bl_info = {
- "name": "Geodesic Domes",
- "author": "Noctumsolis, updated from 2.5 PKHG now for 2.71, Meta Androcto, original for 2.49 from Andy Houston",
+ "name": "Geodesic Domes2",
+ "author": "Noctumsolis, PKHG, Meta Androcto, Andy Houston",
"version": (0, 3, 2),
"blender": (2, 7, 1),
"location": "Toolshelf > Create Tab",
"description": "Create geodesic dome type objects.",
- "warning": "not yet finished",
+ "warning": "",
"wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/Modeling/Geodesic_Domes",
"tracker_url": "https://developer.blender.org/maniphest/task/create/?project=3&type=Bug",
"category": "Mesh"}
@@ -31,10 +31,10 @@ bl_info = {
if "bpy" in locals():
import imp
imp.reload(third_domes_panel_271)
-
+
else:
- from geodesic_domes import third_domes_panel_271
-
+ from . import third_domes_panel_271
+
import bpy
from bpy.props import *
@@ -47,5 +47,3 @@ def unregister():
if __name__ == "__main__":
register()
-
-
diff --git a/geodesic_domes/add_shape_geodesic.py b/geodesic_domes/add_shape_geodesic.py
index 324ef94..879f6fa 100644
--- a/geodesic_domes/add_shape_geodesic.py
+++ b/geodesic_domes/add_shape_geodesic.py
@@ -3,7 +3,7 @@ import mathutils
def reset_transform(ob):
m = mathutils.Matrix()
- ob.matrix_local = m
+ ob.matrix_local = m
def func_add_corrective_pose_shape_fast(source, target):
result = ""
@@ -51,7 +51,7 @@ def func_add_corrective_pose_shape_fast(source, target):
armature = n.object
unposeMesh( shape_key_verts, target, armature)
break
-
+
# set the new shape key value to 1.0, so we see the result instantly
target.data.shape_keys.key_blocks[ target.active_shape_key_index].value = 1.0
try:
@@ -63,18 +63,18 @@ def func_add_corrective_pose_shape_fast(source, target):
target.show_only_shape_key = False
target.data.update()
return result
-
-class add_corrective_pose_shape_fast(bpy.types.Operator):
+
+class add_corrective_pose_shape_fast(bpy.types.Operator):
'''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"
-
+
@classmethod
def poll(cls, context):
return context.active_object != None
def execute(self, context):
-
+
if len(context.selected_objects) > 2:
print("Select source and target objects please")
return {'FINISHED'}
diff --git a/geodesic_domes/forms_271.py b/geodesic_domes/forms_271.py
index f077269..d3e46dc 100644
--- a/geodesic_domes/forms_271.py
+++ b/geodesic_domes/forms_271.py
@@ -1,17 +1,16 @@
import math
-#PKHG>TOOMUCH?? from math import pi, sin, cos, atan, tan, fabs
from math import sin, cos
-from geodesic_domes.vefm_271 import *
+from .vefm_271 import *
class form(mesh):
def __init__(self, uresolution, vresolution, uscale, vscale, upart,\
vpart, uphase, vphase, utwist, vtwist, xscale, yscale, sform):
mesh.__init__(self)
- #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
-
+
self.uscale = uscale
self.vscale = vscale
self.upart = upart
@@ -20,11 +19,11 @@ class form(mesh):
self.vphase = vphase * self.a360
self.utwist = utwist
self.vtwist = vtwist
-
+
self.xscale = xscale
self.yscale = yscale
self.sform = sform
-
+
if self.upart != 1.0: ## there is a gap in the major radius
self.uflag = 1
else:
@@ -45,12 +44,12 @@ class form(mesh):
self.vstep = (self.a360 / self.vres) * self.vpart
if self.xscale != 1.0:
self.xscaleflag = 1
- else:
- self.xscaleflag = 0
- if self.yscale != 1.0:
- self.yscaleflag = 1
- else:
- self.yscaleflag = 0
+ else:
+ self.xscaleflag = 0
+ if self.yscale != 1.0:
+ self.yscaleflag = 1
+ else:
+ self.yscaleflag = 0
self.rowlist=[]
def generatepoints(self):
@@ -59,10 +58,7 @@ class form(mesh):
for j in range(self.vfinish):
u = self.ustep * i + self.uphase
v = self.vstep * j + self.vphase
- # if self.xscaleflag:
- # u = self.ellipsecomp(self.xscale, u)
- # if self.yscaleflag:
- # 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],\
@@ -80,6 +76,7 @@ class form(mesh):
row.append(point)
self.verts.append(point)
self.rowlist.append(row)
+
if self.vflag:
pass
else:
@@ -90,9 +87,6 @@ class form(mesh):
else:
self.rowlist.append(self.rowlist[0])
-# def formula(self, u, v, r1, r2):
-# pass
-
def generatefaces(self):
ufin = len(self.rowlist) - 1
vfin = len(self.rowlist[0]) - 1
@@ -118,45 +112,45 @@ class form(mesh):
if j + 1 == vfin:
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)
unit = 1.0 / self.a360
- if self.ures == 1 :
+ if self.ures == 1 :
print("\n***ERRORin forms_271.grid L121***, ures is 1, changed into 2\n\n")
self.ures = 2
- if self.vres == 1 :
+ if self.vres == 1 :
print("\n***ERROR in grid forms_271.grid L124***, vres is 1, changed into 2\n\n")
- self.vres = 2
+ self.vres = 2
self.ustep = self.a360 / (self.ures - 1)
self.vstep = self.a360 / (self.vres - 1)
-
+
self.uflag = 1
self.vflag = 1
-
- self.xscaleflag = 0
+
+ self.xscaleflag = 0
self.yscaleflag = 0
self.uexpand = unit * self.uscale
self.vexpand = unit * self.vscale
self.ushift = self.uscale * 0.5
self.vshift = self.vscale * 0.5
-
+
self.generatepoints()
self.generatefaces()
for i in range(len(self.verts)):
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
+ z = r1 * r2 - 1.0
return x, y, z
-
-
+
+
class cylinder(form):
def __init__(self, uresolution, vresolution, uscale, vscale, upart, vpart,\
uphase, vphase, utwist, vtwist, xscale, yscale, sform):
@@ -165,12 +159,12 @@ class cylinder(form):
unit = 1.0 / self.a360
self.vshift = self.vscale * 0.5
self.vexpand = unit * self.vscale
- self.vflag = 1
+ self.vflag = 1
self.generatepoints()
self.generatefaces()
for i in range(len(self.verts)):
self.verts[i].index = i
- self.connectivity()
+ self.connectivity()
def formula(self, u, v, r1, r2):
x = sin(u) * self.uscale * r1 * r2 * self.xscale
@@ -191,16 +185,16 @@ class parabola(form):
self.generatefaces()
for i in range(len(self.verts)):
self.verts[i].index = i
- self.connectivity()
-
+ self.connectivity()
+
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
-
-class torus(form):
+
+class torus(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,\
@@ -209,8 +203,8 @@ class torus(form):
self.generatefaces()
for i in range(len(self.verts)):
self.verts[i].index = i
- self.connectivity()
-
+ self.connectivity()
+
def formula(self, u, v, r1, r2):
z = sin(v) * self.uscale * r2 * self.yscale
y = (self.vscale + self.uscale * cos(v)) * cos(u) * r1 * r2
@@ -228,8 +222,8 @@ class sphere(form):
self.generatefaces()
for i in range(len(self.verts)):
self.verts[i].index = i
- self.connectivity()
-
+ self.connectivity()
+
def formula(self, u, v, r1, r2):
v = (v * 0.5) - (self.a360 * 0.25)
x = r1 * cos(u) * r2 * cos(v) * self.uscale * self.xscale
diff --git a/geodesic_domes/geodesic_classes_271.py b/geodesic_domes/geodesic_classes_271.py
index 9142b2b..985dccc 100644
--- a/geodesic_domes/geodesic_classes_271.py
+++ b/geodesic_domes/geodesic_classes_271.py
@@ -1,5 +1,5 @@
-#werkt from
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list