clean up

Consti10 · Sep 17, 2019 · e94b18a · e94b18a
1 parent b3d2a56
commit e94b18a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/app/src/main/cpp/GLRenderer/GLRMono360.cpp b/app/src/main/cpp/GLRenderer/GLRMono360.cpp
@@ -49,7 +49,6 @@ void GLRMono360::onSurfaceChanged(int width, int height) {
 void GLRMono360::onDrawFrame() {
     glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
     cpuFrameTime.start();
-    mMatricesM.calculateNewHeadPoseIfNeeded(gvr_api_.get(),0);
     mMatricesM.calculateNewHeadPose360(gvr_api_.get(),0);
     Matrices& worldMatrices=mMatricesM.getWorldMatrices();
     mVideoRenderer->drawVideoCanvas360(worldMatrices.monoViewTracked,worldMatrices.projection360);

diff --git a/app/src/main/cpp/Other/MatricesManager.cpp b/app/src/main/cpp/Other/MatricesManager.cpp
@@ -124,17 +124,14 @@ void MatricesManager::calculateNewHeadPose360(gvr::GvrApi *gvr_api, const int pr
     const gvr::Mat4f tmpHeadPose = gvr_api->GetHeadSpaceFromStartSpaceTransform(target_time);
     gvr_api->ApplyNeckModel(tmpHeadPose,1);
     worldMatrices.monoViewTracked=toGLM(tmpHeadPose);
-    worldMatrices.monoViewTracked=glm::transpose(worldMatrices.monoViewTracked);
-
-    worldMatrices.monoViewTracked=worldMatrices.leftEyeViewTracked;
-
-    //float aaa[16]={1,-1.94429e-07,5.55111e-17,0,
-    //               1.94429e-07,1,1.66533e-16,0,
-    //               -5.55112e-17,-1.66533e-16,1,0,
-    //               -0.1,1.94429e-08,-5.55111e-18,1,};
-    //worldMatrices.monoViewTracked=glm::make_mat4x4(aaa);
 }
 
+
+//float aaa[16]={1,-1.94429e-07,5.55111e-17,0,
+//               1.94429e-07,1,1.66533e-16,0,
+//               -5.55112e-17,-1.66533e-16,1,0,
+//               -0.1,1.94429e-08,-5.55111e-18,1,};
+//worldMatrices.monoViewTracked=glm::make_mat4x4(aaa);
 /*float rot=0;
 void MatricesManager::calculateNewHeadPose360_fixRot(gvr::GvrApi *gvr_api, const int predictMS) {
     gvr::ClockTimePoint target_time = gvr::GvrApi::GetTimePointNow();