From 3237d7b23dffcb560c3376f1e78ca8aaa342b5e1 Mon Sep 17 00:00:00 2001 From: yangxiao Date: Tue, 29 Apr 2014 18:14:41 -0700 Subject: [PATCH] Revert "wrong rotation" This reverts commit 3c9560017e368495e2a1fdf8a6f8bbe67cddbd34. --- cocos/2d/CCNode.cpp | 2 +- plugin | 2 +- tools/bindings-generator | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cocos/2d/CCNode.cpp b/cocos/2d/CCNode.cpp index bd327cf99d..1a02e61db1 100644 --- a/cocos/2d/CCNode.cpp +++ b/cocos/2d/CCNode.cpp @@ -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; } diff --git a/plugin b/plugin index 547ce2ea62..660761aa97 160000 --- a/plugin +++ b/plugin @@ -1 +1 @@ -Subproject commit 547ce2ea62a220a419f5df6bc54ab609437e49f3 +Subproject commit 660761aa976c7f84274765fba813c9c6d567a8ab diff --git a/tools/bindings-generator b/tools/bindings-generator index 22db42ddf5..4f99d9a65e 160000 --- a/tools/bindings-generator +++ b/tools/bindings-generator @@ -1 +1 @@ -Subproject commit 22db42ddf57dd020f1e6084ff08dee8d9e2334ec +Subproject commit 4f99d9a65e72e0c7cd86e7205b92729d2d764ef2