Browse Source

Refactoring

Moved some rendering-related packages to the renderEngine package.
Tankernn 8 years ago
parent
commit
44a2763a0a
46 changed files with 88 additions and 88 deletions
  1. 3 3
      src/main/java/eu/tankernn/gameEngine/MainLoop.java
  2. 2 2
      src/main/java/eu/tankernn/gameEngine/TankernnGame.java
  3. 3 3
      src/main/java/eu/tankernn/gameEngine/font/rendering/FontShader.java
  4. 2 2
      src/main/java/eu/tankernn/gameEngine/gui/GuiShader.java
  5. 8 8
      src/main/java/eu/tankernn/gameEngine/normalMapping/renderer/NormalMappingShader.java
  6. 3 3
      src/main/java/eu/tankernn/gameEngine/particles/ParticleShader.java
  7. 1 1
      src/main/java/eu/tankernn/gameEngine/postProcessing/ContrastShader.java
  8. 1 1
      src/main/java/eu/tankernn/gameEngine/postProcessing/bloom/BrightFilterShader.java
  9. 2 2
      src/main/java/eu/tankernn/gameEngine/postProcessing/bloom/CombineShader.java
  10. 2 2
      src/main/java/eu/tankernn/gameEngine/postProcessing/gaussianBlur/HorizontalBlurShader.java
  11. 2 2
      src/main/java/eu/tankernn/gameEngine/postProcessing/gaussianBlur/VerticalBlurShader.java
  12. 3 3
      src/main/java/eu/tankernn/gameEngine/renderEngine/MasterRenderer.java
  13. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/Scene.java
  14. 9 9
      src/main/java/eu/tankernn/gameEngine/renderEngine/entities/EntityShader.java
  15. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/ShaderProgram.java
  16. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/Uniform.java
  17. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/UniformBoolean.java
  18. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/UniformFloat.java
  19. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/UniformMatrix.java
  20. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/UniformSampler.java
  21. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/UniformVec2.java
  22. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/UniformVec3.java
  23. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/UniformVec4.java
  24. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/UniformViewMatrix.java
  25. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/shadows/ShadowBox.java
  26. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/shadows/ShadowFrameBuffer.java
  27. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/shadows/ShadowMapEntityRenderer.java
  28. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/shadows/ShadowMapMasterRenderer.java
  29. 3 3
      src/main/java/eu/tankernn/gameEngine/renderEngine/shadows/ShadowShader.java
  30. 0 0
      src/main/java/eu/tankernn/gameEngine/renderEngine/shadows/shadowFragmentShader.glsl
  31. 0 0
      src/main/java/eu/tankernn/gameEngine/renderEngine/shadows/shadowVertexShader.glsl
  32. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/skybox/CubeGenerator.java
  33. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/skybox/Skybox.java
  34. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/skybox/SkyboxRenderer.java
  35. 6 6
      src/main/java/eu/tankernn/gameEngine/renderEngine/skybox/SkyboxShader.java
  36. 0 0
      src/main/java/eu/tankernn/gameEngine/renderEngine/skybox/skyboxFragmentShader.glsl
  37. 0 0
      src/main/java/eu/tankernn/gameEngine/renderEngine/skybox/skyboxVertexShader.glsl
  38. 2 2
      src/main/java/eu/tankernn/gameEngine/renderEngine/terrain/TerrainRenderer.java
  39. 7 7
      src/main/java/eu/tankernn/gameEngine/renderEngine/terrain/TerrainShader.java
  40. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/water/WaterFrameBuffers.java
  41. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/water/WaterMaster.java
  42. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/water/WaterRenderer.java
  43. 7 7
      src/main/java/eu/tankernn/gameEngine/renderEngine/water/WaterShader.java
  44. 1 1
      src/main/java/eu/tankernn/gameEngine/renderEngine/water/WaterTile.java
  45. 0 0
      src/main/java/eu/tankernn/gameEngine/renderEngine/water/waterFragment.glsl
  46. 0 0
      src/main/java/eu/tankernn/gameEngine/renderEngine/water/waterVertex.glsl

+ 3 - 3
src/main/java/eu/tankernn/gameEngine/MainLoop.java

@@ -38,7 +38,9 @@ import eu.tankernn.gameEngine.renderEngine.DisplayManager;
 import eu.tankernn.gameEngine.renderEngine.Loader;
 import eu.tankernn.gameEngine.renderEngine.MasterRenderer;
 import eu.tankernn.gameEngine.renderEngine.Scene;
-import eu.tankernn.gameEngine.skybox.Skybox;
+import eu.tankernn.gameEngine.renderEngine.skybox.Skybox;
+import eu.tankernn.gameEngine.renderEngine.water.WaterMaster;
+import eu.tankernn.gameEngine.renderEngine.water.WaterTile;
 import eu.tankernn.gameEngine.terrains.Terrain;
 import eu.tankernn.gameEngine.terrains.TerrainPack;
 import eu.tankernn.gameEngine.textures.ModelTexture;
@@ -48,8 +50,6 @@ import eu.tankernn.gameEngine.textures.Texture;
 import eu.tankernn.gameEngine.util.DistanceSorter;
 import eu.tankernn.gameEngine.util.MousePicker;
 import eu.tankernn.gameEngine.util.MyFile;
-import eu.tankernn.gameEngine.water.WaterMaster;
-import eu.tankernn.gameEngine.water.WaterTile;
 
 public class MainLoop {
 

+ 2 - 2
src/main/java/eu/tankernn/gameEngine/TankernnGame.java

@@ -4,8 +4,8 @@ import eu.tankernn.gameEngine.entities.Camera;
 import eu.tankernn.gameEngine.renderEngine.DisplayManager;
 import eu.tankernn.gameEngine.renderEngine.Loader;
 import eu.tankernn.gameEngine.renderEngine.MasterRenderer;
-import eu.tankernn.gameEngine.skybox.Skybox;
-import eu.tankernn.gameEngine.water.WaterMaster;
+import eu.tankernn.gameEngine.renderEngine.skybox.Skybox;
+import eu.tankernn.gameEngine.renderEngine.water.WaterMaster;
 
 public class TankernnGame {
 	protected Loader loader;

+ 3 - 3
src/main/java/eu/tankernn/gameEngine/font/rendering/FontShader.java

@@ -1,8 +1,8 @@
 package eu.tankernn.gameEngine.font.rendering;
 
-import eu.tankernn.gameEngine.shaders.ShaderProgram;
-import eu.tankernn.gameEngine.shaders.UniformVec2;
-import eu.tankernn.gameEngine.shaders.UniformVec3;
+import eu.tankernn.gameEngine.renderEngine.shaders.ShaderProgram;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformVec2;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformVec3;
 
 public class FontShader extends ShaderProgram{
 

+ 2 - 2
src/main/java/eu/tankernn/gameEngine/gui/GuiShader.java

@@ -1,7 +1,7 @@
 package eu.tankernn.gameEngine.gui;
 
-import eu.tankernn.gameEngine.shaders.ShaderProgram;
-import eu.tankernn.gameEngine.shaders.UniformMatrix;
+import eu.tankernn.gameEngine.renderEngine.shaders.ShaderProgram;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformMatrix;
 
 public class GuiShader extends ShaderProgram {
 	private static final String VERTEX_FILE = "/eu/tankernn/gameEngine/gui/guiVertexShader.glsl";

+ 8 - 8
src/main/java/eu/tankernn/gameEngine/normalMapping/renderer/NormalMappingShader.java

@@ -7,14 +7,14 @@ import org.lwjgl.util.vector.Vector3f;
 import org.lwjgl.util.vector.Vector4f;
 
 import eu.tankernn.gameEngine.entities.Light;
-import eu.tankernn.gameEngine.shaders.ShaderProgram;
-import eu.tankernn.gameEngine.shaders.UniformBoolean;
-import eu.tankernn.gameEngine.shaders.UniformFloat;
-import eu.tankernn.gameEngine.shaders.UniformMatrix;
-import eu.tankernn.gameEngine.shaders.UniformSampler;
-import eu.tankernn.gameEngine.shaders.UniformVec2;
-import eu.tankernn.gameEngine.shaders.UniformVec3;
-import eu.tankernn.gameEngine.shaders.UniformVec4;
+import eu.tankernn.gameEngine.renderEngine.shaders.ShaderProgram;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformBoolean;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformFloat;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformMatrix;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformSampler;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformVec2;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformVec3;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformVec4;
 
 public class NormalMappingShader extends ShaderProgram {
 

+ 3 - 3
src/main/java/eu/tankernn/gameEngine/particles/ParticleShader.java

@@ -1,8 +1,8 @@
 package eu.tankernn.gameEngine.particles;
 
-import eu.tankernn.gameEngine.shaders.ShaderProgram;
-import eu.tankernn.gameEngine.shaders.UniformFloat;
-import eu.tankernn.gameEngine.shaders.UniformMatrix;
+import eu.tankernn.gameEngine.renderEngine.shaders.ShaderProgram;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformFloat;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformMatrix;
 
 public class ParticleShader extends ShaderProgram {
 

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/postProcessing/ContrastShader.java

@@ -1,6 +1,6 @@
 package eu.tankernn.gameEngine.postProcessing;
 
-import eu.tankernn.gameEngine.shaders.ShaderProgram;
+import eu.tankernn.gameEngine.renderEngine.shaders.ShaderProgram;
 
 public class ContrastShader extends ShaderProgram {
 	

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/postProcessing/bloom/BrightFilterShader.java

@@ -1,6 +1,6 @@
 package eu.tankernn.gameEngine.postProcessing.bloom;
 
-import eu.tankernn.gameEngine.shaders.ShaderProgram;
+import eu.tankernn.gameEngine.renderEngine.shaders.ShaderProgram;
 
 public class BrightFilterShader extends ShaderProgram{
 	

+ 2 - 2
src/main/java/eu/tankernn/gameEngine/postProcessing/bloom/CombineShader.java

@@ -1,7 +1,7 @@
 package eu.tankernn.gameEngine.postProcessing.bloom;
 
-import eu.tankernn.gameEngine.shaders.ShaderProgram;
-import eu.tankernn.gameEngine.shaders.UniformSampler;
+import eu.tankernn.gameEngine.renderEngine.shaders.ShaderProgram;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformSampler;
 
 public class CombineShader extends ShaderProgram {
 

+ 2 - 2
src/main/java/eu/tankernn/gameEngine/postProcessing/gaussianBlur/HorizontalBlurShader.java

@@ -1,7 +1,7 @@
 package eu.tankernn.gameEngine.postProcessing.gaussianBlur;
 
-import eu.tankernn.gameEngine.shaders.ShaderProgram;
-import eu.tankernn.gameEngine.shaders.UniformFloat;
+import eu.tankernn.gameEngine.renderEngine.shaders.ShaderProgram;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformFloat;
 
 public class HorizontalBlurShader extends ShaderProgram {
 

+ 2 - 2
src/main/java/eu/tankernn/gameEngine/postProcessing/gaussianBlur/VerticalBlurShader.java

@@ -1,7 +1,7 @@
 package eu.tankernn.gameEngine.postProcessing.gaussianBlur;
 
-import eu.tankernn.gameEngine.shaders.ShaderProgram;
-import eu.tankernn.gameEngine.shaders.UniformFloat;
+import eu.tankernn.gameEngine.renderEngine.shaders.ShaderProgram;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformFloat;
 
 public class VerticalBlurShader extends ShaderProgram{
 

+ 3 - 3
src/main/java/eu/tankernn/gameEngine/renderEngine/MasterRenderer.java

@@ -21,10 +21,10 @@ import eu.tankernn.gameEngine.entities.Light;
 import eu.tankernn.gameEngine.models.TexturedModel;
 import eu.tankernn.gameEngine.normalMapping.renderer.NormalMappingRenderer;
 import eu.tankernn.gameEngine.renderEngine.entities.EntityRenderer;
+import eu.tankernn.gameEngine.renderEngine.shadows.ShadowMapMasterRenderer;
+import eu.tankernn.gameEngine.renderEngine.skybox.Skybox;
+import eu.tankernn.gameEngine.renderEngine.skybox.SkyboxRenderer;
 import eu.tankernn.gameEngine.renderEngine.terrain.TerrainRenderer;
-import eu.tankernn.gameEngine.shadows.ShadowMapMasterRenderer;
-import eu.tankernn.gameEngine.skybox.Skybox;
-import eu.tankernn.gameEngine.skybox.SkyboxRenderer;
 import eu.tankernn.gameEngine.terrains.Terrain;
 import eu.tankernn.gameEngine.textures.Texture;
 import eu.tankernn.gameEngine.util.ICamera;

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/renderEngine/Scene.java

@@ -5,7 +5,7 @@ import java.util.List;
 import eu.tankernn.gameEngine.entities.Camera;
 import eu.tankernn.gameEngine.entities.Entity;
 import eu.tankernn.gameEngine.entities.Light;
-import eu.tankernn.gameEngine.skybox.Skybox;
+import eu.tankernn.gameEngine.renderEngine.skybox.Skybox;
 import eu.tankernn.gameEngine.terrains.TerrainPack;
 import eu.tankernn.gameEngine.textures.Texture;
 

+ 9 - 9
src/main/java/eu/tankernn/gameEngine/renderEngine/entities/EntityShader.java

@@ -1,14 +1,14 @@
 package eu.tankernn.gameEngine.renderEngine.entities;
 
-import eu.tankernn.gameEngine.shaders.ShaderProgram;
-import eu.tankernn.gameEngine.shaders.UniformBoolean;
-import eu.tankernn.gameEngine.shaders.UniformFloat;
-import eu.tankernn.gameEngine.shaders.UniformMatrix;
-import eu.tankernn.gameEngine.shaders.UniformSampler;
-import eu.tankernn.gameEngine.shaders.UniformVec2;
-import eu.tankernn.gameEngine.shaders.UniformVec3;
-import eu.tankernn.gameEngine.shaders.UniformVec4;
-import eu.tankernn.gameEngine.shaders.UniformViewMatrix;
+import eu.tankernn.gameEngine.renderEngine.shaders.ShaderProgram;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformBoolean;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformFloat;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformMatrix;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformSampler;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformVec2;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformVec3;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformVec4;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformViewMatrix;
 
 public class EntityShader extends ShaderProgram {
 

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/shaders/ShaderProgram.java → src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/ShaderProgram.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.shaders;
+package eu.tankernn.gameEngine.renderEngine.shaders;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/shaders/Uniform.java → src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/Uniform.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.shaders;
+package eu.tankernn.gameEngine.renderEngine.shaders;
 
 import org.lwjgl.opengl.GL20;
 

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/shaders/UniformBoolean.java → src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/UniformBoolean.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.shaders;
+package eu.tankernn.gameEngine.renderEngine.shaders;
 
 import org.lwjgl.opengl.GL20;
 

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/shaders/UniformFloat.java → src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/UniformFloat.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.shaders;
+package eu.tankernn.gameEngine.renderEngine.shaders;
 
 import org.lwjgl.opengl.GL20;
 

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/shaders/UniformMatrix.java → src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/UniformMatrix.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.shaders;
+package eu.tankernn.gameEngine.renderEngine.shaders;
 
 import java.nio.FloatBuffer;
 

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/shaders/UniformSampler.java → src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/UniformSampler.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.shaders;
+package eu.tankernn.gameEngine.renderEngine.shaders;
 
 import org.lwjgl.opengl.GL20;
 

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/shaders/UniformVec2.java → src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/UniformVec2.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.shaders;
+package eu.tankernn.gameEngine.renderEngine.shaders;
 
 import org.lwjgl.opengl.GL20;
 import org.lwjgl.util.vector.Vector2f;

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/shaders/UniformVec3.java → src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/UniformVec3.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.shaders;
+package eu.tankernn.gameEngine.renderEngine.shaders;
 
 import org.lwjgl.opengl.GL20;
 import org.lwjgl.util.vector.Vector3f;

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/shaders/UniformVec4.java → src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/UniformVec4.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.shaders;
+package eu.tankernn.gameEngine.renderEngine.shaders;
 
 import org.lwjgl.opengl.GL20;
 import org.lwjgl.util.vector.Vector4f;

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/shaders/UniformViewMatrix.java → src/main/java/eu/tankernn/gameEngine/renderEngine/shaders/UniformViewMatrix.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.shaders;
+package eu.tankernn.gameEngine.renderEngine.shaders;
 
 import eu.tankernn.gameEngine.util.ICamera;
 

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/shadows/ShadowBox.java → src/main/java/eu/tankernn/gameEngine/renderEngine/shadows/ShadowBox.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.shadows;
+package eu.tankernn.gameEngine.renderEngine.shadows;
 
 import org.lwjgl.opengl.Display;
 import org.lwjgl.util.vector.Matrix4f;

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/shadows/ShadowFrameBuffer.java → src/main/java/eu/tankernn/gameEngine/renderEngine/shadows/ShadowFrameBuffer.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.shadows;
+package eu.tankernn.gameEngine.renderEngine.shadows;
 
 import java.nio.ByteBuffer;
 

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/shadows/ShadowMapEntityRenderer.java → src/main/java/eu/tankernn/gameEngine/renderEngine/shadows/ShadowMapEntityRenderer.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.shadows;
+package eu.tankernn.gameEngine.renderEngine.shadows;
 
 import java.util.List;
 import java.util.Map;

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/shadows/ShadowMapMasterRenderer.java → src/main/java/eu/tankernn/gameEngine/renderEngine/shadows/ShadowMapMasterRenderer.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.shadows;
+package eu.tankernn.gameEngine.renderEngine.shadows;
 
 import java.util.List;
 import java.util.Map;

+ 3 - 3
src/main/java/eu/tankernn/gameEngine/shadows/ShadowShader.java → src/main/java/eu/tankernn/gameEngine/renderEngine/shadows/ShadowShader.java

@@ -1,7 +1,7 @@
-package eu.tankernn.gameEngine.shadows;
+package eu.tankernn.gameEngine.renderEngine.shadows;
 
-import eu.tankernn.gameEngine.shaders.ShaderProgram;
-import eu.tankernn.gameEngine.shaders.UniformMatrix;
+import eu.tankernn.gameEngine.renderEngine.shaders.ShaderProgram;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformMatrix;
 
 public class ShadowShader extends ShaderProgram {
 	

+ 0 - 0
src/main/java/eu/tankernn/gameEngine/shadows/shadowFragmentShader.glsl → src/main/java/eu/tankernn/gameEngine/renderEngine/shadows/shadowFragmentShader.glsl


+ 0 - 0
src/main/java/eu/tankernn/gameEngine/shadows/shadowVertexShader.glsl → src/main/java/eu/tankernn/gameEngine/renderEngine/shadows/shadowVertexShader.glsl


+ 1 - 1
src/main/java/eu/tankernn/gameEngine/skybox/CubeGenerator.java → src/main/java/eu/tankernn/gameEngine/renderEngine/skybox/CubeGenerator.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.skybox;
+package eu.tankernn.gameEngine.renderEngine.skybox;
 
 import eu.tankernn.gameEngine.renderEngine.Vao;
 

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/skybox/Skybox.java → src/main/java/eu/tankernn/gameEngine/renderEngine/skybox/Skybox.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.skybox;
+package eu.tankernn.gameEngine.renderEngine.skybox;
 
 import eu.tankernn.gameEngine.renderEngine.Vao;
 import eu.tankernn.gameEngine.textures.Texture;

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/skybox/SkyboxRenderer.java → src/main/java/eu/tankernn/gameEngine/renderEngine/skybox/SkyboxRenderer.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.skybox;
+package eu.tankernn.gameEngine.renderEngine.skybox;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL20;

+ 6 - 6
src/main/java/eu/tankernn/gameEngine/skybox/SkyboxShader.java → src/main/java/eu/tankernn/gameEngine/renderEngine/skybox/SkyboxShader.java

@@ -1,14 +1,14 @@
-package eu.tankernn.gameEngine.skybox;
+package eu.tankernn.gameEngine.renderEngine.skybox;
 
 import org.lwjgl.util.vector.Matrix4f;
 import org.lwjgl.util.vector.Vector3f;
 
 import eu.tankernn.gameEngine.renderEngine.DisplayManager;
-import eu.tankernn.gameEngine.shaders.ShaderProgram;
-import eu.tankernn.gameEngine.shaders.UniformFloat;
-import eu.tankernn.gameEngine.shaders.UniformMatrix;
-import eu.tankernn.gameEngine.shaders.UniformSampler;
-import eu.tankernn.gameEngine.shaders.UniformVec3;
+import eu.tankernn.gameEngine.renderEngine.shaders.ShaderProgram;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformFloat;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformMatrix;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformSampler;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformVec3;
 import eu.tankernn.gameEngine.util.ICamera;
 
 public class SkyboxShader extends ShaderProgram {

+ 0 - 0
src/main/java/eu/tankernn/gameEngine/skybox/skyboxFragmentShader.glsl → src/main/java/eu/tankernn/gameEngine/renderEngine/skybox/skyboxFragmentShader.glsl


+ 0 - 0
src/main/java/eu/tankernn/gameEngine/skybox/skyboxVertexShader.glsl → src/main/java/eu/tankernn/gameEngine/renderEngine/skybox/skyboxVertexShader.glsl


+ 2 - 2
src/main/java/eu/tankernn/gameEngine/renderEngine/terrain/TerrainRenderer.java

@@ -15,8 +15,8 @@ import org.lwjgl.util.vector.Vector3f;
 import org.lwjgl.util.vector.Vector4f;
 
 import eu.tankernn.gameEngine.entities.Light;
-import eu.tankernn.gameEngine.shadows.ShadowBox;
-import eu.tankernn.gameEngine.shadows.ShadowMapMasterRenderer;
+import eu.tankernn.gameEngine.renderEngine.shadows.ShadowBox;
+import eu.tankernn.gameEngine.renderEngine.shadows.ShadowMapMasterRenderer;
 import eu.tankernn.gameEngine.terrains.Terrain;
 import eu.tankernn.gameEngine.textures.TerrainTexturePack;
 import eu.tankernn.gameEngine.util.ICamera;

+ 7 - 7
src/main/java/eu/tankernn/gameEngine/renderEngine/terrain/TerrainShader.java

@@ -1,12 +1,12 @@
 package eu.tankernn.gameEngine.renderEngine.terrain;
 
-import eu.tankernn.gameEngine.shaders.ShaderProgram;
-import eu.tankernn.gameEngine.shaders.UniformFloat;
-import eu.tankernn.gameEngine.shaders.UniformMatrix;
-import eu.tankernn.gameEngine.shaders.UniformSampler;
-import eu.tankernn.gameEngine.shaders.UniformVec3;
-import eu.tankernn.gameEngine.shaders.UniformVec4;
-import eu.tankernn.gameEngine.shaders.UniformViewMatrix;
+import eu.tankernn.gameEngine.renderEngine.shaders.ShaderProgram;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformFloat;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformMatrix;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformSampler;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformVec3;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformVec4;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformViewMatrix;
 
 public class TerrainShader extends ShaderProgram {
 

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/water/WaterFrameBuffers.java → src/main/java/eu/tankernn/gameEngine/renderEngine/water/WaterFrameBuffers.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.water;
+package eu.tankernn.gameEngine.renderEngine.water;
 
 import java.nio.ByteBuffer;
 

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/water/WaterMaster.java → src/main/java/eu/tankernn/gameEngine/renderEngine/water/WaterMaster.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.water;
+package eu.tankernn.gameEngine.renderEngine.water;
 
 import java.util.ArrayList;
 import java.util.List;

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/water/WaterRenderer.java → src/main/java/eu/tankernn/gameEngine/renderEngine/water/WaterRenderer.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.water;
+package eu.tankernn.gameEngine.renderEngine.water;
 
 import java.util.List;
 

+ 7 - 7
src/main/java/eu/tankernn/gameEngine/water/WaterShader.java → src/main/java/eu/tankernn/gameEngine/renderEngine/water/WaterShader.java

@@ -1,11 +1,11 @@
-package eu.tankernn.gameEngine.water;
+package eu.tankernn.gameEngine.renderEngine.water;
 
-import eu.tankernn.gameEngine.shaders.ShaderProgram;
-import eu.tankernn.gameEngine.shaders.UniformFloat;
-import eu.tankernn.gameEngine.shaders.UniformMatrix;
-import eu.tankernn.gameEngine.shaders.UniformSampler;
-import eu.tankernn.gameEngine.shaders.UniformVec3;
-import eu.tankernn.gameEngine.shaders.UniformViewMatrix;
+import eu.tankernn.gameEngine.renderEngine.shaders.ShaderProgram;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformFloat;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformMatrix;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformSampler;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformVec3;
+import eu.tankernn.gameEngine.renderEngine.shaders.UniformViewMatrix;
 
 public class WaterShader extends ShaderProgram {
 

+ 1 - 1
src/main/java/eu/tankernn/gameEngine/water/WaterTile.java → src/main/java/eu/tankernn/gameEngine/renderEngine/water/WaterTile.java

@@ -1,4 +1,4 @@
-package eu.tankernn.gameEngine.water;
+package eu.tankernn.gameEngine.renderEngine.water;
 
 public class WaterTile {
 	

+ 0 - 0
src/main/java/eu/tankernn/gameEngine/water/waterFragment.glsl → src/main/java/eu/tankernn/gameEngine/renderEngine/water/waterFragment.glsl


+ 0 - 0
src/main/java/eu/tankernn/gameEngine/water/waterVertex.glsl → src/main/java/eu/tankernn/gameEngine/renderEngine/water/waterVertex.glsl