fix: proj fixes. works ok in any resolution

Author: ricardoquesada

cocos/base/CCDirector.cpp

@@ -604,11 +604,9 @@ void Director::setProjection(Projection projection)
     {
         case Projection::_2D:
         {
-            loadIdentityMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
-
             Mat4 orthoMatrix;
             Mat4::createOrthographicOffCenter(0, size.width, 0, size.height, -1024, 1024, &orthoMatrix);
-            multiplyMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION, orthoMatrix);
+            loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION, orthoMatrix);
             loadIdentityMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
             break;
         }
@@ -619,17 +617,14 @@ void Director::setProjection(Projection projection)
 
             Mat4 matrixPerspective, matrixLookup;
 
-            loadIdentityMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
-
             // issue #1334
             Mat4::createPerspective(60, (GLfloat)size.width/size.height, 10, zeye+size.height/2, &matrixPerspective);
 
-            multiplyMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION, matrixPerspective);
-
             Vec3 eye(size.width/2, size.height/2, zeye), center(size.width/2, size.height/2, 0.0f), up(0.0f, 1.0f, 0.0f);
             Mat4::createLookAt(eye, center, up, &matrixLookup);
-            multiplyMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION, matrixLookup);
-            
+            Mat4 proj3d = matrixPerspective * matrixLookup;
+
+            loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION, proj3d);
             loadIdentityMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
             break;
         }

cocos/vr/CCVRGeneric.cpp

@@ -50,7 +50,7 @@ void VRGeneric::setup(GLView* glview)
 {
 //    CC_UNUSED(glview);
 
-    // rebase default viewport in case origin is not 0,0
+    // set origin to 0,0 in case origin is not 0,0
     auto vp = Camera::getDefaultViewport();
     _vrViewSize.width = vp._width/2 + vp._left;
     _vrViewSize.height = vp._height/2 + vp._bottom;
@@ -75,21 +75,38 @@ void VRGeneric::setup(GLView* glview)
     _rightFB->attachDepthStencilTarget(rightDS);
     _rightFB->setClearColor(Color4F(0,0,1,1));
 
+    Size scaledTex = Size(vp._width/2, vp._height/2);
+    V3F_C4B_T2F_Quad quad;
+    quad.bl.colors = Color4B::WHITE;
+    quad.bl.texCoords = Tex2F(0,0);
+    quad.bl.vertices = Vec3(0,0,0);
+
+    quad.tl.colors = Color4B::WHITE;
+    quad.tl.texCoords = Tex2F(0,1);
+    quad.tl.vertices = Vec3(0,scaledTex.height,0);
+
+    quad.br.colors = Color4B::WHITE;
+    quad.br.texCoords = Tex2F(1,0);
+    quad.br.vertices = Vec3(scaledTex.width,0,0);
+
+    quad.tr.colors = Color4B::WHITE;
+    quad.tr.texCoords = Tex2F(1,1);
+    quad.tr.vertices = Vec3(scaledTex.width,scaledTex.height,0);
+
+    PolygonInfo polyInfo;
+    polyInfo.setQuad(&quad);
+
     _leftSprite = Sprite::createWithTexture(_leftFB->getRenderTarget()->getTexture());
     _leftSprite->retain();
     _leftSprite->setPosition(Vec2(0,0));
-    _leftSprite->setAnchorPoint(Vec2::ANCHOR_TOP_LEFT);
-    _leftSprite->setScaleY(-1/CC_CONTENT_SCALE_FACTOR());
-    _leftSprite->setScaleX(1/CC_CONTENT_SCALE_FACTOR());
-//    _leftSprite->setPolygonInfo(polyinfo);
+    _leftSprite->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
+    _leftSprite->setPolygonInfo(polyInfo);
 
     _rightSprite = Sprite::createWithTexture(_rightFB->getRenderTarget()->getTexture());
     _rightSprite->retain();
     _rightSprite->setPosition(Vec2(0,0));
-    _rightSprite->setAnchorPoint(Vec2::ANCHOR_TOP_LEFT);
-    _rightSprite->setScaleY(-1/CC_CONTENT_SCALE_FACTOR());
-    _rightSprite->setScaleX(1/CC_CONTENT_SCALE_FACTOR());
-//    _rightSprite->setPolygonInfo(polyinfo);
+    _rightSprite->setAnchorPoint(Vec2::ANCHOR_BOTTOM_LEFT);
+    _rightSprite->setPolygonInfo(polyInfo);
 }
 
 void VRGeneric::cleanup()
@@ -98,17 +115,29 @@ void VRGeneric::cleanup()
 
 void VRGeneric::render(Scene* scene, Renderer* renderer)
 {
+    auto director = Director::getInstance();
+
+    // FIXME: Use correct eye displacement
+    const float eyeOffset = 1;
     _leftFB->applyFBO();
-    scene->render(renderer, Vec3(-5,0,0));
+    scene->render(renderer, Vec3(-eyeOffset,0,0));
     _leftFB->restoreFBO();
 
     _rightFB->applyFBO();
-    scene->render(renderer, Vec3(5,0,0));
+    scene->render(renderer, Vec3(eyeOffset,0,0));
     _rightFB->restoreFBO();
 
     GLint viewport[4];
     glGetIntegerv(GL_VIEWPORT, viewport);
 
+    Mat4 proj2D;
+    Mat4::createOrthographic(_texSize.width, _texSize.height, -1, 1, &proj2D);
+    proj2D.translate(-_texSize.width/2, -_texSize.height/2, 0);
+    proj2D.scale(2);
+    director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
+    director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION, proj2D);
+
+
     glViewport(0, _vrViewSize.height/2 , _vrViewSize.width, _vrViewSize.height);
     _leftSprite->visit(renderer, Mat4::IDENTITY, 0);
     renderer->render();
@@ -117,6 +146,8 @@ void VRGeneric::render(Scene* scene, Renderer* renderer)
     _rightSprite->visit(renderer, Mat4::IDENTITY, 0);
     renderer->render();
 
+    director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
+
     glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
 }