diff options
Diffstat (limited to 'source/blender/editors/physics/rigidbody_world.c')
| -rw-r--r-- | source/blender/editors/physics/rigidbody_world.c | 182 |
1 files changed, 94 insertions, 88 deletions
diff --git a/source/blender/editors/physics/rigidbody_world.c b/source/blender/editors/physics/rigidbody_world.c index b9049f79d0c..179a5a513f4 100644 --- a/source/blender/editors/physics/rigidbody_world.c +++ b/source/blender/editors/physics/rigidbody_world.c @@ -56,13 +56,13 @@ /* check if there is an active rigid body world */ static bool ED_rigidbody_world_active_poll(bContext *C) { - Scene *scene = CTX_data_scene(C); - return (scene && scene->rigidbody_world); + Scene *scene = CTX_data_scene(C); + return (scene && scene->rigidbody_world); } static bool ED_rigidbody_world_add_poll(bContext *C) { - Scene *scene = CTX_data_scene(C); - return (scene && scene->rigidbody_world == NULL); + Scene *scene = CTX_data_scene(C); + return (scene && scene->rigidbody_world == NULL); } /* ********************************************** */ @@ -72,73 +72,73 @@ static bool ED_rigidbody_world_add_poll(bContext *C) static int rigidbody_world_add_exec(bContext *C, wmOperator *UNUSED(op)) { - Main *bmain = CTX_data_main(C); - Scene *scene = CTX_data_scene(C); - RigidBodyWorld *rbw; + Main *bmain = CTX_data_main(C); + Scene *scene = CTX_data_scene(C); + RigidBodyWorld *rbw; - rbw = BKE_rigidbody_create_world(scene); -// BKE_rigidbody_validate_sim_world(scene, rbw, false); - scene->rigidbody_world = rbw; + rbw = BKE_rigidbody_create_world(scene); + // BKE_rigidbody_validate_sim_world(scene, rbw, false); + scene->rigidbody_world = rbw; - /* Full rebuild of DEG! */ - DEG_relations_tag_update(bmain); - DEG_id_tag_update_ex(bmain, &scene->id, ID_RECALC_ANIMATION); + /* Full rebuild of DEG! */ + DEG_relations_tag_update(bmain); + DEG_id_tag_update_ex(bmain, &scene->id, ID_RECALC_ANIMATION); - return OPERATOR_FINISHED; + return OPERATOR_FINISHED; } void RIGIDBODY_OT_world_add(wmOperatorType *ot) { - /* identifiers */ - ot->idname = "RIGIDBODY_OT_world_add"; - ot->name = "Add Rigid Body World"; - ot->description = "Add Rigid Body simulation world to the current scene"; + /* identifiers */ + ot->idname = "RIGIDBODY_OT_world_add"; + ot->name = "Add Rigid Body World"; + ot->description = "Add Rigid Body simulation world to the current scene"; - /* callbacks */ - ot->exec = rigidbody_world_add_exec; - ot->poll = ED_rigidbody_world_add_poll; + /* callbacks */ + ot->exec = rigidbody_world_add_exec; + ot->poll = ED_rigidbody_world_add_poll; - /* flags */ - ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } /* ********** Remove RigidBody World ************* */ static int rigidbody_world_remove_exec(bContext *C, wmOperator *op) { - Main *bmain = CTX_data_main(C); - Scene *scene = CTX_data_scene(C); - RigidBodyWorld *rbw = scene->rigidbody_world; + Main *bmain = CTX_data_main(C); + Scene *scene = CTX_data_scene(C); + RigidBodyWorld *rbw = scene->rigidbody_world; - /* sanity checks */ - if (ELEM(NULL, scene, rbw)) { - BKE_report(op->reports, RPT_ERROR, "No Rigid Body World to remove"); - return OPERATOR_CANCELLED; - } + /* sanity checks */ + if (ELEM(NULL, scene, rbw)) { + BKE_report(op->reports, RPT_ERROR, "No Rigid Body World to remove"); + return OPERATOR_CANCELLED; + } - BKE_rigidbody_free_world(scene); + BKE_rigidbody_free_world(scene); - /* Full rebuild of DEG! */ - DEG_relations_tag_update(bmain); - DEG_id_tag_update_ex(bmain, &scene->id, ID_RECALC_ANIMATION); + /* Full rebuild of DEG! */ + DEG_relations_tag_update(bmain); + DEG_id_tag_update_ex(bmain, &scene->id, ID_RECALC_ANIMATION); - /* done */ - return OPERATOR_FINISHED; + /* done */ + return OPERATOR_FINISHED; } void RIGIDBODY_OT_world_remove(wmOperatorType *ot) { - /* identifiers */ - ot->idname = "RIGIDBODY_OT_world_remove"; - ot->name = "Remove Rigid Body World"; - ot->description = "Remove Rigid Body simulation world from the current scene"; + /* identifiers */ + ot->idname = "RIGIDBODY_OT_world_remove"; + ot->name = "Remove Rigid Body World"; + ot->description = "Remove Rigid Body simulation world from the current scene"; - /* callbacks */ - ot->exec = rigidbody_world_remove_exec; - ot->poll = ED_rigidbody_world_active_poll; + /* callbacks */ + ot->exec = rigidbody_world_remove_exec; + ot->poll = ED_rigidbody_world_active_poll; - /* flags */ - ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } /* ********************************************** */ @@ -148,59 +148,65 @@ void RIGIDBODY_OT_world_remove(wmOperatorType *ot) static int rigidbody_world_export_exec(bContext *C, wmOperator *op) { - Scene *scene = CTX_data_scene(C); - RigidBodyWorld *rbw = scene->rigidbody_world; - char path[FILE_MAX]; - - /* sanity checks */ - if (ELEM(NULL, scene, rbw)) { - BKE_report(op->reports, RPT_ERROR, "No Rigid Body World to export"); - return OPERATOR_CANCELLED; - } - if (rbw->shared->physics_world == NULL) { - BKE_report(op->reports, RPT_ERROR, "Rigid Body World has no associated physics data to export"); - return OPERATOR_CANCELLED; - } - - RNA_string_get(op->ptr, "filepath", path); + Scene *scene = CTX_data_scene(C); + RigidBodyWorld *rbw = scene->rigidbody_world; + char path[FILE_MAX]; + + /* sanity checks */ + if (ELEM(NULL, scene, rbw)) { + BKE_report(op->reports, RPT_ERROR, "No Rigid Body World to export"); + return OPERATOR_CANCELLED; + } + if (rbw->shared->physics_world == NULL) { + BKE_report( + op->reports, RPT_ERROR, "Rigid Body World has no associated physics data to export"); + return OPERATOR_CANCELLED; + } + + RNA_string_get(op->ptr, "filepath", path); #ifdef WITH_BULLET - RB_dworld_export(rbw->shared->physics_world, path); + RB_dworld_export(rbw->shared->physics_world, path); #endif - return OPERATOR_FINISHED; + return OPERATOR_FINISHED; } static int rigidbody_world_export_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) { - if (!RNA_struct_property_is_set(op->ptr, "relative_path")) - RNA_boolean_set(op->ptr, "relative_path", (U.flag & USER_RELPATHS) != 0); + if (!RNA_struct_property_is_set(op->ptr, "relative_path")) + RNA_boolean_set(op->ptr, "relative_path", (U.flag & USER_RELPATHS) != 0); - if (RNA_struct_property_is_set(op->ptr, "filepath")) - return rigidbody_world_export_exec(C, op); + if (RNA_struct_property_is_set(op->ptr, "filepath")) + return rigidbody_world_export_exec(C, op); - // TODO: use the actual rigidbody world's name + .bullet instead of this temp crap - RNA_string_set(op->ptr, "filepath", "rigidbodyworld_export.bullet"); - WM_event_add_fileselect(C, op); + // TODO: use the actual rigidbody world's name + .bullet instead of this temp crap + RNA_string_set(op->ptr, "filepath", "rigidbodyworld_export.bullet"); + WM_event_add_fileselect(C, op); - return OPERATOR_RUNNING_MODAL; + return OPERATOR_RUNNING_MODAL; } void RIGIDBODY_OT_world_export(wmOperatorType *ot) { - /* identifiers */ - ot->idname = "RIGIDBODY_OT_world_export"; - ot->name = "Export Rigid Body World"; - ot->description = "Export Rigid Body world to simulator's own fileformat (i.e. '.bullet' for Bullet Physics)"; - - /* callbacks */ - ot->invoke = rigidbody_world_export_invoke; - ot->exec = rigidbody_world_export_exec; - ot->poll = ED_rigidbody_world_active_poll; - - /* flags */ - ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; - - /* properties */ - WM_operator_properties_filesel( - ot, FILE_TYPE_FOLDER, FILE_SPECIAL, FILE_SAVE, - FILE_RELPATH, FILE_DEFAULTDISPLAY, FILE_SORT_ALPHA); + /* identifiers */ + ot->idname = "RIGIDBODY_OT_world_export"; + ot->name = "Export Rigid Body World"; + ot->description = + "Export Rigid Body world to simulator's own fileformat (i.e. '.bullet' for Bullet Physics)"; + + /* callbacks */ + ot->invoke = rigidbody_world_export_invoke; + ot->exec = rigidbody_world_export_exec; + ot->poll = ED_rigidbody_world_active_poll; + + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + + /* properties */ + WM_operator_properties_filesel(ot, + FILE_TYPE_FOLDER, + FILE_SPECIAL, + FILE_SAVE, + FILE_RELPATH, + FILE_DEFAULTDISPLAY, + FILE_SORT_ALPHA); } |