Merge branch 'master' of https://julien.clauter@git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2.git

assets/shaders/skinned.frag

@@ -6,5 +6,8 @@ varying vec3 vertexNormal;
 
 void main() {
 	vec3 normal = normalize(vertexNormal);
-	gl_FragColor = max(0.0, -normal.y) * color;
+	float lambert = max(0.0, -normal.y);
+	float rim = 1.0 - lambert;
+	rim *= rim * rim;
+	gl_FragColor = rim + (0.4 + 0.4 * lambert) * color;
 }

src/de/tudarmstadt/informatik/hostage/ui2/fragment/opengl/AnimatedMesh.java

@@ -230,9 +230,11 @@ public class AnimatedMesh {
 		v3[2] = v1[2] + v2[2];
 		return v3;
 	}
-	
+
+	static boolean toggle = true;
 	public void tick() {
-		currentFrame++;
+		toggle = !toggle; // very clever (!) way to slow the animation :DDDD
+		if (toggle) currentFrame++;
 		if (currentFrame >= currentAction.numFrames)
 			currentFrame = 0;
 		

src/de/tudarmstadt/informatik/hostage/ui2/fragment/opengl/ThreatIndicatorGLRenderer.java

@@ -56,7 +56,7 @@ public class ThreatIndicatorGLRenderer implements Renderer {
 		GLES20.glEnable(GLES20.GL_CULL_FACE);
 		
 		try {
-			InputStream is = assets.open("meshes/mario.amh");
+			InputStream is = assets.open("meshes/android.amh");
 			androidMesh = new AnimatedMesh(is);
 		} catch (IOException e) {
 			Log.e("gl", "Couldn't open mesh");
@@ -108,7 +108,7 @@ public class ThreatIndicatorGLRenderer implements Renderer {
 		int colorUniformLoc = GLES20.glGetUniformLocation(program, "color");
 		int mvpUniformLoc = GLES20.glGetUniformLocation(program, "mvp");
 		
-		float [] color = {1.0f, 1.0f, 1.0f, 1.0f};
+		float [] color = {0.6f, 1.0f, 0.0f, 1.0f};
 		GLES20.glUniform4fv(colorUniformLoc, 1, color, 0);
 		//Matrix.rotateM(mvp, 0, 4.0f, 0.0f, 0.0f, 1.0f);
 		Matrix.setIdentityM(modelview, 0);