refactoring

appoly · Mar 28, 2018 · 4b40fd6 · 4b40fd6
1 parent 85fd122
commit 4b40fd6
Show file tree

Hide file tree

Showing 16 changed files with 128 additions and 53 deletions.
diff --git a/arcore-location/src/main/java/uk/co/appoly/arcorelocation/rendering/AnnotationRenderer.java b/arcore-location/src/main/java/uk/co/appoly/arcorelocation/rendering/AnnotationRenderer.java
@@ -1,4 +1,4 @@
-package com.john.arcorelocation.rendering;
+package uk.co.appoly.arcorelocation.rendering;
 
 /**
  * Created by John on 02/03/2018.
@@ -16,7 +16,7 @@
 import android.opengl.Matrix;
 import android.util.Log;
 
-import com.john.arcorelocation.utils.ShaderUtil;
+import uk.co.appoly.arcorelocation.utils.ShaderUtil;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

diff --git a/arcore-location/src/main/java/uk/co/appoly/arcorelocation/rendering/ImageRenderer.java b/arcore-location/src/main/java/uk/co/appoly/arcorelocation/rendering/ImageRenderer.java
@@ -1,4 +1,4 @@
-package com.john.arcorelocation.rendering;
+package uk.co.appoly.arcorelocation.rendering;
 
 /**
  * Created by John on 02/03/2018.
@@ -12,7 +12,7 @@
 import android.opengl.Matrix;
 import android.util.Log;
 
-import com.john.arcorelocation.utils.ShaderUtil;
+import uk.co.appoly.arcorelocation.utils.ShaderUtil;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

diff --git a/arcore-location/src/main/java/uk/co/appoly/arcorelocation/rendering/Renderer.java b/arcore-location/src/main/java/uk/co/appoly/arcorelocation/rendering/Renderer.java
@@ -1,4 +1,4 @@
-package com.john.arcorelocation.rendering;
+package uk.co.appoly.arcorelocation.rendering;
 
 import android.content.Context;
 

diff --git a/arcore-location/src/main/java/uk/co/appoly/arcorelocation/sensor/DeviceLocation.java b/arcore-location/src/main/java/uk/co/appoly/arcorelocation/sensor/DeviceLocation.java
@@ -1,4 +1,4 @@
-package com.john.arcorelocation.sensor;
+package uk.co.appoly.arcorelocation.sensor;
 
 import android.Manifest;
 import android.content.Context;

diff --git a/arcore-location/src/main/java/uk/co/appoly/arcorelocation/sensor/DeviceOrientation.java b/arcore-location/src/main/java/uk/co/appoly/arcorelocation/sensor/DeviceOrientation.java
@@ -1,4 +1,4 @@
-package com.john.arcorelocation.sensor;
+package uk.co.appoly.arcorelocation.sensor;
 
 import android.content.Context;
 import android.hardware.Sensor;

diff --git a/arcore-location/src/main/java/uk/co/appoly/arcorelocation/utils/LocationUtils.java b/arcore-location/src/main/java/uk/co/appoly/arcorelocation/utils/LocationUtils.java
@@ -1,4 +1,4 @@
-package com.john.arcorelocation.utils;
+package uk.co.appoly.arcorelocation.utils;
 
 /**
  * Created by John on 02/03/2018.

diff --git a/arcore-location/src/main/java/uk/co/appoly/arcorelocation/utils/ShaderUtil.java b/arcore-location/src/main/java/uk/co/appoly/arcorelocation/utils/ShaderUtil.java
@@ -1,4 +1,4 @@
-package com.john.arcorelocation.utils;
+package uk.co.appoly.arcorelocation.utils;
 
 /*
  * Copyright 2017 Google Inc. All Rights Reserved.

diff --git a/...hub_appoly_ARCore_Location_0_SNAPSHOT.xml → ...m_github_appoly_ARCore_Location_0_0_1.xml b/...hub_appoly_ARCore_Location_0_SNAPSHOT.xml → ...m_github_appoly_ARCore_Location_0_0_1.xml
diff --git a/examples/hello_ar_java/.idea/workspace.xml b/examples/hello_ar_java/.idea/workspace.xml
diff --git a/examples/hello_ar_java/app/build.gradle b/examples/hello_ar_java/app/build.gradle
@@ -23,15 +23,12 @@ android {
 dependencies {
     // ARCore library
     implementation 'com.google.ar:core:0.91.0'
-
     // Obj - a simple Wavefront OBJ file loader
     // https://github.com/javagl/Obj
     implementation 'de.javagl:obj:0.2.1'
-
     implementation 'com.android.support:appcompat-v7:27.0.2'
     implementation 'com.android.support:design:27.0.2'
-
-    compile 'com.github.appoly:ARCore-Location:9ea6e30d24'
+    implementation 'com.github.appoly:ARCore-Location:0.0.1'
 }
 
 repositories {

diff --git a/...o_ar_java/app/src/main/java/com/google/ar/core/examples/java/helloar/HelloArActivity.java b/...o_ar_java/app/src/main/java/com/google/ar/core/examples/java/helloar/HelloArActivity.java
@@ -53,10 +53,10 @@
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.opengles.GL10;
 
-import uk.co.arcorelocation.LocationScene;
-import uk.co.arcorelocation.LocationMarker;
-import uk.co.arcorelocation.rendering.AnnotationRenderer;
-import uk.co.arcorelocation.rendering.ImageRenderer;
+import uk.co.appoly.arcorelocation.LocationScene;
+import uk.co.appoly.arcorelocation.LocationMarker;
+import uk.co.appoly.arcorelocation.rendering.AnnotationRenderer;
+import uk.co.appoly.arcorelocation.rendering.ImageRenderer;
 
 /**
  * This is a simple example that shows how to create an augmented reality (AR) application using the

diff --git a/.../app/src/main/java/com/google/ar/core/examples/java/helloar/rendering/ObjectRenderer.java b/.../app/src/main/java/com/google/ar/core/examples/java/helloar/rendering/ObjectRenderer.java
@@ -21,7 +21,7 @@
 import android.opengl.GLUtils;
 import android.opengl.Matrix;
 import com.google.ar.core.examples.java.helloar.R;
-import uk.co.arcorelocation.rendering.Renderer;
+import uk.co.appoly.arcorelocation.rendering.Renderer;
 
 import de.javagl.obj.Obj;
 import de.javagl.obj.ObjData;

diff --git a/examples/hello_ar_java/build/android-profile/profile-2018-03-28-12-15-21-048.json b/examples/hello_ar_java/build/android-profile/profile-2018-03-28-12-15-21-048.json
diff --git a/examples/hello_ar_java/build/android-profile/profile-2018-03-28-12-15-21-048.rawproto b/examples/hello_ar_java/build/android-profile/profile-2018-03-28-12-15-21-048.rawproto
diff --git a/examples/hello_ar_java/build/android-profile/profile-2018-03-28-12-27-31-257.json b/examples/hello_ar_java/build/android-profile/profile-2018-03-28-12-27-31-257.json
diff --git a/examples/hello_ar_java/build/android-profile/profile-2018-03-28-12-27-31-257.rawproto b/examples/hello_ar_java/build/android-profile/profile-2018-03-28-12-27-31-257.rawproto