diff options
| author | Nick Samarin <nicks1987@bigmir.net> | 2010-08-15 21:40:57 +0400 |
|---|---|---|
| committer | Nick Samarin <nicks1987@bigmir.net> | 2010-08-15 21:40:57 +0400 |
| commit | b5f4144d251989be378659858ed38aaf572ff4ec (patch) | |
| tree | 5a4bfc9b5cf5513fb75d00608c76a78efdb4020b /source/blender | |
| parent | e6412cd5c6f267c2fbefb4fe42e4f8e26f1bfcd4 (diff) | |
added option to set "up" vector of the actor orientation using navmesh normal (steering actuator)
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/space_logic/logic_window.c | 6 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_actuator_types.h | 1 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_actuator.c | 6 |
3 files changed, 11 insertions, 2 deletions
diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index 929a29974de..6442dcfa66b 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -4351,7 +4351,11 @@ static void draw_actuator_steering(uiLayout *layout, PointerRNA *ptr) uiItemR(row, ptr, "facing", 0, NULL, 0); if (RNA_boolean_get(ptr, "facing")) { - uiItemR(row, ptr, "facingaxis", 0, NULL, 0); + uiItemR(row, ptr, "facingaxis", 0, NULL, 0); + } + if (RNA_pointer_get(ptr, "navmesh").data) + { + uiItemR(row, ptr, "normalup", 0, NULL, 0); } row = uiLayoutRow(layout, 0); uiItemR(row, ptr, "selfterminated", 0, NULL, 0); diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h index 4caee19e399..147d621a4f2 100644 --- a/source/blender/makesdna/DNA_actuator_types.h +++ b/source/blender/makesdna/DNA_actuator_types.h @@ -527,6 +527,7 @@ typedef struct bActuator { #define ACT_STEERING_SELFTERMINATED 1 #define ACT_STEERING_ENABLEVISUALIZATION 2 #define ACT_STEERING_AUTOMATICFACING 4 +#define ACT_STEERING_NORMALUP 8 #endif diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c index 16c640b8695..1f501a211f1 100644 --- a/source/blender/makesrna/intern/rna_actuator.c +++ b/source/blender/makesrna/intern/rna_actuator.c @@ -1976,7 +1976,11 @@ static void rna_def_steering_actuator(BlenderRNA *brna) RNA_def_property_enum_items(prop, facingaxis_items); RNA_def_property_ui_text(prop, "Axis", "Axis for automatic facing"); RNA_def_property_update(prop, NC_LOGIC, NULL); - + + prop= RNA_def_property(srna, "normalup", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "flag", ACT_STEERING_NORMALUP); + RNA_def_property_ui_text(prop, "N", "Use normal of the navmesh to set \"UP\" vector"); + RNA_def_property_update(prop, NC_LOGIC, NULL); } void RNA_def_actuator(BlenderRNA *brna) |