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

Commit 4fef496

Browse files
committed
Merge pull request #37 from googlesamples/release-turing
release-turing
2 parents 0251f0e + 407b6a1 commit 4fef496

File tree

9 files changed

+4
-4
lines changed

9 files changed

+4
-4
lines changed

AreaLearningJava/app/src/main/java/com/projecttango/experiments/javaarealearning/ALRenderer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public void onDrawFrame(GL10 gl) {
8383
mFloorGrid.draw(getViewMatrix(), mProjectionMatrix);
8484
mCameraFrustumAndAxis.draw(getViewMatrix(), mProjectionMatrix);
8585
}
86+
updateViewMatrix();
8687
}
8788

8889
public CameraFrustum getCameraFrustum() {

AreaLearningJava/app/src/main/java/com/projecttango/experiments/javaarealearning/AreaLearningActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,6 @@ public void onPoseAvailable(TangoPoseData pose) {
327327
if (updateRenderer && mRenderer.isValid()) {
328328
mRenderer.getModelMatCalculator().updateModelMatrix(translation,
329329
pose.getRotationAsFloats());
330-
mRenderer.updateViewMatrix();
331330
}
332331
}
333332
}

MotionTrackingJava/app/src/main/java/com/projecttango/experiments/javamotiontracking/MTGLRenderer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ public void onDrawFrame(GL10 gl) {
8282
mFloorGrid.draw(getViewMatrix(), mProjectionMatrix);
8383
mCameraFrustumAndAxis.draw(getViewMatrix(), mProjectionMatrix);
8484
}
85+
updateViewMatrix();
8586
}
8687

8788
public CameraFrustum getCameraFrustum() {

MotionTrackingJava/app/src/main/java/com/projecttango/experiments/javamotiontracking/MotionTrackingActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ public void onPoseAvailable(final TangoPoseData pose) {
184184
mRenderer.getTrajectory().updateTrajectory(translation);
185185
mRenderer.getModelMatCalculator().updateModelMatrix(translation,
186186
pose.getRotationAsFloats());
187-
mRenderer.updateViewMatrix();
188187
}
189188
}
190189

PointCloudJava/app/src/main/java/com/projecttango/experiments/javapointcloud/PCRenderer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ public void onDrawFrame(GL10 gl) {
8282
synchronized (PointCloudActivity.poseLock) {
8383
mCameraFrustumAndAxis.draw(mViewMatrix, mProjectionMatrix);
8484
}
85+
updateViewMatrix();
8586
}
8687

8788
public PointCloud getPointCloud() {

PointCloudJava/app/src/main/java/com/projecttango/experiments/javapointcloud/PointCloudActivity.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
/**
5656
* Main Activity class for the Point Cloud Sample. Handles the connection to the {@link Tango}
5757
* service and propagation of Tango XyzIj data to OpenGL and Layout views. OpenGL rendering logic is
58-
* delegated to the {@link PCRenderer} class.
58+
* delegated to the {@link PCrenderer} class.
5959
*/
6060
public class PointCloudActivity extends Activity implements OnClickListener {
6161

@@ -354,7 +354,6 @@ public void onPoseAvailable(final TangoPoseData pose) {
354354
}
355355
mRenderer.getModelMatCalculator().updateModelMatrix(
356356
pose.getTranslationAsFloats(), pose.getRotationAsFloats());
357-
mRenderer.updateViewMatrix();
358357
}
359358
}
360359

-8 Bytes
Binary file not shown.
-180 Bytes
Binary file not shown.
4.69 KB
Binary file not shown.

0 commit comments

Comments
 (0)