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

Revert "wrong rotation" 

This reverts commit 3c9560017e.
This commit is contained in:
yangxiao 2014-04-29 18:14:41 -07:00
parent 3c9560017e
commit 3237d7b23d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/CCNode.cpp
View File

@ -1378,7 +1378,7 @@ const Matrix& Node::getNodeToParentTransform() const
}
if(_rotationX) {
Matrix rotX;
Matrix::createRotationX(CC_DEGREES_TO_RADIANS(_rotationX), &rotX);
Matrix::createRotationY(CC_DEGREES_TO_RADIANS(_rotationX), &rotX);
_transform = _transform * rotX;
}

2
plugin

@ -1 +1 @@
Subproject commit 547ce2ea62a220a419f5df6bc54ab609437e49f3
Subproject commit 660761aa976c7f84274765fba813c9c6d567a8ab

2
tools/bindings-generator

@ -1 +1 @@
Subproject commit 22db42ddf57dd020f1e6084ff08dee8d9e2334ec
Subproject commit 4f99d9a65e72e0c7cd86e7205b92729d2d764ef2