Tap to select object

Author: andresoviedo

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.andresoviedo.dddmodel"
-    android:versionCode="3"
-    android:versionName="1.0" >
+    android:versionCode="4"
+    android:versionName="1.2.0" >
 
     <uses-sdk
         android:minSdkVersion="8"

README.md

@@ -8,12 +8,14 @@ It is basically an android application with a 3D renderer (OpenGL ES 2.0) that c
 The purpose of this application is to learn and share how to draw using OpenGL language
 
 
-News (30/03/2016)
+News (06/04/2016)
 =================
 
-* Released app on android market :) https://play.google.com/store/apps/details?id=org.andresoviedo.dddmodel
-* Light rendering
+* Implemented selection of objects (click on Demo and touch the different objects)
+* Light rendering implemented
 * Toggle textures & lights
+* Released app on android market :) https://play.google.com/store/apps/details?id=org.andresoviedo.dddmodel
+
 
 About
 =====
@@ -56,13 +58,15 @@ Features
   - display of normals
   - display of bounding box 
   - scaling, rotation
-  - object picking
-  - primitive collision detection (not yet!) 
-  - animation of sprites (not yet!)
+  - object selection
   - touch support!
-    * rotation gesture to rotate
-    * pinch gesture to zoom
+    - tap to select object 
+    - drag to move camera
+    - rotate to rotate camera
+    - pinch & spread to zoom in/out the camera
   - moving of objects (not yet!)
+  - primitive collision detection (not yet!) 
+  - animation of sprites (not yet!)
 
 
 Try it
@@ -99,4 +103,20 @@ Final Notes
 ===========
 
 You are free to use this program while you keep this file and the authoring comments in the code.
-Any comments and suggestions are welcome.
+Any comments and suggestions are welcome.
+
+
+ChangeLog
+=========
+
+(f) fixed, (i) improved, (n) new feature
+
+- 1.2.0 (06/04/2016)
+ - (n) Implemented selection of objects
+
+- 1.1.0 (30/03/2016)
+ - (n) Implemented lighting & toggle textures & lights
+ - (i) Refactoring of 3DObjectImpl
+
+- 1.0.0 (27/03/2016)
+ - (n) First release in Google Play Android Market

android-3DModel.apk

@@ -1,11 +1,15 @@
 package org.andresoviedo.app.model3D.controller;
 
+import org.andresoviedo.app.model3D.model.Object3DData;
+import org.andresoviedo.app.model3D.services.SceneLoader;
 import org.andresoviedo.app.model3D.view.ModelRenderer;
+import org.andresoviedo.app.model3D.view.ModelSurfaceView;
+import org.andresoviedo.app.util.math.Math3DUtils;
 
 import android.graphics.PointF;
-import android.opengl.GLSurfaceView;
 import android.opengl.GLU;
 import android.opengl.Matrix;
+import android.os.SystemClock;
 import android.util.FloatMath;
 import android.util.Log;
 import android.view.MotionEvent;
@@ -20,7 +24,7 @@ public class TouchController {
 	private static final int TOUCH_STATUS_ROTATING_CAMERA = 4;
 	private static final int TOUCH_STATUS_MOVING_WORLD = 5;
 
-	private GLSurfaceView view;
+	private final ModelSurfaceView view;
 	private final ModelRenderer mRenderer;
 
 	int pointerCount = 0;
@@ -41,17 +45,14 @@ public class TouchController {
 	float rotation = 0;
 	int currentSquare = Integer.MIN_VALUE;
 
-	float[] hit1 = null;
-	float[] hit2 = null;
-	float[] hit3 = null;
-	float[] hit4 = null;
-	float hitSquare = -1;
-	float hitTriangle = -1;
 	boolean isOneFixedAndOneMoving = false;
 	boolean fingersAreClosing = false;
 	boolean isRotating = false;
 
 	boolean gestureChanged = false;
+	private boolean moving = false;
+	private boolean simpleTouch = false;
+	private long lastActionTime;
 	private int touchDelay = -2;
 	private int touchStatus = -1;
 
@@ -64,7 +65,7 @@ public class TouchController {
 	float[] rotationVector = new float[4];
 	private float previousRotationSquare;
 
-	public TouchController(GLSurfaceView view, ModelRenderer renderer) {
+	public TouchController(ModelSurfaceView view, ModelRenderer renderer) {
 		super();
 		this.view = view;
 		this.mRenderer = renderer;
@@ -77,18 +78,33 @@ public synchronized boolean onTouchEvent(MotionEvent motionEvent) {
 
 		switch (motionEvent.getActionMasked()) {
 		case MotionEvent.ACTION_UP:
-		case MotionEvent.ACTION_DOWN:
 		case MotionEvent.ACTION_CANCEL:
 		case MotionEvent.ACTION_POINTER_UP:
-		case MotionEvent.ACTION_POINTER_DOWN:
+		case MotionEvent.ACTION_HOVER_EXIT:
 		case MotionEvent.ACTION_OUTSIDE:
+			// this to handle "1 simple touch"
+			if (lastActionTime > SystemClock.uptimeMillis() - 250) {
+				simpleTouch = true;
+			} else {
+				gestureChanged = true;
+				touchDelay = 0;
+				lastActionTime = SystemClock.uptimeMillis();
+				simpleTouch = false;
+			}
+			moving = false;
+			break;
+		case MotionEvent.ACTION_DOWN:
+		case MotionEvent.ACTION_POINTER_DOWN:
 		case MotionEvent.ACTION_HOVER_ENTER:
-		case MotionEvent.ACTION_HOVER_EXIT:
-			Log.d("Touch", "Gesture changed...");
+			Log.d(TAG, "Gesture changed...");
 			gestureChanged = true;
 			touchDelay = 0;
+			lastActionTime = SystemClock.uptimeMillis();
+			simpleTouch = false;
 			break;
 		case MotionEvent.ACTION_MOVE:
+			moving = true;
+			simpleTouch = false;
 			touchDelay++;
 			break;
 		default:
@@ -108,9 +124,6 @@ public synchronized boolean onTouchEvent(MotionEvent motionEvent) {
 			}
 			dx1 = x1 - previousX1;
 			dy1 = y1 - previousY1;
-			hit1 = unproject(x1, y1, 0);
-			hit2 = unproject(x1, y1, 1);
-			// Log.d("Ray", "Ray2---> x:" + xyzw2[0] + " y:" + xyzw2[1] + " z:" + xyzw2[2] + " w(" + xyzw2[3] + ")");
 		} else if (pointerCount == 2) {
 			x1 = motionEvent.getX(0);
 			y1 = motionEvent.getY(0);
@@ -152,12 +165,6 @@ public synchronized boolean onTouchEvent(MotionEvent motionEvent) {
 			currentPress1 = motionEvent.getPressure(0);
 			currentPress2 = motionEvent.getPressure(1);
 			rotation = 0;
-			hit1 = unproject(x1, y1, 0);
-			hit2 = unproject(x1, y1, 1);
-			hit3 = unproject(x2, y2, 0);
-			hit4 = unproject(x2, y2, 1);
-			// wzSquare = hit(xyzw3, xyzw2, mRenderer.getmSquare().getPosition());
-			// wzTriangle = hit(xyzw1, xyzw2, mRenderer.getmTriangle().getPosition());
 			rotation = TouchScreen.getRotation360(motionEvent);
 			currentSquare = TouchScreen.getSquare(motionEvent);
 			if (currentSquare == 1 && previousRotationSquare == 4) {
@@ -173,12 +180,17 @@ public synchronized boolean onTouchEvent(MotionEvent motionEvent) {
 					&& rotationVector[2] != 0;
 		}
 
+		if (pointerCount == 1 && simpleTouch) {
+			// calculate the world coordinates where the user is clicking (near plane and far plane)
+			float[] hit1 = unproject(x1, y1, 0);
+			float[] hit2 = unproject(x1, y1, 1);
+			// check if the ray intersect any of our objects and select the nearer
+			selectObjectImpl(hit1, hit2);
+		}
+
 		if (touchDelay > 1) {
 			// INFO: Procesar gesto
 			if (pointerCount == 1 && currentPress1 > 4.0f) {
-				// TODO: enable this
-				// hitSquare = hit(hit1, hit2, mRenderer.getScene().getSquare1().getPosition());
-				// hitTriangle = hit(hit1, hit2, mRenderer.getScene().getSquare1().getPosition());
 			} else if (pointerCount == 1) {
 				touchStatus = TOUCH_STATUS_MOVING_WORLD;
 				// Log.i("Touch", "Moving World '" + dx1 + "','" + dy1 + "'...");
@@ -278,7 +290,7 @@ public synchronized boolean onTouchEvent(MotionEvent motionEvent) {
 
 		if (gestureChanged && touchDelay > 1) {
 			gestureChanged = false;
-			Log.i("Fin", "Fin");
+			Log.v(TAG, "Fin");
 		}
 
 		view.requestRender();
@@ -287,6 +299,41 @@ public synchronized boolean onTouchEvent(MotionEvent motionEvent) {
 
 	}
 
+	/**
+	 * Get the nearest object intersecting the specified ray and selects it
+	 * 
+	 * @param nearPoint
+	 *            the near point in world coordinates
+	 * @param farPoint
+	 *            the far point in world coordinates
+	 */
+	private void selectObjectImpl(float[] nearPoint, float[] farPoint) {
+		SceneLoader scene = view.getModelActivity().getScene();
+		if (scene == null) {
+			return;
+		}
+		Object3DData objectToSelect = null;
+		float objectToSelectDistance = Integer.MAX_VALUE;
+		for (Object3DData obj : scene.getObjects()) {
+			float distance = Math3DUtils.calculateDistanceOfIntersection(nearPoint, farPoint, obj.getPosition(), 1f);
+			if (distance != -1) {
+				Log.d(TAG, "Hit object " + obj.getId() + " at distance " + distance);
+				if (distance < objectToSelectDistance) {
+					objectToSelectDistance = distance;
+					objectToSelect = obj;
+				}
+			}
+		}
+		if (objectToSelect != null) {
+			Log.i(TAG, "Selected object " + objectToSelect.getId() + " at distance " + objectToSelectDistance);
+			if (scene.getSelectedObject() == objectToSelect) {
+				scene.setSelectedObject(null);
+			} else {
+				scene.setSelectedObject(objectToSelect);
+			}
+		}
+	}
+
 	public float[] unproject(float rx, float ry, float rz) {
 		float[] xyzw = { 0, 0, 0, 0 };
 
@@ -303,33 +350,6 @@ public float[] unproject(float rx, float ry, float rz) {
 		xyzw[3] = 1;
 		return xyzw;
 	}
-
-	public float hit(float[] xyzw, float[] xyzw2, float[] position) {
-		float zPrecition = 1000f;
-
-		float xDif = (xyzw2[0] - xyzw[0]) / zPrecition;
-		float yDif = (xyzw2[1] - xyzw[1]) / zPrecition;
-		float zDif = (xyzw2[2] - xyzw[2]) / zPrecition;
-
-		// @formatter:off
-		for (int i = 0; i < zPrecition; i++) {
-//			Log.d("Hit cube", "HIT");
-			double objWidth = 1;
-			double objHalfWidth = objWidth/2;
-			float xIncr = xDif * i;
-			if ((       xyzw[0] + xIncr) > position[0] - objHalfWidth
-					&& (xyzw[0] + xIncr) < position[0] + objHalfWidth
-					&& (xyzw[1] + (yDif * i)) > position[1] - objHalfWidth
-					&& (xyzw[1] + (yDif * i)) < position[1] + objHalfWidth
-					&& (xyzw[2] + (zDif * i)) > position[2] - objHalfWidth
-					&& (xyzw[2] + (zDif * i)) < position[2] + objHalfWidth) {
-				Log.w("Hit", "HIT: i["+i+"] wz["+(xyzw[2] + (zDif * i))+"]");
-				return xyzw[2] + (zDif * i);
-			}
-		}
-		// @formatter:on
-		return -1;
-	}
 }
 
 class TouchScreen {

src/org/andresoviedo/app/model3D/controller/TouchController.java

@@ -47,6 +47,11 @@ protected void onPreExecute() {
 			@Override
 			protected Void doInBackground(Void... params) {
 				try {
+					// 3D Axis
+					Object3DData axis = Object3DBuilder.buildAxis().setId("axis");
+					axis.setColor(new float[] { 1.0f, 0, 0, 1.0f });
+					addObject(axis);
+
 					// test cube made of arrays
 					Object3DData obj10 = Object3DBuilder.buildCubeV1();
 					obj10.setColor(new float[] { 1f, 0f, 0f, 0.5f });
@@ -58,6 +63,7 @@ protected Void doInBackground(Void... params) {
 					obj11.setColor(new float[] { 1f, 1f, 0f, 0.5f });
 					obj11.setPosition(new float[] { 0f, 2f, 0f });
 					obj11.centerAndScaleAndExplode(1.0f, 1.5f);
+					obj11.setId(obj11.getId() + "_exploded");
 					addObject(obj11);
 
 					// test cube made of wires (I explode it to see the faces better)

src/org/andresoviedo/app/model3D/services/ExampleSceneLoader.java

@@ -25,10 +25,6 @@ public class SceneLoader {
 	 * Parent component
 	 */
 	protected final ModelActivity parent;
-	/**
-	 * The 3D axis
-	 */
-	private Object3DData axis;
 	/**
 	 * List of data objects containing info for building the opengl objects
 	 */
@@ -61,16 +57,16 @@ public class SceneLoader {
 	 * Light position
 	 */
 	private float[] lightPos = new float[] { 0, 0, 3, 1 };
+	/**
+	 * Object selected by the user
+	 */
+	private Object3DData selectedObject = null;
 
 	public SceneLoader(ModelActivity main) {
 		this.parent = main;
 	}
 
 	public void init() {
-		// Draw Axis
-		axis = Object3DBuilder.buildAxis().setId("axis");
-		axis.setColor(new float[] { 1.0f, 0, 0, 1.0f });
-		addObject(axis);
 
 		// Load object
 		if (parent.getParamFile() != null || parent.getParamAssetDir() != null) {
@@ -178,4 +174,12 @@ public boolean isDrawLighting() {
 		return drawLighting;
 	}
 
+	public Object3DData getSelectedObject() {
+		return selectedObject;
+	}
+
+	public void setSelectedObject(Object3DData selectedObject) {
+		this.selectedObject = selectedObject;
+	}
+
 }

src/org/andresoviedo/app/model3D/services/SceneLoader.java

@@ -186,7 +186,7 @@ public void onDrawFrame(GL10 unused) {
 				}
 
 				// Draw bounding box
-				if (scene.isDrawBoundingBox()) {
+				if (scene.isDrawBoundingBox() || scene.getSelectedObject() == objData) {
 					Object3DData boundingBoxData = boundingBoxes.get(objData);
 					if (boundingBoxData == null || changed) {
 						boundingBoxData = Object3DBuilder.buildBoundingBox(objData);