TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 09:23:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

(drose) fixed fluid-ness of relative set_fluid_pos

Browse Source
This commit is contained in:
Darren Ranalli 2004-09-25 01:20:47 +00:00
parent f876dd883d
commit 9a9719507c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panda/src/pgraph/nodePath.cxx
View File

@ -1268,8 +1268,11 @@ set_fluid_pos(const NodePath &other, const LVecBase3f &pos) {
const LVecBase3f &orig_scale = orig_transform->get_scale(); const LVecBase3f &orig_scale = orig_transform->get_scale();
const LVecBase3f &orig_shear = orig_transform->get_shear(); const LVecBase3f &orig_shear = orig_transform->get_shear();
// Use the relative set_transform() to compute the relative pos, and
// then reset all of the other components back to the way they were.
set_transform(other, rel_transform->set_pos(pos)); set_transform(other, rel_transform->set_pos(pos));
set_pos_hpr_scale_shear(get_transform()->get_pos(), orig_hpr, orig_scale, orig_shear); set_transform(TransformState::make_pos_hpr_scale_shear
(get_transform()->get_pos(), orig_hpr, orig_scale, orig_shear));
} else { } else {
// If we didn't have a componentwise transform already, never // If we didn't have a componentwise transform already, never