[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2449] branches/geodesic_domes/ geodesic_classes_259.py: to successfully run the unittest_1_geodesic_domes. py trying to make objects
Peter K.H. Gragert
pkhgragert at gmail.com
Sat Oct 15 09:06:59 CEST 2011
Revision: 2449
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2449
Author: pkhg
Date: 2011-10-15 07:06:58 +0000 (Sat, 15 Oct 2011)
Log Message:
-----------
to successfully run the unittest_1_geodesic_domes.py trying to make objects
a lot of members are now defined directly.
Some as None, such that the tests become clear, if a value is not set.
==> A nice skeleton is created in 3DView
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-15 07:03:58 UTC (rev 2448)
+++ branches/geodesic_domes/geodesic_classes_259.py 2011-10-15 07:06:58 UTC (rev 2449)
@@ -22,6 +22,33 @@
self.a180 = pi
self.a270 = pi * 1.5
self.a360 = pi * 2
+ #define members here
+ #setparams needs:
+ self.frequency = None
+ self.eccentricity = None
+ self.squish = None
+ self.radius = None
+ self.square = None
+ self.squarez = None
+ self.cart = None
+ self.shape = None
+ self.baselevel = None
+ self.faceshape = None
+ self.dualflag = None
+ self.rotxy = None
+ self.rotz = None
+ self.klass = None
+ self.sform = None
+ self.super = None
+ self.odd = None
+ #config needs
+ self.panelpoints = None
+ self.paneledges = None
+ self.reversepanel = None
+ self.edgelength = None
+ self.vertsdone = None
+ self.panels = []
+
#PKHG because of unittest approach for a while the following three lines commentd
#self.setparameters(parameters)
#self.makegeodesic()
@@ -73,7 +100,6 @@
pass
def config(self):
- print("\n========dbg pkhg self.vertskeleton =",self.vertskeleton)
for i in range(len(self.vertskeleton)):
self.vertskeleton[i].index = i
for edges in self.edgeskeleton:
@@ -81,6 +107,7 @@
self.skeleton.append(s)
for i in range(len( self.verts)):
self.verts[i].index = i
+
for i in range(len(self.panelpoints)):
a = self.vertsdone[self.panelpoints[i][0]][1]
b = self.vertsdone[self.panelpoints[i][1]][1]
@@ -99,7 +126,7 @@
reverseflag = 1
p = panel(panpoints, panedges, reverseflag, self)
self.panels.append(p)
-
+
def sphericalize(self):
if self.shape == 2:
self.cutbasecomp()
@@ -340,22 +367,24 @@
#for point on top?
class tetrahedron(geodesic):
def vertedgefacedata(self):
- print(type(self))
self.vertskeleton=[ vertex(( 0.0 , 0.0 , 1.73205080757 )),
vertex(( 0.0 , -1.63299316185 , -0.577350269185 )),
vertex(( 1.41421356237 , 0.816496580927 , -0.57735026919 )),
vertex(( -1.41421356237 , 0.816496580927 , -0.57735026919 )) ]
+ print("\n**** dbg tetrahedron L347",len(self.vertskeleton))
self.edgeskeleton=[ edge(self.vertskeleton[0],self.vertskeleton[1]),
edge(self.vertskeleton[0],self.vertskeleton[2]),
edge(self.vertskeleton[0],self.vertskeleton[3]),
edge(self.vertskeleton[1],self.vertskeleton[2]),
edge(self.vertskeleton[2],self.vertskeleton[3]),
edge(self.vertskeleton[1],self.vertskeleton[3]) ]
+ print("\n**** dbg tetrahedron L354",len(self.edgeskeleton))
+
### probably to be removed, other gui! : "#??? delete PKHG"
-#??? delete PKHG self.panelpoints=[[0,1,2],[0,2,3],[0,1,3],[1,2,3]]
-#??? delete PKHG self.paneledges=[[0,1,3],[1,2,4],[0,2,5],[3,5,4]]
-#??? delete PKHG self.reversepanel=[2,3]
-#???TODO self.edgelength=[]
+ self.panelpoints=[[0,1,2],[0,2,3],[0,1,3],[1,2,3]]
+ self.paneledges=[[0,1,3],[1,2,4],[0,2,5],[3,5,4]]
+ self.reversepanel=[2,3]
+ self.edgelength=[]
self.vertsdone=[[0,0]] * len(self.vertskeleton)
#for edge on top?
@@ -376,7 +405,7 @@
self.panelpoints=[[0,1,2],[1,2,3],[0,1,3],[0,2,3]]
self.paneledges=[[0,1,4],[4,3,5],[0,2,3],[1,2,5]]
self.reversepanel=[0,3]
-## self.edgelength=[]
+ self.edgelength=[]
self.vertsdone=[[0,0]] * len(self.vertskeleton)
#for face on top?
@@ -395,7 +424,7 @@
self.panelpoints=[[2,0,1],[0,1,3],[2,1,3],[2,0,3]]
self.paneledges=[[2,1,0],[0,3,4],[1,5,4],[2,5,3]]
self.reversepanel=[1,3]
-## self.edgelength=[]
+ self.edgelength=[]
self.vertsdone=[[0,0]] * len(self.vertskeleton)
class octahedron(geodesic):
@@ -423,7 +452,7 @@
self.panelpoints=[[0,1,2],[0,2,3],[0,3,4],[0,4,1],[1,2,5],[2,3,5],[3,4,5],[4,1,5]]
self.paneledges=[[0,1,4],[1,2,5],[2,3,6],[3,0,7],[4,8,9],[5,9,10],[6,10,11],[7,11,8]]
self.reversepanel=[4,5,6,7]
-## self.edgelength=[]
+ self.edgelength=[]
self.vertsdone=[[0,0]] * len(self.vertskeleton)
class octaedge(geodesic):
def vertedgefacedata(self):
@@ -448,7 +477,7 @@
self.panelpoints=[[0,1,2],[0,1,3],[0,2,4],[1,2,5],[1,3,5],[0,3,4],[2,4,5],[3,4,5]]
self.paneledges=[[0,2,3],[0,6,5],[2,1,7],[3,4,8],[5,4,9],[6,1,10],[7,8,11],[10,9,11]]
self.reversepanel=[0,2,4,7]
-## self.edgelength=[]
+ self.edgelength=[]
self.vertsdone=[[0,0]] * len(self.vertskeleton)
class octaface(geodesic):
def vertedgefacedata(self):
@@ -473,7 +502,7 @@
self.panelpoints=[[2,0,1],[0,3,4],[0,1,4],[1,4,5],[2,1,5],[2,3,5],[2,0,3],[3,4,5]]
self.paneledges=[[2,1,0],[3,4,9],[0,4,5],[5,6,10],[1,7,6],[8,7,11],[2,8,3],[9,11,10]]
self.reversepanel=[2,5,6,7]
-## self.edgelength=[]
+ self.edgelength=[]
self.vertsdone=[[0,0]] * len(self.vertskeleton)
class icosahedron(geodesic):
def vertedgefacedata(self):
@@ -522,7 +551,7 @@
self.panelpoints=[[0,1,2],[0,2,3],[0,3,4],[0,4,5],[0,5,1],[1,2,6],[2,6,7],[2,3,7],[3,7,8],[3,4,8],[4,8,9],[4,5,9],[5,9,10],[5,1,10],[1,10,6],[6,7,11],[7,8,11],[8,9,11],[9,10,11],[10,6,11]]
self.paneledges=[[0,1,5],[1,2,6],[2,3,7],[3,4,8],[4,0,9],[5,10,11],[11,12,20],[6,12,13],[13,14,21],[7,14,15],[15,16,22],[8,16,17],[17,18,23],[9,18,19],[19,10,24],[20,25,26],[21,26,27],[22,27,28],[23,28,29],[24,29,25]]
self.reversepanel=[5,7,9,11,13,15,16,17,18,19]
-## self.edgelength=[]
+ self.edgelength=[]
self.vertsdone=[[0,0]] * len(self.vertskeleton)
class icoedge(geodesic):
def vertedgefacedata(self):
@@ -573,7 +602,7 @@
self.paneledges=[[0,2,3],[0,7,6],[2,1,9],[3,4,11],[4,5,12],[6,5,13],[7,8,15],[8,1,16],[9,10,18],[11,10,19],
[13,14,22],[15,14,23],[18,17,25],[19,20,26],[12,20,21],[22,21,27],[23,24,28],[16,24,17],[25,26,29],[28,27,29]]
self.reversepanel=[0,2,5,9,11,12,14,15,17,19]
-## self.edgelength=[]
+ self.edgelength=[]
self.vertsdone=[[0,0]] * len(self.vertskeleton)
class icoface(geodesic):
def vertedgefacedata(self):
@@ -623,6 +652,6 @@
self.paneledges=[[2,1,0],[0,3,4],[1,7,6],[2,9,10],[4,5,13],[6,5,14],[7,8,16],[9,8,17],[10,11,19],[3,11,20],
[13,12,21],[14,15,22],[16,15,23],[17,18,24],[19,18,25],[20,12,26],[21,22,27],[24,23,28],[25,26,29],[29,28,27]]
self.reversepanel=[1,3,5,7,9,10,12,14,17,19]
-## self.edgelength=[]
+ self.edgelength=[]
self.vertsdone=[[0,0]] * len(self.vertskeleton)
print("\n===========geodesic start ===========")
More information about the Bf-extensions-cvs
mailing list