From ffa6d1bf163a3cb5d106319a29c61726918d0665 Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 21 Nov 2011 15:44:48 +0000 Subject: [PATCH] add pushers-horizontal and make the initial default for CollisionHandlerPusher::set_horizontal() be false. --- panda/src/collide/collisionHandlerPusher.cxx | 2 +- panda/src/collide/config_collide.cxx | 6 ++++++ panda/src/collide/config_collide.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/panda/src/collide/collisionHandlerPusher.cxx b/panda/src/collide/collisionHandlerPusher.cxx index 67c686e561..b57011da6a 100644 --- a/panda/src/collide/collisionHandlerPusher.cxx +++ b/panda/src/collide/collisionHandlerPusher.cxx @@ -43,7 +43,7 @@ public: //////////////////////////////////////////////////////////////////// CollisionHandlerPusher:: CollisionHandlerPusher() { - _horizontal = true; + _horizontal = pushers_horizontal; } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/collide/config_collide.cxx b/panda/src/collide/config_collide.cxx index 34580e7bc7..9787432888 100644 --- a/panda/src/collide/config_collide.cxx +++ b/panda/src/collide/config_collide.cxx @@ -102,6 +102,12 @@ ConfigVariableInt fluid_cap_amount ("fluid-cap-amount", 100, PRC_DESC("ensures that fluid pos doesn't check beyond X feet")); +ConfigVariableBool pushers_horizontal +("pushers-horizontal", false, + PRC_DESC("Set this true to make all CollisionHandlerPushers have the " + "set_horizontal() flag by default, false to let the move " + "in three dimensions by default.")); + //////////////////////////////////////////////////////////////////// // Function: init_libcollide // Description: Initializes the library. This must be called at diff --git a/panda/src/collide/config_collide.h b/panda/src/collide/config_collide.h index e2f019a768..158ec755fb 100644 --- a/panda/src/collide/config_collide.h +++ b/panda/src/collide/config_collide.h @@ -30,6 +30,7 @@ extern EXPCL_PANDA_COLLIDE ConfigVariableBool flatten_collision_nodes; extern EXPCL_PANDA_COLLIDE ConfigVariableDouble collision_parabola_bounds_threshold; extern EXPCL_PANDA_COLLIDE ConfigVariableInt collision_parabola_bounds_sample; extern EXPCL_PANDA_COLLIDE ConfigVariableInt fluid_cap_amount; +extern EXPCL_PANDA_COLLIDE ConfigVariableBool pushers_horizontal; extern EXPCL_PANDA_COLLIDE void init_libcollide();