[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [637] trunk/py/scripts/addons: update for mathutils, also stripped some redundant conversions.
Campbell Barton
ideasman42 at gmail.com
Sun Apr 25 21:40:09 CEST 2010
Revision: 637
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-extensions&revision=637
Author: campbellbarton
Date: 2010-04-25 21:40:06 +0200 (Sun, 25 Apr 2010)
Log Message:
-----------
update for mathutils, also stripped some redundant conversions.
Modified Paths:
--------------
trunk/py/scripts/addons/add_mesh_archimedean_solids.py
trunk/py/scripts/addons/add_mesh_gemstones.py
trunk/py/scripts/addons/add_mesh_spindle.py
trunk/py/scripts/addons/add_mesh_sqorus.py
trunk/py/scripts/addons/add_mesh_star.py
trunk/py/scripts/addons/add_mesh_twisted_torus.py
trunk/py/scripts/addons/add_mesh_wedge.py
trunk/py/scripts/addons/export_unreal_psk_psa.py
trunk/py/scripts/addons/import_scene_unreal_psk.py
trunk/py/scripts/addons/space_view3d_panel_measure.py
Modified: trunk/py/scripts/addons/add_mesh_archimedean_solids.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_archimedean_solids.py 2010-04-24 19:35:58 UTC (rev 636)
+++ trunk/py/scripts/addons/add_mesh_archimedean_solids.py 2010-04-25 19:40:06 UTC (rev 637)
@@ -239,13 +239,13 @@
for z, up in [(size / 2.0, True), (-size / 2.0, False)]:
face = []
face.append(len(verts))
- verts.append(Vector(quad_size / 2.0, quad_size / 2.0, z))
+ verts.append(Vector((quad_size / 2.0, quad_size / 2.0, z)))
face.append(len(verts))
- verts.append(Vector(quad_size / 2.0, -quad_size / 2.0, z))
+ verts.append(Vector((quad_size / 2.0, -quad_size / 2.0, z)))
face.append(len(verts))
- verts.append(Vector(-quad_size / 2.0, -quad_size / 2.0, z))
+ verts.append(Vector((-quad_size / 2.0, -quad_size / 2.0, z)))
face.append(len(verts))
- verts.append(Vector(-quad_size / 2.0, quad_size / 2.0, z))
+ verts.append(Vector((-quad_size / 2.0, quad_size / 2.0, z)))
if up:
# Top face (quad)
@@ -260,21 +260,21 @@
edgeloop = []
edgeloop.append(len(verts))
- verts.append(Vector(size / 2.0, quad_size / 2.0, z))
+ verts.append(Vector((size / 2.0, quad_size / 2.0, z)))
edgeloop.append(len(verts))
- verts.append(Vector(size / 2.0, -quad_size / 2.0, z))
+ verts.append(Vector((size / 2.0, -quad_size / 2.0, z)))
edgeloop.append(len(verts))
- verts.append(Vector(quad_size / 2.0, -size / 2.0, z))
+ verts.append(Vector((quad_size / 2.0, -size / 2.0, z)))
edgeloop.append(len(verts))
- verts.append(Vector(-quad_size / 2.0, -size / 2.0, z))
+ verts.append(Vector((-quad_size / 2.0, -size / 2.0, z)))
edgeloop.append(len(verts))
- verts.append(Vector(-size / 2.0, -quad_size / 2.0, z))
+ verts.append(Vector((-size / 2.0, -quad_size / 2.0, z)))
edgeloop.append(len(verts))
- verts.append(Vector(-size / 2.0, quad_size / 2.0, z))
+ verts.append(Vector((-size / 2.0, quad_size / 2.0, z)))
edgeloop.append(len(verts))
- verts.append(Vector(-quad_size / 2.0, size / 2.0, z))
+ verts.append(Vector((-quad_size / 2.0, size / 2.0, z)))
edgeloop.append(len(verts))
- verts.append(Vector(quad_size / 2.0, size / 2.0, z))
+ verts.append(Vector((quad_size / 2.0, size / 2.0, z)))
if up:
# Upper 8-sider
@@ -325,7 +325,7 @@
faces = []
for f in ngons:
- loc = Vector(0.0, 0.0, 0.0)
+ loc = Vector((0.0, 0.0, 0.0))
for vert_idx in f:
loc = loc + Vector(verts[vert_idx])
Modified: trunk/py/scripts/addons/add_mesh_gemstones.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_gemstones.py 2010-04-24 19:35:58 UTC (rev 636)
+++ trunk/py/scripts/addons/add_mesh_gemstones.py 2010-04-25 19:40:06 UTC (rev 637)
@@ -249,11 +249,11 @@
# Tip
vert_tip = len(verts)
- verts.append(Vector(0.0, 0.0, -h1))
+ verts.append(Vector((0.0, 0.0, -h1)))
# Middle vertex of the flat side (crown)
vert_flat = len(verts)
- verts.append(Vector(0.0, 0.0, h2))
+ verts.append(Vector((0.0, 0.0, h2)))
edgeloop_flat = []
for i in range(seg):
@@ -301,11 +301,11 @@
# Middle vertex of the flat side (crown)
vert_flat = len(verts)
- verts.append(Vector(0.0, 0.0, height_flat))
+ verts.append(Vector((0.0, 0.0, height_flat)))
# Tip
vert_tip = len(verts)
- verts.append(Vector(0.0, 0.0, height_tip))
+ verts.append(Vector((0.0, 0.0, height_tip)))
verts_flat = []
verts_girdle = []
@@ -317,12 +317,12 @@
# Row for flat side
verts_flat.append(len(verts))
- vec = Vector(table_radius, 0.0, height_flat) * quat
+ vec = Vector((table_radius, 0.0, height_flat)) * quat
verts.append(vec)
# Row for the middle/girdle
verts_girdle.append(len(verts))
- vec = Vector(girdle_radius, 0.0, height_middle) * quat
+ vec = Vector((girdle_radius, 0.0, height_middle)) * quat
verts.append(vec)
# Flat face
Modified: trunk/py/scripts/addons/add_mesh_spindle.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_spindle.py 2010-04-24 19:35:58 UTC (rev 636)
+++ trunk/py/scripts/addons/add_mesh_spindle.py 2010-04-25 19:40:06 UTC (rev 637)
@@ -260,11 +260,11 @@
# Upper tip
idx_upper_tip = len(verts)
- verts.append(Vector(0, 0, half_height + cap_height))
+ verts.append(Vector((0, 0, half_height + cap_height)))
# Lower tip
idx_lower_tip = len(verts)
- verts.append(Vector(0, 0, -half_height - cap_height))
+ verts.append(Vector((0.0, 0.0, -half_height - cap_height)))
upper_edgeloop = []
lower_edgeloop = []
@@ -274,12 +274,12 @@
# Calculate index & location of upper verte4x tip.
idx_up = len(verts)
upper_edgeloop.append(idx_up)
- verts.append(Vector(radius, 0.0, half_height) * mtx)
+ verts.append(Vector((radius, 0.0, half_height)) * mtx)
if height > 0:
idx_low = len(verts)
lower_edgeloop.append(idx_low)
- verts.append(Vector(radius, 0.0, -half_height) * mtx)
+ verts.append(Vector((radius, 0.0, -half_height)) * mtx)
# Create faces for the upper tip.
tip_up_faces = createFaces([idx_upper_tip], upper_edgeloop,
Modified: trunk/py/scripts/addons/add_mesh_sqorus.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_sqorus.py 2010-04-24 19:35:58 UTC (rev 636)
+++ trunk/py/scripts/addons/add_mesh_sqorus.py 2010-04-25 19:40:06 UTC (rev 637)
@@ -255,8 +255,8 @@
for j in range(4):
x = distances[j]
- verts.append(Vector(x, y, size / 2.0))
- verts.append(Vector(x, y, -size / 2.0))
+ verts.append(Vector((x, y, size / 2.0)))
+ verts.append(Vector((x, y, -size / 2.0)))
# Top outer loop (vertex indices)
vIdx_out_up = [0, 2, 4, 6, 14, 22, 30, 28, 26, 24, 16, 8]
@@ -333,9 +333,9 @@
if append:
vert_up = len(verts)
- verts.append(Vector(x, y, size / 2.0))
+ verts.append(Vector((x, y, size / 2.0)))
vert_low = len(verts)
- verts.append(Vector(x, y, -size / 2.0))
+ verts.append(Vector((x, y, -size / 2.0)))
if inner:
vIdx_in_up.append(vert_up)
Modified: trunk/py/scripts/addons/add_mesh_star.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_star.py 2010-04-24 19:35:58 UTC (rev 636)
+++ trunk/py/scripts/addons/add_mesh_star.py 2010-04-25 19:40:06 UTC (rev 637)
@@ -244,10 +244,10 @@
half_height = height / 2.0
vert_idx_top = len(verts)
- verts.append(Vector(0.0, 0.0, half_height))
+ verts.append(Vector((0.0, 0.0, half_height)))
vert_idx_bottom = len(verts)
- verts.append(Vector(0.0, 0.0, -half_height))
+ verts.append(Vector((0.0, 0.0, -half_height)))
edgeloop_top = []
edgeloop_bottom = []
@@ -263,11 +263,11 @@
radius = inner_radius
edgeloop_top.append(len(verts))
- vec = Vector(radius, 0, half_height) * quat
+ vec = Vector((radius, 0, half_height)) * quat
verts.append(vec)
edgeloop_bottom.append(len(verts))
- vec = Vector(radius, 0, -half_height) * quat
+ vec = Vector((radius, 0, -half_height)) * quat
verts.append(vec)
Modified: trunk/py/scripts/addons/add_mesh_twisted_torus.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_twisted_torus.py 2010-04-24 19:35:58 UTC (rev 636)
+++ trunk/py/scripts/addons/add_mesh_twisted_torus.py 2010-04-25 19:40:06 UTC (rev 637)
@@ -271,10 +271,10 @@
for minor_index in range(minor_seg):
angle = (PI_2 * minor_index / minor_seg) + rot_twists
- vec = Vector(
+ vec = Vector((
major_rad + (cos(angle) * minor_rad),
0.0,
- sin(angle) * minor_rad)
+ sin(angle) * minor_rad))
vec = vec * quat
edgeloop.append(len(verts))
Modified: trunk/py/scripts/addons/add_mesh_wedge.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_wedge.py 2010-04-24 19:35:58 UTC (rev 636)
+++ trunk/py/scripts/addons/add_mesh_wedge.py 2010-04-25 19:40:06 UTC (rev 637)
@@ -262,19 +262,19 @@
vIdx_bot = []
vIdx_top.append(len(verts))
- verts.append(Vector(-size_x, -size_y, size_z))
+ verts.append(Vector((-size_x, -size_y, size_z)))
vIdx_bot.append(len(verts))
- verts.append(Vector(-size_x, -size_y, -size_z))
+ verts.append(Vector((-size_x, -size_y, -size_z)))
vIdx_top.append(len(verts))
- verts.append(Vector(size_x, -size_y, size_z))
+ verts.append(Vector((size_x, -size_y, size_z)))
vIdx_bot.append(len(verts))
- verts.append(Vector(size_x, -size_y, -size_z))
+ verts.append(Vector((size_x, -size_y, -size_z)))
vIdx_top.append(len(verts))
- verts.append(Vector(-size_x, size_y, size_z))
+ verts.append(Vector((-size_x, size_y, size_z)))
vIdx_bot.append(len(verts))
- verts.append(Vector(-size_x, size_y, -size_z))
+ verts.append(Vector((-size_x, size_y, -size_z)))
faces.append(vIdx_top)
faces.append(vIdx_bot)
Modified: trunk/py/scripts/addons/export_unreal_psk_psa.py
===================================================================
--- trunk/py/scripts/addons/export_unreal_psk_psa.py 2010-04-24 19:35:58 UTC (rev 636)
+++ trunk/py/scripts/addons/export_unreal_psk_psa.py 2010-04-25 19:40:06 UTC (rev 637)
@@ -1076,11 +1076,11 @@
# (ie. the same as B*A if A and B are matrices representing
# the rotations described by quaternions a and b)
def grassman(a, b):
- return mathutils.Quaternion(
+ return mathutils.Quaternion((
a.w*b.w - a.x*b.x - a.y*b.y - a.z*b.z,
a.w*b.x + a.x*b.w + a.y*b.z - a.z*b.y,
a.w*b.y - a.x*b.z + a.y*b.w + a.z*b.x,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list