[Bf-extensions-cvs] [ecc140b2] master: Cleanup: trailing space
Campbell Barton
noreply at git.blender.org
Fri Sep 7 22:05:16 CEST 2018
Commit: ecc140b225c25a727a582bbe5dea001678497ed0
Author: Campbell Barton
Date: Sat Sep 8 06:14:37 2018 +1000
Branches: master
https://developer.blender.org/rBACecc140b225c25a727a582bbe5dea001678497ed0
Cleanup: trailing space
===================================================================
M add_dimension.py
M add_mesh_clusters/add_mesh_cluster.py
M add_mesh_rocks/rockgen.py
M amaranth/node_editor/switch_material.py
M amaranth/render/unsimplify.py
M automat/AdjOp.py
M automat/JSONOps.py
M cacharanth/__init__.py
M cacharanth/util.py
M cmu_mocap_browser/data.py
M cmu_mocap_browser/makehuman.py
M curve_tools/Curves.py
M curve_tools/Math.py
M curve_tools/Operators.py
M curve_tools/Properties.py
M curve_tools/Surfaces.py
M curve_tools/Util.py
M curve_tools/auto_loft.py
M curve_tools/curve_outline.py
M data_overrides/__init__.py
M data_overrides/override.py
M data_overrides/ui.py
M data_overrides/util.py
M io_atomblend_utilities/io_atomblend_utilities.py
M io_directx_bel/__init__.py
M io_directx_bel/bel/__init__.py
M io_directx_bel/bel/fs.py
M io_directx_bel/bel/group.py
M io_directx_bel/bel/image.py
M io_directx_bel/bel/material.py
M io_directx_bel/bel/mesh.py
M io_directx_bel/bel/ob.py
M io_directx_bel/bel/uv.py
M io_directx_bel/import_x.py
M io_import_BrushSet.py
M io_import_sound_to_anim.py
M io_mesh_gwyddion/import_gwyddion.py
M io_mesh_xyz/export_xyz.py
M io_mesh_xyz/import_xyz.py
M io_points_pcd/__init__.py
M io_points_pcd/pcd_utils.py
M io_points_pcd/pcdparser.py
M io_scene_cod/export_xanim.py
M io_scene_cod/export_xmodel.py
M io_scene_cod/import_xmodel.py
M io_scene_map/__init__.py
M io_scene_map/export_map.py
M mesh_copy_uvs_from_joined.py
M mesh_insert_edge_ring.py
M mesh_ktools.py
M mesh_xoffsets.py
M np_station/__init__.py
M np_station/np_float_box.py
M np_station/np_float_poly.py
M np_station/np_float_rectangle.py
M np_station/np_point_align.py
M np_station/np_point_array.py
M np_station/np_point_copy.py
M np_station/np_point_instance.py
M np_station/utils_function.py
M np_station/utils_geometry.py
M np_station/utils_graphics.py
M object_particle_hair_lab.py
M object_particle_hair_net.py
M oscurart_mesh_thread.py
M render_auto_save.py
M render_shots.py
M space_view3d_enhanced_3d_cursor.py
M space_view3d_library_hide.py
M space_view3d_quickPrefs.py
M sun_position/map.py
M sun_position/operators.py
M sun_position/properties.py
M text_editor_hastebin.py
===================================================================
diff --git a/add_dimension.py b/add_dimension.py
index 1b95bbb9..e62b56f3 100644
--- a/add_dimension.py
+++ b/add_dimension.py
@@ -1724,7 +1724,7 @@ def createCurve(vertArray, self, align_matrix):
DimensionCurve.rotation_euler[0] = radians(self.Dimension_rotation)
DimensionCurve.rotation_euler[1] = u1
DimensionCurve.rotation_euler[2] = u2
-
+
# Align to view
if self.Dimension_align_to_camera :
obj_camera = bpy.context.scene.camera
@@ -1747,7 +1747,7 @@ def createCurve(vertArray, self, align_matrix):
group_name = 'Dimensions'
bpy.ops.object.mode_set(mode = 'OBJECT')
-
+
if group_name in bpy.data.groups:
group = bpy.data.groups[group_name]
else:
@@ -1764,7 +1764,7 @@ def createCurve(vertArray, self, align_matrix):
if self.Dimension_appoint_parent and not self.Dimension_parent == '':
const = DimensionCurve.constraints.new(type='CHILD_OF')
const.target = bpy.data.objects[self.Dimension_parent]
- const.inverse_matrix = bpy.data.objects[self.Dimension_parent].matrix_world.inverted()
+ const.inverse_matrix = bpy.data.objects[self.Dimension_parent].matrix_world.inverted()
bpy.context.scene.update()
bpy.ops.object.select_all(action='DESELECT')
@@ -1818,7 +1818,7 @@ def createCurve(vertArray, self, align_matrix):
#### Parent
DimensionCurve.Dimension_parent = self.Dimension_parent
DimensionCurve.Dimension_appoint_parent = self.Dimension_appoint_parent
-
+
#### Units
DimensionCurve.Dimension_units = self.Dimension_units
DimensionCurve.Dimension_add_units_name = self.Dimension_add_units_name
diff --git a/add_mesh_clusters/add_mesh_cluster.py b/add_mesh_clusters/add_mesh_cluster.py
index 9e30203f..53e54e1e 100644
--- a/add_mesh_clusters/add_mesh_cluster.py
+++ b/add_mesh_clusters/add_mesh_cluster.py
@@ -171,14 +171,14 @@ class CLASS_atom_cluster_Elements(object):
self.radii_ionic = radii_ionic
# This is the class, which stores the properties of one atom.
-class CLASS_atom_cluster_atom(object):
+class CLASS_atom_cluster_atom(object):
__slots__ = ('location')
def __init__(self, location):
self.location = location
# -----------------------------------------------------------------------------
# Read atom data
-
+
def DEF_atom_read_atom_data():
del ATOM_CLUSTER_ELEMENTS[:]
@@ -195,7 +195,7 @@ def DEF_atom_read_atom_data():
radii,radii_ionic)
ATOM_CLUSTER_ELEMENTS.append(li)
-
+
# -----------------------------------------------------------------------------
# Routines for shapes
@@ -217,19 +217,19 @@ def vec_in_parabole(atom_pos, height, diameter):
regular = True
inner = True
-
- px = atom_pos[0]
- py = atom_pos[1]
+
+ px = atom_pos[0]
+ py = atom_pos[1]
pz = atom_pos[2] + height/2.0
-
+
a = diameter / sqrt(4 * height)
-
-
+
+
if pz < 0.0:
return (False, False)
if px == 0.0 and py == 0.0:
return (True, True)
-
+
if py == 0.0:
y = 0.0
x = a * a * pz / px
@@ -238,17 +238,17 @@ def vec_in_parabole(atom_pos, height, diameter):
y = pz * py * a * a / (px*px + py*py)
x = y * px / py
z = (x*x + y*y) / (a * a)
-
+
if( atom_pos.length > sqrt(x*x+y*y+z*z) ):
regular = False
-
+
return (regular, inner)
def vec_in_pyramide_square(atom_pos, size, skin):
-
+
"""
- Please, if possible leave all this! The code documents the
+ Please, if possible leave all this! The code documents the
mathemetical way of cutting a pyramide with square base.
P1 = Vector((-size/2, 0.0, -size/4))
@@ -262,7 +262,7 @@ def vec_in_pyramide_square(atom_pos, size, skin):
v12 = P1 - P6
n1 = v11.cross(v12)
g1 = -n1 * P1
-
+
# Second face
v21 = P6 - P4
v22 = P6 - P5
@@ -274,20 +274,20 @@ def vec_in_pyramide_square(atom_pos, size, skin):
v32 = P1 - P6
n3 = v32.cross(v31)
g3 = -n3 * P1
-
+
# Forth face
v41 = P6 - P2
v42 = P2 - P4
n4 = v41.cross(v42)
g4 = -n4 * P2
-
+
# Fith face, base
v51 = P2 - P1
v52 = P2 - P4
n5 = v51.cross(v52)
g5 = -n5 * P2
"""
-
+
# A much faster way for calculation:
size2 = size * size
size3 = size2 * size
@@ -300,7 +300,7 @@ def vec_in_pyramide_square(atom_pos, size, skin):
n4 = Vector(( 1/4, -1/4, 1/4)) * size2
g4 = g1
n5 = Vector(( 0.0, 0.0, -1/2)) * size2
- g5 = -1/8 * size3
+ g5 = -1/8 * size3
distance_plane_1 = abs((n1 * atom_pos - g1)/n1.length)
on_plane_1 = (atom_pos - n1 * (distance_plane_1/n1.length)).length
@@ -330,7 +330,7 @@ def vec_in_pyramide_square(atom_pos, size, skin):
return (regular, inner)
size = size * (1.0 - skin)
-
+
size2 = size * size
size3 = size2 * size
n1 = Vector((-1/4, -1/4, 1/4)) * size2
@@ -342,7 +342,7 @@ def vec_in_pyramide_square(atom_pos, size, skin):
n4 = Vector(( 1/4, -1/4, 1/4)) * size2
g4 = g1
n5 = Vector(( 0.0, 0.0, -1/2)) * size2
- g5 = -1/8 * size3
+ g5 = -1/8 * size3
distance_plane_1 = abs((n1 * atom_pos - g1)/n1.length)
on_plane_1 = (atom_pos - n1 * (distance_plane_1/n1.length)).length
@@ -354,7 +354,7 @@ def vec_in_pyramide_square(atom_pos, size, skin):
on_plane_4 = (atom_pos - n4 * (distance_plane_4/n4.length)).length
distance_plane_5 = abs((n5 * atom_pos - g5)/n5.length)
on_plane_5 = (atom_pos - n5 * (distance_plane_5/n5.length)).length
-
+
inner = False
if(atom_pos.length > on_plane_1):
inner = True
@@ -371,22 +371,22 @@ def vec_in_pyramide_square(atom_pos, size, skin):
def vec_in_pyramide_hex_abc(atom_pos, size, skin):
-
+
a = size/2.0
#c = size/2.0*cos((30/360)*2.0*pi)
c = size * 0.4330127020
- #s = size/2.0*sin((30/360)*2.0*pi)
- s = size * 0.25
+ #s = size/2.0*sin((30/360)*2.0*pi)
+ s = size * 0.25
#h = 2.0 * (sqrt(6.0)/3.0) * c
h = 1.632993162 * c
"""
- Please, if possible leave all this! The code documents the
+ Please, if possible leave all this! The code documents the
mathemetical way of cutting a tetraeder.
P1 = Vector((0.0, a, 0.0))
P2 = Vector(( -c, -s, 0.0))
- P3 = Vector(( c, -s, 0.0))
+ P3 = Vector(( c, -s, 0.0))
P4 = Vector((0.0, 0.0, h))
C = (P1+P2+P3+P4)/4.0
P1 = P1 - C
@@ -399,7 +399,7 @@ def vec_in_pyramide_hex_abc(atom_pos, size, skin):
v12 = P1 - P4
n1 = v11.cross(v12)
g1 = -n1 * P1
-
+
# Second face
v21 = P2 - P3
v22 = P2 - P4
@@ -411,7 +411,7 @@ def vec_in_pyramide_hex_abc(atom_pos, size, skin):
v32 = P3 - P4
n3 = v31.cross(v32)
g3 = -n3 * P3
-
+
# Forth face
v41 = P2 - P1
v42 = P2 - P3
@@ -452,12 +452,12 @@ def vec_in_pyramide_hex_abc(atom_pos, size, skin):
return (regular, inner)
size = size * (1.0 - skin)
-
+
a = size/2.0
#c = size/2.0*cos((30/360)*2.0*pi)
c= size * 0.4330127020
- #s = size/2.0*sin((30/360)*2.0*pi)
- s = size * 0.25
+ #s = size/2.0*sin((30/360)*2.0*pi)
+ s = size * 0.25
#h = 2.0 * (sqrt(6.0)/3.0) * c
h = 1.632993162 * c
@@ -478,7 +478,7 @@ def vec_in_pyramide_hex_abc(atom_pos, size, skin):
on_plane_3 = (atom_pos - n3 * (distance_plane_3/n3.length)).length
distance_plane_4 = abs((n4 * atom_pos - g4)/n4.length)
on_plane_4 = (atom_pos - n4 * (distance_plane_4/n4.length)).length
-
+
inner = False
if(atom_pos.length > on_plane_1):
inner = True
@@ -490,7 +490,7 @@ def vec_in_pyramide_hex_abc(atom_pos, size, skin):
inner = True
return (regular, inner)
-
+
def vec_in_octahedron(atom_pos,size, skin):
@@ -499,7 +499,7 @@ def vec_in_octahedron(atom_pos,size, skin):
inner = True
"""
- Please, if possible leave all this! The code documents the
+ Please, if possible leave all this! The code documents the
mathemetical way of cutting an octahedron.
P1 = Vector((-size/2, 0.0, 0.0))
@@ -514,19 +514,19 @@ def vec_in_octahedron(atom_pos,size, skin):
v12 = P2 - P3
n1 = v11.cross(v12)
g1 = -n1 * P2
-
+
# Second face
v21 = P1 - P5
v22 = P1 - P3
n2 = v21.cross(v22)
- g2 = -n2 * P1
-
+ g2 = -n2 * P1
+
# Third face
v31 = P1 - P2
v32 = P1 - P6
n3 = v31.cross(v32)
g3 = -n3 * P1
-
+
# Forth face
v41 = P6 - P2
v42 = P2 - P4
@@ -557,7 +557,7 @@ def vec_in_octahedron(atom_pos,size, skin):
n8 = v82.cross(v81)
g8 = -n8 * P1
"""
-
+
# A much faster way for calculation:
size2 = size * size
size3 = size2 * size
@@ -720,12 +720,12 @@ def vec_in_truncated_octahedron(atom_pos,size, skin):
# pp = (size/2.0) - (sqrt(2.0)/2.0) * ((size/sqrt(2.0))/3.0)
pp = size / 3.0
- n_1 = Vector((1.0,0.0,0.0))
- n_2 = Vector((-1.0,0.0,0.0))
- n_3 = Vector((0.0,1.0,0.0))
+ n_1 = Vector((1.0,0.0,0.0))
+ n_2 = Vector((-1.0,0.0,0.0))
+ n_3 = Vector((0.0,1.0,0.0))
n_4 = Vector((0.0,-1.0,0.0))
- n_5 = Vector((0.0,0.0,1.0))
- n_6 = Vector((0.0,0.0,-1.0))
+ n_5 = Vector((0.0,0.0,1.0))
+ n_6 = Vector((0.0,0.0,-1.0))
distance_plane_1b = abs((n_1 * atom_pos + pp)/n_1.length)
on_plane_1b = (atom_pos - n_1 * (distance_plane_1b/n_1.length)).length
@@ -773,7 +773,7 @@ def vec_in_truncated_octahedron(atom_pos,size, skin):
return (regular, inner)
size = size * (1.0 - skin)
-
+
# The normal octahedron
size2 = size * size
size3 = size2 * size
@@ -815,13 +815,13 @@ def vec_in_truncated_octahedron(atom_pos,size, skin):
# pp = (size/2.0) - (sqrt(2.0)/2.0) * ((size/sqrt(2.0))/3.0)
pp = size / 3.0
- n_1 = Vector((1.0,0.0,0.0))
- n_2 = Vector((-1.0,0.0,0.0))
- n_3 = Vector((0.0,1.0,0.0))
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list