Collada parser fixes

Author: andresoviedo

README.md

@@ -12,17 +12,11 @@ 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)
 * Collada format (DAE): https://en.wikipedia.org/wiki/COLLADA
 
-News (24/11/2017)
+News (08/12/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
-* Fixed #16: Toogle point drawing
-* Fixed #15: Toggle rotating light
-* Fixed #1: Cpu Performance problems
-* Fixed #5: Memory Performance problems
 
 
 Android Market
@@ -52,16 +46,16 @@ Whats next
 
 * Stabilize app performance
 * Code refactoring
-* Carboard support
-* Chromecast support
+* Carboard support?
+* Chromecast support?
 * ...
 
 
 Features
 ========
 
   - OpenGL ES 2.0 API
-  - Formats: OBJ (wavefront) & STL (STereoLithography)
+  - Formats: OBJ (wavefront), STL (STereoLithography) & DAE (Collada-BETA)
   - calculation of normals
   - transformations: scaling, rotation, translation
   - colors
@@ -75,9 +69,9 @@ Features
     - drag to move camera
     - rotate with 2 fingers to rotate camera
     - pinch & spread to zoom in/out the camera
+  - skeletal animations
   - moving of objects (not yet!)
   - primitive collision detection (not yet!)
-  - animation of sprites (not yet!)
 
 Try it
 ======
@@ -127,6 +121,10 @@ ChangeLog
 
 (f) fixed, (i) improved, (n) new feature
 
+- 2.0.1 (08/12/2017)
+  - (f) Multiple Collada parser fixes
+  - (f) Camera now can look inside objects
+
 - 2.0.0 (24/11/2017)
   - (n) Support for collada files with skeletal animations :)
 

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="14"
-    android:versionName="2.0.0" >
+    android:versionCode="15"
+    android:versionName="2.0.1" >
 
     <uses-sdk
         android:minSdkVersion="8"

app/src/main/AndroidManifest.xml

@@ -33,7 +33,7 @@
   </library_cameras>
   <library_images>
     <image id="character_Texture_png" name="character_Texture_png">
-      <init_from>character%20Texture.png</init_from>
+      <init_from>cowboy.png</init_from>
     </image>
   </library_images>
   <library_effects>

app/src/main/assets/models/Stormtrooper_D.jpg

@@ -4,6 +4,7 @@
 import android.os.SystemClock;
 import android.util.Log;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -69,7 +70,7 @@ public void update(Object3DData obj) {
 	 * reset, causing the animation to loop.
 	 */
 	private void increaseAnimationTime(AnimatedModel obj) {
-		animationTime += 0.01; // System.nanoTime();
+		animationTime += 0.01;
 		if (animationTime > obj.getAnimation().getLength()) {
 			this.animationTime %= obj.getAnimation().getLength();
 		}
@@ -136,7 +137,11 @@ private Map<String, float[]> calculateCurrentAnimationPose(AnimatedModel obj) {
 	private void applyPoseToJoints(Map<String, float[]> currentPose, Joint joint, float[] parentTransform) {
 		float[] currentLocalTransform = currentPose.get(joint.name);
 		float[] currentTransform = new float[16];
-		Matrix.multiplyMM(currentTransform,0,parentTransform,0,currentLocalTransform,0);
+		if (currentLocalTransform == null) {
+			currentLocalTransform = new float[16];
+			Matrix.setIdentityM(currentLocalTransform,0);
+		}
+		Matrix.multiplyMM(currentTransform, 0, parentTransform, 0, currentLocalTransform, 0);
 		for (Joint childJoint : joint.children) {
 			applyPoseToJoints(currentPose, childJoint, currentTransform);
 		}

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

@@ -52,7 +52,7 @@ public JointTransform(Vector3f position, Quaternion rotation) {
 	 *         transform as represented by the position and rotation in this
 	 *         instance, just in matrix form.
 	 */
-	protected float[] getLocalTransform() {
+	public float[] getLocalTransform() {
 		float[] matrix = new float[16];
 		Matrix.setIdentityM(matrix,0);
 		Matrix.translateM(matrix,0,matrix,0,position.x,position.y,position.z);

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

@@ -13,13 +13,14 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.List;
 
 /**
  * This component allows loading the model without blocking the UI.
  *
  * @author andresoviedo
  */
-public abstract class LoaderTask extends AsyncTask<Void, Integer, Object3DData> {
+public abstract class LoaderTask extends AsyncTask<Void, Integer, List<Object3DData>> {
 
 	/**
 	 * URL to the 3D model
@@ -85,9 +86,9 @@ protected void onPreExecute() {
 
 
 	@Override
-	protected Object3DData doInBackground(Void... params) {
+	protected List<Object3DData> doInBackground(Void... params) {
 		try {
-			Object3DData data = build();
+			List<Object3DData> data = build();
 			callback.onLoadComplete(data);
 			build(data);
 			return  data;
@@ -97,9 +98,9 @@ protected Object3DData doInBackground(Void... params) {
 		}
 	}
 
-	protected abstract Object3DData build() throws Exception;
+	protected abstract List<Object3DData> build() throws Exception;
 
-	protected abstract void build(Object3DData data) throws Exception;
+	protected abstract void build(List<Object3DData> data) throws Exception;
 
 	@Override
 	protected void onProgressUpdate(Integer... values) {
@@ -127,7 +128,7 @@ protected void onProgressUpdate(Integer... values) {
 	}
 
 	@Override
-	protected void onPostExecute(Object3DData data) {
+	protected void onPostExecute(List<Object3DData> data) {
 		super.onPostExecute(data);
 		if (dialog.isShowing()) {
 			dialog.dismiss();