Fixes #28. Load texture is nos available

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 (23/04/2017)
+News (19/11/2017)
 =================
 
+* 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
@@ -49,7 +50,7 @@ Whats next
 ==========
 
 * Stabilize app performance
-* Load multiple textures #3
+* Skeletal animations
 * Code refactoring
 * Carboard support
 * Chromecast support
@@ -126,6 +127,9 @@ ChangeLog
 
 (f) fixed, (i) improved, (n) new feature
 
+- 1.3.2 (19/11/2017)
+ - (f) #28: Load texture available for any model having texture coordinates
+
 - 1.3.1 (23/04/2017)
  - (f) #18: Removed asReadOnlyBuffer() because it is causing IndexOutOfBounds on Android 7
 

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="11"
-    android:versionName="1.3.1" >
+    android:versionCode="12"
+    android:versionName="1.3.2" >
 
     <uses-sdk
         android:minSdkVersion="8"

app/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@ Ni 1.00
 Ks 0.86 0.86 0.86
 newmtl phong1SG
 illum 4
-Kd 0.00 1.00 0.00
+Kd 1.00 1.00 1.00
 Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 map_Kd DECALS.bmp

app/src/main/assets/models/ToyPlane.mtl

@@ -1,4 +1,4 @@
-newmtl cube1_auv
+newmtl blinn1SG
 illum 4
 Kd 1.00 1.00 1.00
 Ka 0.00 0.00 0.00

app/src/main/assets/models/truck.mtl

@@ -11,6 +11,7 @@
 import org.andresoviedo.app.model3D.services.WavefrontLoader.Material;
 import org.andresoviedo.app.model3D.services.WavefrontLoader.Materials;
 import org.andresoviedo.app.model3D.services.WavefrontLoader.Tuple3;
+import org.andresoviedo.app.model3D.services.collada.loader.ColladaLoader;
 import org.andresoviedo.app.model3D.services.stl.STLLoader;
 import org.andresoviedo.app.model3D.services.wavefront.WavefrontLoader2;
 import org.andresoviedo.app.util.math.Math3DUtils;
@@ -595,7 +596,7 @@ public static Object3DData generateArrays(AssetManager assets, Object3DData obj)
 		}
 
 
-		if (textureData != null) {
+		//if (textureData != null) {
 			ArrayList<Tuple3> texCoords = obj.getTexCoords();
 			if (texCoords != null && texCoords.size() > 0) {
 
@@ -633,10 +634,10 @@ public static Object3DData generateArrays(AssetManager assets, Object3DData obj)
 							textureOk = true;
 						}
 
-						// populate texture coords if ok
+						// populate texture coords if ok (in case we have more than 1 texture and 1 is missing. see face.obj example)
 						int[] text = faces.facesTexIdxs.get(i);
 						for (int j = 0; j < text.length; j++) {
-							if (textureOk) {
+							if (textureData == null || textureOk) {
 								anyTextureOk = true;
 								textureCoordsArraysBuffer.put(counter++, textureCoordsBuffer.get(text[j] * 2));
 								textureCoordsArraysBuffer.put(counter++, textureCoordsBuffer.get(text[j] * 2 + 1));
@@ -662,7 +663,7 @@ public static Object3DData generateArrays(AssetManager assets, Object3DData obj)
 					Log.e("Object3DBuilder", "Failure to load texture coordinates", ex);
 				}
 			}
-		}
+		//}
 		obj.setTextureData(textureData);
 
 		return obj;
@@ -869,6 +870,9 @@ public static void loadV6AsyncParallel(final Activity parent, final URL url, fin
 		} else if (modelId.toLowerCase().endsWith(".stl")) {
 			Log.i("Object3DBuilder", "Loading STL object from: "+url);
 			STLLoader.loadSTLAsync(parent, url, callback);
+		} else if (modelId.toLowerCase().endsWith(".dae")) {
+			Log.i("Object3DBuilder", "Loading Collada object from: "+url);
+			ColladaLoader.loadAsync(parent, url, callback);
 		}
 	}
 

app/src/main/java/org/andresoviedo/app/model3D/model/Object3DBuilder.java

@@ -518,7 +518,7 @@ protected boolean supportsTextures() {
 }
 
 /**
- * Drawer using textures & multiple colors
+ * Drawer using textures & colors
  * 
  * @author andresoviedo
  *
@@ -599,7 +599,7 @@ class Object3DV5 extends Object3DImpl {
 		   "   float distance = length(u_LightPos - modelViewVertex);\n         "+
 		   "   diffuse = diffuse * (1.0 / (1.0 + (0.05 * distance * distance)));\n"+
 			//  Add ambient lighting
-			"  diffuse = diffuse + 0.3;"+
+			"  diffuse = diffuse + 0.5;"+
 		// Multiply the color by the illumination level. It will be interpolated across the triangle.
 		   "   v_Color = a_Color * diffuse;\n"+
 		    "   v_Color[3] = a_Color[3];"+ // correct alpha
@@ -680,7 +680,7 @@ class Object3DV6 extends Object3DImpl {
 		   "   float distance = length(u_LightPos - modelViewVertex);\n         "+
 		   "   diffuse = diffuse * (1.0 / (1.0 + (0.05 * distance * distance)));\n"+
 			//  Add ambient lighting
-			"  diffuse = diffuse + 0.3;"+
+			"  diffuse = diffuse + 0.5;"+
 		// Multiply the color by the illumination level. It will be interpolated across the triangle.
 		   "   v_Color = a_Color * diffuse;\n"+
 		   "   v_Color[3] = a_Color[3];"+ // correct alpha
@@ -734,7 +734,7 @@ protected boolean supportsMvMatrix() {
 }
 
 /**
- * Drawer using color & lights
+ * Drawer using colors & lights
  *
  * @author andresoviedo
  *
@@ -766,7 +766,7 @@ class Object3DV7 extends Object3DImpl {
 					"   float distance = length(u_LightPos - modelViewVertex);\n         "+
 					"   diffuse = diffuse * (1.0 / (1.0 + (0.05 * distance * distance)));\n"+
 					//  Add ambient lighting
-					"  diffuse = diffuse + 0.3;"+
+					"  diffuse = diffuse + 0.5;"+
 					// Multiply the color by the illumination level. It will be interpolated across the triangle.
 					"   v_Color = vColor * diffuse;\n"+
 					"   v_Color[3] = vColor[3];"+ // correct alpha
@@ -830,7 +830,6 @@ class Object3DV8 extends Object3DImpl {
 					// light variables
 					"uniform mat4 u_MVMatrix;\n"+
 					"uniform vec3 u_LightPos;\n"+
-					"attribute vec4 a_Color;\n"+
 					"attribute vec3 a_Normal;\n"+
 					// calculated color
 					"varying vec4 v_Color;\n"+
@@ -850,7 +849,7 @@ class Object3DV8 extends Object3DImpl {
 					"   float distance = length(u_LightPos - modelViewVertex);\n         "+
 					"   diffuse = diffuse * (1.0 / (1.0 + (0.05 * distance * distance)));\n"+
 					//  Add ambient lighting
-					"  diffuse = diffuse + 0.3;"+
+					"  diffuse = diffuse + 0.5;"+
 					// Multiply the color by the illumination level. It will be interpolated across the triangle.
 					"   v_Color = vColor * diffuse;\n"+
 					"   v_Color[3] = vColor[3];"+ // correct alpha
@@ -873,7 +872,7 @@ class Object3DV8 extends Object3DImpl {
 	// @formatter:on
 
 	public Object3DV8() {
-		super("V8", vertexShaderCode, fragmentShaderCode, "a_Position", "a_TexCoordinate", "a_Normal");
+		super("V8", vertexShaderCode, fragmentShaderCode, "vColor", "a_Position", "a_TexCoordinate", "a_Normal");
 	}
 
 	@Override

app/src/main/java/org/andresoviedo/app/model3D/model/Object3DImpl.java

@@ -1,6 +1,10 @@
 package org.andresoviedo.app.model3D.services;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -11,6 +15,7 @@
 import org.andresoviedo.app.model3D.model.Object3DData;
 import org.andresoviedo.app.model3D.view.ModelActivity;
 import org.andresoviedo.app.util.url.android.Handler;
+import org.apache.commons.io.IOUtils;
 
 import android.os.SystemClock;
 import android.util.Log;
@@ -227,7 +232,7 @@ public void toggleLighting() {
 		}
 		else if (this.drawLighting && !this.rotatingLight){
 			this.drawLighting = false;
-			makeToastText("Lightsoff", Toast.LENGTH_SHORT);
+			makeToastText("Lights off", Toast.LENGTH_SHORT);
 		}
 		else {
 			this.drawLighting = true;
@@ -253,4 +258,23 @@ public void setSelectedObject(Object3DData selectedObject) {
 		this.selectedObject = selectedObject;
 	}
 
+	public void loadTexture(String path){
+		if (objects.size() != 1) {
+			makeToastText("Unavailable", Toast.LENGTH_SHORT);
+			return;
+		}
+
+		try {
+			InputStream is = new FileInputStream(path);
+			ByteArrayOutputStream bos = new ByteArrayOutputStream();
+			IOUtils.copy(is,bos);
+			is.close();
+
+			Object3DData obj = objects.get(0);
+			obj.setTextureData(bos.toByteArray());
+		} catch (IOException ex) {
+			makeToastText("Problem loading texture: "+ex.getMessage(), Toast.LENGTH_SHORT);
+		}
+	}
+
 }

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

@@ -0,0 +1,26 @@
+package org.andresoviedo.app.model3D.services.collada.entities;
+
+/**
+ * Contains the extracted data for an animated model, which includes the mesh data, and skeleton (joints heirarchy) data.
+ * @author Karl
+ *
+ */
+public class AnimatedModelData {
+
+	private final SkeletonData joints;
+	private final MeshData mesh;
+	
+	public AnimatedModelData(MeshData mesh, SkeletonData joints){
+		this.joints = joints;
+		this.mesh = mesh;
+	}
+	
+	public SkeletonData getJointsData(){
+		return joints;
+	}
+	
+	public MeshData getMeshData(){
+		return mesh;
+	}
+	
+}

app/src/main/java/org/andresoviedo/app/model3D/services/collada/entities/AnimatedModelData.java

@@ -0,0 +1,20 @@
+package org.andresoviedo.app.model3D.services.collada.entities;
+
+/**
+ * Contains the extracted data for an animation, which includes the length of
+ * the entire animation and the data for all the keyframes of the animation.
+ * 
+ * @author Karl
+ *
+ */
+public class AnimationData {
+
+	public final float lengthSeconds;
+	public final KeyFrameData[] keyFrames;
+
+	public AnimationData(float lengthSeconds, KeyFrameData[] keyFrames) {
+		this.lengthSeconds = lengthSeconds;
+		this.keyFrames = keyFrames;
+	}
+
+}