diff --git a/.classpath b/.classpath index a430f1a..2a464d9 100644 --- a/.classpath +++ b/.classpath @@ -1,11 +1,5 @@ - - - - - - @@ -28,5 +22,11 @@ + + + + + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 91ca62e..8b5c4dc 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -8,7 +8,9 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/java/io/github/hydos/ginger/Example.java b/src/main/java/io/github/hydos/ginger/Example.java similarity index 98% rename from java/io/github/hydos/ginger/Example.java rename to src/main/java/io/github/hydos/ginger/Example.java index b215775..d0ad2fd 100644 --- a/java/io/github/hydos/ginger/Example.java +++ b/src/main/java/io/github/hydos/ginger/Example.java @@ -185,7 +185,7 @@ public class Example { button.hide(guis); } -// masterRenderer.renderScene(entities, normalMapEntities, terrains, lights, camera, new Vector4f(0, -1, 0, 100000)); + masterRenderer.renderScene(entities, normalMapEntities, terrains, lights, camera, new Vector4f(0, -1, 0, 100000)); masterRenderer.renderGuis(guis); TextMaster.render(); diff --git a/java/io/github/hydos/ginger/Starter.java b/src/main/java/io/github/hydos/ginger/Starter.java similarity index 100% rename from java/io/github/hydos/ginger/Starter.java rename to src/main/java/io/github/hydos/ginger/Starter.java diff --git a/java/io/github/hydos/ginger/UI/UICanvas.java b/src/main/java/io/github/hydos/ginger/UI/UICanvas.java similarity index 100% rename from java/io/github/hydos/ginger/UI/UICanvas.java rename to src/main/java/io/github/hydos/ginger/UI/UICanvas.java diff --git a/java/io/github/hydos/ginger/UI/UIManager.java b/src/main/java/io/github/hydos/ginger/UI/UIManager.java similarity index 100% rename from java/io/github/hydos/ginger/UI/UIManager.java rename to src/main/java/io/github/hydos/ginger/UI/UIManager.java diff --git a/java/io/github/hydos/ginger/UI/canvases/WelcomeScreen.java b/src/main/java/io/github/hydos/ginger/UI/canvases/WelcomeScreen.java similarity index 100% rename from java/io/github/hydos/ginger/UI/canvases/WelcomeScreen.java rename to src/main/java/io/github/hydos/ginger/UI/canvases/WelcomeScreen.java diff --git a/java/io/github/hydos/ginger/UI/enums/UIColourType.java b/src/main/java/io/github/hydos/ginger/UI/enums/UIColourType.java similarity index 100% rename from java/io/github/hydos/ginger/UI/enums/UIColourType.java rename to src/main/java/io/github/hydos/ginger/UI/enums/UIColourType.java diff --git a/java/io/github/hydos/ginger/UI/enums/UIDefaultClipSide.java b/src/main/java/io/github/hydos/ginger/UI/enums/UIDefaultClipSide.java similarity index 100% rename from java/io/github/hydos/ginger/UI/enums/UIDefaultClipSide.java rename to src/main/java/io/github/hydos/ginger/UI/enums/UIDefaultClipSide.java diff --git a/java/io/github/hydos/ginger/UI/enums/UIType.java b/src/main/java/io/github/hydos/ginger/UI/enums/UIType.java similarity index 100% rename from java/io/github/hydos/ginger/UI/enums/UIType.java rename to src/main/java/io/github/hydos/ginger/UI/enums/UIType.java diff --git a/java/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.java b/src/main/java/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.java similarity index 100% rename from java/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.java rename to src/main/java/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.java diff --git a/java/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.java b/src/main/java/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.java similarity index 100% rename from java/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.java rename to src/main/java/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.java diff --git a/java/io/github/hydos/ginger/engine/elements/GuiTexture.java b/src/main/java/io/github/hydos/ginger/engine/elements/GuiTexture.java similarity index 100% rename from java/io/github/hydos/ginger/engine/elements/GuiTexture.java rename to src/main/java/io/github/hydos/ginger/engine/elements/GuiTexture.java diff --git a/java/io/github/hydos/ginger/engine/elements/buttons/TextureButton.java b/src/main/java/io/github/hydos/ginger/engine/elements/buttons/TextureButton.java similarity index 100% rename from java/io/github/hydos/ginger/engine/elements/buttons/TextureButton.java rename to src/main/java/io/github/hydos/ginger/engine/elements/buttons/TextureButton.java diff --git a/java/io/github/hydos/ginger/engine/elements/objects/Entity.java b/src/main/java/io/github/hydos/ginger/engine/elements/objects/Entity.java similarity index 100% rename from java/io/github/hydos/ginger/engine/elements/objects/Entity.java rename to src/main/java/io/github/hydos/ginger/engine/elements/objects/Entity.java diff --git a/java/io/github/hydos/ginger/engine/elements/objects/Light.java b/src/main/java/io/github/hydos/ginger/engine/elements/objects/Light.java similarity index 100% rename from java/io/github/hydos/ginger/engine/elements/objects/Light.java rename to src/main/java/io/github/hydos/ginger/engine/elements/objects/Light.java diff --git a/java/io/github/hydos/ginger/engine/elements/objects/Player.java b/src/main/java/io/github/hydos/ginger/engine/elements/objects/Player.java similarity index 100% rename from java/io/github/hydos/ginger/engine/elements/objects/Player.java rename to src/main/java/io/github/hydos/ginger/engine/elements/objects/Player.java diff --git a/java/io/github/hydos/ginger/engine/font/Character.java b/src/main/java/io/github/hydos/ginger/engine/font/Character.java similarity index 100% rename from java/io/github/hydos/ginger/engine/font/Character.java rename to src/main/java/io/github/hydos/ginger/engine/font/Character.java diff --git a/java/io/github/hydos/ginger/engine/font/FontType.java b/src/main/java/io/github/hydos/ginger/engine/font/FontType.java similarity index 100% rename from java/io/github/hydos/ginger/engine/font/FontType.java rename to src/main/java/io/github/hydos/ginger/engine/font/FontType.java diff --git a/java/io/github/hydos/ginger/engine/font/GUIText.java b/src/main/java/io/github/hydos/ginger/engine/font/GUIText.java similarity index 100% rename from java/io/github/hydos/ginger/engine/font/GUIText.java rename to src/main/java/io/github/hydos/ginger/engine/font/GUIText.java diff --git a/java/io/github/hydos/ginger/engine/font/Line.java b/src/main/java/io/github/hydos/ginger/engine/font/Line.java similarity index 100% rename from java/io/github/hydos/ginger/engine/font/Line.java rename to src/main/java/io/github/hydos/ginger/engine/font/Line.java diff --git a/java/io/github/hydos/ginger/engine/font/MetaFile.java b/src/main/java/io/github/hydos/ginger/engine/font/MetaFile.java similarity index 100% rename from java/io/github/hydos/ginger/engine/font/MetaFile.java rename to src/main/java/io/github/hydos/ginger/engine/font/MetaFile.java diff --git a/java/io/github/hydos/ginger/engine/font/TextMaster.java b/src/main/java/io/github/hydos/ginger/engine/font/TextMaster.java similarity index 100% rename from java/io/github/hydos/ginger/engine/font/TextMaster.java rename to src/main/java/io/github/hydos/ginger/engine/font/TextMaster.java diff --git a/java/io/github/hydos/ginger/engine/font/TextMeshCreator.java b/src/main/java/io/github/hydos/ginger/engine/font/TextMeshCreator.java similarity index 100% rename from java/io/github/hydos/ginger/engine/font/TextMeshCreator.java rename to src/main/java/io/github/hydos/ginger/engine/font/TextMeshCreator.java diff --git a/java/io/github/hydos/ginger/engine/font/TextMeshData.java b/src/main/java/io/github/hydos/ginger/engine/font/TextMeshData.java similarity index 100% rename from java/io/github/hydos/ginger/engine/font/TextMeshData.java rename to src/main/java/io/github/hydos/ginger/engine/font/TextMeshData.java diff --git a/java/io/github/hydos/ginger/engine/font/Word.java b/src/main/java/io/github/hydos/ginger/engine/font/Word.java similarity index 100% rename from java/io/github/hydos/ginger/engine/font/Word.java rename to src/main/java/io/github/hydos/ginger/engine/font/Word.java diff --git a/java/io/github/hydos/ginger/engine/io/Window.java b/src/main/java/io/github/hydos/ginger/engine/io/Window.java similarity index 100% rename from java/io/github/hydos/ginger/engine/io/Window.java rename to src/main/java/io/github/hydos/ginger/engine/io/Window.java diff --git a/java/io/github/hydos/ginger/engine/mathEngine/Maths.java b/src/main/java/io/github/hydos/ginger/engine/mathEngine/Maths.java similarity index 100% rename from java/io/github/hydos/ginger/engine/mathEngine/Maths.java rename to src/main/java/io/github/hydos/ginger/engine/mathEngine/Maths.java diff --git a/java/io/github/hydos/ginger/engine/mathEngine/Quaternion.java b/src/main/java/io/github/hydos/ginger/engine/mathEngine/Quaternion.java similarity index 100% rename from java/io/github/hydos/ginger/engine/mathEngine/Quaternion.java rename to src/main/java/io/github/hydos/ginger/engine/mathEngine/Quaternion.java diff --git a/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix.java b/src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix.java similarity index 100% rename from java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix.java rename to src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix.java diff --git a/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix2f.java b/src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix2f.java similarity index 100% rename from java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix2f.java rename to src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix2f.java diff --git a/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix3f.java b/src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix3f.java similarity index 100% rename from java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix3f.java rename to src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix3f.java diff --git a/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix4f.java b/src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix4f.java similarity index 100% rename from java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix4f.java rename to src/main/java/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix4f.java diff --git a/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector.java b/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector.java similarity index 100% rename from java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector.java rename to src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector.java diff --git a/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector2f.java b/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector2f.java similarity index 100% rename from java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector2f.java rename to src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector2f.java diff --git a/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector3f.java b/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector3f.java similarity index 100% rename from java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector3f.java rename to src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector3f.java diff --git a/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector4f.java b/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector4f.java similarity index 100% rename from java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector4f.java rename to src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector4f.java diff --git a/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector.java b/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector.java similarity index 100% rename from java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector.java rename to src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector.java diff --git a/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector2f.java b/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector2f.java similarity index 100% rename from java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector2f.java rename to src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector2f.java diff --git a/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector3f.java b/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector3f.java similarity index 100% rename from java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector3f.java rename to src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector3f.java diff --git a/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector4f.java b/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector4f.java similarity index 100% rename from java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector4f.java rename to src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/Vector4f.java diff --git a/java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector2f.java b/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector2f.java similarity index 100% rename from java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector2f.java rename to src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector2f.java diff --git a/java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector3f.java b/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector3f.java similarity index 100% rename from java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector3f.java rename to src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector3f.java diff --git a/java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector4f.java b/src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector4f.java similarity index 100% rename from java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector4f.java rename to src/main/java/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector4f.java diff --git a/java/io/github/hydos/ginger/engine/obj/ModelData.java b/src/main/java/io/github/hydos/ginger/engine/obj/ModelData.java similarity index 100% rename from java/io/github/hydos/ginger/engine/obj/ModelData.java rename to src/main/java/io/github/hydos/ginger/engine/obj/ModelData.java diff --git a/java/io/github/hydos/ginger/engine/obj/ModelLoader.java b/src/main/java/io/github/hydos/ginger/engine/obj/ModelLoader.java similarity index 100% rename from java/io/github/hydos/ginger/engine/obj/ModelLoader.java rename to src/main/java/io/github/hydos/ginger/engine/obj/ModelLoader.java diff --git a/java/io/github/hydos/ginger/engine/obj/OBJFileLoader.java b/src/main/java/io/github/hydos/ginger/engine/obj/OBJFileLoader.java similarity index 100% rename from java/io/github/hydos/ginger/engine/obj/OBJFileLoader.java rename to src/main/java/io/github/hydos/ginger/engine/obj/OBJFileLoader.java diff --git a/java/io/github/hydos/ginger/engine/obj/Vertex.java b/src/main/java/io/github/hydos/ginger/engine/obj/Vertex.java similarity index 100% rename from java/io/github/hydos/ginger/engine/obj/Vertex.java rename to src/main/java/io/github/hydos/ginger/engine/obj/Vertex.java diff --git a/java/io/github/hydos/ginger/engine/obj/normals/ModelDataNM.java b/src/main/java/io/github/hydos/ginger/engine/obj/normals/ModelDataNM.java similarity index 100% rename from java/io/github/hydos/ginger/engine/obj/normals/ModelDataNM.java rename to src/main/java/io/github/hydos/ginger/engine/obj/normals/ModelDataNM.java diff --git a/java/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.java b/src/main/java/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.java similarity index 100% rename from java/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.java rename to src/main/java/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.java diff --git a/java/io/github/hydos/ginger/engine/obj/normals/VertexNM.java b/src/main/java/io/github/hydos/ginger/engine/obj/normals/VertexNM.java similarity index 100% rename from java/io/github/hydos/ginger/engine/obj/normals/VertexNM.java rename to src/main/java/io/github/hydos/ginger/engine/obj/normals/VertexNM.java diff --git a/java/io/github/hydos/ginger/engine/particle/InsertionSort.java b/src/main/java/io/github/hydos/ginger/engine/particle/InsertionSort.java similarity index 100% rename from java/io/github/hydos/ginger/engine/particle/InsertionSort.java rename to src/main/java/io/github/hydos/ginger/engine/particle/InsertionSort.java diff --git a/java/io/github/hydos/ginger/engine/particle/Particle.java b/src/main/java/io/github/hydos/ginger/engine/particle/Particle.java similarity index 100% rename from java/io/github/hydos/ginger/engine/particle/Particle.java rename to src/main/java/io/github/hydos/ginger/engine/particle/Particle.java diff --git a/java/io/github/hydos/ginger/engine/particle/ParticleMaster.java b/src/main/java/io/github/hydos/ginger/engine/particle/ParticleMaster.java similarity index 100% rename from java/io/github/hydos/ginger/engine/particle/ParticleMaster.java rename to src/main/java/io/github/hydos/ginger/engine/particle/ParticleMaster.java diff --git a/java/io/github/hydos/ginger/engine/particle/ParticleSystem.java b/src/main/java/io/github/hydos/ginger/engine/particle/ParticleSystem.java similarity index 100% rename from java/io/github/hydos/ginger/engine/particle/ParticleSystem.java rename to src/main/java/io/github/hydos/ginger/engine/particle/ParticleSystem.java diff --git a/java/io/github/hydos/ginger/engine/particle/ParticleTexture.java b/src/main/java/io/github/hydos/ginger/engine/particle/ParticleTexture.java similarity index 100% rename from java/io/github/hydos/ginger/engine/particle/ParticleTexture.java rename to src/main/java/io/github/hydos/ginger/engine/particle/ParticleTexture.java diff --git a/java/io/github/hydos/ginger/engine/postProcessing/ContrastChanger.java b/src/main/java/io/github/hydos/ginger/engine/postProcessing/ContrastChanger.java similarity index 100% rename from java/io/github/hydos/ginger/engine/postProcessing/ContrastChanger.java rename to src/main/java/io/github/hydos/ginger/engine/postProcessing/ContrastChanger.java diff --git a/java/io/github/hydos/ginger/engine/postProcessing/ContrastShader.java b/src/main/java/io/github/hydos/ginger/engine/postProcessing/ContrastShader.java similarity index 100% rename from java/io/github/hydos/ginger/engine/postProcessing/ContrastShader.java rename to src/main/java/io/github/hydos/ginger/engine/postProcessing/ContrastShader.java diff --git a/java/io/github/hydos/ginger/engine/postProcessing/Fbo.java b/src/main/java/io/github/hydos/ginger/engine/postProcessing/Fbo.java similarity index 100% rename from java/io/github/hydos/ginger/engine/postProcessing/Fbo.java rename to src/main/java/io/github/hydos/ginger/engine/postProcessing/Fbo.java diff --git a/java/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.java b/src/main/java/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.java similarity index 100% rename from java/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.java rename to src/main/java/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.java diff --git a/java/io/github/hydos/ginger/engine/postProcessing/PostProcessing.java b/src/main/java/io/github/hydos/ginger/engine/postProcessing/PostProcessing.java similarity index 100% rename from java/io/github/hydos/ginger/engine/postProcessing/PostProcessing.java rename to src/main/java/io/github/hydos/ginger/engine/postProcessing/PostProcessing.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/MasterRenderer.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/MasterRenderer.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/MasterRenderer.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/MasterRenderer.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/models/RawModel.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/models/RawModel.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/models/RawModel.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/models/RawModel.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/models/TexturedModel.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/models/TexturedModel.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/models/TexturedModel.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/models/TexturedModel.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/renderers/EntityRenderer.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/EntityRenderer.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/renderers/EntityRenderer.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/EntityRenderer.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/renderers/FontRenderer.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/FontRenderer.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/renderers/FontRenderer.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/FontRenderer.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/renderers/GuiRenderer.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/GuiRenderer.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/renderers/GuiRenderer.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/GuiRenderer.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/renderers/NormalMappingRenderer.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/NormalMappingRenderer.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/renderers/NormalMappingRenderer.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/NormalMappingRenderer.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/renderers/SkyboxRenderer.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/SkyboxRenderer.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/renderers/SkyboxRenderer.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/SkyboxRenderer.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/renderers/TerrainRenderer.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/TerrainRenderer.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/renderers/TerrainRenderer.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/renderers/TerrainRenderer.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/shaders/FontShader.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/FontShader.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/shaders/FontShader.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/FontShader.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/shaders/GuiShader.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/GuiShader.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/shaders/GuiShader.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/GuiShader.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/shaders/NormalMappingShader.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/NormalMappingShader.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/shaders/NormalMappingShader.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/NormalMappingShader.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/shaders/ParticleShader.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/ParticleShader.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/shaders/ParticleShader.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/ParticleShader.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/shaders/ShaderProgram.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/ShaderProgram.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/shaders/ShaderProgram.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/ShaderProgram.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/shaders/SkyboxShader.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/SkyboxShader.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/shaders/SkyboxShader.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/SkyboxShader.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/shaders/StaticShader.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/StaticShader.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/shaders/StaticShader.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/StaticShader.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/shaders/TerrainShader.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/TerrainShader.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/shaders/TerrainShader.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/shaders/TerrainShader.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/texture/Image.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/texture/Image.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/texture/Image.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/texture/Image.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/texture/ModelTexture.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/texture/ModelTexture.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/texture/ModelTexture.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/texture/ModelTexture.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/tools/IOUtil.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/tools/IOUtil.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/tools/IOUtil.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/tools/IOUtil.java diff --git a/java/io/github/hydos/ginger/engine/renderEngine/tools/MousePicker.java b/src/main/java/io/github/hydos/ginger/engine/renderEngine/tools/MousePicker.java similarity index 100% rename from java/io/github/hydos/ginger/engine/renderEngine/tools/MousePicker.java rename to src/main/java/io/github/hydos/ginger/engine/renderEngine/tools/MousePicker.java diff --git a/java/io/github/hydos/ginger/engine/shadow/ShadowBox.java b/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowBox.java similarity index 100% rename from java/io/github/hydos/ginger/engine/shadow/ShadowBox.java rename to src/main/java/io/github/hydos/ginger/engine/shadow/ShadowBox.java diff --git a/java/io/github/hydos/ginger/engine/shadow/ShadowFrameBuffer.java b/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowFrameBuffer.java similarity index 100% rename from java/io/github/hydos/ginger/engine/shadow/ShadowFrameBuffer.java rename to src/main/java/io/github/hydos/ginger/engine/shadow/ShadowFrameBuffer.java diff --git a/java/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.java b/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.java similarity index 100% rename from java/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.java rename to src/main/java/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.java diff --git a/java/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.java b/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.java similarity index 100% rename from java/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.java rename to src/main/java/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.java diff --git a/java/io/github/hydos/ginger/engine/shadow/ShadowShader.java b/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowShader.java similarity index 100% rename from java/io/github/hydos/ginger/engine/shadow/ShadowShader.java rename to src/main/java/io/github/hydos/ginger/engine/shadow/ShadowShader.java diff --git a/java/io/github/hydos/ginger/engine/terrain/Terrain.java b/src/main/java/io/github/hydos/ginger/engine/terrain/Terrain.java similarity index 100% rename from java/io/github/hydos/ginger/engine/terrain/Terrain.java rename to src/main/java/io/github/hydos/ginger/engine/terrain/Terrain.java diff --git a/java/io/github/hydos/ginger/engine/terrain/TerrainTexture.java b/src/main/java/io/github/hydos/ginger/engine/terrain/TerrainTexture.java similarity index 100% rename from java/io/github/hydos/ginger/engine/terrain/TerrainTexture.java rename to src/main/java/io/github/hydos/ginger/engine/terrain/TerrainTexture.java diff --git a/java/io/github/hydos/ginger/engine/terrain/TerrainTexturePack.java b/src/main/java/io/github/hydos/ginger/engine/terrain/TerrainTexturePack.java similarity index 100% rename from java/io/github/hydos/ginger/engine/terrain/TerrainTexturePack.java rename to src/main/java/io/github/hydos/ginger/engine/terrain/TerrainTexturePack.java diff --git a/java/io/github/hydos/ginger/engine/utils/Loader.java b/src/main/java/io/github/hydos/ginger/engine/utils/Loader.java similarity index 100% rename from java/io/github/hydos/ginger/engine/utils/Loader.java rename to src/main/java/io/github/hydos/ginger/engine/utils/Loader.java diff --git a/java/io/github/hydos/ginger/main/GingerMain.java b/src/main/java/io/github/hydos/ginger/main/GingerMain.java similarity index 100% rename from java/io/github/hydos/ginger/main/GingerMain.java rename to src/main/java/io/github/hydos/ginger/main/GingerMain.java diff --git a/java/io/github/hydos/ginger/main/settings/Constants.java b/src/main/java/io/github/hydos/ginger/main/settings/Constants.java similarity index 100% rename from java/io/github/hydos/ginger/main/settings/Constants.java rename to src/main/java/io/github/hydos/ginger/main/settings/Constants.java diff --git a/java/io/github/hydos/ginger/main/tools/GSceneBuilder.java b/src/main/java/io/github/hydos/ginger/main/tools/GSceneBuilder.java similarity index 100% rename from java/io/github/hydos/ginger/main/tools/GSceneBuilder.java rename to src/main/java/io/github/hydos/ginger/main/tools/GSceneBuilder.java diff --git a/src/main/resources/shaders/particleFragmentShader.glsl b/src/main/resources/shaders/particleFragmentShader.glsl index 6371be6..69bbea9 100644 --- a/src/main/resources/shaders/particleFragmentShader.glsl +++ b/src/main/resources/shaders/particleFragmentShader.glsl @@ -15,4 +15,4 @@ void main(void){ out_colour = mix(colour1, colour2, blend); -} +} \ No newline at end of file diff --git a/target/classes/io/github/hydos/ginger/Example.class b/target/classes/io/github/hydos/ginger/Example.class index 355543c..f8fb1bf 100644 Binary files a/target/classes/io/github/hydos/ginger/Example.class and b/target/classes/io/github/hydos/ginger/Example.class differ diff --git a/target/classes/io/github/hydos/ginger/Starter.class b/target/classes/io/github/hydos/ginger/Starter.class index b60c210..970edd9 100644 Binary files a/target/classes/io/github/hydos/ginger/Starter.class and b/target/classes/io/github/hydos/ginger/Starter.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.class b/target/classes/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.class index c89ecb2..3b51112 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.class and b/target/classes/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera$1.class b/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera$1.class index 672d221..d754d7e 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera$1.class and b/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera$1.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.class b/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.class index 10e25d1..2a6a7d5 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.class and b/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/font/Character.class b/target/classes/io/github/hydos/ginger/engine/font/Character.class index 447259f..780c253 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/font/Character.class and b/target/classes/io/github/hydos/ginger/engine/font/Character.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/font/FontType.class b/target/classes/io/github/hydos/ginger/engine/font/FontType.class index 7e0faa6..b19b527 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/font/FontType.class and b/target/classes/io/github/hydos/ginger/engine/font/FontType.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/font/GUIText.class b/target/classes/io/github/hydos/ginger/engine/font/GUIText.class index 3164476..bb50b84 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/font/GUIText.class and b/target/classes/io/github/hydos/ginger/engine/font/GUIText.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/font/Line.class b/target/classes/io/github/hydos/ginger/engine/font/Line.class index a8835fc..b8b7336 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/font/Line.class and b/target/classes/io/github/hydos/ginger/engine/font/Line.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/font/MetaFile.class b/target/classes/io/github/hydos/ginger/engine/font/MetaFile.class index b50a612..d9589c8 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/font/MetaFile.class and b/target/classes/io/github/hydos/ginger/engine/font/MetaFile.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/font/TextMaster.class b/target/classes/io/github/hydos/ginger/engine/font/TextMaster.class index f825fb0..f0d9044 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/font/TextMaster.class and b/target/classes/io/github/hydos/ginger/engine/font/TextMaster.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/font/TextMeshCreator.class b/target/classes/io/github/hydos/ginger/engine/font/TextMeshCreator.class index 750f6ea..842bc66 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/font/TextMeshCreator.class and b/target/classes/io/github/hydos/ginger/engine/font/TextMeshCreator.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/font/TextMeshData.class b/target/classes/io/github/hydos/ginger/engine/font/TextMeshData.class index 6bc906a..3ce44df 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/font/TextMeshData.class and b/target/classes/io/github/hydos/ginger/engine/font/TextMeshData.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/font/Word.class b/target/classes/io/github/hydos/ginger/engine/font/Word.class index 8b7fd14..d12e10d 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/font/Word.class and b/target/classes/io/github/hydos/ginger/engine/font/Word.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/io/Window.class b/target/classes/io/github/hydos/ginger/engine/io/Window.class index 898464b..6a21f77 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/io/Window.class and b/target/classes/io/github/hydos/ginger/engine/io/Window.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/Maths.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/Maths.class index ab4a36a..49469c9 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/Maths.class and b/target/classes/io/github/hydos/ginger/engine/mathEngine/Maths.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/Quaternion.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/Quaternion.class index 07f445b..538dfd3 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/Quaternion.class and b/target/classes/io/github/hydos/ginger/engine/mathEngine/Quaternion.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix.class index 20d0847..a2def8f 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix.class and b/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix2f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix2f.class index dffe93b..fc3f6ca 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix2f.class and b/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix2f.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix3f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix3f.class index df64082..2275260 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix3f.class and b/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix3f.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix4f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix4f.class index 4bd934a..87f2624 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix4f.class and b/target/classes/io/github/hydos/ginger/engine/mathEngine/matrixes/Matrix4f.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector.class index 2263590..aad9f5c 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector.class and b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector2f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector2f.class index aa55db3..177829f 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector2f.class and b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector2f.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector3f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector3f.class index 444dbd4..5d313a8 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector3f.class and b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector3f.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector4f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector4f.class index 3150c3e..3031d75 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector4f.class and b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/ReadableVector4f.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector.class index 2b6dbd0..358d0b5 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector.class and b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector2f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector2f.class index e2692d4..87dd583 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector2f.class and b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector2f.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector3f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector3f.class index b83e8cd..9aaa293 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector3f.class and b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector3f.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector4f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector4f.class index 9994d90..4ba13ab 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector4f.class and b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/Vector4f.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector2f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector2f.class index 4bf23a7..d726633 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector2f.class and b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector2f.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector3f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector3f.class index 96c389f..bd21e8c 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector3f.class and b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector3f.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector4f.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector4f.class index c0f4a78..f5d0dd0 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector4f.class and b/target/classes/io/github/hydos/ginger/engine/mathEngine/vectors/WritableVector4f.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/obj/ModelData.class b/target/classes/io/github/hydos/ginger/engine/obj/ModelData.class index b1cd759..94e30e1 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/obj/ModelData.class and b/target/classes/io/github/hydos/ginger/engine/obj/ModelData.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/obj/ModelLoader.class b/target/classes/io/github/hydos/ginger/engine/obj/ModelLoader.class index 6dbdbcc..99d6422 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/obj/ModelLoader.class and b/target/classes/io/github/hydos/ginger/engine/obj/ModelLoader.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/obj/OBJFileLoader.class b/target/classes/io/github/hydos/ginger/engine/obj/OBJFileLoader.class index 639af62..918565d 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/obj/OBJFileLoader.class and b/target/classes/io/github/hydos/ginger/engine/obj/OBJFileLoader.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/obj/Vertex.class b/target/classes/io/github/hydos/ginger/engine/obj/Vertex.class index b724afb..5427475 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/obj/Vertex.class and b/target/classes/io/github/hydos/ginger/engine/obj/Vertex.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/obj/normals/ModelDataNM.class b/target/classes/io/github/hydos/ginger/engine/obj/normals/ModelDataNM.class index aee1fcf..b1a0614 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/obj/normals/ModelDataNM.class and b/target/classes/io/github/hydos/ginger/engine/obj/normals/ModelDataNM.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.class b/target/classes/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.class index 006228b..027e061 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.class and b/target/classes/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/obj/normals/VertexNM.class b/target/classes/io/github/hydos/ginger/engine/obj/normals/VertexNM.class index 81ca120..b7d8612 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/obj/normals/VertexNM.class and b/target/classes/io/github/hydos/ginger/engine/obj/normals/VertexNM.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/particle/InsertionSort.class b/target/classes/io/github/hydos/ginger/engine/particle/InsertionSort.class index 3a684ad..13d138c 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/particle/InsertionSort.class and b/target/classes/io/github/hydos/ginger/engine/particle/InsertionSort.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/particle/Particle.class b/target/classes/io/github/hydos/ginger/engine/particle/Particle.class index 869ea42..6bac8ab 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/particle/Particle.class and b/target/classes/io/github/hydos/ginger/engine/particle/Particle.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/particle/ParticleMaster.class b/target/classes/io/github/hydos/ginger/engine/particle/ParticleMaster.class index 0e12499..d41608f 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/particle/ParticleMaster.class and b/target/classes/io/github/hydos/ginger/engine/particle/ParticleMaster.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/particle/ParticleSystem.class b/target/classes/io/github/hydos/ginger/engine/particle/ParticleSystem.class index 8379d27..5112d6a 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/particle/ParticleSystem.class and b/target/classes/io/github/hydos/ginger/engine/particle/ParticleSystem.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/particle/ParticleTexture.class b/target/classes/io/github/hydos/ginger/engine/particle/ParticleTexture.class index 36e4970..597db99 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/particle/ParticleTexture.class and b/target/classes/io/github/hydos/ginger/engine/particle/ParticleTexture.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/postProcessing/ContrastChanger.class b/target/classes/io/github/hydos/ginger/engine/postProcessing/ContrastChanger.class index 7c8b4bb..eed51ae 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/postProcessing/ContrastChanger.class and b/target/classes/io/github/hydos/ginger/engine/postProcessing/ContrastChanger.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/postProcessing/ContrastShader.class b/target/classes/io/github/hydos/ginger/engine/postProcessing/ContrastShader.class index 7edbcdb..086fdb9 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/postProcessing/ContrastShader.class and b/target/classes/io/github/hydos/ginger/engine/postProcessing/ContrastShader.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/postProcessing/Fbo.class b/target/classes/io/github/hydos/ginger/engine/postProcessing/Fbo.class index 1d2d96a..c620801 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/postProcessing/Fbo.class and b/target/classes/io/github/hydos/ginger/engine/postProcessing/Fbo.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.class b/target/classes/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.class index 8c2114c..9de0145 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.class and b/target/classes/io/github/hydos/ginger/engine/postProcessing/ImageRenderer.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/postProcessing/PostProcessing.class b/target/classes/io/github/hydos/ginger/engine/postProcessing/PostProcessing.class index bc08dde..c047e60 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/postProcessing/PostProcessing.class and b/target/classes/io/github/hydos/ginger/engine/postProcessing/PostProcessing.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/MasterRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/MasterRenderer.class index e0f8d62..3f445d0 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/MasterRenderer.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/MasterRenderer.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/models/RawModel.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/models/RawModel.class index f57d586..1d4d018 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/models/RawModel.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/models/RawModel.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/models/TexturedModel.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/models/TexturedModel.class index 3375f05..a321529 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/models/TexturedModel.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/models/TexturedModel.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/EntityRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/EntityRenderer.class index 5bb6ffa..f0bb8d5 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/EntityRenderer.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/EntityRenderer.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/FontRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/FontRenderer.class index 624d0c1..bf02534 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/FontRenderer.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/FontRenderer.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/GuiRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/GuiRenderer.class index 73c1af6..1211b74 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/GuiRenderer.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/GuiRenderer.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/NormalMappingRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/NormalMappingRenderer.class index d306b5e..6a1a5f6 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/NormalMappingRenderer.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/NormalMappingRenderer.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.class index a6bf241..d450ebc 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/SkyboxRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/SkyboxRenderer.class index 06acb95..9f765c1 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/SkyboxRenderer.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/SkyboxRenderer.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/TerrainRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/TerrainRenderer.class index 4472ab9..1736b6b 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/TerrainRenderer.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/TerrainRenderer.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/FontShader.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/FontShader.class index 578a549..e8b1a57 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/FontShader.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/FontShader.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/GuiShader.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/GuiShader.class index ce543c3..669cf8d 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/GuiShader.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/GuiShader.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/NormalMappingShader.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/NormalMappingShader.class index 52c9ec3..8502afb 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/NormalMappingShader.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/NormalMappingShader.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/ParticleShader.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/ParticleShader.class index 94743b5..8ed3c38 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/ParticleShader.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/ParticleShader.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/ShaderProgram.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/ShaderProgram.class index 71e2e37..3bf1050 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/ShaderProgram.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/ShaderProgram.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/SkyboxShader.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/SkyboxShader.class index ff89f64..da29b7d 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/SkyboxShader.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/SkyboxShader.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/StaticShader.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/StaticShader.class index df60fa1..82b07c2 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/StaticShader.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/StaticShader.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/TerrainShader.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/TerrainShader.class index f717529..710fdaa 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/TerrainShader.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/TerrainShader.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/texture/Image.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/texture/Image.class index 69a5faf..ba5a820 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/texture/Image.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/texture/Image.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/texture/ModelTexture.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/texture/ModelTexture.class index b417ebc..754f1a6 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/texture/ModelTexture.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/texture/ModelTexture.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/tools/IOUtil.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/tools/IOUtil.class index dcae783..4fb6d2d 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/tools/IOUtil.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/tools/IOUtil.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/tools/MousePicker.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/tools/MousePicker.class index 43b3238..3c43228 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/tools/MousePicker.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/tools/MousePicker.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowBox.class b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowBox.class index aba8579..19de8fb 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowBox.class and b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowBox.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowFrameBuffer.class b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowFrameBuffer.class index 1762709..38ade51 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowFrameBuffer.class and b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowFrameBuffer.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.class b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.class index d816201..fe500d5 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.class and b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.class b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.class index 929c7fd..bc031f7 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.class and b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowShader.class b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowShader.class index 72e10ed..8d969e5 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowShader.class and b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowShader.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/terrain/Terrain.class b/target/classes/io/github/hydos/ginger/engine/terrain/Terrain.class index 365d633..ee8a94c 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/terrain/Terrain.class and b/target/classes/io/github/hydos/ginger/engine/terrain/Terrain.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/terrain/TerrainTexture.class b/target/classes/io/github/hydos/ginger/engine/terrain/TerrainTexture.class index a0cd12a..85829f0 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/terrain/TerrainTexture.class and b/target/classes/io/github/hydos/ginger/engine/terrain/TerrainTexture.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/terrain/TerrainTexturePack.class b/target/classes/io/github/hydos/ginger/engine/terrain/TerrainTexturePack.class index d1f05d1..42eff06 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/terrain/TerrainTexturePack.class and b/target/classes/io/github/hydos/ginger/engine/terrain/TerrainTexturePack.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/utils/Loader.class b/target/classes/io/github/hydos/ginger/engine/utils/Loader.class index c8dab9b..7e92c7e 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/utils/Loader.class and b/target/classes/io/github/hydos/ginger/engine/utils/Loader.class differ diff --git a/target/classes/io/github/hydos/ginger/main/GingerMain.class b/target/classes/io/github/hydos/ginger/main/GingerMain.class index 485916f..1c7ae24 100644 Binary files a/target/classes/io/github/hydos/ginger/main/GingerMain.class and b/target/classes/io/github/hydos/ginger/main/GingerMain.class differ diff --git a/target/classes/io/github/hydos/ginger/main/settings/Constants.class b/target/classes/io/github/hydos/ginger/main/settings/Constants.class index 8c19e0b..f9c6f61 100644 Binary files a/target/classes/io/github/hydos/ginger/main/settings/Constants.class and b/target/classes/io/github/hydos/ginger/main/settings/Constants.class differ diff --git a/target/classes/shaders/particleFragmentShader.glsl b/target/classes/shaders/particleFragmentShader.glsl index 6371be6..69bbea9 100644 --- a/target/classes/shaders/particleFragmentShader.glsl +++ b/target/classes/shaders/particleFragmentShader.glsl @@ -15,4 +15,4 @@ void main(void){ out_colour = mix(colour1, colour2, blend); -} +} \ No newline at end of file diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index ba4647e..119d2a6 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Jun 12 16:17:17 AEST 2019 +#Thu Feb 20 16:43:50 AEST 2020 version=NIGHTLY groupId=me.hydos artifactId=ginger diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/target/original-ginger-NIGHTLY.jar b/target/original-ginger-NIGHTLY.jar index 7a64709..83cc7a8 100644 Binary files a/target/original-ginger-NIGHTLY.jar and b/target/original-ginger-NIGHTLY.jar differ