[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2684] branches/geodesic_domes/ geodesic_domes_260/vefm_259.py: A little bit clean up
Peter K.H. Gragert
pkhgragert at gmail.com
Wed Nov 30 08:02:29 CET 2011
Revision: 2684
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2684
Author: pkhg
Date: 2011-11-30 07:02:24 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
A little bit clean up
Modified Paths:
--------------
branches/geodesic_domes/geodesic_domes_260/vefm_259.py
Modified: branches/geodesic_domes/geodesic_domes_260/vefm_259.py
===================================================================
--- branches/geodesic_domes/geodesic_domes_260/vefm_259.py 2011-11-29 22:45:56 UTC (rev 2683)
+++ branches/geodesic_domes/geodesic_domes_260/vefm_259.py 2011-11-30 07:02:24 UTC (rev 2684)
@@ -14,7 +14,7 @@
from add_utils import AddObjectHelper, add_object_data
from collections import Counter
-
+'''PKHG not needed?
def find_twice_vert(l1,l2):
tmp = [el for el in l1]
tmp.extend(l2)
@@ -22,6 +22,7 @@
result = max(tt.keys(),key = lambda k:tt[k])
print("twice give", result)
return result
+'''
def vefm_add_object(selfobj):
for i in range(len(selfobj.verts)):
@@ -51,12 +52,8 @@
class vertex:
- def __init__(self,vec=(0,0,0)): #x = 0,y = 0,z = 0):
+ def __init__(self,vec=(0,0,0)): #default x = 0,y = 0,z = 0):
self.vector = Vector(vec)
-#PKHG test 20111030
-# self.x = vec[0]
-# self.y = vec[1]
-# self.z = vec[2]
self.length = self.vector.length
self.index = 0
self.normal = 0
@@ -122,7 +119,7 @@
#PKHG not implemented, needed?
pass
-#???PKHG TODO why are add and sub different?
+#???PKHG TODO why are add and sub different? Solved check the two cases used
def __add__(self,other):
if "<class 'mathutils.Vector'>" == str(type(other)):
tmp = self.vector + other
@@ -135,7 +132,7 @@
tmp = self.vector - other
else:
tmp = self.vector - other.vector
- tmp = self.vector - other.vector
+# tmp = self.vector - other.vector
return vertex(tmp)
def __mul__(self,other):
@@ -148,7 +145,6 @@
return (tmp)
def negative(self):
-# return vertex((-self.x,-self.y,-self.z))
return vertex(-self.vector)
class crossp:
@@ -156,21 +152,15 @@
def __init__(self,v1,v2):
self.v1 = v1
self.v2 = v2
- # self.docrossproduct(v1,v2)
#
def docrossproduct(self):
tmp = self.v1.vector.cross(self.v2.vector)
-# x = (self.v1.y*self.v2.z)-(self.v2.y*self.v1.z)
-# y = (self.v1.z*self.v2.x)-(self.v2.z*self.v1.x)
-# z = (self.v1.x*self.v2.y)-(self.v2.x*self.v1.y)
-# return vertex(x,y,z)
return vertex(tmp)
class average:
## Takes a list of vertices and returns the average. If two verts are passed, returns midpoint.
def __init__(self,vertlist):
self.vertlist = vertlist
- # self.centroid()
def centroid(self):
tmp = Vector()
@@ -247,10 +237,8 @@
if v1.length == 0 or v2.length == 0:
print("\nPKHG warning, =====vefm_259 dotproduct L245====== at least one zero vector 0 used")
return 0 # pi * 0.25 #PKHT_TEST04nov pi * 0.25 #45 degrees??? #PKHG???TODO
-# dot=(v1.x*v2.x)+(v1.y*v2.y)+(v1.z*v2.z)
dot = v1.vector.dot(v2.vector)
- costheta = dot/(v1.length*v2.length)
-# pkhgtmp = v1.vector.dot(v2.vector)
+ costheta = dot / (v1.length * v2.length)
tmp = acos(costheta)
return tmp
@@ -342,8 +330,6 @@
leftvect = edge.vectb
corner.append(rightedge)
corner.append(leftedge)
-# print("\n===========---------dbg vefm L332corner stuff vert",current.index)
-# print("corner nu =",corner)
if rightedge and leftedge:
'''
if rightedge:
@@ -368,7 +354,6 @@
two = two.vect
elif two.b is self.corners[1][0]:
two = two.vectb
- # print("crossp 1",one,"crossp 2",two)
self.normal = crossp(one,two).docrossproduct()
self.normal.findlength()
self.normal.normalize()
@@ -401,7 +386,7 @@
spokes.append(newedge)
class mesh:
- def __init__(self , name="pkhg_test"):
+ def __init__(self , name="GD_mesh"):
self.name = name #pkhg test phase at least ;-)
self.verts=[]
self.edges=[]
@@ -559,7 +544,6 @@
self.makehexfaces(face)
for vert in self.verts:
- #PKHG TODO
vert.clockwise()
self.hexvertface(vert)
self.verts = self.hexverts
@@ -568,19 +552,17 @@
self.vertedgeflag = 0
self.vertfaceflag = 0
self.faceedgeflag = 0
- print("\n ==========================self hexified I hope")
+#PKHG_DBG print("\n ==========================self hexified I hope")
#breakpoint(locals(),True)
def hexshorten(self,currentedge, hexvert_counter):
third = vertex(currentedge.vect/3.0)
-# newvert1 = vertex(currentedge.a.x,currentedge.a.y,currentedge.a.z)
-# newvert2 = vertex(currentedge.b.x,currentedge.b.y,currentedge.b.z)
newvert1 = vertex(currentedge.a.vector)
newvert2 = vertex(currentedge.b.vector)
newvert1 = newvert1 + third
newvert1.index = hexvert_counter
newvert2 = newvert2 - third
- newvert2.index = hexvert_counter + 1 #PKHG FORGOTTON?? 21-11
+ newvert2.index = hexvert_counter + 1 #PKHG caller adjusts +=2
newedge = edge(newvert1,newvert2)
newedge.index = currentedge.index
self.hexverts.append(newvert1)
@@ -684,8 +666,8 @@
self.faceedgeflag = 0
def class2(self):
- self.class2verts=[]
- self.class2edges=[]
+ self.class2verts=[] #PKHG_??? used?
+ self.class2edges=[] #PKHG_??? used?
self.class2faces=[]
newvertstart = len(self.verts)
@@ -839,8 +821,7 @@
def createghostverts(self):
self.ghoststart = len(self.verts)
for vert in self.base.verts:
- # print("vert.normal",vert.normal," self.coords[-1][1] ",self.coords[-1][1])
- newvert = vert+(vert.normal*self.coords[-1][1])
+ newvert = vert + (vert.normal * self.coords[-1][1])
self.verts.append(newvert)
def doface(self,candidate):
@@ -855,7 +836,6 @@
else:
line=[]
for point in candidate.vertices:
-# newvert = vertex(point.x,point.y,point.z)
newvert = vertex(point.vector)
self.verts.append(newvert)
line.append(newvert)
@@ -935,14 +915,13 @@
for vert in e.vertices:
a = self.verts[vert]
tmp.append(a)
-#dbg print("\n--------13 11 L893 importmesh tmp = ",tmp,type(tmp[0]),type(tmp[1]))
newedge = edge(tmp[0],tmp[1])
newedge.index = e.index
self.edges.append(newedge)
#PKHG faces
for f in impmesh.data.faces:
temp=[]
- for vert in f.vertices: #PKHG a list of indices
+ for vert in f.vertices: #PKHG a list! of indices
a = self.verts[vert] #PKHG verts contains already vertex objects
temp.append(a)
newface = face(temp)
@@ -955,13 +934,6 @@
for i in range(len(self.verts)):
self.temp.append([])
self.verts[i].index = i
- ''' see above! PKHG something is missing in breakquad
- if breakquadflag:
- for facey in self.faces:
- if len(facey.vertices)>3:
- #print("***INFO***quad found")
- self.breakquad(facey)
- #'''
for i in range(len(self.verts)):
target = self.surroundingverts(self.verts[i])
for j in range(len(target)): ## go through those verts
@@ -1163,11 +1135,8 @@
start = len(self.verts)
centre = apex
for point in template.verts:
-# ay = apex.normal * point.z * self.height
ay = apex.normal * point.vector.z * self.height
-# ce = apex.cross * point.y * self.width
ce = apex.cross * point.vector.y * self.width
-# be = apex.unit * point.x * self.shrink
be = apex.unit * point.vector.x * self.shrink
de = ay+be+ce
newvert = centre+de
More information about the Bf-extensions-cvs
mailing list