RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

calling apply_linear_force if node is a PandaNode

This commit is contained in:
Dave Schuyler 2003-07-25 23:25:58 +00:00
parent 4ff57f4306
commit 5b69c12a88
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panda/src/collide/collisionHandlerPusher.cxx
View File

@ -170,7 +170,6 @@ handle_entries() {
for (sj = shoves.begin(); sj != si; ++sj) {
ShoveData &sd2 = (*sj);
if (sd2._valid) {
float d = sd._vector.dot(sd2._vector);
if (collide_cat.is_debug()) {
collide_cat.debug()
@ -185,7 +184,6 @@ handle_entries() {
} else {
sd._valid = false;
}
} else {
// These two shoves are not in the same direction.
// If they are both from polygons that are a child
@ -259,6 +257,8 @@ handle_entries() {
LVecBase3f pos = trans->get_pos();
pos += net_shove * trans->get_mat();
def._node->set_transform(trans->set_pos(pos));
apply_linear_force(def, force_normal);
} else {
// Otherwise, go ahead and do the matrix math to do things
// the old and clumsy way.
@ -266,7 +266,6 @@ handle_entries() {
def.get_mat(mat);
def.set_mat(LMatrix4f::translate_mat(net_shove) * mat);
}
apply_linear_force(def, force_normal);
}
}
}