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

forced-roll flavor of decompose_matrix now has no default cs

Browse Source
This commit is contained in:
David Rose 2003-07-02 21:42:51 +00:00
parent 439b8b4546
commit 05e6e05c4d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1098,7 +1098,7 @@ get_hpr(const NodePath &other, float roll) const {
// function is deprecated anyway. // function is deprecated anyway.
LMatrix4f mat = get_mat(other); LMatrix4f mat = get_mat(other);
LVector3f scale, hpr, pos; LVector3f scale, hpr, pos;
decompose_matrix(mat, scale, hpr, pos, roll); decompose_matrix(mat, scale, hpr, pos, roll, CS_default);
return hpr; return hpr;
} }

9
panda/src/pgraph/pandaNode.cxx
View File

@ -1027,8 +1027,15 @@ stash_child(int child_index) {
PT(PandaNode) child_node = get_child(child_index); PT(PandaNode) child_node = get_child(child_index);
int sort = get_child_sort(child_index); int sort = get_child_sort(child_index);
cerr << " a: " << this << ":" << get_ref_count() << ", " << child_node
<< " " << *this << " stashes " << *child_node << "\n";
PT(PandaNode) self = this;
remove_child(child_index); remove_child(child_index);
cerr << " b\n";
CDWriter cdata(_cycler); CDWriter cdata(_cycler);
CDWriter cdata_child(child_node->_cycler); CDWriter cdata_child(child_node->_cycler);
@ -1042,7 +1049,7 @@ stash_child(int child_index) {
// Call callback hooks. // Call callback hooks.
children_changed(); children_changed();
child_node->parents_changed(); cerr << "stash done.\n";
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////