forked from bartvdbraak/blender
add_mesh_torus now passes the pep8 test
This commit is contained in:
Campbell Barton
parent
29aea786cb
commit
2cf22b53bc
@ -16,100 +16,124 @@
|
||||
#
|
||||
# ##### END GPL LICENSE BLOCK #####
|
||||
|
||||
import bpy, Mathutils
|
||||
from math import cos, sin, pi, radians
|
||||
# <pep8-80 compliant>
|
||||
import bpy
|
||||
import Mathutils
|
||||
from math import cos, sin, pi
|
||||
|
||||
|
||||
def add_torus(PREF_MAJOR_RAD, PREF_MINOR_RAD, PREF_MAJOR_SEG, PREF_MINOR_SEG):
|
||||
Vector = Mathutils.Vector
|
||||
Quaternion = Mathutils.Quaternion
|
||||
def add_torus(major_rad, minor_rad, major_seg, minor_seg):
|
||||
Vector = Mathutils.Vector
|
||||
Quaternion = Mathutils.Quaternion
|
||||
|
||||
PI_2= pi*2
|
||||
Z_AXIS = 0,0,1
|
||||
PI_2 = pi * 2
|
||||
z_axis = (0, 0, 1)
|
||||
|
||||
verts = []
|
||||
faces = []
|
||||
i1 = 0
|
||||
tot_verts = PREF_MAJOR_SEG * PREF_MINOR_SEG
|
||||
for major_index in range(PREF_MAJOR_SEG):
|
||||
verts_tmp = []
|
||||
quat = Quaternion( Z_AXIS, (major_index/PREF_MAJOR_SEG)*PI_2)
|
||||
verts = []
|
||||
faces = []
|
||||
i1 = 0
|
||||
tot_verts = major_seg * minor_seg
|
||||
for major_index in range(major_seg):
|
||||
quat = Quaternion(z_axis, (major_index / major_seg) * PI_2)
|
||||
|
||||
for minor_index in range(PREF_MINOR_SEG):
|
||||
angle = 2*pi*minor_index/PREF_MINOR_SEG
|
||||
for minor_index in range(minor_seg):
|
||||
angle = 2 * pi * minor_index / minor_seg
|
||||
|
||||
vec = Vector(PREF_MAJOR_RAD+(cos(angle)*PREF_MINOR_RAD), 0, (sin(angle)*PREF_MINOR_RAD)) * quat
|
||||
verts.extend([vec.x, vec.y, vec.z])
|
||||
vec = Vector(major_rad + (cos(angle) * minor_rad), 0.0,
|
||||
(sin(angle) * minor_rad)) * quat
|
||||
|
||||
if minor_index+1==PREF_MINOR_SEG:
|
||||
i2 = (major_index)*PREF_MINOR_SEG
|
||||
i3 = i1 + PREF_MINOR_SEG
|
||||
i4 = i2 + PREF_MINOR_SEG
|
||||
verts.extend([vec.x, vec.y, vec.z])
|
||||
|
||||
else:
|
||||
i2 = i1 + 1
|
||||
i3 = i1 + PREF_MINOR_SEG
|
||||
i4 = i3 + 1
|
||||
if minor_index + 1 == minor_seg:
|
||||
i2 = (major_index) * minor_seg
|
||||
i3 = i1 + minor_seg
|
||||
i4 = i2 + minor_seg
|
||||
|
||||
if i2>=tot_verts: i2 = i2-tot_verts
|
||||
if i3>=tot_verts: i3 = i3-tot_verts
|
||||
if i4>=tot_verts: i4 = i4-tot_verts
|
||||
else:
|
||||
i2 = i1 + 1
|
||||
i3 = i1 + minor_seg
|
||||
i4 = i3 + 1
|
||||
|
||||
# stupid eekadoodle
|
||||
if i2: faces.extend( [i1,i3,i4,i2] )
|
||||
else: faces.extend( [i2,i1,i3,i4] )
|
||||
if i2 >= tot_verts:
|
||||
i2 = i2 - tot_verts
|
||||
if i3 >= tot_verts:
|
||||
i3 = i3 - tot_verts
|
||||
if i4 >= tot_verts:
|
||||
i4 = i4 - tot_verts
|
||||
|
||||
i1+=1
|
||||
# stupid eekadoodle
|
||||
if i2:
|
||||
faces.extend([i1, i3, i4, i2])
|
||||
else:
|
||||
faces.extend([i2, i1, i3, i4])
|
||||
|
||||
return verts, faces
|
||||
i1 += 1
|
||||
|
||||
return verts, faces
|
||||
|
||||
from bpy.props import *
|
||||
|
||||
class MESH_OT_primitive_torus_add(bpy.types.Operator):
|
||||
'''Add a torus mesh.'''
|
||||
bl_idname = "mesh.primitive_torus_add"
|
||||
bl_label = "Add Torus"
|
||||
bl_register = True
|
||||
bl_undo = True
|
||||
|
||||
major_radius = FloatProperty(name="Major Radius", description="Number of segments for the main ring of the torus", default= 1.0, min= 0.01, max= 100.0)
|
||||
minor_radius = FloatProperty(name="Minor Radius", description="Number of segments for the minor ring of the torus", default= 0.25, min= 0.01, max= 100.0)
|
||||
major_segments = IntProperty(name="Major Segments", description="Number of segments for the main ring of the torus", default= 48, min= 3, max= 256)
|
||||
minor_segments = IntProperty(name="Minor Segments", description="Number of segments for the minor ring of the torus", default= 16, min= 3, max= 256)
|
||||
class AddTorusPrimitive(bpy.types.Operator):
|
||||
'''Add a torus mesh.'''
|
||||
bl_idname = "mesh.primitive_torus_add"
|
||||
bl_label = "Add Torus"
|
||||
bl_register = True
|
||||
bl_undo = True
|
||||
|
||||
def execute(self, context):
|
||||
verts_loc, faces = add_torus(self.major_radius, self.minor_radius, self.major_segments, self.minor_segments)
|
||||
major_radius = FloatProperty(name="Major Radius",
|
||||
description="Number of segments for the main ring of the torus",
|
||||
default=1.0, min=0.01, max=100.0)
|
||||
minor_radius = FloatProperty(name="Minor Radius",
|
||||
description="Number of segments for the minor ring of the torus",
|
||||
default=0.25, min=0.01, max=100.0)
|
||||
major_segments = IntProperty(name="Major Segments",
|
||||
description="Number of segments for the main ring of the torus",
|
||||
default=48, min=3, max=256)
|
||||
minor_segments = IntProperty(name="Minor Segments",
|
||||
description="Number of segments for the minor ring of the torus",
|
||||
default=16, min=3, max=256)
|
||||
|
||||
me= bpy.data.add_mesh("Torus")
|
||||
def execute(self, context):
|
||||
|
||||
me.add_geometry(int(len(verts_loc)/3), 0, int(len(faces)/4))
|
||||
me.verts.foreach_set("co", verts_loc)
|
||||
me.faces.foreach_set("verts_raw", faces)
|
||||
verts_loc, faces = add_torus(self.major_radius,
|
||||
self.minor_radius,
|
||||
self.major_segments,
|
||||
self.minor_segments)
|
||||
|
||||
sce = context.scene
|
||||
mesh = bpy.data.add_mesh("Torus")
|
||||
|
||||
# ugh
|
||||
for ob in sce.objects:
|
||||
ob.selected = False
|
||||
mesh.add_geometry(int(len(verts_loc) / 3), 0, int(len(faces) / 4))
|
||||
mesh.verts.foreach_set("co", verts_loc)
|
||||
mesh.faces.foreach_set("verts_raw", faces)
|
||||
|
||||
me.update()
|
||||
ob= bpy.data.add_object('MESH', "Torus")
|
||||
ob.data= me
|
||||
context.scene.add_object(ob)
|
||||
context.scene.active_object = ob
|
||||
ob.selected = True
|
||||
scene = context.scene
|
||||
|
||||
ob.location = tuple(context.scene.cursor_location)
|
||||
# ugh
|
||||
for ob in scene.objects:
|
||||
ob.selected = False
|
||||
|
||||
return ('FINISHED',)
|
||||
mesh.update()
|
||||
ob_new = bpy.data.add_object('MESH', "Torus")
|
||||
ob_new.data = mesh
|
||||
scene.add_object(ob_new)
|
||||
scene.active_object = ob_new
|
||||
ob_new.selected = True
|
||||
|
||||
ob_new.location = tuple(context.scene.cursor_location)
|
||||
|
||||
return ('FINISHED',)
|
||||
|
||||
# Register the operator
|
||||
bpy.ops.add(MESH_OT_primitive_torus_add)
|
||||
bpy.ops.add(AddTorusPrimitive)
|
||||
|
||||
# Add to a menu
|
||||
import dynamic_menu
|
||||
import space_info
|
||||
menu_item = dynamic_menu.add(bpy.types.INFO_MT_mesh_add, (lambda self, context: self.layout.itemO("mesh.primitive_torus_add", text="Torus", icon='ICON_MESH_DONUT')) )
|
||||
|
||||
menu_func = (lambda self, context: self.layout.itemO("mesh.primitive_torus_add",
|
||||
text="Torus", icon='ICON_MESH_DONUT'))
|
||||
|
||||
menu_item = dynamic_menu.add(bpy.types.INFO_MT_mesh_add, menu_func)
|
||||
|
||||
if __name__ == "__main__":
|
||||
bpy.ops.mesh.primitive_torus_add()
|
||||
bpy.ops.mesh.primitive_torus_add()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user