Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

getParentToNodeTransform return Matrix

This commit is contained in:
Huabing.Xu 2014-04-08 22:13:59 +08:00
parent 3837c23ebe
commit fcff284fd5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/2d/CCNode.cpp
View File

@ -1451,13 +1451,13 @@ void Node::setAdditionalTransform(kmMat4* additionalTransform)
AffineTransform Node::getParentToNodeAffineTransform() const
{
AffineTransform ret;
kmMat4 ret4 = getParentToNodeTransform();
Matrix ret4 = getParentToNodeTransform();
GLToCGAffine(ret4.mat,&ret);
GLToCGAffine(ret4.m,&ret);
return ret;
}
const kmMat4& Node::getParentToNodeTransform() const
const Matrix& Node::getParentToNodeTransform() const
{
if ( _inverseDirty ) {
kmMat4Inverse(&_inverse, &_transform);

2
cocos/2d/CCNode.h
View File

@ -1209,7 +1209,7 @@ public:
* Returns the matrix that transform parent's space coordinates to the node's (local) space coordinates.
* The matrix is in Pixels.
*/
virtual const kmMat4& getParentToNodeTransform() const;
virtual const Matrix& getParentToNodeTransform() const;
virtual AffineTransform getParentToNodeAffineTransform() const;
/** @deprecated Use getParentToNodeTransform() instead */