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

compare quats better

This commit is contained in:
David Rose 2002-07-15 18:18:06 +00:00
parent 44f3ceb82a
commit 49e157c65d
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
panda/src/pgraph/transformState.cxx
View File

@ -220,18 +220,27 @@ operator < (const TransformState &other) const {
return 0;
}
if ((_flags & (F_components_given | F_hpr_given)) ==
(F_components_given | F_hpr_given)) {
if ((_flags & (F_components_given | F_hpr_given | F_quat_given)) ==
(F_components_given | F_hpr_given | F_quat_given)) {
// If the transform was specified componentwise, compare them
// componentwise.
int c = _pos.compare_to(other._pos);
if (c != 0) {
return c < 0;
}
c = _hpr.compare_to(other._hpr);
if (c != 0) {
return c < 0;
if ((_flags & F_hpr_given) != 0) {
c = _hpr.compare_to(other._hpr);
if (c != 0) {
return c < 0;
}
} else if ((_flags & F_quat_given) != 0) {
c = _quat.compare_to(other._quat);
if (c != 0) {
return c < 0;
}
}
c = _scale.compare_to(other._scale);
return c < 0;
}