From b050bd8459ed1e325ec320eec67a4c9184ba3826 Mon Sep 17 00:00:00 2001 From: cxgeorge <> Date: Sun, 10 Jun 2001 03:52:44 +0000 Subject: [PATCH] small optimization --- panda/src/collide/collisionHandlerPusher.cxx | 21 ++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/panda/src/collide/collisionHandlerPusher.cxx b/panda/src/collide/collisionHandlerPusher.cxx index 314fc0f511..94e069f2f2 100644 --- a/panda/src/collide/collisionHandlerPusher.cxx +++ b/panda/src/collide/collisionHandlerPusher.cxx @@ -172,19 +172,28 @@ handle_entries() { } } - if (_horizontal) { - net_shove[2] = 0.0; + LMatrix4f mat; + def.get_mat(mat); + + // def.set_mat(LMatrix4f::translate_mat(net_shove) * mat); + + mat(3,0) += net_shove[0]; + mat(3,1) += net_shove[1]; + + if (!_horizontal) { + mat(3,2) += net_shove[2]; } + def.set_mat(mat); + if (collide_cat.is_debug()) { + if (_horizontal) + net_shove[2] = 0.0; + collide_cat.debug() << "Net shove on " << *from_node << " is: " << net_shove << "\n"; } - - LMatrix4f mat; - def.get_mat(mat); - def.set_mat(LMatrix4f::translate_mat(net_shove) * mat); } } }