diff options
Diffstat (limited to 'platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/app')
3 files changed, 8 insertions, 12 deletions
diff --git a/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/app/CanvasARSurfaceView.java b/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/app/CanvasARSurfaceView.java index 40c789d0a2..efe8acfa1d 100644 --- a/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/app/CanvasARSurfaceView.java +++ b/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/app/CanvasARSurfaceView.java @@ -57,6 +57,5 @@ public class CanvasARSurfaceView extends SurfaceView implements SurfaceHolder.Ca } @Override - public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) { - } + public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {} } diff --git a/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/app/FingerPainting.java b/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/app/FingerPainting.java index e4aaf5784b..ac97dfbf77 100644 --- a/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/app/FingerPainting.java +++ b/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/app/FingerPainting.java @@ -19,17 +19,14 @@ package com.google.skar.examples.helloskar.app; import android.graphics.Color; import android.graphics.Path; import android.graphics.PointF; -import android.util.Log; -import com.google.skar.examples.helloskar.helpers.TapHelper; +import com.google.skar.examples.helloskar.helpers.GestureHelper; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.ArrayList; - public class FingerPainting { public static class BuiltPath { public Path path; @@ -87,7 +84,7 @@ public class FingerPainting { * @param holdTap ScrollEvent associated with the hit test that calls this function * @return true if point was computed and added. False otherwise. */ - public boolean computeNextPoint(float[] hitLocation, TapHelper.ScrollEvent holdTap) { + public boolean computeNextPoint(float[] hitLocation, GestureHelper.ScrollEvent holdTap) { if (isEmpty()) { // If finger painting is empty, then first point is origin. Model matrix // of the finger painting is the model matrix of the first point diff --git a/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/app/HelloCanvasAR.java b/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/app/HelloCanvasAR.java index d883c693a2..78791fae93 100644 --- a/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/app/HelloCanvasAR.java +++ b/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/app/HelloCanvasAR.java @@ -57,8 +57,8 @@ import com.google.ar.core.examples.java.helloskar.R; import com.google.skar.examples.helloskar.helpers.CameraPermissionHelper; import com.google.skar.examples.helloskar.helpers.DisplayRotationHelper; import com.google.skar.examples.helloskar.helpers.FullScreenHelper; +import com.google.skar.examples.helloskar.helpers.GestureHelper; import com.google.skar.examples.helloskar.helpers.SnackbarHelper; -import com.google.skar.examples.helloskar.helpers.TapHelper; import com.google.skar.examples.helloskar.rendering.BackgroundRenderer; import com.google.skar.examples.helloskar.rendering.DrawManager; @@ -105,7 +105,7 @@ public class HelloCanvasAR extends AppCompatActivity implements GLSurfaceView.Re private boolean installRequested; private final SnackbarHelper messageSnackbarHelper = new SnackbarHelper(); private DisplayRotationHelper displayRotationHelper; - private TapHelper tapHelper; + private GestureHelper tapHelper; // Temporary matrix allocated here to reduce number of allocations for each frame. private final float[] anchorMatrix = new float[16]; @@ -138,7 +138,7 @@ public class HelloCanvasAR extends AppCompatActivity implements GLSurfaceView.Re holder = arSurfaceView.getHolder(); // Set up tap listener. - tapHelper = new TapHelper(this); + tapHelper = new GestureHelper(this); glSurfaceView.setOnTouchListener(tapHelper); // Set up renderer. @@ -439,9 +439,9 @@ public class HelloCanvasAR extends AppCompatActivity implements GLSurfaceView.Re */ private void handleHoldTaps(Frame frame, Camera camera) { // Building finger painting - TapHelper.ScrollEvent holdTap = tapHelper.holdPoll(); + GestureHelper.ScrollEvent holdTap = tapHelper.holdPoll(); if (holdTap != null && camera.getTrackingState() == TrackingState.TRACKING) { - for (HitResult hit : frame.hitTest(holdTap.e)) { + for (HitResult hit : frame.hitTest(holdTap.event)) { // Check if any plane was hit, and if it was hit inside the plane polygon Trackable trackable = hit.getTrackable(); // Creates an anchor if a plane or an oriented point was hit. |