Ver Fonte

Resource folder restructuring

Tankernn há 8 anos atrás
pai
commit
b63d181e46
54 ficheiros alterados com 19 adições e 19 exclusões
  1. 5 5
      src/main/java/eu/tankernn/game/Game.java
  2. 14 14
      src/main/java/eu/tankernn/game/Settings.java
  3. 0 0
      src/main/resources/font/arial.fnt
  4. 0 0
      src/main/resources/font/arial.png
  5. 0 0
      src/main/resources/models/Soptunna.obj
  6. 0 0
      src/main/resources/models/barrel.obj
  7. 0 0
      src/main/resources/models/boulder.obj
  8. 0 0
      src/main/resources/models/bunny.obj
  9. 0 0
      src/main/resources/models/character.dae
  10. 0 0
      src/main/resources/models/character.obj
  11. 0 0
      src/main/resources/models/cherry.obj
  12. 0 0
      src/main/resources/models/crate.obj
  13. 0 0
      src/main/resources/models/cube.obj
  14. 0 0
      src/main/resources/models/dragon.obj
  15. 0 0
      src/main/resources/models/drone.obj
  16. 0 0
      src/main/resources/models/exampleOBJ.obj
  17. 0 0
      src/main/resources/models/fern.obj
  18. 0 0
      src/main/resources/models/grass.obj
  19. 0 0
      src/main/resources/models/grassModel.obj
  20. 0 0
      src/main/resources/models/lantern.obj
  21. 0 0
      src/main/resources/models/lowPolyTree.obj
  22. 0 0
      src/main/resources/models/model.dae
  23. 0 0
      src/main/resources/models/tree.obj
  24. 0 0
      src/main/resources/textures/barrel.png
  25. 0 0
      src/main/resources/textures/barrelN.png
  26. 0 0
      src/main/resources/textures/barrelS.png
  27. 0 0
      src/main/resources/textures/blendMap.png
  28. 0 0
      src/main/resources/textures/boulder.png
  29. 0 0
      src/main/resources/textures/boulderNormal.png
  30. 0 0
      src/main/resources/textures/cherry.png
  31. 0 0
      src/main/resources/textures/cherryS.png
  32. 0 0
      src/main/resources/textures/crate.png
  33. 0 0
      src/main/resources/textures/crateNormal.png
  34. 0 0
      src/main/resources/textures/diffuse.png
  35. 0 0
      src/main/resources/textures/dirt.png
  36. 0 0
      src/main/resources/textures/fern.png
  37. 0 0
      src/main/resources/textures/flower.png
  38. 0 0
      src/main/resources/textures/grass.png
  39. 0 0
      src/main/resources/textures/grassFlowers.png
  40. 0 0
      src/main/resources/textures/grassTexture.png
  41. 0 0
      src/main/resources/textures/grassy.png
  42. 0 0
      src/main/resources/textures/grassy2.png
  43. 0 0
      src/main/resources/textures/heightmap.png
  44. 0 0
      src/main/resources/textures/image.png
  45. 0 0
      src/main/resources/textures/lantern.png
  46. 0 0
      src/main/resources/textures/lanternS.png
  47. 0 0
      src/main/resources/textures/lowPolyTree.png
  48. 0 0
      src/main/resources/textures/mud.png
  49. 0 0
      src/main/resources/textures/path.png
  50. 0 0
      src/main/resources/textures/pinkFlowers.png
  51. 0 0
      src/main/resources/textures/tree.png
  52. 0 0
      src/main/resources/textures/waterDUDV.png
  53. 0 0
      src/main/resources/textures/waterNormalMap.png
  54. 0 0
      src/main/resources/textures/white.png

+ 5 - 5
src/main/java/eu/tankernn/game/Game.java

@@ -58,13 +58,13 @@ public class Game extends TankernnGame3D {
 	}
 	
 	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");
+		Texture backgroundTexture = loader.loadTexture("textures/grassy.png");
+		Texture rTexture = loader.loadTexture("textures/dirt.png");
+		Texture gTexture = loader.loadTexture("textures/pinkFlowers.png");
+		Texture bTexture = loader.loadTexture("textures/path.png");
 		
 		TerrainTexturePack texturePack = new TerrainTexturePack(backgroundTexture, rTexture, gTexture, bTexture);
-		Texture blendMap = loader.loadTexture("blendMap.png");
+		Texture blendMap = loader.loadTexture("textures/blendMap.png");
 		
 		terrainPack = new TerrainPack(loader, texturePack, blendMap, 1235);
 	}

+ 14 - 14
src/main/java/eu/tankernn/game/Settings.java

@@ -1,14 +1,14 @@
-package eu.tankernn.game;
-
-public class Settings {
-	public static final boolean DEBUG = false;
-	public static final String GAME_NAME = "Tankernn game engine tester";
-	
-	// Skybox settings
-	public static final String[] TEXTURE_FILES = {"alps_rt", "alps_lf", "alps_up", "alps_dn", "alps_bk", "alps_ft"};
-	public static final String[] NIGHT_TEXTURE_FILES = {"midnight_rt", "midnight_lf", "midnight_up", "midnight_dn", "midnight_bk", "midnight_ft"};
-	
-	// Water settings
-	public static final String DUDV_MAP = "waterDUDV.png";
-	public static final String NORMAL_MAP = "waterNormalMap.png";
-}
+package eu.tankernn.game;
+
+public class Settings {
+	public static final boolean DEBUG = false;
+	public static final String GAME_NAME = "Tankernn game engine tester";
+	
+	// Skybox settings
+	public static final String[] TEXTURE_FILES = {"alps_rt", "alps_lf", "alps_up", "alps_dn", "alps_bk", "alps_ft"};
+	public static final String[] NIGHT_TEXTURE_FILES = {"midnight_rt", "midnight_lf", "midnight_up", "midnight_dn", "midnight_bk", "midnight_ft"};
+	
+	// Water settings
+	public static final String DUDV_MAP = "textures/waterDUDV.png";
+	public static final String NORMAL_MAP = "textures/waterNormalMap.png";
+}

+ 0 - 0
src/main/resources/arial.fnt → src/main/resources/font/arial.fnt


+ 0 - 0
src/main/resources/arial.png → src/main/resources/font/arial.png


+ 0 - 0
src/main/resources/Soptunna.obj → src/main/resources/models/Soptunna.obj


+ 0 - 0
src/main/resources/barrel.obj → src/main/resources/models/barrel.obj


+ 0 - 0
src/main/resources/boulder.obj → src/main/resources/models/boulder.obj


+ 0 - 0
src/main/resources/bunny.obj → src/main/resources/models/bunny.obj


+ 0 - 0
src/main/resources/character.dae → src/main/resources/models/character.dae


+ 0 - 0
src/main/resources/character.obj → src/main/resources/models/character.obj


+ 0 - 0
src/main/resources/cherry.obj → src/main/resources/models/cherry.obj


+ 0 - 0
src/main/resources/crate.obj → src/main/resources/models/crate.obj


+ 0 - 0
src/main/resources/cube.obj → src/main/resources/models/cube.obj


+ 0 - 0
src/main/resources/dragon.obj → src/main/resources/models/dragon.obj


+ 0 - 0
src/main/resources/drone.obj → src/main/resources/models/drone.obj


+ 0 - 0
src/main/resources/exampleOBJ.obj → src/main/resources/models/exampleOBJ.obj


+ 0 - 0
src/main/resources/fern.obj → src/main/resources/models/fern.obj


+ 0 - 0
src/main/resources/grass.obj → src/main/resources/models/grass.obj


+ 0 - 0
src/main/resources/grassModel.obj → src/main/resources/models/grassModel.obj


+ 0 - 0
src/main/resources/lantern.obj → src/main/resources/models/lantern.obj


+ 0 - 0
src/main/resources/lowPolyTree.obj → src/main/resources/models/lowPolyTree.obj


+ 0 - 0
src/main/resources/model.dae → src/main/resources/models/model.dae


+ 0 - 0
src/main/resources/tree.obj → src/main/resources/models/tree.obj


+ 0 - 0
src/main/resources/barrel.png → src/main/resources/textures/barrel.png


+ 0 - 0
src/main/resources/barrelN.png → src/main/resources/textures/barrelN.png


+ 0 - 0
src/main/resources/barrelS.png → src/main/resources/textures/barrelS.png


+ 0 - 0
src/main/resources/blendMap.png → src/main/resources/textures/blendMap.png


+ 0 - 0
src/main/resources/boulder.png → src/main/resources/textures/boulder.png


+ 0 - 0
src/main/resources/boulderNormal.png → src/main/resources/textures/boulderNormal.png


+ 0 - 0
src/main/resources/cherry.png → src/main/resources/textures/cherry.png


+ 0 - 0
src/main/resources/cherryS.png → src/main/resources/textures/cherryS.png


+ 0 - 0
src/main/resources/crate.png → src/main/resources/textures/crate.png


+ 0 - 0
src/main/resources/crateNormal.png → src/main/resources/textures/crateNormal.png


+ 0 - 0
src/main/resources/diffuse.png → src/main/resources/textures/diffuse.png


+ 0 - 0
src/main/resources/dirt.png → src/main/resources/textures/dirt.png


+ 0 - 0
src/main/resources/fern.png → src/main/resources/textures/fern.png


+ 0 - 0
src/main/resources/flower.png → src/main/resources/textures/flower.png


+ 0 - 0
src/main/resources/grass.png → src/main/resources/textures/grass.png


+ 0 - 0
src/main/resources/grassFlowers.png → src/main/resources/textures/grassFlowers.png


+ 0 - 0
src/main/resources/grassTexture.png → src/main/resources/textures/grassTexture.png


+ 0 - 0
src/main/resources/grassy.png → src/main/resources/textures/grassy.png


+ 0 - 0
src/main/resources/grassy2.png → src/main/resources/textures/grassy2.png


+ 0 - 0
src/main/resources/heightmap.png → src/main/resources/textures/heightmap.png


+ 0 - 0
src/main/resources/image.png → src/main/resources/textures/image.png


+ 0 - 0
src/main/resources/lantern.png → src/main/resources/textures/lantern.png


+ 0 - 0
src/main/resources/lanternS.png → src/main/resources/textures/lanternS.png


+ 0 - 0
src/main/resources/lowPolyTree.png → src/main/resources/textures/lowPolyTree.png


+ 0 - 0
src/main/resources/mud.png → src/main/resources/textures/mud.png


+ 0 - 0
src/main/resources/path.png → src/main/resources/textures/path.png


+ 0 - 0
src/main/resources/pinkFlowers.png → src/main/resources/textures/pinkFlowers.png


+ 0 - 0
src/main/resources/tree.png → src/main/resources/textures/tree.png


+ 0 - 0
src/main/resources/waterDUDV.png → src/main/resources/textures/waterDUDV.png


+ 0 - 0
src/main/resources/waterNormalMap.png → src/main/resources/textures/waterNormalMap.png


+ 0 - 0
src/main/resources/white.png → src/main/resources/textures/white.png