[Bf-extensions-cvs] [c6676127] master: add advanced objects: split to 2 folders menu and panel

meta-androcto noreply at git.blender.org
Thu Jun 15 14:06:31 CEST 2017


Commit: c6676127556e5756e4c94f39784d27149f2eb86d
Author: meta-androcto
Date:   Thu Jun 15 22:06:00 2017 +1000
Branches: master
https://developer.blender.org/rBAc6676127556e5756e4c94f39784d27149f2eb86d

add advanced objects: split to 2 folders menu and panel

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

D	add_advanced_objects/delaunay_voronoi/__init__.py
R070	add_advanced_objects/__init__.py	add_advanced_objects_menu/__init__.py
R100	add_advanced_objects/add_light_template.py	add_advanced_objects_menu/add_light_template.py
R100	add_advanced_objects/add_mesh_aggregate.py	add_advanced_objects_menu/add_mesh_aggregate.py
R100	add_advanced_objects/arrange_on_curve.py	add_advanced_objects_menu/arrange_on_curve.py
R100	add_advanced_objects/circle_array.py	add_advanced_objects_menu/circle_array.py
R100	add_advanced_objects/copy2.py	add_advanced_objects_menu/copy2.py
R100	add_advanced_objects/cubester.py	add_advanced_objects_menu/cubester.py
R100	add_advanced_objects/make_struts.py	add_advanced_objects_menu/make_struts.py
R100	add_advanced_objects/mesh_easylattice.py	add_advanced_objects_menu/mesh_easylattice.py
R100	add_advanced_objects/object_add_chain.py	add_advanced_objects_menu/object_add_chain.py
R100	add_advanced_objects/oscurart_chain_maker.py	add_advanced_objects_menu/oscurart_chain_maker.py
R100	add_advanced_objects/pixelate_3d.py	add_advanced_objects_menu/pixelate_3d.py
R100	add_advanced_objects/random_box_structure.py	add_advanced_objects_menu/random_box_structure.py
R100	add_advanced_objects/rope_alpha.py	add_advanced_objects_menu/rope_alpha.py
R100	add_advanced_objects/scene_objects_bi.py	add_advanced_objects_menu/scene_objects_bi.py
R100	add_advanced_objects/scene_objects_cycles.py	add_advanced_objects_menu/scene_objects_cycles.py
R100	add_advanced_objects/scene_texture_render.py	add_advanced_objects_menu/scene_texture_render.py
R100	add_advanced_objects/trilighting.py	add_advanced_objects_menu/trilighting.py
R100	add_advanced_objects/delaunay_voronoi/DelaunayVoronoi.py	add_advanced_objects_panels/DelaunayVoronoi.py
A	add_advanced_objects_panels/__init__.py
R083	add_advanced_objects/delaunay_voronoi/delaunayVoronoiBlender.py	add_advanced_objects_panels/delaunay_voronoi.py
R098	add_advanced_objects/drop_to_ground.py	add_advanced_objects_panels/drop_to_ground.py
R099	add_advanced_objects/object_laplace_lightning.py	add_advanced_objects_panels/object_laplace_lightning.py
R099	add_advanced_objects/object_mangle_tools.py	add_advanced_objects_panels/object_mangle_tools.py
R083	add_advanced_objects/delaunay_voronoi/oscurart_constellation.py	add_advanced_objects_panels/oscurart_constellation.py
R097	add_advanced_objects/unfold_transition.py	add_advanced_objects_panels/unfold_transition.py

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

diff --git a/add_advanced_objects/delaunay_voronoi/__init__.py b/add_advanced_objects/delaunay_voronoi/__init__.py
deleted file mode 100644
index c32eb374..00000000
--- a/add_advanced_objects/delaunay_voronoi/__init__.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding:utf-8 -*-
-
-# ##### 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": "Delaunay Voronoi",
-    "description": "Points cloud Delaunay triangulation in 2.5D "
-                   "(suitable for terrain modelling) or Voronoi diagram in 2D",
-    "author": "Domlysz, Oscurart",
-    "version": (1, 3),
-    "blender": (2, 7, 0),
-    "location": "View3D > Tools > GIS",
-    "warning": "",
-    "wiki_url": "https://github.com/domlysz/BlenderGIS/wiki",
-    "category": ""
-    }
-
-if "bpy" in locals():
-    import importlib
-    importlib.reload(oscurart_constellation)
-
-else:
-    from . import oscurart_constellation
-
-import bpy
-from .delaunayVoronoiBlender import ToolsPanelDelaunay
-
-
-# Register
-def register():
-    bpy.utils.register_module(__name__)
-
-
-def unregister():
-    bpy.utils.unregister_module(__name__)
diff --git a/add_advanced_objects/__init__.py b/add_advanced_objects_menu/__init__.py
similarity index 70%
rename from add_advanced_objects/__init__.py
rename to add_advanced_objects_menu/__init__.py
index 4a70f83d..b1d86454 100644
--- a/add_advanced_objects/__init__.py
+++ b/add_advanced_objects_menu/__init__.py
@@ -44,23 +44,16 @@ if "bpy" in locals():
     importlib.reload(trilighting)
     importlib.reload(pixelate_3d)
     importlib.reload(object_add_chain)
-    importlib.reload(drop_to_ground)
     importlib.reload(circle_array)
-    importlib.reload(unfold_transition)
     importlib.reload(copy2)
     importlib.reload(make_struts)
     importlib.reload(random_box_structure)
     importlib.reload(cubester)
     importlib.reload(rope_alpha)
     importlib.reload(add_mesh_aggregate)
-    importlib.reload(object_mangle_tools)
     importlib.reload(arrange_on_curve)
-    importlib.reload(object_laplace_lightning)
     importlib.reload(mesh_easylattice)
-    importlib.reload(DelaunayVoronoi)
-    importlib.reload(delaunayVoronoiBlender)
-    importlib.reload(oscurart_constellation)
-    importlib.reload(oscurart_chain_maker)
+
 
 else:
     from . import add_light_template
@@ -70,24 +63,16 @@ else:
     from . import trilighting
     from . import pixelate_3d
     from . import object_add_chain
-    from . import oscurart_chain_maker
-    from . import drop_to_ground
     from . import circle_array
-    from . import unfold_transition
     from . import copy2
     from . import make_struts
     from . import random_box_structure
     from . import cubester
     from . import rope_alpha
     from . import add_mesh_aggregate
-    from . import object_mangle_tools
     from . import arrange_on_curve
-    from . import object_laplace_lightning
     from . import mesh_easylattice
 
-    from .delaunay_voronoi import DelaunayVoronoi
-    from .delaunay_voronoi import delaunayVoronoiBlender
-    from .delaunay_voronoi import oscurart_constellation
 
 import bpy
 from bpy.types import (
@@ -256,6 +241,7 @@ class AdvancedObjPreferences(AddonPreferences):
             box.label(text="Physics Tools:", icon="LAYER_ACTIVE")
             box.label(text="Drop to Ground, Wrecking Ball and Cloth Rope", icon="LAYER_USED")
 
+
         icon_2 = "TRIA_RIGHT" if not self.show_panel_list else "TRIA_DOWN"
         box = layout.box()
         box.prop(self, "show_panel_list", emboss=False, icon=icon_2)
@@ -263,14 +249,8 @@ class AdvancedObjPreferences(AddonPreferences):
         if self.show_panel_list:
             box.label(text="Panels located in 3D View Tools Region > Create",
                       icon="LAYER_ACTIVE")
-            box.label(text="Drop to Ground", icon="LAYER_USED")
-            box.label(text="Unfold Transition", icon="LAYER_USED")
             box.label(text="CubeSter", icon="LAYER_USED")
-            box.label(text="Mangle tools", icon="LAYER_USED")
-            box.label(text="Laplacian Lighting", icon="LAYER_USED")
-            box.label(text="Delaunay Voronoi", icon="LAYER_USED")
-            box.label(text="Duplicate on Curve  (Shown if an Active Curve Object is it the 3D View)",
-                      icon="LAYER_USED")
+
 
 
 # Cubester update functions
@@ -556,202 +536,6 @@ class AdvancedObjProperties(PropertyGroup):
             ],
             default='O',
             )
-    # object_laplace_lighting props
-    ORIGIN = FloatVectorProperty(
-            name="Origin charge"
-            )
-    GROUNDZ = IntProperty(
-            name="Ground Z coordinate"
-            )
-    HORDER = IntProperty(
-            name="Secondary paths orders",
-            default=1
-            )
-    # object_laplace_lighting UI props
-    TSTEPS = IntProperty(
-            name="Iterations",
-            default=350,
-            description="Number of cells to create\n"
-                        "Will end early if hits ground plane or cloud"
-            )
-    GSCALE = FloatProperty(
-            name="Grid unit size",
-            default=0.12,
-            description="scale of cells, .25 = 4 cells per blenderUnit"
-            )
-    BIGVAR = FloatProperty(
-            name="Straightness",
-            default=6.3,
-            description="Straightness/branchiness of bolt, \n"
-                        "<2 is mush, >12 is staight line, 6.3 is good"
-            )
-    GROUNDBOOL = BoolProperty(
-            name="Use Ground object",
-            description="Use ground plane or not",
-            default=True
-            )
-    GROUNDC = IntProperty(
-            name="Ground charge",
-            default=-250,
-            description="Charge of the ground plane"
-            )
-    CLOUDBOOL = BoolProperty(
-            name="Use Cloud object",
-            default=False,
-            description="Use cloud object - attracts and terminates like ground but\n"
-                        "any obj instead of z plane\n"
-                        "Can slow down loop if obj is large, overrides ground"
-            )
-    CLOUDC = IntProperty(
-            name="Cloud charge",
-            default=-1,
-            description="Charge of a cell in cloud object\n"
-                        "(so total charge also depends on obj size)"
-            )
-    VMMESH = BoolProperty(
-            name="Multi mesh",
-            default=True,
-            description="Output to multi-meshes for different materials on main/sec/side branches"
-            )
-    VSMESH = BoolProperty(
-            name="Single mesh",
-            default=False,
-            description="Output to single mesh for using build modifier and particles for effects"
-            )
-    VCUBE = BoolProperty(
-            name="Cubes",
-            default=False,
-            description="CTRL-J after run to JOIN\n"
-                        "Outputs a bunch of cube objects, mostly for testing"
-            )
-    VVOX = BoolProperty(
-            name="Voxel (experimental)",
-            default=False,
-            description="Output to a voxel file to bpy.data.filepath\FSLGvoxels.raw\n"
-                        "(doesn't work well right now)"
-            )
-    IBOOL = BoolProperty(
-            name="Use Insulator object",
-            default=False,
-            description="Use insulator mesh object to prevent growth of bolt in areas"
-            )
-    OOB = StringProperty(
-            name="Select",
-            default="",
-            description="Origin of bolt, can be an Empty\n"
-                        "if object is a mesh will use all verts as charges")
-    GOB = StringProperty(
-            name="Select",
-            default="",
-            description="Object to use as ground plane, uses z coord only"
-            )
-    COB = StringProperty(
-            name="Select",
-            default="",
-            description="Object to use as cloud, best to use a cube"
-            )
-    IOB = StringProperty(
-            name="Select",
-            default="",
-            description="Object to use as insulator, 'voxelized'\n"
-                        "before generating bolt (can be slow)"
-            )
-    # object_mangle_tools properties
-    mangle_constraint_vector = BoolVectorProperty(
-            name="Mangle Constraint",
-            default=(True, True, True),
-            subtype='XYZ',
-            description="Constrains Mangle Direction"
-            )
-    mangle_random_magnitude = IntProperty(
-            name="Mangle Severity",
-            default=5,
-            min=1, max=30,
-            description="Severity of mangling"
-            )
-    mangle_name = StringProperty(
-            name="Shape Key Name",
-            default="mangle",
-            description="Name given for mangled shape keys"
-            )
-    # unfold_transition properties
-    unfold_arm_name = StringProperty(
-            default=""
-            )
-    unfold_modo = EnumProperty(
-            name="",
-            items=[("cursor", "3D Cursor", "Use the Distance to 3D Cursor"),
-                   ("weight", "Weight Map", "Use a Painted Weight map"),
-                   ("index", "Mesh Indices", "Use Faces and Vertices index")],
-            description="How to Sort Bones for animation", default="cursor"
-            )
-    unfold_flip = BoolProperty(
-            name="Flipping Faces",
-            default=False,
-            descript

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-extensions-cvs mailing list