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

be even more forgiving of componentwise transforms

Browse Source
This commit is contained in:
David Rose 2002-06-25 18:59:17 +00:00
parent 84291066be
commit 60cc983f84
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -695,10 +695,12 @@ do_compose(const TransformState *other) const {
nassertr((other->_flags & F_is_invalid) == 0, other);
if (compose_componentwise &&
components_given() && has_uniform_scale() &&
other->components_given()) {
// We will do this operation componentwise if both transforms were
// given componentwise, and no non-uniform scale is involved.
has_uniform_scale() &&
((components_given() && other->has_components()) ||
(other->components_given() && has_components()))) {
// We will do this operation componentwise if *either* transform
// was given componentwise (and there is no non-uniform scale in
// the way).
LVecBase3f pos = get_pos();
LQuaternionf quat = get_quat();
@ -746,11 +748,12 @@ do_invert_compose(const TransformState *other) const {
nassertr((other->_flags & F_is_invalid) == 0, other);
if (compose_componentwise &&
components_given() && has_uniform_scale() &&
(other->is_identity() ||
(other->components_given()))) {
// We will do this operation componentwise if both transforms were
// given componentwise, and no non-uniform scale is involved.
has_uniform_scale() &&
((components_given() && other->has_components()) ||
(other->components_given() && has_components()))) {
// We will do this operation componentwise if *either* transform
// was given componentwise (and there is no non-uniform scale in
// the way).
LVecBase3f pos = get_pos();
LQuaternionf quat = get_quat();