Skip to content

Commit e94b18a

Browse files
author
di57mec
committed
clean up
1 parent b3d2a56 commit e94b18a

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

app/src/main/cpp/GLRenderer/GLRMono360.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ void GLRMono360::onSurfaceChanged(int width, int height) {
4949
void GLRMono360::onDrawFrame() {
5050
glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
5151
cpuFrameTime.start();
52-
mMatricesM.calculateNewHeadPoseIfNeeded(gvr_api_.get(),0);
5352
mMatricesM.calculateNewHeadPose360(gvr_api_.get(),0);
5453
Matrices& worldMatrices=mMatricesM.getWorldMatrices();
5554
mVideoRenderer->drawVideoCanvas360(worldMatrices.monoViewTracked,worldMatrices.projection360);

app/src/main/cpp/Other/MatricesManager.cpp

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,17 +124,14 @@ void MatricesManager::calculateNewHeadPose360(gvr::GvrApi *gvr_api, const int pr
124124
const gvr::Mat4f tmpHeadPose = gvr_api->GetHeadSpaceFromStartSpaceTransform(target_time);
125125
gvr_api->ApplyNeckModel(tmpHeadPose,1);
126126
worldMatrices.monoViewTracked=toGLM(tmpHeadPose);
127-
worldMatrices.monoViewTracked=glm::transpose(worldMatrices.monoViewTracked);
128-
129-
worldMatrices.monoViewTracked=worldMatrices.leftEyeViewTracked;
130-
131-
//float aaa[16]={1,-1.94429e-07,5.55111e-17,0,
132-
// 1.94429e-07,1,1.66533e-16,0,
133-
// -5.55112e-17,-1.66533e-16,1,0,
134-
// -0.1,1.94429e-08,-5.55111e-18,1,};
135-
//worldMatrices.monoViewTracked=glm::make_mat4x4(aaa);
136127
}
137128

129+
130+
//float aaa[16]={1,-1.94429e-07,5.55111e-17,0,
131+
// 1.94429e-07,1,1.66533e-16,0,
132+
// -5.55112e-17,-1.66533e-16,1,0,
133+
// -0.1,1.94429e-08,-5.55111e-18,1,};
134+
//worldMatrices.monoViewTracked=glm::make_mat4x4(aaa);
138135
/*float rot=0;
139136
void MatricesManager::calculateNewHeadPose360_fixRot(gvr::GvrApi *gvr_api, const int predictMS) {
140137
gvr::ClockTimePoint target_time = gvr::GvrApi::GetTimePointNow();

0 commit comments

Comments
 (0)