Fix/rendering (#91)

Fix/rendering
appoly · Apr 25, 2019 · 68b830e · 68b830e
2 parents 771ddc7 + a48cdd0
commit 68b830e
Show file tree

Hide file tree

Showing 9 changed files with 429 additions and 295 deletions.
diff --git a/arcore-location/arcore-location.iml b/arcore-location/arcore-location.iml
diff --git a/arcore-location/build.gradle b/arcore-location/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
         // NOTE: Do not place your application dependencies here; they belong
@@ -31,13 +31,13 @@ allprojects {
 
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
 
 
 
     defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 26
+        minSdkVersion 24
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
@@ -51,18 +51,18 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //implementation 'com.google.ar:core:1.2.0'
-    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.google.android.gms:play-services-location:16.0.0'
+    implementation "com.google.ar.sceneform:core:1.7.0"
+    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.7.0"
+    implementation 'com.android.support:support-v4:28.0.0'
+
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation 'com.google.android.gms:play-services-location:15.0.1'
-
-    implementation "com.google.ar.sceneform:core:1.0.0"
-    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.0.0"
 }
 
diff --git a/arcore-location/src/main/java/uk/co/appoly/arcorelocation/LocationMarker.java b/arcore-location/src/main/java/uk/co/appoly/arcorelocation/LocationMarker.java
@@ -1,5 +1,6 @@
 package uk.co.appoly.arcorelocation;
 
+import com.google.ar.sceneform.AnchorNode;
 import com.google.ar.sceneform.Node;
 
 import uk.co.appoly.arcorelocation.rendering.LocationNode;
@@ -143,7 +144,8 @@ public void setRenderEvent(LocationNodeRender renderEvent) {
     public enum ScalingMode {
         FIXED_SIZE_ON_SCREEN,
         NO_SCALING,
-        GRADUAL_TO_MAX_RENDER_DISTANCE
+        GRADUAL_TO_MAX_RENDER_DISTANCE,
+        GRADUAL_FIXED_SIZE
     }
 
 }