From 6db7693bc3764fc0834a0c62c70373defd9ea9c7 Mon Sep 17 00:00:00 2001 From: hYdos Date: Mon, 2 Mar 2020 15:11:55 +1000 Subject: [PATCH] camal casing is good dont @ me --- .../com/github/halotroop/litecraft/Litecraft.java | 10 +++++----- .../litecraft/screens/ExitGameScreen.java | 6 +++--- .../halotroop/litecraft/screens/IngameHUD.java | 6 +++--- .../halotroop/litecraft/screens/TitleScreen.java | 6 +++--- .../halotroop/litecraft/types/block/Block.java | 2 +- .../halotroop/litecraft/types/entity/Entity.java | 2 +- .../github/halotroop/litecraft/world/World.java | 2 +- .../litecraft/world/block/BlockRenderer.java | 8 ++++---- .../ginger/engine/common/api/GingerRegister.java | 8 ++++---- .../common/elements/buttons/TextureButton.java | 2 +- .../engine/common/elements/objects/Player.java | 2 +- .../common/elements/objects/RenderObject.java | 2 +- .../hydos/ginger/engine/common/io/Window.java | 4 ++-- .../ginger/engine/common/obj/ModelLoader.java | 6 +++--- .../common/obj/normals/NormalMappedObjLoader.java | 4 ++-- .../ginger/engine/openGL/render/Renderer.java | 5 ----- .../engine/openGL/render/texture/ColorDepth.java | 6 ------ .../engine/{openGL => opengl}/api/GingerGL.java | 14 +++++++------- .../engine/{openGL => opengl}/api/GingerUtils.java | 10 +++++----- .../{openGL => opengl}/api/ResourceManager.java | 2 +- .../{openGL => opengl}/fbo/FboCallbackHandler.java | 2 +- .../engine/{openGL => opengl}/font/Character.java | 2 +- .../engine/{openGL => opengl}/font/FontType.java | 2 +- .../engine/{openGL => opengl}/font/GUIText.java | 2 +- .../engine/{openGL => opengl}/font/Line.java | 2 +- .../engine/{openGL => opengl}/font/MetaFile.java | 2 +- .../engine/{openGL => opengl}/font/TextMaster.java | 8 ++++---- .../{openGL => opengl}/font/TextMeshCreator.java | 2 +- .../{openGL => opengl}/font/TextMeshData.java | 2 +- .../engine/{openGL => opengl}/font/Word.java | 2 +- .../postprocessing/ContrastChanger.java | 4 ++-- .../postprocessing/ContrastShader.java | 4 ++-- .../{openGL => opengl}/postprocessing/Fbo.java | 4 ++-- .../postprocessing/ImageRenderer.java | 2 +- .../postprocessing/PostProcessing.java | 6 +++--- .../{openGL => opengl}/render/MasterRenderer.java | 10 +++++----- .../ginger/engine/opengl/render/Renderer.java | 5 +++++ .../{openGL => opengl}/render/models/RawModel.java | 2 +- .../render/models/TexturedModel.java | 4 ++-- .../render/renderers/FontRenderer.java | 8 ++++---- .../render/renderers/GuiRenderer.java | 10 +++++----- .../render/renderers/NormalMappingRenderer.java | 10 +++++----- .../render/renderers/ObjectRenderer.java | 10 +++++----- .../render/renderers/SkyboxRenderer.java | 10 +++++----- .../render/shaders/FontShader.java | 4 ++-- .../render/shaders/GuiShader.java | 2 +- .../render/shaders/NormalMappingShader.java | 2 +- .../render/shaders/ParticleShader.java | 2 +- .../render/shaders/ShaderProgram.java | 2 +- .../render/shaders/SkyboxShader.java | 2 +- .../render/shaders/StaticShader.java | 2 +- .../render/shaders/TerrainShader.java | 2 +- .../engine/opengl/render/texture/ColorDepth.java | 6 ++++++ .../{openGL => opengl}/render/texture/Image.java | 4 ++-- .../render/texture/ModelTexture.java | 2 +- .../{openGL => opengl}/render/tools/IOUtil.java | 2 +- .../render/tools/MousePicker.java | 2 +- .../engine/{openGL => opengl}/screen/Screen.java | 2 +- .../{openGL => opengl}/shadow/ShadowBox.java | 4 ++-- .../shadow/ShadowFrameBuffer.java | 2 +- .../shadow/ShadowMapEntityRenderer.java | 6 +++--- .../shadow/ShadowMapMasterRenderer.java | 4 ++-- .../{openGL => opengl}/shadow/ShadowShader.java | 4 ++-- .../engine/{openGL => opengl}/utils/GlLoader.java | 6 +++--- .../{openGL => opengl}/voxelutils/BlockMesher.java | 2 +- 65 files changed, 143 insertions(+), 143 deletions(-) delete mode 100644 src/main/java/com/github/hydos/ginger/engine/openGL/render/Renderer.java delete mode 100644 src/main/java/com/github/hydos/ginger/engine/openGL/render/texture/ColorDepth.java rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/api/GingerGL.java (91%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/api/GingerUtils.java (72%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/api/ResourceManager.java (80%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/fbo/FboCallbackHandler.java (73%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/font/Character.java (98%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/font/FontType.java (96%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/font/GUIText.java (99%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/font/Line.java (97%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/font/MetaFile.java (99%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/font/TextMaster.java (84%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/font/TextMeshCreator.java (98%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/font/TextMeshData.java (91%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/font/Word.java (94%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/postprocessing/ContrastChanger.java (81%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/postprocessing/ContrastShader.java (76%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/postprocessing/Fbo.java (97%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/postprocessing/ImageRenderer.java (89%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/postprocessing/PostProcessing.java (81%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/MasterRenderer.java (94%) create mode 100644 src/main/java/com/github/hydos/ginger/engine/opengl/render/Renderer.java rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/models/RawModel.java (82%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/models/TexturedModel.java (72%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/renderers/FontRenderer.java (84%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/renderers/GuiRenderer.java (81%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/renderers/NormalMappingRenderer.java (90%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/renderers/ObjectRenderer.java (90%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/renderers/SkyboxRenderer.java (86%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/shaders/FontShader.java (92%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/shaders/GuiShader.java (91%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/shaders/NormalMappingShader.java (98%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/shaders/ParticleShader.java (94%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/shaders/ShaderProgram.java (98%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/shaders/SkyboxShader.java (93%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/shaders/StaticShader.java (98%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/shaders/TerrainShader.java (98%) create mode 100644 src/main/java/com/github/hydos/ginger/engine/opengl/render/texture/ColorDepth.java rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/texture/Image.java (92%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/texture/ModelTexture.java (97%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/tools/IOUtil.java (94%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/render/tools/MousePicker.java (98%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/screen/Screen.java (84%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/shadow/ShadowBox.java (98%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/shadow/ShadowFrameBuffer.java (98%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/shadow/ShadowMapEntityRenderer.java (94%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/shadow/ShadowMapMasterRenderer.java (98%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/shadow/ShadowShader.java (85%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/utils/GlLoader.java (97%) rename src/main/java/com/github/hydos/ginger/engine/{openGL => opengl}/voxelutils/BlockMesher.java (69%) diff --git a/src/main/java/com/github/halotroop/litecraft/Litecraft.java b/src/main/java/com/github/halotroop/litecraft/Litecraft.java index f28a56e..7235915 100644 --- a/src/main/java/com/github/halotroop/litecraft/Litecraft.java +++ b/src/main/java/com/github/halotroop/litecraft/Litecraft.java @@ -15,11 +15,11 @@ import com.github.hydos.ginger.engine.common.elements.objects.*; import com.github.hydos.ginger.engine.common.io.Window; import com.github.hydos.ginger.engine.common.obj.ModelLoader; import com.github.hydos.ginger.engine.common.obj.shapes.StaticCube; -import com.github.hydos.ginger.engine.openGL.api.*; -import com.github.hydos.ginger.engine.openGL.font.FontType; -import com.github.hydos.ginger.engine.openGL.render.MasterRenderer; -import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel; -import com.github.hydos.ginger.engine.openGL.utils.GlLoader; +import com.github.hydos.ginger.engine.opengl.api.*; +import com.github.hydos.ginger.engine.opengl.font.FontType; +import com.github.hydos.ginger.engine.opengl.render.MasterRenderer; +import com.github.hydos.ginger.engine.opengl.render.models.TexturedModel; +import com.github.hydos.ginger.engine.opengl.utils.GlLoader; import tk.valoeghese.gateways.client.io.*; diff --git a/src/main/java/com/github/halotroop/litecraft/screens/ExitGameScreen.java b/src/main/java/com/github/halotroop/litecraft/screens/ExitGameScreen.java index 52fb041..a46f1dd 100644 --- a/src/main/java/com/github/halotroop/litecraft/screens/ExitGameScreen.java +++ b/src/main/java/com/github/halotroop/litecraft/screens/ExitGameScreen.java @@ -3,9 +3,9 @@ package com.github.halotroop.litecraft.screens; import org.joml.*; import com.github.hydos.ginger.engine.common.io.Window; -import com.github.hydos.ginger.engine.openGL.api.*; -import com.github.hydos.ginger.engine.openGL.font.GUIText; -import com.github.hydos.ginger.engine.openGL.screen.Screen; +import com.github.hydos.ginger.engine.opengl.api.*; +import com.github.hydos.ginger.engine.opengl.font.GUIText; +import com.github.hydos.ginger.engine.opengl.screen.Screen; public class ExitGameScreen extends Screen { diff --git a/src/main/java/com/github/halotroop/litecraft/screens/IngameHUD.java b/src/main/java/com/github/halotroop/litecraft/screens/IngameHUD.java index c0c90ae..7330792 100644 --- a/src/main/java/com/github/halotroop/litecraft/screens/IngameHUD.java +++ b/src/main/java/com/github/halotroop/litecraft/screens/IngameHUD.java @@ -4,9 +4,9 @@ import org.joml.*; import com.github.halotroop.litecraft.Litecraft; import com.github.hydos.ginger.engine.common.api.GingerRegister; -import com.github.hydos.ginger.engine.openGL.api.*; -import com.github.hydos.ginger.engine.openGL.font.GUIText; -import com.github.hydos.ginger.engine.openGL.screen.Screen; +import com.github.hydos.ginger.engine.opengl.api.*; +import com.github.hydos.ginger.engine.opengl.font.GUIText; +import com.github.hydos.ginger.engine.opengl.screen.Screen; public class IngameHUD extends Screen { diff --git a/src/main/java/com/github/halotroop/litecraft/screens/TitleScreen.java b/src/main/java/com/github/halotroop/litecraft/screens/TitleScreen.java index 73875ba..c33c0d1 100644 --- a/src/main/java/com/github/halotroop/litecraft/screens/TitleScreen.java +++ b/src/main/java/com/github/halotroop/litecraft/screens/TitleScreen.java @@ -10,9 +10,9 @@ import com.github.halotroop.litecraft.world.dimension.Dimensions; import com.github.hydos.ginger.engine.common.elements.GuiTexture; import com.github.hydos.ginger.engine.common.elements.buttons.TextureButton; import com.github.hydos.ginger.engine.common.io.Window; -import com.github.hydos.ginger.engine.openGL.api.GingerGL; -import com.github.hydos.ginger.engine.openGL.font.GUIText; -import com.github.hydos.ginger.engine.openGL.screen.Screen; +import com.github.hydos.ginger.engine.opengl.api.GingerGL; +import com.github.hydos.ginger.engine.opengl.font.GUIText; +import com.github.hydos.ginger.engine.opengl.screen.Screen; /** * YeS diff --git a/src/main/java/com/github/halotroop/litecraft/types/block/Block.java b/src/main/java/com/github/halotroop/litecraft/types/block/Block.java index 2a9c52b..0882b9e 100644 --- a/src/main/java/com/github/halotroop/litecraft/types/block/Block.java +++ b/src/main/java/com/github/halotroop/litecraft/types/block/Block.java @@ -3,7 +3,7 @@ package com.github.halotroop.litecraft.types.block; import java.util.*; import com.github.hydos.ginger.engine.common.obj.ModelLoader; -import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel; +import com.github.hydos.ginger.engine.opengl.render.models.TexturedModel; public class Block { diff --git a/src/main/java/com/github/halotroop/litecraft/types/entity/Entity.java b/src/main/java/com/github/halotroop/litecraft/types/entity/Entity.java index 934f114..dc6b0d6 100644 --- a/src/main/java/com/github/halotroop/litecraft/types/entity/Entity.java +++ b/src/main/java/com/github/halotroop/litecraft/types/entity/Entity.java @@ -3,7 +3,7 @@ package com.github.halotroop.litecraft.types.entity; import org.joml.Vector3f; import com.github.hydos.ginger.engine.common.elements.objects.RenderObject; -import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel; +import com.github.hydos.ginger.engine.opengl.render.models.TexturedModel; public abstract class Entity extends RenderObject { diff --git a/src/main/java/com/github/halotroop/litecraft/world/World.java b/src/main/java/com/github/halotroop/litecraft/world/World.java index 7183e48..3d790ab 100644 --- a/src/main/java/com/github/halotroop/litecraft/world/World.java +++ b/src/main/java/com/github/halotroop/litecraft/world/World.java @@ -17,7 +17,7 @@ import com.github.halotroop.litecraft.world.gen.*; import com.github.halotroop.litecraft.world.gen.modifier.WorldModifier; import com.github.hydos.ginger.engine.common.elements.objects.Player; import com.github.hydos.ginger.engine.common.obj.ModelLoader; -import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel; +import com.github.hydos.ginger.engine.opengl.render.models.TexturedModel; import it.unimi.dsi.fastutil.longs.*; diff --git a/src/main/java/com/github/halotroop/litecraft/world/block/BlockRenderer.java b/src/main/java/com/github/halotroop/litecraft/world/block/BlockRenderer.java index 6aa7222..d1830b2 100644 --- a/src/main/java/com/github/halotroop/litecraft/world/block/BlockRenderer.java +++ b/src/main/java/com/github/halotroop/litecraft/world/block/BlockRenderer.java @@ -10,10 +10,10 @@ import com.github.hydos.ginger.engine.common.api.GingerRegister; import com.github.hydos.ginger.engine.common.elements.objects.RenderObject; import com.github.hydos.ginger.engine.common.io.Window; import com.github.hydos.ginger.engine.common.math.Maths; -import com.github.hydos.ginger.engine.openGL.render.Renderer; -import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel; -import com.github.hydos.ginger.engine.openGL.render.shaders.StaticShader; -import com.github.hydos.ginger.engine.openGL.utils.GlLoader; +import com.github.hydos.ginger.engine.opengl.render.Renderer; +import com.github.hydos.ginger.engine.opengl.render.models.TexturedModel; +import com.github.hydos.ginger.engine.opengl.render.shaders.StaticShader; +import com.github.hydos.ginger.engine.opengl.utils.GlLoader; public class BlockRenderer extends Renderer implements WorldGenConstants { diff --git a/src/main/java/com/github/hydos/ginger/engine/common/api/GingerRegister.java b/src/main/java/com/github/hydos/ginger/engine/common/api/GingerRegister.java index 9b371e6..fd5973c 100644 --- a/src/main/java/com/github/hydos/ginger/engine/common/api/GingerRegister.java +++ b/src/main/java/com/github/hydos/ginger/engine/common/api/GingerRegister.java @@ -4,10 +4,10 @@ import java.util.*; import com.github.hydos.ginger.engine.common.api.game.Game; import com.github.hydos.ginger.engine.common.elements.buttons.TextureButton; -import com.github.hydos.ginger.engine.openGL.font.GUIText; -import com.github.hydos.ginger.engine.openGL.postprocessing.Fbo; -import com.github.hydos.ginger.engine.openGL.render.MasterRenderer; -import com.github.hydos.ginger.engine.openGL.screen.Screen; +import com.github.hydos.ginger.engine.opengl.font.GUIText; +import com.github.hydos.ginger.engine.opengl.postprocessing.Fbo; +import com.github.hydos.ginger.engine.opengl.render.MasterRenderer; +import com.github.hydos.ginger.engine.opengl.screen.Screen; import com.github.hydos.multithreading.GingerThreading; /** Used if a game wants to access engine variables safely */ diff --git a/src/main/java/com/github/hydos/ginger/engine/common/elements/buttons/TextureButton.java b/src/main/java/com/github/hydos/ginger/engine/common/elements/buttons/TextureButton.java index 9f10d7e..ea9adb8 100644 --- a/src/main/java/com/github/hydos/ginger/engine/common/elements/buttons/TextureButton.java +++ b/src/main/java/com/github/hydos/ginger/engine/common/elements/buttons/TextureButton.java @@ -7,7 +7,7 @@ import org.lwjgl.glfw.GLFW; import com.github.hydos.ginger.engine.common.elements.GuiTexture; import com.github.hydos.ginger.engine.common.io.Window; -import com.github.hydos.ginger.engine.openGL.utils.GlLoader; +import com.github.hydos.ginger.engine.opengl.utils.GlLoader; public class TextureButton { diff --git a/src/main/java/com/github/hydos/ginger/engine/common/elements/objects/Player.java b/src/main/java/com/github/hydos/ginger/engine/common/elements/objects/Player.java index 39aa042..992ce5b 100644 --- a/src/main/java/com/github/hydos/ginger/engine/common/elements/objects/Player.java +++ b/src/main/java/com/github/hydos/ginger/engine/common/elements/objects/Player.java @@ -8,7 +8,7 @@ import com.github.halotroop.litecraft.world.gen.WorldGenConstants; import com.github.hydos.ginger.engine.common.Constants; import com.github.hydos.ginger.engine.common.api.GingerRegister; import com.github.hydos.ginger.engine.common.io.Window; -import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel; +import com.github.hydos.ginger.engine.opengl.render.models.TexturedModel; public class Player extends RenderObject implements WorldGenConstants { diff --git a/src/main/java/com/github/hydos/ginger/engine/common/elements/objects/RenderObject.java b/src/main/java/com/github/hydos/ginger/engine/common/elements/objects/RenderObject.java index 76754f9..b473240 100644 --- a/src/main/java/com/github/hydos/ginger/engine/common/elements/objects/RenderObject.java +++ b/src/main/java/com/github/hydos/ginger/engine/common/elements/objects/RenderObject.java @@ -2,7 +2,7 @@ package com.github.hydos.ginger.engine.common.elements.objects; import org.joml.Vector3f; -import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel; +import com.github.hydos.ginger.engine.opengl.render.models.TexturedModel; public class RenderObject { diff --git a/src/main/java/com/github/hydos/ginger/engine/common/io/Window.java b/src/main/java/com/github/hydos/ginger/engine/common/io/Window.java index dbc87a4..c3827ec 100644 --- a/src/main/java/com/github/hydos/ginger/engine/common/io/Window.java +++ b/src/main/java/com/github/hydos/ginger/engine/common/io/Window.java @@ -7,8 +7,8 @@ import org.lwjgl.BufferUtils; import org.lwjgl.glfw.*; import org.lwjgl.opengl.*; -import com.github.hydos.ginger.engine.openGL.api.GingerGL; -import com.github.hydos.ginger.engine.openGL.render.texture.Image; +import com.github.hydos.ginger.engine.opengl.api.GingerGL; +import com.github.hydos.ginger.engine.opengl.render.texture.Image; public class Window { diff --git a/src/main/java/com/github/hydos/ginger/engine/common/obj/ModelLoader.java b/src/main/java/com/github/hydos/ginger/engine/common/obj/ModelLoader.java index 6d9a7ba..d642bd2 100644 --- a/src/main/java/com/github/hydos/ginger/engine/common/obj/ModelLoader.java +++ b/src/main/java/com/github/hydos/ginger/engine/common/obj/ModelLoader.java @@ -1,9 +1,9 @@ package com.github.hydos.ginger.engine.common.obj; import com.github.hydos.ginger.engine.common.obj.shapes.StaticCube; -import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel; -import com.github.hydos.ginger.engine.openGL.render.texture.ModelTexture; -import com.github.hydos.ginger.engine.openGL.utils.GlLoader; +import com.github.hydos.ginger.engine.opengl.render.models.TexturedModel; +import com.github.hydos.ginger.engine.opengl.render.texture.ModelTexture; +import com.github.hydos.ginger.engine.opengl.utils.GlLoader; public class ModelLoader { diff --git a/src/main/java/com/github/hydos/ginger/engine/common/obj/normals/NormalMappedObjLoader.java b/src/main/java/com/github/hydos/ginger/engine/common/obj/normals/NormalMappedObjLoader.java index cb2b71c..5058170 100644 --- a/src/main/java/com/github/hydos/ginger/engine/common/obj/normals/NormalMappedObjLoader.java +++ b/src/main/java/com/github/hydos/ginger/engine/common/obj/normals/NormalMappedObjLoader.java @@ -5,8 +5,8 @@ import java.util.*; import org.joml.*; -import com.github.hydos.ginger.engine.openGL.render.models.RawModel; -import com.github.hydos.ginger.engine.openGL.utils.GlLoader; +import com.github.hydos.ginger.engine.opengl.render.models.RawModel; +import com.github.hydos.ginger.engine.opengl.utils.GlLoader; public class NormalMappedObjLoader { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/Renderer.java b/src/main/java/com/github/hydos/ginger/engine/openGL/render/Renderer.java deleted file mode 100644 index 152e40d..0000000 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/Renderer.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.hydos.ginger.engine.openGL.render; - -public abstract class Renderer -{ -} \ No newline at end of file diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/texture/ColorDepth.java b/src/main/java/com/github/hydos/ginger/engine/openGL/render/texture/ColorDepth.java deleted file mode 100644 index e1445b1..0000000 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/texture/ColorDepth.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.github.hydos.ginger.engine.openGL.render.texture; - -public enum ColorDepth -{ - R, RG, RGB, RGBA -} diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/api/GingerGL.java b/src/main/java/com/github/hydos/ginger/engine/opengl/api/GingerGL.java similarity index 91% rename from src/main/java/com/github/hydos/ginger/engine/openGL/api/GingerGL.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/api/GingerGL.java index 78ccd43..7d8002b 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/api/GingerGL.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/api/GingerGL.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.api; +package com.github.hydos.ginger.engine.opengl.api; import org.joml.Vector2f; @@ -10,12 +10,12 @@ import com.github.hydos.ginger.engine.common.api.game.*; import com.github.hydos.ginger.engine.common.elements.buttons.TextureButton; import com.github.hydos.ginger.engine.common.elements.objects.Player; import com.github.hydos.ginger.engine.common.io.Window; -import com.github.hydos.ginger.engine.openGL.font.*; -import com.github.hydos.ginger.engine.openGL.postprocessing.*; -import com.github.hydos.ginger.engine.openGL.render.MasterRenderer; -import com.github.hydos.ginger.engine.openGL.render.tools.MousePicker; -import com.github.hydos.ginger.engine.openGL.screen.Screen; -import com.github.hydos.ginger.engine.openGL.utils.GlLoader; +import com.github.hydos.ginger.engine.opengl.font.*; +import com.github.hydos.ginger.engine.opengl.postprocessing.*; +import com.github.hydos.ginger.engine.opengl.render.MasterRenderer; +import com.github.hydos.ginger.engine.opengl.render.tools.MousePicker; +import com.github.hydos.ginger.engine.opengl.screen.Screen; +import com.github.hydos.ginger.engine.opengl.utils.GlLoader; import com.github.hydos.multithreading.GingerThreading; public class GingerGL diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/api/GingerUtils.java b/src/main/java/com/github/hydos/ginger/engine/opengl/api/GingerUtils.java similarity index 72% rename from src/main/java/com/github/hydos/ginger/engine/openGL/api/GingerUtils.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/api/GingerUtils.java index 87fc316..e5a52e7 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/api/GingerUtils.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/api/GingerUtils.java @@ -1,11 +1,11 @@ -package com.github.hydos.ginger.engine.openGL.api; +package com.github.hydos.ginger.engine.opengl.api; import com.github.hydos.ginger.engine.common.obj.ModelLoader; import com.github.hydos.ginger.engine.common.obj.normals.NormalMappedObjLoader; -import com.github.hydos.ginger.engine.openGL.font.TextMaster; -import com.github.hydos.ginger.engine.openGL.render.MasterRenderer; -import com.github.hydos.ginger.engine.openGL.render.models.*; -import com.github.hydos.ginger.engine.openGL.render.texture.ModelTexture; +import com.github.hydos.ginger.engine.opengl.font.TextMaster; +import com.github.hydos.ginger.engine.opengl.render.MasterRenderer; +import com.github.hydos.ginger.engine.opengl.render.models.*; +import com.github.hydos.ginger.engine.opengl.render.texture.ModelTexture; public class GingerUtils { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/api/ResourceManager.java b/src/main/java/com/github/hydos/ginger/engine/opengl/api/ResourceManager.java similarity index 80% rename from src/main/java/com/github/hydos/ginger/engine/openGL/api/ResourceManager.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/api/ResourceManager.java index b431d0c..46a611a 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/api/ResourceManager.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/api/ResourceManager.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.api; +package com.github.hydos.ginger.engine.opengl.api; /** * make your own resource manager if you want! diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/fbo/FboCallbackHandler.java b/src/main/java/com/github/hydos/ginger/engine/opengl/fbo/FboCallbackHandler.java similarity index 73% rename from src/main/java/com/github/hydos/ginger/engine/openGL/fbo/FboCallbackHandler.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/fbo/FboCallbackHandler.java index 56d07db..fb50251 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/fbo/FboCallbackHandler.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/fbo/FboCallbackHandler.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.fbo; +package com.github.hydos.ginger.engine.opengl.fbo; public abstract class FboCallbackHandler { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/font/Character.java b/src/main/java/com/github/hydos/ginger/engine/opengl/font/Character.java similarity index 98% rename from src/main/java/com/github/hydos/ginger/engine/openGL/font/Character.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/font/Character.java index e64b23e..a78190b 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/font/Character.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/font/Character.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.font; +package com.github.hydos.ginger.engine.opengl.font; /** Simple data structure class holding information about a certain glyph in the * font texture atlas. All sizes are for a font-size of 1. */ diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/font/FontType.java b/src/main/java/com/github/hydos/ginger/engine/opengl/font/FontType.java similarity index 96% rename from src/main/java/com/github/hydos/ginger/engine/openGL/font/FontType.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/font/FontType.java index 45ca9ea..c3545b3 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/font/FontType.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/font/FontType.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.font; +package com.github.hydos.ginger.engine.opengl.font; /** Represents a font. It holds the font's texture atlas as well as having the * ability to create the quad vertices for any text using this font. */ diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/font/GUIText.java b/src/main/java/com/github/hydos/ginger/engine/opengl/font/GUIText.java similarity index 99% rename from src/main/java/com/github/hydos/ginger/engine/openGL/font/GUIText.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/font/GUIText.java index 53d8676..e4aff05 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/font/GUIText.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/font/GUIText.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.font; +package com.github.hydos.ginger.engine.opengl.font; import org.joml.*; diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/font/Line.java b/src/main/java/com/github/hydos/ginger/engine/opengl/font/Line.java similarity index 97% rename from src/main/java/com/github/hydos/ginger/engine/openGL/font/Line.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/font/Line.java index 4bcbafe..7fd25cd 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/font/Line.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/font/Line.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.font; +package com.github.hydos.ginger.engine.opengl.font; import java.util.*; diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/font/MetaFile.java b/src/main/java/com/github/hydos/ginger/engine/opengl/font/MetaFile.java similarity index 99% rename from src/main/java/com/github/hydos/ginger/engine/openGL/font/MetaFile.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/font/MetaFile.java index 7c5127e..1d13845 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/font/MetaFile.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/font/MetaFile.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.font; +package com.github.hydos.ginger.engine.opengl.font; import java.io.*; import java.util.*; diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/font/TextMaster.java b/src/main/java/com/github/hydos/ginger/engine/opengl/font/TextMaster.java similarity index 84% rename from src/main/java/com/github/hydos/ginger/engine/openGL/font/TextMaster.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/font/TextMaster.java index c84189d..6f665da 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/font/TextMaster.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/font/TextMaster.java @@ -1,10 +1,10 @@ -package com.github.hydos.ginger.engine.openGL.font; +package com.github.hydos.ginger.engine.opengl.font; import java.util.*; -import com.github.hydos.ginger.engine.openGL.api.GingerGL; -import com.github.hydos.ginger.engine.openGL.render.renderers.FontRenderer; -import com.github.hydos.ginger.engine.openGL.utils.GlLoader; +import com.github.hydos.ginger.engine.opengl.api.GingerGL; +import com.github.hydos.ginger.engine.opengl.render.renderers.FontRenderer; +import com.github.hydos.ginger.engine.opengl.utils.GlLoader; public class TextMaster { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/font/TextMeshCreator.java b/src/main/java/com/github/hydos/ginger/engine/opengl/font/TextMeshCreator.java similarity index 98% rename from src/main/java/com/github/hydos/ginger/engine/openGL/font/TextMeshCreator.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/font/TextMeshCreator.java index 5f1aed3..28f3675 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/font/TextMeshCreator.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/font/TextMeshCreator.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.font; +package com.github.hydos.ginger.engine.opengl.font; import java.util.*; diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/font/TextMeshData.java b/src/main/java/com/github/hydos/ginger/engine/opengl/font/TextMeshData.java similarity index 91% rename from src/main/java/com/github/hydos/ginger/engine/openGL/font/TextMeshData.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/font/TextMeshData.java index 5776156..da65526 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/font/TextMeshData.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/font/TextMeshData.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.font; +package com.github.hydos.ginger.engine.opengl.font; /** Stores the vertex data for all the quads on which a text will be rendered. */ public class TextMeshData diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/font/Word.java b/src/main/java/com/github/hydos/ginger/engine/opengl/font/Word.java similarity index 94% rename from src/main/java/com/github/hydos/ginger/engine/openGL/font/Word.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/font/Word.java index 13e064e..d983674 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/font/Word.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/font/Word.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.font; +package com.github.hydos.ginger.engine.opengl.font; import java.util.*; diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/ContrastChanger.java b/src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/ContrastChanger.java similarity index 81% rename from src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/ContrastChanger.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/ContrastChanger.java index 639d12b..de7a1ac 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/ContrastChanger.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/ContrastChanger.java @@ -1,8 +1,8 @@ -package com.github.hydos.ginger.engine.openGL.postprocessing; +package com.github.hydos.ginger.engine.opengl.postprocessing; import org.lwjgl.opengl.*; -import com.github.hydos.ginger.engine.openGL.fbo.FboCallbackHandler; +import com.github.hydos.ginger.engine.opengl.fbo.FboCallbackHandler; public class ContrastChanger extends FboCallbackHandler { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/ContrastShader.java b/src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/ContrastShader.java similarity index 76% rename from src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/ContrastShader.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/ContrastShader.java index a0ab2ec..d602c59 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/ContrastShader.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/ContrastShader.java @@ -1,6 +1,6 @@ -package com.github.hydos.ginger.engine.openGL.postprocessing; +package com.github.hydos.ginger.engine.opengl.postprocessing; -import com.github.hydos.ginger.engine.openGL.render.shaders.ShaderProgram; +import com.github.hydos.ginger.engine.opengl.render.shaders.ShaderProgram; public class ContrastShader extends ShaderProgram { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/Fbo.java b/src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/Fbo.java similarity index 97% rename from src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/Fbo.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/Fbo.java index 8d272c8..ec41b83 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/Fbo.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/Fbo.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.postprocessing; +package com.github.hydos.ginger.engine.opengl.postprocessing; import static org.lwjgl.opengl.ARBFramebufferObject.*; import static org.lwjgl.opengl.GL11.*; @@ -9,7 +9,7 @@ import org.lwjgl.glfw.*; import org.lwjgl.system.Callback; import com.github.hydos.ginger.engine.common.io.Window; -import com.github.hydos.ginger.engine.openGL.fbo.FboCallbackHandler; +import com.github.hydos.ginger.engine.opengl.fbo.FboCallbackHandler; public class Fbo { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/ImageRenderer.java b/src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/ImageRenderer.java similarity index 89% rename from src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/ImageRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/ImageRenderer.java index 13c1922..d4cf3c0 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/ImageRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/ImageRenderer.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.postprocessing; +package com.github.hydos.ginger.engine.opengl.postprocessing; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/PostProcessing.java b/src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/PostProcessing.java similarity index 81% rename from src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/PostProcessing.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/PostProcessing.java index bfe03eb..d4eaa23 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/postprocessing/PostProcessing.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/postprocessing/PostProcessing.java @@ -1,9 +1,9 @@ -package com.github.hydos.ginger.engine.openGL.postprocessing; +package com.github.hydos.ginger.engine.opengl.postprocessing; import org.lwjgl.opengl.*; -import com.github.hydos.ginger.engine.openGL.render.models.RawModel; -import com.github.hydos.ginger.engine.openGL.utils.GlLoader; +import com.github.hydos.ginger.engine.opengl.render.models.RawModel; +import com.github.hydos.ginger.engine.opengl.utils.GlLoader; public class PostProcessing { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/MasterRenderer.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/MasterRenderer.java similarity index 94% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/MasterRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/MasterRenderer.java index f63d531..ebd0801 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/MasterRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/MasterRenderer.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.render; +package com.github.hydos.ginger.engine.opengl.render; import java.lang.Math; import java.util.*; @@ -12,10 +12,10 @@ import com.github.hydos.ginger.engine.common.cameras.Camera; import com.github.hydos.ginger.engine.common.elements.GuiTexture; import com.github.hydos.ginger.engine.common.elements.objects.*; import com.github.hydos.ginger.engine.common.io.Window; -import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel; -import com.github.hydos.ginger.engine.openGL.render.renderers.*; -import com.github.hydos.ginger.engine.openGL.render.shaders.*; -import com.github.hydos.ginger.engine.openGL.shadow.ShadowMapMasterRenderer; +import com.github.hydos.ginger.engine.opengl.render.models.TexturedModel; +import com.github.hydos.ginger.engine.opengl.render.renderers.*; +import com.github.hydos.ginger.engine.opengl.render.shaders.*; +import com.github.hydos.ginger.engine.opengl.shadow.ShadowMapMasterRenderer; public class MasterRenderer { diff --git a/src/main/java/com/github/hydos/ginger/engine/opengl/render/Renderer.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/Renderer.java new file mode 100644 index 0000000..963ccad --- /dev/null +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/Renderer.java @@ -0,0 +1,5 @@ +package com.github.hydos.ginger.engine.opengl.render; + +public abstract class Renderer +{ +} \ No newline at end of file diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/models/RawModel.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/models/RawModel.java similarity index 82% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/models/RawModel.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/models/RawModel.java index 226157d..4cba450 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/models/RawModel.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/models/RawModel.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.render.models; +package com.github.hydos.ginger.engine.opengl.render.models; public class RawModel { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/models/TexturedModel.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/models/TexturedModel.java similarity index 72% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/models/TexturedModel.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/models/TexturedModel.java index 621af24..708acfd 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/models/TexturedModel.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/models/TexturedModel.java @@ -1,6 +1,6 @@ -package com.github.hydos.ginger.engine.openGL.render.models; +package com.github.hydos.ginger.engine.opengl.render.models; -import com.github.hydos.ginger.engine.openGL.render.texture.ModelTexture; +import com.github.hydos.ginger.engine.opengl.render.texture.ModelTexture; public class TexturedModel { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/FontRenderer.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/renderers/FontRenderer.java similarity index 84% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/FontRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/renderers/FontRenderer.java index ffc8ba3..26dda53 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/FontRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/renderers/FontRenderer.java @@ -1,12 +1,12 @@ -package com.github.hydos.ginger.engine.openGL.render.renderers; +package com.github.hydos.ginger.engine.opengl.render.renderers; import java.util.*; import org.lwjgl.opengl.*; -import com.github.hydos.ginger.engine.openGL.font.*; -import com.github.hydos.ginger.engine.openGL.render.Renderer; -import com.github.hydos.ginger.engine.openGL.render.shaders.FontShader; +import com.github.hydos.ginger.engine.opengl.font.*; +import com.github.hydos.ginger.engine.opengl.render.Renderer; +import com.github.hydos.ginger.engine.opengl.render.shaders.FontShader; public class FontRenderer extends Renderer { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/GuiRenderer.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/renderers/GuiRenderer.java similarity index 81% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/GuiRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/renderers/GuiRenderer.java index 2c1246e..4e76b79 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/GuiRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/renderers/GuiRenderer.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.render.renderers; +package com.github.hydos.ginger.engine.opengl.render.renderers; import java.util.List; @@ -7,10 +7,10 @@ import org.lwjgl.opengl.*; import com.github.hydos.ginger.engine.common.elements.GuiTexture; import com.github.hydos.ginger.engine.common.math.Maths; -import com.github.hydos.ginger.engine.openGL.render.Renderer; -import com.github.hydos.ginger.engine.openGL.render.models.RawModel; -import com.github.hydos.ginger.engine.openGL.render.shaders.GuiShader; -import com.github.hydos.ginger.engine.openGL.utils.GlLoader; +import com.github.hydos.ginger.engine.opengl.render.Renderer; +import com.github.hydos.ginger.engine.opengl.render.models.RawModel; +import com.github.hydos.ginger.engine.opengl.render.shaders.GuiShader; +import com.github.hydos.ginger.engine.opengl.utils.GlLoader; public class GuiRenderer extends Renderer { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/NormalMappingRenderer.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/renderers/NormalMappingRenderer.java similarity index 90% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/NormalMappingRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/renderers/NormalMappingRenderer.java index 68729b6..01de0cd 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/NormalMappingRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/renderers/NormalMappingRenderer.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.render.renderers; +package com.github.hydos.ginger.engine.opengl.render.renderers; import java.util.*; @@ -9,10 +9,10 @@ import com.github.hydos.ginger.engine.common.cameras.Camera; import com.github.hydos.ginger.engine.common.elements.objects.*; import com.github.hydos.ginger.engine.common.io.Window; import com.github.hydos.ginger.engine.common.math.Maths; -import com.github.hydos.ginger.engine.openGL.render.*; -import com.github.hydos.ginger.engine.openGL.render.models.*; -import com.github.hydos.ginger.engine.openGL.render.shaders.NormalMappingShader; -import com.github.hydos.ginger.engine.openGL.render.texture.ModelTexture; +import com.github.hydos.ginger.engine.opengl.render.*; +import com.github.hydos.ginger.engine.opengl.render.models.*; +import com.github.hydos.ginger.engine.opengl.render.shaders.NormalMappingShader; +import com.github.hydos.ginger.engine.opengl.render.texture.ModelTexture; public class NormalMappingRenderer extends Renderer { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/ObjectRenderer.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/renderers/ObjectRenderer.java similarity index 90% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/ObjectRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/renderers/ObjectRenderer.java index bc45ca3..2a81add 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/ObjectRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/renderers/ObjectRenderer.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.render.renderers; +package com.github.hydos.ginger.engine.opengl.render.renderers; import java.util.*; @@ -10,10 +10,10 @@ import com.github.hydos.ginger.engine.common.api.GingerRegister; import com.github.hydos.ginger.engine.common.elements.objects.RenderObject; import com.github.hydos.ginger.engine.common.io.Window; import com.github.hydos.ginger.engine.common.math.Maths; -import com.github.hydos.ginger.engine.openGL.render.*; -import com.github.hydos.ginger.engine.openGL.render.models.*; -import com.github.hydos.ginger.engine.openGL.render.shaders.StaticShader; -import com.github.hydos.ginger.engine.openGL.render.texture.ModelTexture; +import com.github.hydos.ginger.engine.opengl.render.*; +import com.github.hydos.ginger.engine.opengl.render.models.*; +import com.github.hydos.ginger.engine.opengl.render.shaders.StaticShader; +import com.github.hydos.ginger.engine.opengl.render.texture.ModelTexture; public class ObjectRenderer extends Renderer { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/SkyboxRenderer.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/renderers/SkyboxRenderer.java similarity index 86% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/SkyboxRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/renderers/SkyboxRenderer.java index 6d90742..e884f33 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/renderers/SkyboxRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/renderers/SkyboxRenderer.java @@ -1,13 +1,13 @@ -package com.github.hydos.ginger.engine.openGL.render.renderers; +package com.github.hydos.ginger.engine.opengl.render.renderers; import org.joml.Matrix4f; import org.lwjgl.opengl.*; import com.github.hydos.ginger.engine.common.cameras.Camera; -import com.github.hydos.ginger.engine.openGL.render.Renderer; -import com.github.hydos.ginger.engine.openGL.render.models.RawModel; -import com.github.hydos.ginger.engine.openGL.render.shaders.SkyboxShader; -import com.github.hydos.ginger.engine.openGL.utils.GlLoader; +import com.github.hydos.ginger.engine.opengl.render.Renderer; +import com.github.hydos.ginger.engine.opengl.render.models.RawModel; +import com.github.hydos.ginger.engine.opengl.render.shaders.SkyboxShader; +import com.github.hydos.ginger.engine.opengl.utils.GlLoader; public class SkyboxRenderer extends Renderer { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/FontShader.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/FontShader.java similarity index 92% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/FontShader.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/FontShader.java index e405272..aeb7f85 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/FontShader.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/FontShader.java @@ -1,8 +1,8 @@ -package com.github.hydos.ginger.engine.openGL.render.shaders; +package com.github.hydos.ginger.engine.opengl.render.shaders; import org.joml.*; -import com.github.hydos.ginger.engine.openGL.font.GUIText; +import com.github.hydos.ginger.engine.opengl.font.GUIText; public class FontShader extends ShaderProgram { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/GuiShader.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/GuiShader.java similarity index 91% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/GuiShader.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/GuiShader.java index 5af8a50..7f767db 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/GuiShader.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/GuiShader.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.render.shaders; +package com.github.hydos.ginger.engine.opengl.render.shaders; import org.joml.Matrix4f; diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/NormalMappingShader.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/NormalMappingShader.java similarity index 98% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/NormalMappingShader.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/NormalMappingShader.java index 552b78b..053f523 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/NormalMappingShader.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/NormalMappingShader.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.render.shaders; +package com.github.hydos.ginger.engine.opengl.render.shaders; import java.util.List; diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/ParticleShader.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/ParticleShader.java similarity index 94% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/ParticleShader.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/ParticleShader.java index 7a728f3..fdb2156 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/ParticleShader.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/ParticleShader.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.render.shaders; +package com.github.hydos.ginger.engine.opengl.render.shaders; import org.joml.Matrix4f; diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/ShaderProgram.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/ShaderProgram.java similarity index 98% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/ShaderProgram.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/ShaderProgram.java index ee752bd..43c5f20 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/ShaderProgram.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/ShaderProgram.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.render.shaders; +package com.github.hydos.ginger.engine.opengl.render.shaders; import java.io.*; diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/SkyboxShader.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/SkyboxShader.java similarity index 93% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/SkyboxShader.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/SkyboxShader.java index f960a90..c13519a 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/SkyboxShader.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/SkyboxShader.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.render.shaders; +package com.github.hydos.ginger.engine.opengl.render.shaders; import org.joml.Matrix4f; diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/StaticShader.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/StaticShader.java similarity index 98% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/StaticShader.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/StaticShader.java index c687e3f..2738b9e 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/StaticShader.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/StaticShader.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.render.shaders; +package com.github.hydos.ginger.engine.opengl.render.shaders; import java.util.List; diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/TerrainShader.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/TerrainShader.java similarity index 98% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/TerrainShader.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/TerrainShader.java index 9d375f9..5c7e370 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/shaders/TerrainShader.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/shaders/TerrainShader.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.render.shaders; +package com.github.hydos.ginger.engine.opengl.render.shaders; import java.util.List; diff --git a/src/main/java/com/github/hydos/ginger/engine/opengl/render/texture/ColorDepth.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/texture/ColorDepth.java new file mode 100644 index 0000000..987b40d --- /dev/null +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/texture/ColorDepth.java @@ -0,0 +1,6 @@ +package com.github.hydos.ginger.engine.opengl.render.texture; + +public enum ColorDepth +{ + R, RG, RGB, RGBA +} diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/texture/Image.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/texture/Image.java similarity index 92% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/texture/Image.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/texture/Image.java index 97e096c..5791e67 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/texture/Image.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/texture/Image.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.render.texture; +package com.github.hydos.ginger.engine.opengl.render.texture; import static org.lwjgl.stb.STBImage.*; import static org.lwjgl.system.MemoryStack.stackPush; @@ -8,7 +8,7 @@ import java.nio.*; import org.lwjgl.system.MemoryStack; -import com.github.hydos.ginger.engine.openGL.render.tools.IOUtil; +import com.github.hydos.ginger.engine.opengl.render.tools.IOUtil; public class Image { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/texture/ModelTexture.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/texture/ModelTexture.java similarity index 97% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/texture/ModelTexture.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/texture/ModelTexture.java index 538a046..3146525 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/texture/ModelTexture.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/texture/ModelTexture.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.render.texture; +package com.github.hydos.ginger.engine.opengl.render.texture; import org.lwjgl.opengl.*; diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/tools/IOUtil.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/tools/IOUtil.java similarity index 94% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/tools/IOUtil.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/tools/IOUtil.java index 0fe3210..cd5a099 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/tools/IOUtil.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/tools/IOUtil.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.render.tools; +package com.github.hydos.ginger.engine.opengl.render.tools; import static org.lwjgl.BufferUtils.createByteBuffer; diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/render/tools/MousePicker.java b/src/main/java/com/github/hydos/ginger/engine/opengl/render/tools/MousePicker.java similarity index 98% rename from src/main/java/com/github/hydos/ginger/engine/openGL/render/tools/MousePicker.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/render/tools/MousePicker.java index 90e714e..12407a9 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/render/tools/MousePicker.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/render/tools/MousePicker.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.render.tools; +package com.github.hydos.ginger.engine.opengl.render.tools; import org.joml.*; diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/screen/Screen.java b/src/main/java/com/github/hydos/ginger/engine/opengl/screen/Screen.java similarity index 84% rename from src/main/java/com/github/hydos/ginger/engine/openGL/screen/Screen.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/screen/Screen.java index 87f4b8c..a3e48ae 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/screen/Screen.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/screen/Screen.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.screen; +package com.github.hydos.ginger.engine.opengl.screen; import java.util.List; diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowBox.java b/src/main/java/com/github/hydos/ginger/engine/opengl/shadow/ShadowBox.java similarity index 98% rename from src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowBox.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/shadow/ShadowBox.java index fc01d0f..9108fce 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowBox.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/shadow/ShadowBox.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.shadow; +package com.github.hydos.ginger.engine.opengl.shadow; import java.lang.Math; @@ -6,7 +6,7 @@ import org.joml.*; import com.github.hydos.ginger.engine.common.cameras.Camera; import com.github.hydos.ginger.engine.common.io.Window; -import com.github.hydos.ginger.engine.openGL.render.MasterRenderer; +import com.github.hydos.ginger.engine.opengl.render.MasterRenderer; /** Represents the 3D cuboidal area of the world in which objects will cast * shadows (basically represents the orthographic projection area for the shadow diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowFrameBuffer.java b/src/main/java/com/github/hydos/ginger/engine/opengl/shadow/ShadowFrameBuffer.java similarity index 98% rename from src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowFrameBuffer.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/shadow/ShadowFrameBuffer.java index 7c02d69..14d1120 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowFrameBuffer.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/shadow/ShadowFrameBuffer.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.shadow; +package com.github.hydos.ginger.engine.opengl.shadow; import java.nio.ByteBuffer; diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowMapEntityRenderer.java b/src/main/java/com/github/hydos/ginger/engine/opengl/shadow/ShadowMapEntityRenderer.java similarity index 94% rename from src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowMapEntityRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/shadow/ShadowMapEntityRenderer.java index b381389..70e021e 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowMapEntityRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/shadow/ShadowMapEntityRenderer.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.shadow; +package com.github.hydos.ginger.engine.opengl.shadow; import java.util.*; @@ -7,8 +7,8 @@ import org.lwjgl.opengl.*; import com.github.hydos.ginger.engine.common.elements.objects.RenderObject; import com.github.hydos.ginger.engine.common.math.Maths; -import com.github.hydos.ginger.engine.openGL.render.MasterRenderer; -import com.github.hydos.ginger.engine.openGL.render.models.*; +import com.github.hydos.ginger.engine.opengl.render.MasterRenderer; +import com.github.hydos.ginger.engine.opengl.render.models.*; public class ShadowMapEntityRenderer { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowMapMasterRenderer.java b/src/main/java/com/github/hydos/ginger/engine/opengl/shadow/ShadowMapMasterRenderer.java similarity index 98% rename from src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowMapMasterRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/shadow/ShadowMapMasterRenderer.java index 3efa5d1..0e27772 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowMapMasterRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/shadow/ShadowMapMasterRenderer.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.shadow; +package com.github.hydos.ginger.engine.opengl.shadow; import java.lang.Math; import java.util.*; @@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11; import com.github.hydos.ginger.engine.common.cameras.Camera; import com.github.hydos.ginger.engine.common.elements.objects.*; -import com.github.hydos.ginger.engine.openGL.render.models.TexturedModel; +import com.github.hydos.ginger.engine.opengl.render.models.TexturedModel; /** This class is in charge of using all of the classes in the shadows package to * carry out the shadow render pass, i.e. rendering the scene to the shadow map diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowShader.java b/src/main/java/com/github/hydos/ginger/engine/opengl/shadow/ShadowShader.java similarity index 85% rename from src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowShader.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/shadow/ShadowShader.java index 4eab987..99b0ace 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/shadow/ShadowShader.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/shadow/ShadowShader.java @@ -1,8 +1,8 @@ -package com.github.hydos.ginger.engine.openGL.shadow; +package com.github.hydos.ginger.engine.opengl.shadow; import org.joml.Matrix4f; -import com.github.hydos.ginger.engine.openGL.render.shaders.ShaderProgram; +import com.github.hydos.ginger.engine.opengl.render.shaders.ShaderProgram; public class ShadowShader extends ShaderProgram { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/utils/GlLoader.java b/src/main/java/com/github/hydos/ginger/engine/opengl/utils/GlLoader.java similarity index 97% rename from src/main/java/com/github/hydos/ginger/engine/openGL/utils/GlLoader.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/utils/GlLoader.java index 8450ff0..ed35c8a 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/utils/GlLoader.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/utils/GlLoader.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.utils; +package com.github.hydos.ginger.engine.opengl.utils; import java.nio.*; import java.util.*; @@ -8,8 +8,8 @@ import org.lwjgl.opengl.*; import com.github.halotroop.litecraft.types.block.*; import com.github.hydos.ginger.engine.common.io.Window; -import com.github.hydos.ginger.engine.openGL.render.models.RawModel; -import com.github.hydos.ginger.engine.openGL.render.texture.*; +import com.github.hydos.ginger.engine.opengl.render.models.RawModel; +import com.github.hydos.ginger.engine.opengl.render.texture.*; public class GlLoader { diff --git a/src/main/java/com/github/hydos/ginger/engine/openGL/voxelutils/BlockMesher.java b/src/main/java/com/github/hydos/ginger/engine/opengl/voxelutils/BlockMesher.java similarity index 69% rename from src/main/java/com/github/hydos/ginger/engine/openGL/voxelutils/BlockMesher.java rename to src/main/java/com/github/hydos/ginger/engine/opengl/voxelutils/BlockMesher.java index 81bdc9f..5bd785d 100644 --- a/src/main/java/com/github/hydos/ginger/engine/openGL/voxelutils/BlockMesher.java +++ b/src/main/java/com/github/hydos/ginger/engine/opengl/voxelutils/BlockMesher.java @@ -1,4 +1,4 @@ -package com.github.hydos.ginger.engine.openGL.voxelutils; +package com.github.hydos.ginger.engine.opengl.voxelutils; public class BlockMesher {