Browse Source

panic animation of android

Fabio Arnold 10 years ago
parent
commit
5633f699f3

BIN
assets/meshes/android.amh


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

@@ -219,7 +219,7 @@ public class AnimatedMesh {
 			actions.add(new Action(data));
 		}
 		
-		currentAction = actions.get(0);
+		currentAction = actions.get(actions.size() - 1);
 		currentFrame = 0;
 	}
 	

+ 1 - 2
src/de/tudarmstadt/informatik/hostage/ui2/fragment/opengl/ThreatIndicatorGLRenderer.java

@@ -132,12 +132,11 @@ public class ThreatIndicatorGLRenderer implements Renderer {
 		
 		float[] color = mixColor(0.5f + 0.5f * (float)Math.sin(0.2f * beeAnimation), whiteColor, redColor);
 		GLES20.glUniform4fv(colorUniformLoc, 1, color, 0);
-		Log.i("gl", color[0]+" "+color[1]+" "+color[2]+" "+color[3]);
 		
 		GLES20.glUniform1i(textureUniformLoc, 0);
 		
 		Matrix.setIdentityM(modelview, 0);
-		Matrix.translateM(modelview, 0, 0.0f, -0.5f, -2.0f);
+		Matrix.translateM(modelview, 0, 0.0f, -0.8f, -2.0f);
 		Matrix.rotateM(modelview, 0, -80.0f, 1.0f, 0.0f, 0.0f);
 		Matrix.multiplyMM(mvp, 0, projection, 0, modelview, 0);