AR Pet Showcase updated to match GearVRf PR #2005

common.gradle

@@ -1,4 +1,7 @@
-project.ext.hasBackend = false
+if (project.hasProperty("hasBackend"))
+    project.ext.hasBackend = true
+else
+    project.ext.hasBackend = false
 
 if (file("../../../extra_properties.gradle").exists()) {
     apply from: '../../../extra_properties.gradle'

gvr-arcore/app/src/main/java/org/gearvrf/arcore/simplesample/SampleMain.java

@@ -161,7 +161,7 @@ public void onTouchStart(GVRSceneObject sceneObj, GVRPicker.GVRPickedObject pick
                 return;
             }
 
-            if (mDraggingObject == null) {
+            if (mDraggingObject == null && pickInfo.motionEvent != null) {
                 mDraggingObject = sceneObj;
 
                 mYaw = sceneObj.getTransform().getRotationYaw();
@@ -200,7 +200,7 @@ public void onInside(GVRSceneObject sceneObj, GVRPicker.GVRPickedObject pickInfo
 
             if (mDraggingObject == null) {
                 return;
-            } else {
+            } else if (pickInfo.motionEvent != null){
                 // get the current x,y hit location
                 float hitLocationX = pickInfo.motionEvent.getX();
                 float hitLocationY = pickInfo.motionEvent.getY();
@@ -262,7 +262,8 @@ private void addVirtualObject(float[] pose, VirtualObject andy) {
         GVRAnchor anchor;
 
         if (mVirtObjCount < MAX_VIRTUAL_OBJECTS) {
-             anchor = mixedReality.createAnchor(pose, andy);
+             anchor = mixedReality.createAnchor(pose);
+             anchor.attachSceneObject(andy);
 
             mainScene.addSceneObject(anchor);
             mVirtualObjects.add(anchor);

gvr-arpet/app/build.gradle

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015 Samsung Electronics Co., LTD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+apply plugin: 'com.android.application'
+
+System.setProperty("appName", "gvr-arpet")
+
+project.ext.hasBackend = true
+project.ext.backend_monoscopic = true
+
+if (file("../../common.gradle").exists()) {
+    apply from: '../../common.gradle'
+} else if (file("../../../../GearVRf-Demos/common.gradle").exists()) {
+    apply from: '../../../../GearVRf-Demos/common.gradle'
+}
+
+def getPropertyOrDefault(propertyName, defaultValue) {
+    return project.hasProperty(propertyName) ? project.property(propertyName) : defaultValue
+}
+
+android {
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
+    defaultConfig {
+        manifestPlaceholders = [cloudAnchorApiKey: getPropertyOrDefault("cloudAnchorApiKey", "")]
+        minSdkVersion 24
+        targetSdkVersion 28
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    sourceSets.main {
+        jni.srcDirs = [] // no auto generation of Android.mk
+        jniLibs.srcDir 'libs' // pre-compiled libraries
+    }
+}
+
+dependencies {
+    // ARCore library
+    implementation 'com.google.ar:core:1.5.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'org.greenrobot:eventbus:3.1.1'
+    debugImplementation(name: 'MixedReality-debug', ext: 'aar')
+    releaseImplementation(name: 'MixedReality-release', ext: 'aar')
+    debugImplementation(name: 'gvrf-physics-debug', ext: 'aar')
+    releaseImplementation(name: 'gvrf-physics-release', ext: 'aar')
+}

gvr-arpet/app/src/main/AndroidManifest.xml

@@ -0,0 +1,66 @@
+<!--/* Copyright 2015 Samsung Electronics Co., LTD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.gearvrf.arpet"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+    <!-- This tag indicates that this application requires ARCore.  This results in the application
+        only being visible in the Google Play Store on devices that support ARCore. -->
+    <uses-feature
+        android:name="android.hardware.camera.ar"
+        android:required="true" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name">
+
+        <activity
+            android:name="org.gearvrf.arpet.PetActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleTask"
+            android:screenOrientation="landscape">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <!-- This tag indicates that this application requires ARCore.  This results in the Google Play
+            Store downloading and installing ARCore along with the application. -->
+        <meta-data
+            android:name="com.google.ar.core"
+            android:value="required" />
+
+        <!-- This API key is used to share anchor using Google Cloud Anchor API -->
+        <meta-data
+            android:name="com.google.android.ar.API_KEY"
+            android:value="${cloudAnchorApiKey}" />
+
+    </application>
+
+</manifest>

gvr-arpet/app/src/main/assets/gvr.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /* Copyright 2015 Samsung Electronics Co., LTD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+
+<!--
+ This is a configuration file with default settings. You can assume that using this
+ one will receive the same effect as gvr_note4_empty.xml.
+-->
+
+<lens name="N4" >
+
+    <vr-app-settings
+        framebufferPixelsHigh="DEFAULT"
+        framebufferPixelsWide="DEFAULT"
+        showLoadingIcon="true"
+        useProtectedFramebuffer="false"
+        useSrgbFramebuffer="false" >
+
+        <mono-mode-parms
+            monoFullScreen="false"
+            monoMode="false" />
+
+        <mode-parms
+            allowPowerSave="true"
+            resetWindowFullScreen="true" />
+
+        <performance-parms
+            cpuLevel="2"
+            gpuLevel="2" />
+
+        <eye-buffer-parms
+            colorFormat="COLOR_8888"
+            depthFormat="DEPTH_24"
+            fov-y="DEFAULT"
+            multiSamples="2"
+            resolutionWidth="DEFAULT"
+            resolutionHeight="DEFAULT"
+            resolveDepth="false" />
+
+        <head-model-parms
+            eyeHeight="DEFAULT"
+            headModelDepth="DEFAULT"
+            headModelHeight="DEFAULT"
+            interpupillaryDistance="DEFAULT" />
+    </vr-app-settings>
+
+</lens>