maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Modified UI for collision filter props_collision_filter_mask

Browse source 
* Moved to collision filter mask panel under armory props to keep UI
more tidy.
* Moved the `arm_rb_collision_filter_mask` property out of the
props_collision_filter_mask to be with the rest of the properties.
* Changed name and description of collision filter mask to be more
consistent with the existing rigid body UI.
This commit is contained in:
N8n5h 2021-03-17 20:28:26 -03:00
parent 7d78e01bb4
commit ca2c3e151a
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
blender/arm/props.py
View file

@ -280,6 +280,12 @@ def init_properties():
bpy.types.Object.arm_rb_trigger = BoolProperty(name="Trigger", description="Disable contact response", default=False)
bpy.types.Object.arm_rb_deactivation_time = FloatProperty(name="Deactivation Time", description="Delay putting rigid body into sleep", default=0.0)
bpy.types.Object.arm_rb_ccd = BoolProperty(name="Continuous Collision Detection", description="Improve collision for fast moving objects", default=False)
bpy.types.Object.arm_rb_collision_filter_mask = bpy.props.BoolVectorProperty(
name="Collision Collections Filter Mask",
description="Collision collections rigid body interacts with",
default=(True, False, False, False, False, False, False, False, False, False, False, False, False, False, False, False, False, False, False, False),
size=20,
subtype='LAYER')
bpy.types.Object.arm_animation_enabled = BoolProperty(name="Animation", description="Enable skinning & timeline animation", default=True)
bpy.types.Object.arm_tilesheet = StringProperty(name="Tilesheet", description="Set tilesheet animation", default='')
bpy.types.Object.arm_tilesheet_action = StringProperty(name="Tilesheet Action", description="Set startup action", default='')

23
blender/arm/props_collision_filter_mask.py
View file

@ -3,29 +3,28 @@ from bpy.props import *
from bpy.types import Panel
class ARM_PT_RbCollisionFilterMaskPanel(bpy.types.Panel):
bl_label = "Armory Collision Filter Mask"
bl_label = "Collections Filter Mask"
bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW"
bl_context = "physics"
bl_parent_id = "ARM_PT_PhysicsPropsPanel"
@classmethod
def poll(self, context):
obj = context.object
if obj is None:
return False
return obj.rigid_body is not None
def draw(self, context):
layout = self.layout
layout.use_property_split = True
layout.use_property_decorate = False
obj = bpy.context.object
if obj == None:
return
if obj.rigid_body != None:
layout.prop(obj, 'arm_rb_collision_filter_mask')
obj = context.object
layout.prop(obj, 'arm_rb_collision_filter_mask', text="", expand=True)
def register():
bpy.utils.register_class(ARM_PT_RbCollisionFilterMaskPanel)
bpy.types.Object.arm_rb_collision_filter_mask = bpy.props.BoolVectorProperty(
name="Collision Filter Mask",
default=(True, False, False,False,False,False, False, False,False,False,False, False, False,False,False,False, False, False,False,False),
size=20,
subtype='LAYER')
def unregister():
bpy.utils.unregister_class(ARM_PT_RbCollisionFilterMaskPanel)