Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ venv.bak/
# Rope project settings
.ropeproject

# PyCharm project settings
.idea

# mkdocs documentation
/site

Expand All @@ -123,3 +126,6 @@ dmypy.json

# Pyre type checker
.pyre/

# operating system files
.DS_Store
2 changes: 1 addition & 1 deletion collider_conversion/convert_from_name.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@


class OBJECT_OT_convert_from_name(Operator):
"""Convert selected colliders to mesh objects"""
"""Assign collider attributes from the object naming"""
bl_idname = "object.convert_from_name"
bl_label = "Collider from Naming"
bl_description = 'Assign collider attributes from the object naming.'
Expand Down
2 changes: 1 addition & 1 deletion collider_conversion/convert_to_shape.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from ..collider_shapes.add_bounding_primitive import OBJECT_OT_add_bounding_object

class COLLISION_OT_assign_shape(bpy.types.Operator):
"""Select/Deselect collision objects"""
"""Reassign the collider shape type on selected colliders, updating their names to match"""
bl_idname = "object.assign_collider_shape"
bl_label = "Assign Collider Shape"
bl_description = 'Assign shape to a collider'
Expand Down
4 changes: 4 additions & 0 deletions collider_operators/utility_operators.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class COLLISION_OT_adjust_decimation(bpy.types.Operator):
"""Adjust Decimation to Target Triangle Count"""
bl_idname = "object.adjust_decimation"
bl_label = "Limit Tris Count"
bl_description = "Adjust the decimation modifier to reach a target triangle count"
bl_options = {'REGISTER', 'UNDO'}

target_triangles: IntProperty(
Expand Down Expand Up @@ -65,6 +66,7 @@ class COLLISION_OT_MoveOriginToParentOperator(bpy.types.Operator):
"""Apply Parent Transform to Child"""
bl_idname = "object.origin_to_parent"
bl_label = "Move Origin to Parent"
bl_description = "Move the collider origin to match its parent object's position"
bl_options = {'REGISTER', 'UNDO'}

@classmethod
Expand Down Expand Up @@ -210,8 +212,10 @@ def fix_inverse_matrix(obj):


class COLLISION_OT_FixColliderTransform(bpy.types.Operator):
"""Fix the parent inverse matrix on selected colliders"""
bl_idname = "object.fix_parent_inverse_transform"
bl_label = "Fix Parent Inverse Matrix"
bl_description = "Reset the parent inverse matrix and bake the transform into mesh data"
bl_options = {'REGISTER', 'UNDO'}

@classmethod
Expand Down
2 changes: 1 addition & 1 deletion collider_shapes/add_bounding_sphere.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def create_sphere(pos, diameter, segments):


class OBJECT_OT_add_bounding_sphere(OBJECT_OT_add_bounding_object, Operator):
"""Create a new bounding box object"""
"""Create spherical colliders based on the selection"""
bl_idname = "mesh.add_bounding_sphere"
bl_label = "Add Sphere"
bl_description = 'Create spherical colliders based on the selection'
Expand Down
2 changes: 1 addition & 1 deletion collider_shapes/add_collision_mesh.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


class OBJECT_OT_add_mesh_collision(OBJECT_OT_add_bounding_object, Operator):
"""Create a new bounding box object"""
"""Create triangle mesh colliders based on the selection"""
bl_idname = "mesh.add_mesh_collision"
bl_label = "Add Mesh"
bl_description = 'Create triangle mesh colliders based on the selection'
Expand Down
2 changes: 1 addition & 1 deletion collider_shapes/add_collision_remesh.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class OBJECT_OT_add_remesh_collision(OBJECT_OT_add_bounding_object, Operator):
"""Create a new bounding box object"""
bl_idname = "mesh.add_remesh_collision"
bl_label = "Add Re-meshed"
bl_description = 'Create a triangle mesh colliders based on the voxel re-meshed target'
bl_description = 'Create triangle mesh colliders based on the voxel re-meshed target'

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
Expand Down
2 changes: 1 addition & 1 deletion groups/user_groups.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def set_object_color(obj, color):


class COLLISION_OT_assign_user_group(bpy.types.Operator):
"""Select/Deselect collision objects"""
"""Assign User Group to selected colliders"""
bl_idname = "object.assign_user_group"
bl_label = "Assign User Group"
bl_description = 'Assign User Group to collider'
Expand Down
2 changes: 1 addition & 1 deletion preferences/preferences.py
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ def draw_vhacd_panel(self, layout, context):
box.label(text="You can also use a custom build of vhacd compiled for your Linux distribution.")

else:
box.label(text="Auto Conevx is currently not supported on MacOS", icon='ERROR')
box.label(text="Auto Convex is currently not supported on this platform", icon='ERROR')
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll submit a separate PR for macOS support at a different point, but thought this would at least be more flexible wording while also fixing a typo 🙂




Expand Down
3 changes: 2 additions & 1 deletion preferences/prefs_properties.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ class CollisionAddonPrefsProperties():
name="Suffix Digits",
description="Defines the number of digits used for numerating.",
default=3,
min=0,
)

# Collider Shapes
Expand Down Expand Up @@ -379,7 +380,7 @@ class CollisionAddonPrefsProperties():
# VHACD parameters

# -e
vhacd_volumneErrorPercent: bpy.props.FloatProperty(name='Volumne Error Percentage',
vhacd_volumneErrorPercent: bpy.props.FloatProperty(name='Volume Error Percentage',
description=' Volume error allowed as a percentage. Default is 1%. Valid range is 0.001 to 10',
default=0.01,
min=0.001,
Expand Down
8 changes: 4 additions & 4 deletions properties/properties.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,16 @@ class ColliderTools_Properties(bpy.types.PropertyGroup):

default_use_loose_island: bpy.props.BoolProperty(name="Use Loose Islands",
default=False,
description="Set the default for using the modifier stack or not when creating colliders.")
description="Set the default for generating separate colliders for each island of geometry in the source object.")

default_join_primitives: bpy.props.BoolProperty(name="Join Primitives",
default=False,
description="Set the default for using the modifier stack or not when creating colliders.")
description="Set the default for joining all generated colliders into a single object after creation.")


default_keep_original_material: bpy.props.BoolProperty(name="Keep Original Materials",
default=False,
description="Set the default for using the modifier stack or not when creating colliders.")
description="Set the default for keeping the source object's materials on the collider instead of assigning a physics material.")

default_keep_original_name: bpy.props.BoolProperty(name="Keep Original Name",
default=False,
Expand Down Expand Up @@ -150,7 +150,7 @@ class ColliderTools_Properties(bpy.types.PropertyGroup):
)

default_capsule_segments: bpy.props.IntProperty(name="Capsule Segments",
description="Amount of sphere segments.",
description="Amount of capsule segments.",
default=16,
)

Expand Down
2 changes: 1 addition & 1 deletion rigid_body/rigid_body.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


class OBJECT_OT_make_rigid_body(bpy.types.Operator):
"""Tooltip"""
"""Convert object to be a rigid body"""
bl_idname = "object.set_rigid_body"
bl_label = "Set Rigid Body"
bl_description = 'Convert object to be a rigid body'
Expand Down
13 changes: 7 additions & 6 deletions ui/properties_panels.py
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ def execute(self, context):


class PREFERENCES_OT_open_addon(bpy.types.Operator):
"""Tooltip"""
"""Open the addon preferences panel"""
bl_idname = "simple_collider.open_preferences"
bl_label = "Open Addon preferences"

Expand Down Expand Up @@ -415,13 +415,13 @@ def draw_header(self, context):
# Open documentation
layout = self.layout
row = layout.row(align=True)
row.operator("wm.url_open", text="", icon='HELP').url = "hhttps://weisl.github.io/collider_overview/"
row.operator("wm.url_open", text="", icon='HELP').url = "https://weisl.github.io/collider_overview/"

# Open Preferences
addon_name = get_addon_name()
op = row.operator("simple_camera.open_preferences", text="", icon='PREFERENCES')
op = row.operator("simple_collider.open_preferences", text="", icon='PREFERENCES')
op.addon_name = addon_name
op.prefs_tabs = 'GENERAL'
op.prefs_tabs = 'SETTINGS'

# Open Export Popup
op = row.operator("wm.call_menu_pie", text="", icon="WINDOW")
Expand Down Expand Up @@ -467,7 +467,7 @@ def draw_header(self, context):
layout = self.layout
row = layout.row(align=True)
row.operator('view.collider_view_object', icon='HIDE_OFF', text='Collider Groups')
row.operator("wm.url_open", text="", icon='HELP').url = "https://weisl.github.io/collider_overview/"
row.operator("wm.url_open", text="", icon='HELP').url = "https://weisl.github.io/collider_groups/"

def draw(self, context):
layout = self.layout
Expand Down Expand Up @@ -642,9 +642,10 @@ def draw(self, context):


class BUTTON_OT_auto_convex(bpy.types.Operator):
"""Print object name in Console"""
"""Create convex hull colliders based on the voxel decomposition target"""
bl_idname = "button.auto_convex"
bl_label = "Auto Convex"
bl_description = 'Create convex hull colliders based on the voxel decomposition target'

@classmethod
def poll(cls, context):
Expand Down