no message

peterlin424 · May 25, 2016 · 3b9dfd1 · 3b9dfd1
1 parent af9364d
commit 3b9dfd1
Show file tree

Hide file tree

Showing 11 changed files with 205 additions and 175 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,6 +10,8 @@ android {
         targetSdkVersion 23
         versionCode 1
         versionName "1.0"
+
+        multiDexEnabled true
     }
     buildTypes {
         release {

diff --git a/app/src/main/assets/Watch.xml b/app/src/main/assets/Watch.xml
@@ -3,7 +3,7 @@
   <Tracking>
     <ImageTarget name="mark-15" size="100.000000 100.000000" />
     <ImageTarget name="mark-29" size="100.000000 100.000000" />
-    <ImageTarget name="google-cloud" size="100.000000 75.024391" />
     <ImageTarget name="low_resolution_image" size="100.000000 135.021103" />
+    <ImageTarget name="google-cloud" size="100.000000 75.024391" />
   </Tracking>
 </QCARConfig>
diff --git a/app/src/main/java/project/peter/com/vuforiarajawali3d/ImageTargetActivity.java b/app/src/main/java/project/peter/com/vuforiarajawali3d/ImageTargetActivity.java
@@ -25,8 +25,12 @@ protected void onCreate(Bundle savedInstanceState) {
 
         this.setCollisionCallback(new CollisionCallback() {
             @Override
-            public void ObjectCollision(int obj1, int obj2) {
-                Log.d("ImageTargetActivity", "Object " + obj1 + " is Collision by Object " + String.valueOf(obj2));
+            public void ObjectCollision(int objId1, int objId2) {
+                Log.d("ImageTargetActivity", "Object " + objId1 + " is Collision by Object " + String.valueOf(objId2));
+                if (objId1==2||objId2==2){
+                    Model3D temp = ImageTargetActivity.this.getModel3DArrayList().get(2);
+                    temp.transitionAnimation(0,1,1000,2000);
+                }
             }
         });
 
@@ -54,7 +58,7 @@ private void setShowModels(){
 
         Model3D tempM3D;
 
-        // target 1
+        // target 1 , id : 0
         tempM3D = new Model3D(this, R.raw.roadcar_obj);
         tempM3D.setObj_scale(0.2f);
         tempM3D.setObj_translate_x(-20.0f);
@@ -72,7 +76,7 @@ private void setShowModels(){
 
         arrayList.add(tempM3D);
 
-        // target 2
+        // target 2 , id : 1
         tempM3D = new Model3D(this, R.raw.watch_obj);
         tempM3D.setObj_scale(10.0f);
         tempM3D.setObj_translate_x(0.0f);
@@ -88,7 +92,7 @@ private void setShowModels(){
 
         arrayList.add(tempM3D);
 
-        // target 3
+        // target 3 , id : 2
         tempM3D = new Model3D(this, R.raw.ingrid_mesh);
         tempM3D.setMODE(Model3D.LOAD_MD5_MASH);
         tempM3D.addAnims(R.raw.ingrid_idle);
@@ -106,7 +110,7 @@ private void setShowModels(){
 
         arrayList.add(tempM3D);
 
-        // target 4
+        // target 4 , id : 3
         tempM3D = new Model3D(this, R.raw.watch0009_obj);
         tempM3D.setObj_scale(10.0f);
         tempM3D.setObj_translate_x(0.0f);

diff --git a/app/src/main/java/project/peter/com/vuforiarajawali3d/MainActivity.java b/app/src/main/java/project/peter/com/vuforiarajawali3d/MainActivity.java
@@ -1,8 +1,8 @@
 package project.peter.com.vuforiarajawali3d;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;