fix: little fixes

zilongshanren · May 31, 2016 · 96200ee · 96200ee
1 parent a2eb811
commit 96200ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/cocos/2d/CCNode.cpp b/cocos/2d/CCNode.cpp
@@ -1792,9 +1792,6 @@ void Node::setAdditionalTransform(Mat4* additionalTransform)
     }
     else
     {
-        // FIXME: Why "set" multiplies with the previous one.
-        // "set" should just replace the old one.
-        // in any case, we should add a new method called "concatAdditionalTransform"
         _additionalTransform = *additionalTransform;
         _useAdditionalTransform = true;
     }

diff --git a/cocos/2d/CCScene.cpp b/cocos/2d/CCScene.cpp
@@ -208,9 +208,10 @@ void Scene::render(Renderer* renderer, const Mat4& eyeTransform, const Mat4* eye
         // then the "nodeToParent transform" will be lost.
         // And it is important that the change is "permament", because the matrix might be used for calculate
         // culling and other stuff.
-        camera->setAdditionalTransform(eyeTransform.getInversed());
         if (eyeProjection)
             camera->setAdditionalProjection(*eyeProjection * camera->getProjectionMatrix().getInversed());
+        else
+            camera->setAdditionalTransform(eyeTransform.getInversed());
 
         director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
         director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION, Camera::_visitingCamera->getViewProjectionMatrix());