Skeletal animations

Author: andresoviedo

README.md

@@ -12,9 +12,10 @@ The purpose of this application is to learn and share how to draw using OpenGL l
 * STereoLithography format (STL): https://en.wikipedia.org/wiki/STL_(file_format)
 
 
-News (21/11/2017)
+News (24/11/2017)
 =================
 
+* Support for collada files with skeletal animations :)
 * Fixed #28: Load texture feature is now available
 * Fixed #18: Removed asReadOnlyBuffer() - not working on Android 7
 * Enhancement #17: Added support for TLS format
@@ -50,7 +51,6 @@ Whats next
 ==========
 
 * Stabilize app performance
-* Skeletal animations
 * Code refactoring
 * Carboard support
 * Chromecast support
@@ -127,6 +127,9 @@ ChangeLog
 
 (f) fixed, (i) improved, (n) new feature
 
+- 2.0.0 (24/11/2017)
+  - (n) Support for collada files with skeletal animations :)
+
 - 1.4.1 (21/11/2017)
   - (f) #29: Crash loading obj with only vertex info
 

app/build/outputs/apk/app-release.apk

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.andresoviedo.dddmodel2"
-    android:versionCode="13"
-    android:versionName="1.4.1" >
+    android:versionCode="14"
+    android:versionName="2.0.0" >
 
     <uses-sdk
         android:minSdkVersion="8"

app/src/main/AndroidManifest.xml

@@ -2,6 +2,7 @@
 
 import android.opengl.Matrix;
 import android.os.SystemClock;
+import android.util.Log;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -68,7 +69,7 @@ public void update(Object3DData obj) {
 	 * reset, causing the animation to loop.
 	 */
 	private void increaseAnimationTime(AnimatedModel obj) {
-		animationTime += SystemClock.uptimeMillis();
+		animationTime += 0.01; // System.nanoTime();
 		if (animationTime > obj.getAnimation().getLength()) {
 			this.animationTime %= obj.getAnimation().getLength();
 		}
@@ -139,8 +140,9 @@ private void applyPoseToJoints(Map<String, float[]> currentPose, Joint joint, fl
 		for (Joint childJoint : joint.children) {
 			applyPoseToJoints(currentPose, childJoint, currentTransform);
 		}
-		Matrix.multiplyMM(currentTransform,0,joint.getInverseBindTransform(), 0, currentTransform, 0);
-		joint.setAnimationTransform(currentTransform);
+		float[] animationTransform = new float[16];
+		Matrix.multiplyMM(animationTransform, 0, currentTransform, 0, joint.getInverseBindTransform(),0);
+		joint.setAnimationTransform(animationTransform);
 	}
 
 	/**

app/src/main/assets/models/cowboy.dae

@@ -56,9 +56,8 @@ protected float[] getLocalTransform() {
 		float[] matrix = new float[16];
 		Matrix.setIdentityM(matrix,0);
 		Matrix.translateM(matrix,0,matrix,0,position.x,position.y,position.z);
-		float[] ret = new float[16];
-		Matrix.multiplyMM(ret,0,matrix,0,rotation.toRotationMatrix(),0);
-		return ret;
+		Matrix.multiplyMM(matrix,0,matrix,0,rotation.toRotationMatrix(),0);
+		return matrix;
 	}
 
 	/**

app/src/main/assets/models/cowboy.png

@@ -54,7 +54,7 @@ public class Camera {
 
 	public Camera() {
 		// Initialize variables...
-		this(0, 0, 3, 0, 0, -1, 0, 1, 0);
+		this(0, 0, 6, 0, 0, -1, 0, 1, 0);
 
 	}
 
@@ -198,7 +198,7 @@ private boolean isOutOfBounds(float[] buffer) {
 					buffer[0] / buffer[3]
 					, buffer[1] / buffer[3]
 					, buffer[2] / buffer[3] )) {
-				Log.d("Camera", "Inside bounds of '" + objects.get(i).getId() + "'");
+				Log.i("Camera", "Inside bounds of '" + objects.get(i).getId() + "'");
 				return true;
 			}
 		}

app/src/main/java/org/andresoviedo/app/model3D/animation/Animator.java

@@ -3,10 +3,10 @@
 public interface Object3D {
 
 	// number of coordinates per vertex in this array
-	final int COORDS_PER_VERTEX = 3;
-	final int VERTEX_STRIDE = COORDS_PER_VERTEX * 4; // 4 bytes per
+	int COORDS_PER_VERTEX = 3;
+	int VERTEX_STRIDE = COORDS_PER_VERTEX * 4; // 4 bytes per
 
-	final float[] DEFAULT_COLOR = { 1.0f, 0.0f, 0, 1.0f };
+	float[] DEFAULT_COLOR = { 1.0f, 0.0f, 0, 1.0f };
 
 	void draw(Object3DData obj, float[] pMatrix, float[] vMatrix, int textureId, float[] lightPosInEyeSpace);
 

app/src/main/java/org/andresoviedo/app/model3D/animation/JointTransform.java

@@ -340,7 +340,7 @@ public static Object3DData buildAxis() {
 	public static Object3DData buildCubeV1() {
 		return new Object3DData(
 				createNativeByteBuffer(cubePositionData.length * 4).asFloatBuffer().put(cubePositionData))
-				.setDrawMode(GLES20.GL_TRIANGLES).setId("cubeV1").centerAndScale(1.0f);
+				.setDrawMode(GLES20.GL_TRIANGLES).setId("cubeV1").centerAndScale(1.0f).setFaces(new Faces(8));
 	}
 
 	public static Object3DData buildCubeV1_with_normals() {
@@ -350,22 +350,22 @@ public static Object3DData buildCubeV1_with_normals() {
 						createNativeByteBuffer(cubeColorData.length * 4).asFloatBuffer().put(cubeColorData))
 				.setVertexNormalsArrayBuffer(
 						createNativeByteBuffer(cubeNormalData.length * 4).asFloatBuffer().put(cubeNormalData))
-				.setDrawMode(GLES20.GL_TRIANGLES).setId("cubeV1_light").centerAndScale(1.0f);
+				.setDrawMode(GLES20.GL_TRIANGLES).setId("cubeV1_light").centerAndScale(1.0f).setFaces(new Faces(8));
 	}
 
 	public static Object3DData buildSquareV2() {
-		return new Object3DData(
-				createNativeByteBuffer(squarePositionData.length * 4).asFloatBuffer().put(squarePositionData),
-				createNativeByteBuffer(squareDrawOrderData.length * 4).asIntBuffer().put(squareDrawOrderData)
-						.asReadOnlyBuffer()).setDrawMode(GLES20.GL_TRIANGLES).setId("cubeV2").centerAndScale(1.0f);
+		IntBuffer drawBuffer = createNativeByteBuffer(squareDrawOrderData.length * 4).asIntBuffer().put(squareDrawOrderData);
+		FloatBuffer vertexBuffer = createNativeByteBuffer(squarePositionData.length * 4).asFloatBuffer().put(squarePositionData);
+		return new Object3DData(vertexBuffer,drawBuffer.asReadOnlyBuffer()).setDrawMode(GLES20.GL_TRIANGLES).setId("cubeV2")
+				.centerAndScale(1.0f).setFaces(new Faces(8)).setDrawOrder(drawBuffer);
 	}
 
 	public static Object3DData buildCubeV3(byte[] textureData) {
 		return new Object3DData(
 				createNativeByteBuffer(cubePositionData.length * 4).asFloatBuffer().put(cubePositionData),
 				createNativeByteBuffer(cubeTextureCoordinateData.length * 4).asFloatBuffer()
 						.put(cubeTextureCoordinateData).asReadOnlyBuffer(),
-				textureData).setDrawMode(GLES20.GL_TRIANGLES).setId("cubeV3").centerAndScale(1.0f);
+				textureData).setDrawMode(GLES20.GL_TRIANGLES).setId("cubeV3").centerAndScale(1.0f).setFaces(new Faces(8));
 	}
 
 	public static Object3DData buildCubeV4(byte[] textureData) {
@@ -374,7 +374,7 @@ public static Object3DData buildCubeV4(byte[] textureData) {
 				createNativeByteBuffer(cubeColorData.length * 4).asFloatBuffer().put(cubeColorData).asReadOnlyBuffer(),
 				createNativeByteBuffer(cubeTextureCoordinateData.length * 4).asFloatBuffer()
 						.put(cubeTextureCoordinateData).asReadOnlyBuffer(),
-				textureData).setDrawMode(GLES20.GL_TRIANGLES).setId("cubeV4").centerAndScale(1.0f);
+				textureData).setDrawMode(GLES20.GL_TRIANGLES).setId("cubeV4").centerAndScale(1.0f).setFaces(new Faces(8));
 	}
 
 	public static Object3DData loadV5(AssetManager assets, String assetDir, String assetFilename) {
@@ -397,6 +397,7 @@ public static Object3DData loadV5(AssetManager assets, String assetDir, String a
 			data3D.setId(assetFilename);
 			data3D.setAssetsDir(assetDir);
 			data3D.setDimensions(wfl.getDimensions());
+			//data3D.centerAndScale(5,new float[]{0,0,0});
 			data3D.centerScale();
 
 			data3D.setDrawMode(GLES20.GL_TRIANGLES);
@@ -483,7 +484,7 @@ public static Object3DData generateArrays(AssetManager assets, Object3DData obj)
 
 		// build file normals
 		final FloatBuffer vertexNormalsBuffer = obj.getNormals();
-		if (vertexNormalsBuffer.capacity() > 0) {
+		if (vertexNormalsBuffer != null && vertexNormalsBuffer.capacity() > 0) {
 			Log.i("Object3DBuilder", "Populating normals buffer...");
 			for (int n=0; n<faces.facesNormIdxs.size(); n++) {
 				int[] normal = faces.facesNormIdxs.get(n);