Remove unneccesary bulk of code in addons used for testing
This commit is contained in:
@@ -32,270 +32,3 @@ bl_info = {
|
||||
"Scripts/Curve/Curve_Objects",
|
||||
"category": "Add Curve"
|
||||
}
|
||||
|
||||
if "bpy" in locals():
|
||||
import importlib
|
||||
importlib.reload(add_curve_aceous_galore)
|
||||
importlib.reload(add_curve_spirals)
|
||||
importlib.reload(add_curve_torus_knots)
|
||||
importlib.reload(add_surface_plane_cone)
|
||||
importlib.reload(add_curve_curly)
|
||||
importlib.reload(beveltaper_curve)
|
||||
importlib.reload(add_curve_celtic_links)
|
||||
importlib.reload(add_curve_braid)
|
||||
importlib.reload(add_curve_simple)
|
||||
importlib.reload(add_curve_spirofit_bouncespline)
|
||||
|
||||
else:
|
||||
from . import add_curve_aceous_galore
|
||||
from . import add_curve_spirals
|
||||
from . import add_curve_torus_knots
|
||||
from . import add_surface_plane_cone
|
||||
from . import add_curve_curly
|
||||
from . import beveltaper_curve
|
||||
from . import add_curve_celtic_links
|
||||
from . import add_curve_braid
|
||||
from . import add_curve_simple
|
||||
from . import add_curve_spirofit_bouncespline
|
||||
|
||||
import bpy
|
||||
from bpy.types import (
|
||||
Menu,
|
||||
AddonPreferences,
|
||||
)
|
||||
from bpy.props import (
|
||||
StringProperty,
|
||||
BoolProperty,
|
||||
)
|
||||
|
||||
|
||||
def convert_old_presets(data_path, msg_data_path, old_preset_subdir,
|
||||
new_preset_subdir, fixdic={}, ext=".py"):
|
||||
"""
|
||||
convert old presets
|
||||
"""
|
||||
|
||||
def convert_presets(self, context):
|
||||
if not getattr(self, data_path, False):
|
||||
return None
|
||||
import os
|
||||
|
||||
target_path = os.path.join("presets", old_preset_subdir)
|
||||
target_path = bpy.utils.user_resource('SCRIPTS',
|
||||
target_path)
|
||||
|
||||
# created an anytype op to run against preset
|
||||
op = type('', (), {})()
|
||||
|
||||
files = [f for f in os.listdir(target_path) if f.endswith(ext)]
|
||||
if not files:
|
||||
print("No old presets in %s" % target_path)
|
||||
setattr(self, msg_data_path, "No old presets")
|
||||
return None
|
||||
|
||||
new_target_path = os.path.join("presets", new_preset_subdir)
|
||||
new_target_path = bpy.utils.user_resource('SCRIPTS',
|
||||
new_target_path,
|
||||
create=True)
|
||||
for f in files:
|
||||
file = open(os.path.join(target_path, f))
|
||||
for line in file:
|
||||
if line.startswith("op."):
|
||||
exec(line)
|
||||
file.close()
|
||||
for key, items in fixdic.items():
|
||||
if hasattr(op, key) and isinstance(getattr(op, key), int):
|
||||
setattr(op, key, items[getattr(op, key)])
|
||||
# create a new one
|
||||
new_file_path = os.path.join(new_target_path, f)
|
||||
if os.path.isfile(new_file_path):
|
||||
# do nothing
|
||||
print("Preset %s already exists, passing..." % f)
|
||||
continue
|
||||
file_preset = open(new_file_path, 'w')
|
||||
file_preset.write("import bpy\n")
|
||||
file_preset.write("op = bpy.context.active_operator\n")
|
||||
|
||||
for prop, value in vars(op).items():
|
||||
if isinstance(value, str):
|
||||
file_preset.write("op.%s = '%s'\n" % (prop, str(value)))
|
||||
else:
|
||||
file_preset.write("op.%s = %s\n" % (prop, str(value)))
|
||||
file_preset.close()
|
||||
print("Writing new preset to %s" % new_file_path)
|
||||
|
||||
setattr(self, msg_data_path, "Converted %d old presets" % len(files))
|
||||
return None
|
||||
|
||||
return convert_presets
|
||||
|
||||
|
||||
# Addons Preferences
|
||||
|
||||
class CurveExtraObjectsAddonPreferences(AddonPreferences):
|
||||
bl_idname = __name__
|
||||
|
||||
spiral_fixdic = {
|
||||
"spiral_type": ['ARCH', 'ARCH', 'LOG', 'SPHERE', 'TORUS'],
|
||||
"curve_type": ['POLY', 'NURBS'],
|
||||
"spiral_direction": ['COUNTER_CLOCKWISE', 'CLOCKWISE']
|
||||
}
|
||||
update_spiral_presets_msg = StringProperty(
|
||||
default="Nothing to do"
|
||||
)
|
||||
update_spiral_presets = BoolProperty(
|
||||
name="Update Old Presets",
|
||||
description="Update presets to reflect data changes",
|
||||
default=False,
|
||||
update=convert_old_presets(
|
||||
"update_spiral_presets", # this props name
|
||||
"update_spiral_presets_msg", # message prop
|
||||
"operator/curve.spirals",
|
||||
"curve_extras/curve.spirals",
|
||||
fixdic=spiral_fixdic
|
||||
)
|
||||
)
|
||||
show_menu_list = BoolProperty(
|
||||
name="Menu List",
|
||||
description="Show/Hide the Add Menu items",
|
||||
default=False
|
||||
)
|
||||
show_panel_list = BoolProperty(
|
||||
name="Panels List",
|
||||
description="Show/Hide the Panel items",
|
||||
default=False
|
||||
)
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
box = layout.box()
|
||||
box.label(text="Spirals:")
|
||||
|
||||
if self.update_spiral_presets:
|
||||
box.label(self.update_spiral_presets_msg, icon="FILE_TICK")
|
||||
else:
|
||||
box.prop(self, "update_spiral_presets")
|
||||
|
||||
icon_1 = "TRIA_RIGHT" if not self.show_menu_list else "TRIA_DOWN"
|
||||
box = layout.box()
|
||||
box.prop(self, "show_menu_list", emboss=False, icon=icon_1)
|
||||
|
||||
if self.show_menu_list:
|
||||
box.label(text="Items located in the Add Menu > Curve (default shortcut Ctrl + A):",
|
||||
icon="LAYER_USED")
|
||||
box.label(text="2D Objects:", icon="LAYER_ACTIVE")
|
||||
box.label(text="Angle, Arc, Circle, Distance, Ellipse, Line, Point, Polygon,",
|
||||
icon="LAYER_USED")
|
||||
box.label(text="Polygon ab, Rectangle, Rhomb, Sector, Segment, Trapezoid",
|
||||
icon="LAYER_USED")
|
||||
box.label(text="Curve Profiles:", icon="LAYER_ACTIVE")
|
||||
box.label(text="Arc, Arrow, Cogwheel, Cycloid, Flower, Helix (3D),",
|
||||
icon="LAYER_USED")
|
||||
box.label(text="Noise (3D), Nsided, Profile, Rectangle, Splat, Star",
|
||||
icon="LAYER_USED")
|
||||
box.label(text="Curve Spirals:", icon="LAYER_ACTIVE")
|
||||
box.label(text="Archemedian, Logarithmic, Spheric, Torus",
|
||||
icon="LAYER_USED")
|
||||
box.label(text="Knots:", icon="LAYER_ACTIVE")
|
||||
box.label(text="Torus Knots Plus, Celtic Links, Braid Knot",
|
||||
icon="LAYER_USED")
|
||||
box.label(text="Curly Curve", icon="LAYER_ACTIVE")
|
||||
box.label(text="Bevel/Taper:", icon="LAYER_ACTIVE")
|
||||
box.label(text="Add Curve as Bevel, Add Curve as Taper",
|
||||
icon="LAYER_USED")
|
||||
|
||||
box.label(text="Items located in the Add Menu > Surface (default shortcut Ctrl + A):",
|
||||
icon="LAYER_USED")
|
||||
box.label(text="Wedge, Cone, Star, Plane",
|
||||
icon="LAYER_ACTIVE")
|
||||
|
||||
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)
|
||||
|
||||
if self.show_panel_list:
|
||||
box.label(text="Panel located in 3D View Tools Region > Create:",
|
||||
icon="LAYER_ACTIVE")
|
||||
box.label(text="Spline:", icon="LAYER_ACTIVE")
|
||||
box.label(text="SpiroFit, Bounce Spline, Catenary", icon="LAYER_USED")
|
||||
box.label(text="Panel located in 3D View Tools Region > Tools:",
|
||||
icon="LAYER_ACTIVE")
|
||||
box.label(text="Simple Curve:", icon="LAYER_ACTIVE")
|
||||
box.label(text="Available if the Active Object is a Curve was created with 2D Objects",
|
||||
icon="LAYER_USED")
|
||||
|
||||
|
||||
class INFO_MT_curve_knots_add1(Menu):
|
||||
# Define the "Extras" menu
|
||||
bl_idname = "curve_knots_add"
|
||||
bl_label = "Plants"
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.operator_context = 'INVOKE_REGION_WIN'
|
||||
|
||||
layout.operator("curve.torus_knot_plus", text="Torus Knot Plus")
|
||||
layout.operator("curve.celtic_links", text="Celtic Links")
|
||||
layout.operator("mesh.add_braid", text="Braid Knot")
|
||||
|
||||
|
||||
# Define "Extras" menus
|
||||
def menu_func(self, context):
|
||||
if context.mode != 'OBJECT':
|
||||
# fix in D2142 will allow to work in EDIT_CURVE
|
||||
return None
|
||||
|
||||
layout = self.layout
|
||||
|
||||
layout.operator_menu_enum("mesh.curveaceous_galore", "ProfileType",
|
||||
icon='CURVE_DATA')
|
||||
layout.operator_menu_enum("curve.spirals", "spiral_type",
|
||||
icon='CURVE_DATA')
|
||||
layout.separator()
|
||||
|
||||
layout.menu("curve_knots_add", text="Knots", icon='CURVE_DATA')
|
||||
layout.separator()
|
||||
layout.operator("curve.curlycurve", text="Curly Curve",
|
||||
icon='CURVE_DATA')
|
||||
layout.menu("OBJECT_MT_bevel_taper_curve_menu", text="Bevel/Taper",
|
||||
icon='CURVE_DATA')
|
||||
|
||||
|
||||
def menu_surface(self, context):
|
||||
self.layout.separator()
|
||||
if context.mode == 'EDIT_SURFACE':
|
||||
self.layout.operator("curve.smooth_x_times",
|
||||
text="Special Smooth", icon="MOD_CURVE")
|
||||
elif context.mode == 'OBJECT':
|
||||
self.layout.operator("object.add_surface_wedge", text="Wedge",
|
||||
icon="SURFACE_DATA")
|
||||
self.layout.operator("object.add_surface_cone", text="Cone",
|
||||
icon="SURFACE_DATA")
|
||||
self.layout.operator("object.add_surface_star", text="Star",
|
||||
icon="SURFACE_DATA")
|
||||
self.layout.operator("object.add_surface_plane", text="Plane",
|
||||
icon="SURFACE_DATA")
|
||||
|
||||
|
||||
def register():
|
||||
add_curve_simple.register()
|
||||
bpy.utils.register_module(__name__)
|
||||
|
||||
# Add "Extras" menu to the "Add Curve" menu
|
||||
bpy.types.INFO_MT_curve_add.append(menu_func)
|
||||
# Add "Extras" menu to the "Add Surface" menu
|
||||
bpy.types.INFO_MT_surface_add.append(menu_surface)
|
||||
|
||||
|
||||
def unregister():
|
||||
add_curve_simple.unregister()
|
||||
# Remove "Extras" menu from the "Add Curve" menu.
|
||||
bpy.types.INFO_MT_curve_add.remove(menu_func)
|
||||
# Remove "Extras" menu from the "Add Surface" menu.
|
||||
bpy.types.INFO_MT_surface_add.remove(menu_surface)
|
||||
|
||||
bpy.utils.unregister_module(__name__)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
register()
|
||||
|
Reference in New Issue
Block a user