diff --git a/add_mesh_extra_objects/__init__.py b/add_mesh_extra_objects/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..8b436b530ff0b94585a6c9e83d03024283e9e803
--- /dev/null
+++ b/add_mesh_extra_objects/__init__.py
@@ -0,0 +1,103 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+bl_info = {
+ "name": "Extra Objects",
+ "author": "Pontiac, Fourmadmen, varkenvarken, tuga3d, meta-androcto",
+ "version": (0, 1),
+ "blender": (2, 5, 7),
+ "api": 35853,
+ "location": "View3D > Add > Mesh > Extra Objects",
+ "description": "Adds More Object Types.",
+ "warning": "",
+ "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\
+ "Scripts/Add_Mesh/Add_Extra",
+ "tracker_url": "http://projects.blender.org/tracker/index.php?"\
+ "func=detail&aid=22457",
+ "category": "Add Mesh"}
+
+
+if "bpy" in locals():
+ import imp
+ imp.reload(add_mesh_extra_objects)
+ imp.reload(add_mesh_twisted_torus)
+ imp.reload(add_mesh_gemstones)
+ imp.reload(add_mesh_gears)
+ imp.reload(add_mesh_3d_function_surface)
+else:
+ from . import add_mesh_extra_objects
+ from . import add_mesh_twisted_torus
+ from . import add_mesh_gemstones
+ from . import add_mesh_gears
+ from . import add_mesh_3d_function_surface
+
+import bpy
+
+
+class INFO_MT_mesh_extras_add(bpy.types.Menu):
+ # Define the "Extras" menu
+ bl_idname = "INFO_MT_mesh_extra_objects_add"
+ bl_label = "Extra Objects"
+
+ def draw(self, context):
+ layout = self.layout
+ layout.operator_context = 'INVOKE_REGION_WIN'
+ layout.operator("mesh.primitive_sqorus_add",
+ text="Sqorus")
+ layout.operator("mesh.primitive_wedge_add")
+ layout.operator("mesh.primitive_star_add",
+ text="Star")
+ layout.operator("mesh.primitive_trapezohedron_add",
+ text="Trapezohedron")
+ layout.operator("mesh.primitive_twisted_torus_add",
+ text="Twisted Torus")
+ layout.operator("mesh.primitive_diamond_add",
+ text="Diamond")
+ layout.operator("mesh.primitive_gem_add",
+ text="Gem")
+ layout.operator("mesh.primitive_gear",
+ text="Gear")
+ layout.operator("mesh.primitive_worm_gear",
+ text="Worm")
+ layout.operator("mesh.primitive_z_function_surface",
+ text="Z Math Surface")
+ layout.operator("mesh.primitive_xyz_function_surface",
+ text="XYZ Math Surface")
+
+# Register all operators and panels
+
+# Define "Extras" menu
+def menu_func(self, context):
+ self.layout.menu("INFO_MT_mesh_extra_objects_add", icon="PLUGIN")
+
+
+def register():
+ bpy.utils.register_module(__name__)
+
+ # Add "Extras" menu to the "Add Mesh" menu
+ bpy.types.INFO_MT_mesh_add.append(menu_func)
+
+
+def unregister():
+ bpy.utils.unregister_module(__name__)
+
+ # Remove "Extras" menu from the "Add Mesh" menu.
+ bpy.types.INFO_MT_mesh_add.remove(menu_func)
+
+if __name__ == "__main__":
+ register()
\ No newline at end of file
diff --git a/add_mesh_3d_function_surface.py b/add_mesh_extra_objects/add_mesh_3d_function_surface.py
similarity index 94%
rename from add_mesh_3d_function_surface.py
rename to add_mesh_extra_objects/add_mesh_3d_function_surface.py
index 9b75e128f7b7f6aac1d3a5da8fbb094088732f77..e415813abda7fd3a43a57c04c03585d1060e39d9 100644
--- a/add_mesh_3d_function_surface.py
+++ b/add_mesh_extra_objects/add_mesh_3d_function_surface.py
@@ -15,7 +15,7 @@
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ##### END GPL LICENSE BLOCK #####
-
+"""
bl_info = {
"name": "3D Function Surfaces",
"author": "Buerbaum Martin (Pontiac)",
@@ -30,7 +30,7 @@ bl_info = {
"tracker_url": "https://projects.blender.org/tracker/index.php?"\
"func=detail&aid=21444",
"category": "Add Mesh"}
-
+"""
"""
Z Function Surface
@@ -496,38 +496,3 @@ class AddXYZFunctionSurface(bpy.types.Operator):
return {'FINISHED'}
-################################
-
-
-# Define "3D Function Surface" menu
-def menu_func_z(self, context):
- self.layout.operator(AddZFunctionSurface.bl_idname,
- text="Z Function Surface",
- icon="PLUGIN")
-
-
-def menu_func_xyz(self, context):
- self.layout.operator(AddXYZFunctionSurface.bl_idname,
- text="X,Y,Z Function Surface",
- icon="PLUGIN")
-
-
-def register():
- bpy.utils.register_module(__name__)
-
- # Add menus to the "Add Mesh" menu
- INFO_MT_mesh_add = bpy.types.INFO_MT_mesh_add
- INFO_MT_mesh_add.append(menu_func_z)
- INFO_MT_mesh_add.append(menu_func_xyz)
-
-
-def unregister():
- bpy.utils.unregister_module(__name__)
-
- # Remove menus from the "Add Mesh" menu.
- INFO_MT_mesh_add = bpy.types.INFO_MT_mesh_add
- INFO_MT_mesh_add.remove(menu_func_z)
- INFO_MT_mesh_add.remove(menu_func_xyz)
-
-if __name__ == "__main__":
- register()
diff --git a/add_mesh_extras.py b/add_mesh_extra_objects/add_mesh_extra_objects.py
similarity index 90%
rename from add_mesh_extras.py
rename to add_mesh_extra_objects/add_mesh_extra_objects.py
index bc5fc8bcf53647792f37bd0336a2a6357dcff8dc..f87bb044236becb310eea5bb67e9e34c6e6dd190 100644
--- a/add_mesh_extras.py
+++ b/add_mesh_extra_objects/add_mesh_extra_objects.py
@@ -16,21 +16,6 @@
#
# ##### END GPL LICENSE BLOCK #####
-bl_info = {
- "name": "Extras",
- "author": "Pontiac, Fourmadmen, meta-androcto",
- "version": (0, 5),
- "blender": (2, 5, 7),
- "api": 35853,
- "location": "View3D > Add > Mesh > Extras",
- "description": "Adds Star, Wedge, & Sqorus objects.",
- "warning": "",
- "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\
- "Scripts/Add_Mesh/Add_Extra",
- "tracker_url": "http://projects.blender.org/tracker/index.php?"\
- "func=detail&aid=22457",
- "category": "Add Mesh"}
-
import bpy
from mathutils import *
from math import *
@@ -504,40 +489,4 @@ class AddTrapezohedron(bpy.types.Operator):
return {'FINISHED'}
-class INFO_MT_mesh_extras_add(bpy.types.Menu):
- # Define the "Extras" menu
- bl_idname = "INFO_MT_mesh_extras_add"
- bl_label = "Extras"
-
- def draw(self, context):
- layout = self.layout
- layout.operator_context = 'INVOKE_REGION_WIN'
- layout.operator("mesh.primitive_sqorus_add", text="Sqorus")
- layout.operator("mesh.primitive_wedge_add", text="Wedge")
- layout.operator("mesh.primitive_star_add", text="Star")
- layout.operator("mesh.primitive_trapezohedron_add",
- text="Trapezohedron")
-
-
-# Register all operators and panels
-
-# Define "Extras" menu
-def menu_func(self, context):
- self.layout.menu("INFO_MT_mesh_extras_add", icon="PLUGIN")
-
-
-def register():
- bpy.utils.register_module(__name__)
-
- # Add "Extras" menu to the "Add Mesh" menu
- bpy.types.INFO_MT_mesh_add.append(menu_func)
-
-
-def unregister():
- bpy.utils.unregister_module(__name__)
-
- # Remove "Extras" menu from the "Add Mesh" menu.
- bpy.types.INFO_MT_mesh_add.remove(menu_func)
-if __name__ == "__main__":
- register()
diff --git a/add_mesh_gears.py b/add_mesh_extra_objects/add_mesh_gears.py
similarity index 96%
rename from add_mesh_gears.py
rename to add_mesh_extra_objects/add_mesh_gears.py
index 65b3f964a01eab6a7d8e948bf8cf7e56a6cb31a3..47cc950e856c8c53f1c0268ef5a749f59e1ffe3e 100644
--- a/add_mesh_gears.py
+++ b/add_mesh_extra_objects/add_mesh_gears.py
@@ -18,7 +18,7 @@
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENCE BLOCK *****
-
+"""
bl_info = {
"name": "Gears",
"author": "Michel J. Anders (varkenvarken)",
@@ -33,6 +33,7 @@ bl_info = {
"tracker_url": "https://projects.blender.org/tracker/index.php?"\
"func=detail&aid=21732",
"category": "Add Mesh"}
+"""
"""
What was needed to port it from 2.49 -> 2.50 alpha 0?
@@ -799,38 +800,3 @@ class AddWormGear(bpy.types.Operator):
return {'FINISHED'}
-
-class INFO_MT_mesh_gears_add(bpy.types.Menu):
- # Define the "Gears" menu
- bl_idname = "INFO_MT_mesh_gears_add"
- bl_label = "Gears"
-
- def draw(self, context):
- layout = self.layout
- layout.operator_context = 'INVOKE_REGION_WIN'
- layout.operator("mesh.primitive_gear",
- text="Gear")
- layout.operator("mesh.primitive_worm_gear",
- text="Worm")
-
-
-# Define "Gears" menu
-def menu_func(self, context):
- self.layout.menu("INFO_MT_mesh_gears_add", icon="PLUGIN")
-
-
-def register():
- bpy.utils.register_module(__name__)
-
- # Add "Gears" entry to the "Add Mesh" menu.
- bpy.types.INFO_MT_mesh_add.append(menu_func)
-
-
-def unregister():
- bpy.utils.unregister_module(__name__)
-
- # Remove "Gears" entry from the "Add Mesh" menu.
- bpy.types.INFO_MT_mesh_add.remove(menu_func)
-
-if __name__ == "__main__":
- register()
diff --git a/add_mesh_gemstones.py b/add_mesh_extra_objects/add_mesh_gemstones.py
similarity index 91%
rename from add_mesh_gemstones.py
rename to add_mesh_extra_objects/add_mesh_gemstones.py
index aa00d822bb2a0db3699a7e5308c30850017d986a..9af8cdb660122d3ea6d1fd2fe5ec75e7b6bbd662 100644
--- a/add_mesh_gemstones.py
+++ b/add_mesh_extra_objects/add_mesh_gemstones.py
@@ -15,7 +15,7 @@
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ##### END GPL LICENSE BLOCK #####
-
+"""
bl_info = {
"name": "Gemstones",
"author": "Pontiac, Fourmadmen, Dreampainter",
@@ -30,7 +30,7 @@ bl_info = {
"tracker_url": "https://projects.blender.org/tracker/index.php?"\
"func=detail&aid=21432",
"category": "Add Mesh"}
-
+"""
import bpy
from mathutils import *
from math import *
@@ -331,42 +331,3 @@ class AddGem(bpy.types.Operator):
return {'FINISHED'}
-
-class INFO_MT_mesh_gemstones_add(bpy.types.Menu):
- # Define the "Gemstones" menu
- bl_idname = "INFO_MT_mesh_gemstones_add"
- bl_label = "Gemstones"
-
- def draw(self, context):
- layout = self.layout
- layout.operator_context = 'INVOKE_REGION_WIN'
- layout.operator("mesh.primitive_diamond_add",
- text="Diamond")
- layout.operator("mesh.primitive_gem_add",
- text="Gem")
-
-
-# Register all operators and panels
-
-
-# Define "Gemstones" menu
-def menu_func(self, context):
- self.layout.menu("INFO_MT_mesh_gemstones_add", icon="PLUGIN")
-
-
-def register():
- bpy.utils.register_module(__name__)
-
- # Add "Gemstones" menu to the "Add Mesh" menu
- bpy.types.INFO_MT_mesh_add.append(menu_func)
-
-
-def unregister():
- bpy.utils.unregister_module(__name__)
-
- # Remove "Gemstones" menu from the "Add Mesh" menu.
- bpy.types.INFO_MT_mesh_add.remove(menu_func)
-
-
-if __name__ == "__main__":
- register()
diff --git a/add_mesh_extra_objects/add_mesh_twisted_torus.py b/add_mesh_extra_objects/add_mesh_twisted_torus.py
new file mode 100644
index 0000000000000000000000000000000000000000..82edee6b253235178e5fa9a0fc6d48695be99549
--- /dev/null
+++ b/add_mesh_extra_objects/add_mesh_twisted_torus.py
@@ -0,0 +1,253 @@
+# add_mesh_twisted_torus.py Copyright (C) 2009-2010, Paulo Gomes
+# tuga3d {at} gmail {dot} com
+# add twisted torus to the blender 2.50 add->mesh menu
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENCE BLOCK *****
+"""
+bl_info = {
+ "name": "Twisted Torus",
+ "author": "Paulo_Gomes",
+ "version": (0, 11, 1),
+ "blender": (2, 5, 7),
+ "api": 35853,
+ "location": "View3D > Add > Mesh ",
+ "description": "Adds a mesh Twisted Torus to the Add Mesh menu",
+ "warning": "",
+ "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\
+ "Scripts/Add_Mesh/Add_Twisted_Torus",
+ "tracker_url": "https://projects.blender.org/tracker/index.php?"\
+ "func=detail&aid=21622",
+ "category": "Add Mesh"}
+
+Usage:
+
+* Launch from Add Mesh menu
+
+* Modify parameters as desired or keep defaults
+"""
+
+
+import bpy
+from bpy.props import *
+
+import mathutils
+from mathutils import *
+from math import cos, sin, pi
+
+
+# Create a new mesh (object) from verts/edges/faces.
+# verts/edges/faces ... List of vertices/edges/faces for the
+# new mesh (as used in from_pydata).
+# name ... Name of the new mesh (& object).
+def create_mesh_object(context, verts, edges, faces, name):
+ scene = context.scene
+ obj_act = scene.objects.active
+
+ # Create new mesh
+ mesh = bpy.data.meshes.new(name)
+
+ # Make a mesh from a list of verts/edges/faces.
+ mesh.from_pydata(verts, edges, faces)
+
+ # Update mesh geometry after adding stuff.
+ mesh.update()
+
+ import add_object_utils
+ return add_object_utils.object_data_add(context, mesh, operator=None)
+
+# A very simple "bridge" tool.
+# Connects two equally long vertex rows with faces.
+# Returns a list of the new faces (list of lists)
+#
+# vertIdx1 ... First vertex list (list of vertex indices).
+# vertIdx2 ... Second vertex list (list of vertex indices).
+# closed ... Creates a loop (first & last are closed).
+# flipped ... Invert the normal of the face(s).
+#
+# Note: You can set vertIdx1 to a single vertex index to create
+# a fan/star of faces.
+# Note: If both vertex idx list are the same length they have
+# to have at least 2 vertices.
+def createFaces(vertIdx1, vertIdx2, closed=False, flipped=False):
+ faces = []
+
+ if not vertIdx1 or not vertIdx2:
+ return None
+
+ if len(vertIdx1) < 2 and len(vertIdx2) < 2:
+ return None
+
+ fan = False
+ if (len(vertIdx1) != len(vertIdx2)):
+ if (len(vertIdx1) == 1 and len(vertIdx2) > 1):
+ fan = True
+ else:
+ return None
+
+ total = len(vertIdx2)
+
+ if closed:
+ # Bridge the start with the end.
+ if flipped:
+ face = [
+ vertIdx1[0],
+ vertIdx2[0],
+ vertIdx2[total - 1]]
+ if not fan:
+ face.append(vertIdx1[total - 1])
+ faces.append(face)
+
+ else:
+ face = [vertIdx2[0], vertIdx1[0]]
+ if not fan:
+ face.append(vertIdx1[total - 1])
+ face.append(vertIdx2[total - 1])
+ faces.append(face)
+
+ # Bridge the rest of the faces.
+ for num in range(total - 1):
+ if flipped:
+ if fan:
+ face = [vertIdx2[num], vertIdx1[0], vertIdx2[num + 1]]
+ else:
+ face = [vertIdx2[num], vertIdx1[num],
+ vertIdx1[num + 1], vertIdx2[num + 1]]
+ faces.append(face)
+ else:
+ if fan:
+ face = [vertIdx1[0], vertIdx2[num], vertIdx2[num + 1]]
+ else:
+ face = [vertIdx1[num], vertIdx2[num],
+ vertIdx2[num + 1], vertIdx1[num + 1]]
+ faces.append(face)
+
+ return faces
+
+
+def add_twisted_torus(major_rad, minor_rad, major_seg, minor_seg, twists):
+ PI_2 = pi * 2.0
+ z_axis = (0.0, 0.0, 1.0)
+
+ verts = []
+ faces = []
+
+ edgeloop_prev = []
+ for major_index in range(major_seg):
+ quat = Quaternion(z_axis, (major_index / major_seg) * PI_2)
+ rot_twists = PI_2 * major_index / major_seg * twists
+
+ edgeloop = []
+
+ # Create section ring
+ for minor_index in range(minor_seg):
+ angle = (PI_2 * minor_index / minor_seg) + rot_twists
+
+ vec = Vector((
+ major_rad + (cos(angle) * minor_rad),
+ 0.0,
+ sin(angle) * minor_rad))
+ vec = vec * quat
+
+ edgeloop.append(len(verts))
+ verts.append(vec)
+
+ # Remember very first edgeloop.
+ if major_index == 0:
+ edgeloop_first = edgeloop
+
+ # Bridge last with current ring
+ if edgeloop_prev:
+ f = createFaces(edgeloop_prev, edgeloop, closed=True)
+ faces.extend(f)
+
+ edgeloop_prev = edgeloop
+
+ # Bridge first and last ring
+ f = createFaces(edgeloop_prev, edgeloop_first, closed=True)
+ faces.extend(f)
+
+ return verts, faces
+
+
+class AddTwistedTorus(bpy.types.Operator):
+ '''Add a torus mesh'''
+ bl_idname = "mesh.primitive_twisted_torus_add"
+ bl_label = "Add Torus"
+ bl_options = {'REGISTER', 'UNDO'}
+
+ major_radius = FloatProperty(name="Major Radius",
+ description="Radius from the origin to the" \
+ " center of the cross section",
+ min=0.01,
+ max=100.0,
+ default=1.0)
+ minor_radius = FloatProperty(name="Minor Radius",
+ description="Radius of the torus' cross section",
+ min=0.01,
+ max=100.0,
+ default=0.25)
+ major_segments = IntProperty(name="Major Segments",
+ description="Number of segments for the main ring of the torus",
+ min=3,
+ max=256,
+ default=48)
+ minor_segments = IntProperty(name="Minor Segments",
+ description="Number of segments for the minor ring of the torus",
+ min=3,
+ max=256,
+ default=12)
+ twists = IntProperty(name="Twists",
+ description="Number of twists of the torus",
+ min=0,
+ max=256,
+ default=1)
+
+ use_abso = BoolProperty(name="Use Int+Ext Controls",
+ description="Use the Int / Ext controls for torus dimensions",
+ default=False)
+ abso_major_rad = FloatProperty(name="Exterior Radius",
+ description="Total Exterior Radius of the torus",
+ min=0.01,
+ max=100.0,
+ default=1.0)
+ abso_minor_rad = FloatProperty(name="Inside Radius",
+ description="Total Interior Radius of the torus",
+ min=0.01,
+ max=100.0,
+ default=0.5)
+
+ def execute(self, context):
+
+ if self.use_abso == True:
+ extra_helper = (self.abso_major_rad - self.abso_minor_rad) * 0.5
+ self.major_radius = self.abso_minor_rad + extra_helper
+ self.minor_radius = extra_helper
+
+ verts, faces = add_twisted_torus(
+ self.major_radius,
+ self.minor_radius,
+ self.major_segments,
+ self.minor_segments,
+ self.twists)
+
+ # Actually create the mesh object from this geometry data.
+ obj = create_mesh_object(context, verts, [], faces, "TwistedTorus")
+
+ return {'FINISHED'}
+