[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [1860] trunk/py/scripts/addons: merged "lesser" add mesh scripts.

Brendon Murphy meta.androcto1 at gmail.com
Sun Apr 24 12:40:49 CEST 2011


Revision: 1860
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=1860
Author:   meta-androcto
Date:     2011-04-24 10:40:49 +0000 (Sun, 24 Apr 2011)
Log Message:
-----------
merged "lesser" add mesh scripts.
add mesh extras, gemstones, twisted torus, gears & 3d function surfaces
Now in folder add_mesh_extra_objects under 1 init file.

Added Paths:
-----------
    trunk/py/scripts/addons/add_mesh_extra_objects/
    trunk/py/scripts/addons/add_mesh_extra_objects/__init__.py
    trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_3d_function_surface.py
    trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_extra_objects.py
    trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_gears.py
    trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_gemstones.py
    trunk/py/scripts/addons/add_mesh_extra_objects/add_mesh_twisted_torus.py

Removed Paths:
-------------
    trunk/py/scripts/addons/add_mesh_3d_function_surface.py
    trunk/py/scripts/addons/add_mesh_extras.py
    trunk/py/scripts/addons/add_mesh_gears.py
    trunk/py/scripts/addons/add_mesh_gemstones.py

Deleted: trunk/py/scripts/addons/add_mesh_3d_function_surface.py
===================================================================
--- trunk/py/scripts/addons/add_mesh_3d_function_surface.py	2011-04-21 14:04:05 UTC (rev 1859)
+++ trunk/py/scripts/addons/add_mesh_3d_function_surface.py	2011-04-24 10:40:49 UTC (rev 1860)
@@ -1,533 +0,0 @@
-# ##### 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": "3D Function Surfaces",
-    "author": "Buerbaum Martin (Pontiac)",
-    "version": (0, 3, 7),
-    "blender": (2, 5, 7),
-    "api": 35853,
-    "location": "View3D > Add > Mesh",
-    "description": "Create Objects using Math Formulas",
-    "warning": "",
-    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\
-        "Scripts/Add_Mesh/Add_3d_Function_Surface",
-    "tracker_url": "https://projects.blender.org/tracker/index.php?"\
-        "func=detail&aid=21444",
-    "category": "Add Mesh"}
-
-"""
-Z Function Surface
-
-This script lets the user create a surface where the z coordinate
-is a function of the x and y coordinates.
-
-    z = f(x,y)
-
-X,Y,Z Function Surface
-
-This script lets the user create a surface where the x, y and z
-coordinates are defiend by a function.
-
-    x = f(u,v)
-    y = f(u,v)
-    z = f(u,v)
-
-Usage:
-You have to activated the script in the "Add-Ons" tab (user preferences).
-The functionality can then be accessed via the
-"Add Mesh" -> "Z Function Surface"
-and
-"Add Mesh" -> "X,Y,Z Function Surface"
-menu.
-
-Version history:
-v0.3.6 - Various updates to match current Blender API.
-    Removed recall functionality.
-    Better code for align_matrix
-    Hopefully fixed bug where uMax was never reached. May cause other stuff.
-v0.3.5 - createFaces can now "Flip" faces and create fan/star like faces.
-v0.3.4 - Updated store_recall_properties, apply_object_align
-    and create_mesh_object.
-    Changed how recall data is stored.
-v0.3.3 - API change Mathutils -> mathutils (r557)
-v0.3.2 - Various fixes&streamlining by ideasman42/Campbell Barton.
-    r544 Compile expressions for faster execution
-    r544 Use operator reports for errors too
-    r544 Avoid type checks by converting to a float, errors
-    converting to a float are reported too.
-    Fixed an error Campbell overlooked (appending tuples to an
-    array, not single values) Thamnks for the report wild_doogy.
-    Added 'description' field, updated 'wiki_url'.
-    Made the script PEP8 compatible again.
-v0.3.1 - Use hidden "edit" property for "recall" operator.
-    Bugfix: Z Function was mixing up div_x and div_y
-v0.3 - X,Y,Z Function Surface (by Ed Mackey & tuga3d).
-    Renamed old function to "Z Function Surface".
-    Align the geometry to the view if the user preference says so.
-    Store recall properties in newly created object.
-v0.2.3 - Use bl_info for Add-On information.
-v0.2.2 - Fixed Add-On registration text.
-v0.2.1 - Fixed some new API stuff.
-    Mainly we now have the register/unregister functions.
-    Also the new() function for objects now accepts a mesh object.
-    Changed the script so it can be managed from the "Add-Ons" tab
-    in the user preferences.
-    Added dummy "PLUGIN" icon.
-    Corrected FSF address.
-    Clean up of tooltips.
-v0.2 - Added security check for eval() function
-    Check return value of eval() for complex numbers.
-v0.1.1 - Use 'CANCELLED' return value when failing.
-    Updated web links.
-v0.1 - Initial revision.
-More Links:
-http://gitorious.org/blender-scripts/blender-3d-function-surface
-http://blenderartists.org/forum/showthread.php?t=179043
-"""
-import bpy
-from mathutils import *
-from math import *
-from bpy.props import *
-
-# List of safe functions for eval()
-safe_list = ['math', 'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'cosh',
-    'degrees', 'e', 'exp', 'fabs', 'floor', 'fmod', 'frexp', 'hypot',
-    'ldexp', 'log', 'log10', 'modf', 'pi', 'pow', 'radians',
-    'sin', 'sinh', 'sqrt', 'tan', 'tanh']
-
-# Use the list to filter the local namespace
-safe_dict = dict((k, globals().get(k, None)) for k in safe_list)
-
-
-# Stores the values of a list of properties and the
-# operator id in a property group ('recall_op') inside the object.
-# Could (in theory) be used for non-objects.
-# Note: Replaces any existing property group with the same name!
-# ob ... Object to store the properties in.
-# op ... The operator that should be used.
-# op_args ... A dictionary with valid Blender
-#             properties (operator arguments/parameters).
-
-
-# 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):
-
-    # 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
-
-
-class AddZFunctionSurface(bpy.types.Operator):
-    '''Add a surface defined defined by a function z=f(x,y)'''
-    bl_idname = "mesh.primitive_z_function_surface"
-    bl_label = "Add Z Function Surface"
-    bl_options = {'REGISTER', 'UNDO'}
-
-    equation = StringProperty(name="Z Equation",
-        description="Equation for z=f(x,y)",
-        default="1 - ( x**2 + y**2 )")
-
-    div_x = IntProperty(name="X Subdivisions",
-        description="Number of vertices in x direction.",
-        default=16,
-        min=3,
-        max=256)
-    div_y = IntProperty(name="Y Subdivisions",
-        description="Number of vertices in y direction.",
-        default=16,
-        min=3,
-        max=256)
-
-    size_x = FloatProperty(name="X Size",
-        description="Size of the x axis.",
-        default=2.0,
-        min=0.01,
-        max=100.0,
-        unit="LENGTH")
-    size_y = FloatProperty(name="Y Size",
-        description="Size of the y axis.",
-        default=2.0,
-        min=0.01,
-        max=100.0,
-        unit="LENGTH")
-
-    def execute(self, context):
-        equation = self.equation
-        div_x = self.div_x
-        div_y = self.div_y
-        size_x = self.size_x
-        size_y = self.size_y
-
-        verts = []
-        faces = []
-
-        delta_x = size_x / float(div_x - 1)
-        delta_y = size_y / float(div_y - 1)
-        start_x = -(size_x / 2.0)
-        start_y = -(size_y / 2.0)
-
-        edgeloop_prev = []
-
-        try:
-            expr_args = (
-                compile(equation, __file__, 'eval'),
-                {"__builtins__": None},
-                safe_dict)
-        except:
-            import traceback
-            self.report({'ERROR'}, "Error parsing expression: "
-                + traceback.format_exc(limit=1))
-            return {'CANCELLED'}
-
-        for row_x in range(div_x):
-            edgeloop_cur = []
-            x = start_x + row_x * delta_x
-
-            for row_y in range(div_y):
-                y = start_y + row_y * delta_y
-                z = 0.0
-
-                safe_dict['x'] = x
-                safe_dict['y'] = y
-
-                # Try to evaluate the equation.
-                try:
-                    z = float(eval(*expr_args))
-                except:
-                    import traceback
-                    self.report({'ERROR'}, "Error evaluating expression: "
-                        + traceback.format_exc(limit=1))

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-extensions-cvs mailing list