[Bf-extensions-cvs] [487aa3c] master: Final commit Mesh Extra Objects 2.75 Updated Authors, added built in xyz math object presets

[Brendon Murphy]

Commit: 487aa3cbf094106a4ae97177dc3ac2617e758025
Author: Brendon Murphy
Date:   Mon May 4 10:45:11 2015 +1000
Branches: master
https://developer.blender.org/rBA487aa3cbf094106a4ae97177dc3ac2617e758025

Final commit Mesh Extra Objects 2.75
Updated Authors, added built in xyz math object presets

===================================================================

M	add_mesh_extra_objects/__init__.py
A	presets/operator/mesh.primitive_round_cube_add/Capsule.py
A	presets/operator/mesh.primitive_round_cube_add/Clay_Bar.py
A	presets/operator/mesh.primitive_round_cube_add/Cube.py
A	presets/operator/mesh.primitive_round_cube_add/Grid_3D.py
A	presets/operator/mesh.primitive_round_cube_add/Octahedron.py
A	presets/operator/mesh.primitive_round_cube_add/Quadsphere.py
A	presets/operator/mesh.primitive_round_cube_add/Rounded_Cube.py
A	presets/operator/mesh.primitive_xyz_function_surface/bonbon.py
A	presets/operator/mesh.primitive_xyz_function_surface/boy.py
A	presets/operator/mesh.primitive_xyz_function_surface/catalan.py
A	presets/operator/mesh.primitive_xyz_function_surface/catenoid.py
A	presets/operator/mesh.primitive_xyz_function_surface/clifford_torus.py
A	presets/operator/mesh.primitive_xyz_function_surface/cochlea.py
A	presets/operator/mesh.primitive_xyz_function_surface/cosinus.py
A	presets/operator/mesh.primitive_xyz_function_surface/dini.py
A	presets/operator/mesh.primitive_xyz_function_surface/enneper.py
A	presets/operator/mesh.primitive_xyz_function_surface/helicoidal.py
A	presets/operator/mesh.primitive_xyz_function_surface/helix.py
A	presets/operator/mesh.primitive_xyz_function_surface/hexahedron.py
A	presets/operator/mesh.primitive_xyz_function_surface/hyperhelicoidal.py
A	presets/operator/mesh.primitive_xyz_function_surface/klein.py
A	presets/operator/mesh.primitive_xyz_function_surface/moebius.py
A	presets/operator/mesh.primitive_xyz_function_surface/pseudo_catenoid.py
A	presets/operator/mesh.primitive_xyz_function_surface/pseudosphere.py
A	presets/operator/mesh.primitive_xyz_function_surface/ridged_torus.py
A	presets/operator/mesh.primitive_xyz_function_surface/shell.py
A	presets/operator/mesh.primitive_xyz_function_surface/sine.py
A	presets/operator/mesh.primitive_xyz_function_surface/snake.py
A	presets/operator/mesh.primitive_xyz_function_surface/sterosphere.py
A	presets/operator/mesh.primitive_xyz_function_surface/torus.py
A	presets/operator/mesh.primitive_xyz_function_surface/twisted_torus.py

===================================================================

diff --git a/add_mesh_extra_objects/__init__.py b/add_mesh_extra_objects/__init__.py
index 9cd1812..e15054c 100644
--- a/add_mesh_extra_objects/__init__.py
+++ b/add_mesh_extra_objects/__init__.py
@@ -16,13 +16,15 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 # Contributed to by
-# Pontiac, Fourmadmen, varkenvarken, tuga3d, meta-androcto, metalliandy, dreampainter, cotejrp1#
+# Pontiac, Fourmadmen, varkenvarken, tuga3d, meta-androcto, metalliandy, dreampainter, cotejrp1 #
+# liero, Kayo Phoenix, sugiany, dommetysk, Phymec, Anthony D'Agostino, Pablo Vazquez, Richard Wilks #
+# xyz presets by elfnor
 
 bl_info = {
     "name": "Extra Objects",
     "author": "Multiple Authors",
     "version": (0, 3, 0),
-    "blender": (2, 74, 0),
+    "blender": (2, 75, 0),
     "location": "View3D > Add > Mesh",
     "description": "Add extra mesh object types",
     "warning": "",
diff --git a/presets/operator/mesh.primitive_round_cube_add/Capsule.py b/presets/operator/mesh.primitive_round_cube_add/Capsule.py
new file mode 100644
index 0000000..05122df
--- /dev/null
+++ b/presets/operator/mesh.primitive_round_cube_add/Capsule.py
@@ -0,0 +1,8 @@
+import bpy
+op = bpy.context.active_operator
+
+op.radius = 0.5
+op.arc_div = 8
+op.lin_div = 0
+op.size = (0.0, 0.0, 3.0)
+op.div_type = 'CORNERS'
\ No newline at end of file
diff --git a/presets/operator/mesh.primitive_round_cube_add/Clay_Bar.py b/presets/operator/mesh.primitive_round_cube_add/Clay_Bar.py
new file mode 100644
index 0000000..0f56d05
--- /dev/null
+++ b/presets/operator/mesh.primitive_round_cube_add/Clay_Bar.py
@@ -0,0 +1,8 @@
+import bpy
+op = bpy.context.active_operator
+
+op.radius = 0.4
+op.arc_div = 8
+op.lin_div = 0
+op.size = (1.5, 3.0, 1.0)
+op.div_type = 'ALL'
\ No newline at end of file
diff --git a/presets/operator/mesh.primitive_round_cube_add/Cube.py b/presets/operator/mesh.primitive_round_cube_add/Cube.py
new file mode 100644
index 0000000..c5b0781
--- /dev/null
+++ b/presets/operator/mesh.primitive_round_cube_add/Cube.py
@@ -0,0 +1,9 @@
+import bpy
+op = bpy.context.active_operator
+
+op.radius = 0.0
+op.arc_div = 1
+op.lin_div = 0
+op.size = (2.0, 2.0, 2.0)
+op.div_type = 'CORNERS'
+op.odd_axis_align = False
\ No newline at end of file
diff --git a/presets/operator/mesh.primitive_round_cube_add/Grid_3D.py b/presets/operator/mesh.primitive_round_cube_add/Grid_3D.py
new file mode 100644
index 0000000..d0519f4
--- /dev/null
+++ b/presets/operator/mesh.primitive_round_cube_add/Grid_3D.py
@@ -0,0 +1,7 @@
+import bpy
+op = bpy.context.active_operator
+
+op.radius = 0
+op.size = (2, 2, 2)
+op.lin_div = 5
+op.div_type = 'ALL'
\ No newline at end of file
diff --git a/presets/operator/mesh.primitive_round_cube_add/Octahedron.py b/presets/operator/mesh.primitive_round_cube_add/Octahedron.py
new file mode 100644
index 0000000..b795e84
--- /dev/null
+++ b/presets/operator/mesh.primitive_round_cube_add/Octahedron.py
@@ -0,0 +1,9 @@
+import bpy
+op = bpy.context.active_operator
+
+op.radius = 1.0
+op.arc_div = 1
+op.lin_div = 0
+op.size = (0.0, 0.0, 0.0)
+op.div_type = 'CORNERS'
+op.odd_axis_align = True
\ No newline at end of file
diff --git a/presets/operator/mesh.primitive_round_cube_add/Quadsphere.py b/presets/operator/mesh.primitive_round_cube_add/Quadsphere.py
new file mode 100644
index 0000000..3e777d2
--- /dev/null
+++ b/presets/operator/mesh.primitive_round_cube_add/Quadsphere.py
@@ -0,0 +1,8 @@
+import bpy
+op = bpy.context.active_operator
+
+op.radius = 1.0
+op.arc_div = 8
+op.lin_div = 0
+op.size = (0.0, 0.0, 0.0)
+op.div_type = 'CORNERS'
\ No newline at end of file
diff --git a/presets/operator/mesh.primitive_round_cube_add/Rounded_Cube.py b/presets/operator/mesh.primitive_round_cube_add/Rounded_Cube.py
new file mode 100644
index 0000000..1a892dd
--- /dev/null
+++ b/presets/operator/mesh.primitive_round_cube_add/Rounded_Cube.py
@@ -0,0 +1,8 @@
+import bpy
+op = bpy.context.active_operator
+
+op.radius = 0.25
+op.arc_div = 8
+op.lin_div = 0
+op.size = (2.0, 2.0, 2.0)
+op.div_type = 'CORNERS'
\ No newline at end of file
diff --git a/presets/operator/mesh.primitive_xyz_function_surface/bonbon.py b/presets/operator/mesh.primitive_xyz_function_surface/bonbon.py
new file mode 100644
index 0000000..b464e76
--- /dev/null
+++ b/presets/operator/mesh.primitive_xyz_function_surface/bonbon.py
@@ -0,0 +1,22 @@
+import bpy
+op = bpy.context.active_operator
+
+op.x_eq = 'u'
+op.y_eq = 'cos(u)*sin(v)'
+op.z_eq = 'cos(u)*cos(v)'
+op.range_u_min = 0.0
+op.range_u_max = 6.2831854820251465
+op.range_u_step = 32
+op.wrap_u = False
+op.range_v_min = 0.0
+op.range_v_max = 6.2831854820251465
+op.range_v_step = 128
+op.wrap_v = False
+op.close_v = False
+op.n_eq = 1
+op.a_eq = '0'
+op.b_eq = '0'
+op.c_eq = '0'
+op.f_eq = '0'
+op.g_eq = '0'
+op.h_eq = '0'
diff --git a/presets/operator/mesh.primitive_xyz_function_surface/boy.py b/presets/operator/mesh.primitive_xyz_function_surface/boy.py
new file mode 100644
index 0000000..2537883
--- /dev/null
+++ b/presets/operator/mesh.primitive_xyz_function_surface/boy.py
@@ -0,0 +1,22 @@
+import bpy
+op = bpy.context.active_operator
+
+op.x_eq = '2/3* (cos(u)* cos(2*v) + sqrt(2)* sin(u)* cos(v))* cos(u) / (sqrt(2) - sin(2*u)* sin(3*v))'
+op.y_eq = 'sqrt(2)* cos(u)* cos(u) / (sqrt(2) - sin(2*u)* sin(3*v))'
+op.z_eq = '2/3* (cos(u)* sin(2*v) - sqrt(2)* sin(u)* sin(v))* cos(u) / (sqrt(2) - sin(2*u)* sin(3*v))'
+op.range_u_min = 0.0
+op.range_u_max = 3.1415927410125732
+op.range_u_step = 32
+op.wrap_u = False
+op.range_v_min = 0.0
+op.range_v_max = 3.1415927410125732
+op.range_v_step = 64
+op.wrap_v = False
+op.close_v = False
+op.n_eq = 1
+op.a_eq = '0'
+op.b_eq = '0'
+op.c_eq = '0'
+op.f_eq = '0'
+op.g_eq = '0'
+op.h_eq = '0'
diff --git a/presets/operator/mesh.primitive_xyz_function_surface/catalan.py b/presets/operator/mesh.primitive_xyz_function_surface/catalan.py
new file mode 100644
index 0000000..8c87675
--- /dev/null
+++ b/presets/operator/mesh.primitive_xyz_function_surface/catalan.py
@@ -0,0 +1,22 @@
+import bpy
+op = bpy.context.active_operator
+
+op.x_eq = 'u-sin(u)*cosh(v)'
+op.y_eq = '4*sin(1/2*u)*sinh(v/2)'
+op.z_eq = '1-cos(u)*cosh(v)'
+op.range_u_min = -3.1415927410125732
+op.range_u_max = 9.42477798461914
+op.range_u_step = 32
+op.wrap_u = False
+op.range_v_min = -2.0
+op.range_v_max = 2.0
+op.range_v_step = 128
+op.wrap_v = False
+op.close_v = False
+op.n_eq = 1
+op.a_eq = '0'
+op.b_eq = '0'
+op.c_eq = '0'
+op.f_eq = '0'
+op.g_eq = '0'
+op.h_eq = '0'
diff --git a/presets/operator/mesh.primitive_xyz_function_surface/catenoid.py b/presets/operator/mesh.primitive_xyz_function_surface/catenoid.py
new file mode 100644
index 0000000..98e12ba
--- /dev/null
+++ b/presets/operator/mesh.primitive_xyz_function_surface/catenoid.py
@@ -0,0 +1,22 @@
+import bpy
+op = bpy.context.active_operator
+
+op.x_eq = '2*cosh(v/2)*cos(u)'
+op.y_eq = 'v'
+op.z_eq = '2*cosh(v/2)*sin(u)'
+op.range_u_min = -3.1415927410125732
+op.range_u_max = 3.1415927410125732
+op.range_u_step = 32
+op.wrap_u = True
+op.range_v_min = -3.1415927410125732
+op.range_v_max = 3.1415927410125732
+op.range_v_step = 128
+op.wrap_v = False
+op.close_v = False
+op.n_eq = 1
+op.a_eq = '0'
+op.b_eq = '0'
+op.c_eq = '0'
+op.f_eq = '0'
+op.g_eq = '0'
+op.h_eq = '0'
diff --git a/presets/operator/mesh.primitive_xyz_function_surface/clifford_torus.py b/presets/operator/mesh.primitive_xyz_function_surface/clifford_torus.py
new file mode 100644
index 0000000..7e14f55
--- /dev/null
+++ b/presets/operator/mesh.primitive_xyz_function_surface/clifford_torus.py
@@ -0,0 +1,22 @@
+import bpy
+op = bpy.context.active_operator
+
+op.x_eq = 'cos(u+v)/(sqrt(2.)+cos(v-u))'
+op.y_eq = 'sin(v-u)/(sqrt(2.)+cos(v-u))'
+op.z_eq = 'sin(u+v)/(sqrt(2.)+cos(v-u))'
+op.range_u_min = 0.0
+op.range_u_max = 3.140000104904175
+op.range_u_step = 8
+op.wrap_u = False
+op.range_v_min = 0.0
+op.range_v_max = 6.2831854820251465
+op.range_v_step = 128
+op.wrap_v = False
+op.close_v = False
+op.n_eq = 1
+op.a_eq = '0'
+op.b_eq = '0'
+op.c_eq = '0'
+op.f_eq = '0'
+op.g_eq = '0'
+op.h_eq = '0'
diff --git a/presets/operator/mesh.primitive_xyz_function_surface/cochlea.py b/presets/operator/mesh.primitive_xyz_function_surface/cochlea.py
new file mode 100644
index 0000000..0e9ed68
--- /dev/null
+++ b/presets/operator/mesh.primitive_xyz_function_surface/cochlea.py
@@ -0,0 +1,22 @@
+import bpy
+op = bpy.context.active_operator
+
+op.x_eq = 'v*cos(u)'
+op.y_eq = 'v*sin(u)'
+op.z_eq = '0.4*u'
+op.range_u_min = 0.0
+op.range_u_max = 12.566370964050293
+op.range_u_step = 32
+op.wrap_u = False
+op.range_v_min = 0.0
+op.range_v_max = 2.0
+op.range_v_step = 32
+op.wrap_v = False
+op.close_v = False
+op.n_eq = 1
+op.a_eq = '0'
+op.b_eq = '0'
+op.c_eq = '0'
+op.f_eq = '0'
+op.g_eq = '0'
+op.h_eq = '0'
diff --git a/presets/operator/mesh.primitive_xyz_function_surface/cosinus.py b/presets/operator/mesh.primitive_xyz_function_surface/cosinus.py
new file mode 100644
index 0000000..a8b3e5d
--- /dev/null
+++ b/presets/operator/mesh.primitive_xyz_function_surface/cosinus.py
@@ -0,0 +1,22 @@
+import bpy
+op = bpy.context.active_operator
+
+op.x_eq = 'u'
+op.y_eq = 'sin(pi*((u)**2+(v)**2))/2'
+op.z_eq = 'v'
+op.range_u_min = -1.0
+op.range_u_max = 1.0
+op.range_u_step = 32
+op.wrap_u = False
+op.range_v_min = -1.0
+op.range_v_max = 1.0
+op.range_v_step = 128
+op.wrap_v = False
+op.close_v = False
+op.n_eq = 1
+op.a_eq = '0'
+op.b_eq = '0'
+op.c_eq = '0'
+op.f_eq = '0'
+op.g_eq = '0'
+op.h_eq = '0'
diff --git a/presets/operator/mesh.primitive_xyz_function_surface/dini.py b/presets/operator/mesh.primitive_xyz_function_surface/dini.py
new file mode 100644
index 0000000..aef4591
--- /dev/null
+++ b/presets/operator/mesh.primitive_xyz_function_surface/dini.py
@@ -0,0 +1,22 @@
+import bpy
+op = bpy.context.active_operator
+
+op.x_eq = 'a*cos(u)*sin(v)'
+op.y_eq = 'a*sin(u)*sin(v)'
+op.z_eq = '(cos(v)+log(tan(v/2)+1e-2)) + b*u'
+op.range_u_min = 0.0
+op.range_u_max = 12.566370964050293
+op.range_u_step = 128
+op.wrap_u = False
+op.range_v_min = 0.0
+op.range_v_max = 2.0
+op.range_v_step = 128
+op.wrap_v = False
+op.close_v = False
+op.n_eq = 1
+op.a_eq = '1'
+op.b_eq = '0.2'
+op.c_eq = '0'
+op.f_eq = '0'
+op.g_eq = '0'
+op.h_eq = '0'
diff --git a/presets/operator/mesh.primitive_xyz_functi

@@ Diff output truncated at 10240 characters. @@