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

wrong scale order

This commit is contained in:
yangxiao 2014-12-25 10:39:48 +08:00
parent 510633ba72
commit 0db70977f9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/2d/CCNode.cpp
View File

@ -1791,15 +1791,15 @@ const Mat4& Node::getNodeToParentTransform() const
} }
if (_scaleX != 1.f) if (_scaleX != 1.f)
{ {
_transform.m[0] *= _scaleX, _transform.m[4] *= _scaleX, _transform.m[8] *= _scaleX; _transform.m[0] *= _scaleX, _transform.m[1] *= _scaleX, _transform.m[2] *= _scaleX;
} }
if (_scaleY != 1.f) if (_scaleY != 1.f)
{ {
_transform.m[1] *= _scaleY, _transform.m[5] *= _scaleY, _transform.m[9] *= _scaleY; _transform.m[4] *= _scaleY, _transform.m[5] *= _scaleY, _transform.m[6] *= _scaleY;
} }
if (_scaleZ != 1.f) if (_scaleZ != 1.f)
{ {
_transform.m[2] *= _scaleZ, _transform.m[6] *= _scaleZ, _transform.m[10] *= _scaleZ; _transform.m[8] *= _scaleZ, _transform.m[9] *= _scaleZ, _transform.m[10] *= _scaleZ;
} }
_transform.m[12] = x, _transform.m[13] = y, _transform.m[14] = z; _transform.m[12] = x, _transform.m[13] = y, _transform.m[14] = z;