Skip to content
This repository has been archived by the owner on Mar 2, 2018. It is now read-only.

Commit

Permalink
Merge pull request #37 from googlesamples/release-turing
Browse files Browse the repository at this point in the history
release-turing
  • Loading branch information
r4ravi2008 committed Aug 7, 2015
2 parents 0251f0e + 407b6a1 commit 4fef496
Show file tree
Hide file tree
Showing 9 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ public void onDrawFrame(GL10 gl) {
mFloorGrid.draw(getViewMatrix(), mProjectionMatrix);
mCameraFrustumAndAxis.draw(getViewMatrix(), mProjectionMatrix);
}
updateViewMatrix();
}

public CameraFrustum getCameraFrustum() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,6 @@ public void onPoseAvailable(TangoPoseData pose) {
if (updateRenderer && mRenderer.isValid()) {
mRenderer.getModelMatCalculator().updateModelMatrix(translation,
pose.getRotationAsFloats());
mRenderer.updateViewMatrix();
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public void onDrawFrame(GL10 gl) {
mFloorGrid.draw(getViewMatrix(), mProjectionMatrix);
mCameraFrustumAndAxis.draw(getViewMatrix(), mProjectionMatrix);
}
updateViewMatrix();
}

public CameraFrustum getCameraFrustum() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ public void onPoseAvailable(final TangoPoseData pose) {
mRenderer.getTrajectory().updateTrajectory(translation);
mRenderer.getModelMatCalculator().updateModelMatrix(translation,
pose.getRotationAsFloats());
mRenderer.updateViewMatrix();
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public void onDrawFrame(GL10 gl) {
synchronized (PointCloudActivity.poseLock) {
mCameraFrustumAndAxis.draw(mViewMatrix, mProjectionMatrix);
}
updateViewMatrix();
}

public PointCloud getPointCloud() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
/**
* Main Activity class for the Point Cloud Sample. Handles the connection to the {@link Tango}
* service and propagation of Tango XyzIj data to OpenGL and Layout views. OpenGL rendering logic is
* delegated to the {@link PCRenderer} class.
* delegated to the {@link PCrenderer} class.
*/
public class PointCloudActivity extends Activity implements OnClickListener {

Expand Down Expand Up @@ -354,7 +354,6 @@ public void onPoseAvailable(final TangoPoseData pose) {
}
mRenderer.getModelMatCalculator().updateModelMatrix(
pose.getTranslationAsFloats(), pose.getRotationAsFloats());
mRenderer.updateViewMatrix();
}
}

Expand Down
Binary file modified TangoReleaseLibs/aar/TangoUtils.aar
Binary file not shown.
Binary file modified TangoReleaseLibs/aar/tango-ux-support-library.aar
Binary file not shown.
Binary file modified TangoReleaseLibs/jar/tango_java_lib.jar
Binary file not shown.

0 comments on commit 4fef496

Please sign in to comment.