Proper resource folder and update to work with animations

pom.xml

@@ -26,6 +26,12 @@
 			<artifactId>netty-all</artifactId>
 			<version>4.1.6.Final</version>
 		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
 
 	</dependencies>
 
@@ -64,6 +70,52 @@
 					</descriptorRefs>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<!-- Skips unit tests if the value of skip.unit.tests property is true -->
+					<skipTests>${skip.unit.tests}</skipTests>
+					<argLine>-Djava.library.path="${project.basedir}/target/natives" ${surefireArgLine}</argLine>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.7.5.201505241946</version>
+				<executions>
+					<!-- Prepares the property pointing to the JaCoCo runtime agent which 
+						is passed as VM argument when Maven the Surefire plugin is executed. -->
+					<execution>
+						<id>pre-unit-test</id>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+						<configuration>
+							<!-- Sets the path to the file which contains the execution data. -->
+							<destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
+							<!-- Sets the name of the property containing the settings for JaCoCo 
+								runtime agent. -->
+							<propertyName>surefireArgLine</propertyName>
+						</configuration>
+					</execution>
+					<!-- Ensures that the code coverage report for unit tests is created 
+						after unit tests have been run. -->
+					<execution>
+						<id>post-unit-test</id>
+						<phase>test</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+						<configuration>
+							<!-- Sets the path to the file which contains the execution data. -->
+							<dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
+							<!-- Sets the output directory for the code coverage report. -->
+							<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>com.googlecode.mavennatives</groupId>
 				<artifactId>maven-nativedependencies-plugin</artifactId>
@@ -80,11 +132,6 @@
 			</plugin>
 		</plugins>
 		<resources>
-			<resource>
-				<directory>res</directory>
-				<excludes>
-				</excludes>
-			</resource>
 			<resource>
 				<directory>src/main/java</directory>
 				<includes>

src/main/java/eu/tankernn/game/Game.java

@@ -11,64 +11,74 @@ import org.lwjgl.util.vector.Vector3f;
 
 import eu.tankernn.gameEngine.GameLauncher;
 import eu.tankernn.gameEngine.TankernnGame3D;
+import eu.tankernn.gameEngine.animation.animatedModel.AnimatedModel;
+import eu.tankernn.gameEngine.animation.animation.Animation;
+import eu.tankernn.gameEngine.animation.loaders.AnimationLoader;
 import eu.tankernn.gameEngine.entities.Entity3D;
 import eu.tankernn.gameEngine.entities.Light;
 import eu.tankernn.gameEngine.entities.Player;
 import eu.tankernn.gameEngine.entities.PlayerCamera;
 import eu.tankernn.gameEngine.loader.textures.TerrainTexturePack;
 import eu.tankernn.gameEngine.loader.textures.Texture;
-import eu.tankernn.gameEngine.renderEngine.skybox.Skybox;
 import eu.tankernn.gameEngine.renderEngine.water.WaterTile;
 import eu.tankernn.gameEngine.terrains.TerrainPack;
 import eu.tankernn.gameEngine.util.InternalFile;
 
 public class Game extends TankernnGame3D {
 	public Game() {
-		super(Settings.GAME_NAME,
-				new Skybox(Texture.newCubeMap(InternalFile.fromFilenames("skybox", TEXTURE_FILES, "png"), 200),
-						Texture.newCubeMap(InternalFile.fromFilenames("skybox", NIGHT_TEXTURE_FILES, "png"), 200), 400),
-				DUDV_MAP, NORMAL_MAP, new Light(new Vector3f(1000, 1000, 0), new Vector3f(1f, 1f, 1f)));
-
+		super(Settings.GAME_NAME, TEXTURE_FILES, NIGHT_TEXTURE_FILES, DUDV_MAP, NORMAL_MAP, new Light(new Vector3f(1000, 1000, 0), new Vector3f(1f, 1f, 1f)));
+		
 		try {
 			setupTerrain();
 		} catch (FileNotFoundException e) {
 			e.printStackTrace();
 		}
 		setupWater();
-
-		player = new Player(0, new Vector3f(0, 0, 0), new Vector3f(0, 0, 0), 1,
-				loader.getModel(0).getRawModel().getBoundingBox(), terrainPack);
+		
+		InternalFile charFile;
+		try {
+			charFile = new InternalFile("character.dae");
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+			return;
+		}
+		
+		Animation anim = AnimationLoader.loadAnimation(charFile);
+		AnimatedModel playerModel = loader.loadDAE(charFile);
+		playerModel.doAnimation(anim);
+		player = new Player(playerModel, new Vector3f(0, 0, 0), new Vector3f(0, 0, 0), 1, loader.getBoundingBox(0), terrainPack);
+		
+		entities.add(player);
 		camera = new PlayerCamera(player, terrainPack);
-
-		entities.add(new Entity3D(2, new Vector3f(0, 0, 0), new Vector3f(0, 0, 0), 1,
-				loader.getModel(2).getRawModel().getBoundingBox()));
+		
+		entities.add(new Entity3D(loader.getModel(2), new Vector3f(0, 0, 0), new Vector3f(0, 0, 0), 1, loader.getBoundingBox(2)));
 		lights.add(new Light(new Vector3f(0, 1000, 0), new Vector3f(1f, 1f, 1f)));
 	}
-
+	
 	private void setupTerrain() throws FileNotFoundException {
 		Texture backgroundTexture = loader.loadTexture("grassy.png");
 		Texture rTexture = loader.loadTexture("dirt.png");
 		Texture gTexture = loader.loadTexture("pinkFlowers.png");
 		Texture bTexture = loader.loadTexture("path.png");
-
+		
 		TerrainTexturePack texturePack = new TerrainTexturePack(backgroundTexture, rTexture, gTexture, bTexture);
 		Texture blendMap = loader.loadTexture("blendMap.png");
-
+		
 		terrainPack = new TerrainPack(loader, texturePack, blendMap, 1235);
 	}
-
+	
 	private void setupWater() {
 		WaterTile water = new WaterTile(50, 50, 0, 60);
 		waterMaster.addWaterTile(water);
 	}
-
+	
 	public void update() {
 		super.update();
 		if (picker.getCurrentTerrainPoint() != null) {
 			entities.get(1).setPosition(picker.getCurrentTerrainPoint());
 		}
 	}
-
+	
 	public static void main(String[] args) {
 		GameLauncher.init(Settings.GAME_NAME);
 		GameLauncher.launch(new Game());

src/test/java/eu/tankernn/game/test/GameTest.java

@@ -0,0 +1,18 @@
+package eu.tankernn.game.test;
+
+import org.junit.Test;
+
+import eu.tankernn.game.Game;
+import eu.tankernn.gameEngine.renderEngine.DisplayManager;
+
+public class GameTest {
+	@Test
+	public void gameShouldInit() {
+		DisplayManager.createDisplay("Test", 200, 200);
+		Game tester = new Game();
+		
+		tester.update();
+		tester.render();
+		tester.cleanUp();
+	}
+}