diff --git a/src/main/java/io/github/hydos/ginger/Example.java b/src/main/java/com/github/hydos/ginger/Example.java similarity index 80% rename from src/main/java/io/github/hydos/ginger/Example.java rename to src/main/java/com/github/hydos/ginger/Example.java index 03df14b..b66c8de 100644 --- a/src/main/java/io/github/hydos/ginger/Example.java +++ b/src/main/java/com/github/hydos/ginger/Example.java @@ -1,25 +1,25 @@ -package io.github.hydos.ginger; +package com.github.hydos.ginger; import java.util.*; -import io.github.hydos.ginger.engine.api.*; -import io.github.hydos.ginger.engine.cameras.Camera; -import io.github.hydos.ginger.engine.elements.GuiTexture; -import io.github.hydos.ginger.engine.elements.buttons.TextureButton; -import io.github.hydos.ginger.engine.elements.objects.*; -import io.github.hydos.ginger.engine.font.*; -import io.github.hydos.ginger.engine.io.Window; -import io.github.hydos.ginger.engine.math.vectors.*; -import io.github.hydos.ginger.engine.obj.ModelLoader; -import io.github.hydos.ginger.engine.obj.shapes.StaticCube; -import io.github.hydos.ginger.engine.particle.*; -import io.github.hydos.ginger.engine.render.MasterRenderer; -import io.github.hydos.ginger.engine.render.models.TexturedModel; -import io.github.hydos.ginger.engine.terrain.*; -import io.github.hydos.ginger.engine.utils.Loader; -import io.github.hydos.ginger.main.GingerMain; -import io.github.hydos.ginger.main.settings.Constants; -import io.github.hydos.litecraft.Block; +import com.github.hydos.ginger.engine.api.*; +import com.github.hydos.ginger.engine.cameras.Camera; +import com.github.hydos.ginger.engine.elements.GuiTexture; +import com.github.hydos.ginger.engine.elements.buttons.TextureButton; +import com.github.hydos.ginger.engine.elements.objects.*; +import com.github.hydos.ginger.engine.font.*; +import com.github.hydos.ginger.engine.io.Window; +import com.github.hydos.ginger.engine.math.vectors.*; +import com.github.hydos.ginger.engine.obj.ModelLoader; +import com.github.hydos.ginger.engine.obj.shapes.StaticCube; +import com.github.hydos.ginger.engine.particle.*; +import com.github.hydos.ginger.engine.render.MasterRenderer; +import com.github.hydos.ginger.engine.render.models.TexturedModel; +import com.github.hydos.ginger.engine.terrain.*; +import com.github.hydos.ginger.engine.utils.Loader; +import com.github.hydos.ginger.main.GingerMain; +import com.github.hydos.ginger.main.settings.Constants; +import com.github.hydos.litecraft.Block; public class Example extends Game{ @@ -122,8 +122,8 @@ public class Example extends Game{ if(isInWorld) { ginger3D.renderWithoutTerrain(this); // TODO: dynamic text -// text.textString = "" + (data.entities.size() + data.flatTerrains.size()); } + text.setText(playButton.isClicked() + ""); ginger3D.renderOverlays(this); playButton.update(); diff --git a/src/main/java/io/github/hydos/ginger/Starter.java b/src/main/java/com/github/hydos/ginger/Starter.java similarity index 82% rename from src/main/java/io/github/hydos/ginger/Starter.java rename to src/main/java/com/github/hydos/ginger/Starter.java index 8b198ec..5a24ee0 100644 --- a/src/main/java/io/github/hydos/ginger/Starter.java +++ b/src/main/java/com/github/hydos/ginger/Starter.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger; +package com.github.hydos.ginger; public class Starter { diff --git a/src/main/java/io/github/hydos/ginger/engine/api/Game.java b/src/main/java/com/github/hydos/ginger/engine/api/Game.java similarity index 56% rename from src/main/java/io/github/hydos/ginger/engine/api/Game.java rename to src/main/java/com/github/hydos/ginger/engine/api/Game.java index 6579c81..71e65db 100644 --- a/src/main/java/io/github/hydos/ginger/engine/api/Game.java +++ b/src/main/java/com/github/hydos/ginger/engine/api/Game.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.api; +package com.github.hydos.ginger.engine.api; public abstract class Game { diff --git a/src/main/java/io/github/hydos/ginger/engine/api/GameData.java b/src/main/java/com/github/hydos/ginger/engine/api/GameData.java similarity index 76% rename from src/main/java/io/github/hydos/ginger/engine/api/GameData.java rename to src/main/java/com/github/hydos/ginger/engine/api/GameData.java index dfdcc3c..e96efe2 100644 --- a/src/main/java/io/github/hydos/ginger/engine/api/GameData.java +++ b/src/main/java/com/github/hydos/ginger/engine/api/GameData.java @@ -1,13 +1,13 @@ -package io.github.hydos.ginger.engine.api; +package com.github.hydos.ginger.engine.api; import java.util.*; import org.joml.Vector4f; -import io.github.hydos.ginger.engine.cameras.Camera; -import io.github.hydos.ginger.engine.elements.GuiTexture; -import io.github.hydos.ginger.engine.elements.objects.*; -import io.github.hydos.ginger.engine.terrain.Terrain; +import com.github.hydos.ginger.engine.cameras.Camera; +import com.github.hydos.ginger.engine.elements.GuiTexture; +import com.github.hydos.ginger.engine.elements.objects.*; +import com.github.hydos.ginger.engine.terrain.Terrain; /* * Used for storing essential engine game data so main class isn't messy diff --git a/src/main/java/io/github/hydos/ginger/engine/api/Ginger.java b/src/main/java/com/github/hydos/ginger/engine/api/Ginger.java similarity index 79% rename from src/main/java/io/github/hydos/ginger/engine/api/Ginger.java rename to src/main/java/com/github/hydos/ginger/engine/api/Ginger.java index e57c76c..eae369f 100644 --- a/src/main/java/io/github/hydos/ginger/engine/api/Ginger.java +++ b/src/main/java/com/github/hydos/ginger/engine/api/Ginger.java @@ -1,13 +1,13 @@ -package io.github.hydos.ginger.engine.api; +package com.github.hydos.ginger.engine.api; -import io.github.hydos.ginger.engine.font.TextMaster; -import io.github.hydos.ginger.engine.io.Window; -import io.github.hydos.ginger.engine.particle.ParticleMaster; -import io.github.hydos.ginger.engine.postprocessing.*; -import io.github.hydos.ginger.engine.render.MasterRenderer; -import io.github.hydos.ginger.engine.render.tools.MousePicker; -import io.github.hydos.ginger.engine.utils.Loader; -import io.github.hydos.ginger.main.GingerMain; +import com.github.hydos.ginger.engine.font.TextMaster; +import com.github.hydos.ginger.engine.io.Window; +import com.github.hydos.ginger.engine.particle.ParticleMaster; +import com.github.hydos.ginger.engine.postprocessing.*; +import com.github.hydos.ginger.engine.render.MasterRenderer; +import com.github.hydos.ginger.engine.render.tools.MousePicker; +import com.github.hydos.ginger.engine.utils.Loader; +import com.github.hydos.ginger.main.GingerMain; public class Ginger { diff --git a/src/main/java/io/github/hydos/ginger/engine/api/ResourceManager.java b/src/main/java/com/github/hydos/ginger/engine/api/ResourceManager.java similarity index 83% rename from src/main/java/io/github/hydos/ginger/engine/api/ResourceManager.java rename to src/main/java/com/github/hydos/ginger/engine/api/ResourceManager.java index 5077fb1..2761554 100644 --- a/src/main/java/io/github/hydos/ginger/engine/api/ResourceManager.java +++ b/src/main/java/com/github/hydos/ginger/engine/api/ResourceManager.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.api; +package com.github.hydos.ginger.engine.api; /* * make your own resource manager if you want! diff --git a/src/main/java/io/github/hydos/ginger/engine/cameras/Camera.java b/src/main/java/com/github/hydos/ginger/engine/cameras/Camera.java similarity index 91% rename from src/main/java/io/github/hydos/ginger/engine/cameras/Camera.java rename to src/main/java/com/github/hydos/ginger/engine/cameras/Camera.java index 122d130..1a24247 100644 --- a/src/main/java/io/github/hydos/ginger/engine/cameras/Camera.java +++ b/src/main/java/com/github/hydos/ginger/engine/cameras/Camera.java @@ -1,11 +1,11 @@ -package io.github.hydos.ginger.engine.cameras; +package com.github.hydos.ginger.engine.cameras; import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFWScrollCallback; -import io.github.hydos.ginger.engine.elements.objects.Player; -import io.github.hydos.ginger.engine.io.Window; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.elements.objects.Player; +import com.github.hydos.ginger.engine.io.Window; +import com.github.hydos.ginger.engine.math.vectors.Vector3f; public class Camera { diff --git a/src/main/java/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.java b/src/main/java/com/github/hydos/ginger/engine/cameras/FirstPersonCamera.java similarity index 87% rename from src/main/java/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.java rename to src/main/java/com/github/hydos/ginger/engine/cameras/FirstPersonCamera.java index cccbd2f..be52b34 100644 --- a/src/main/java/io/github/hydos/ginger/engine/cameras/FirstPersonCamera.java +++ b/src/main/java/com/github/hydos/ginger/engine/cameras/FirstPersonCamera.java @@ -1,9 +1,9 @@ -package io.github.hydos.ginger.engine.cameras; +package com.github.hydos.ginger.engine.cameras; import org.lwjgl.glfw.GLFW; -import io.github.hydos.ginger.engine.io.Window; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.io.Window; +import com.github.hydos.ginger.engine.math.vectors.Vector3f; public class FirstPersonCamera { diff --git a/src/main/java/io/github/hydos/ginger/engine/elements/GuiTexture.java b/src/main/java/com/github/hydos/ginger/engine/elements/GuiTexture.java similarity index 84% rename from src/main/java/io/github/hydos/ginger/engine/elements/GuiTexture.java rename to src/main/java/com/github/hydos/ginger/engine/elements/GuiTexture.java index 765a890..dc242c7 100644 --- a/src/main/java/io/github/hydos/ginger/engine/elements/GuiTexture.java +++ b/src/main/java/com/github/hydos/ginger/engine/elements/GuiTexture.java @@ -1,6 +1,6 @@ -package io.github.hydos.ginger.engine.elements; +package com.github.hydos.ginger.engine.elements; -import io.github.hydos.ginger.engine.math.vectors.Vector2f; +import com.github.hydos.ginger.engine.math.vectors.Vector2f; public class GuiTexture { diff --git a/src/main/java/io/github/hydos/ginger/engine/elements/buttons/TextureButton.java b/src/main/java/com/github/hydos/ginger/engine/elements/buttons/TextureButton.java similarity index 84% rename from src/main/java/io/github/hydos/ginger/engine/elements/buttons/TextureButton.java rename to src/main/java/com/github/hydos/ginger/engine/elements/buttons/TextureButton.java index 3fc7235..c84097f 100644 --- a/src/main/java/io/github/hydos/ginger/engine/elements/buttons/TextureButton.java +++ b/src/main/java/com/github/hydos/ginger/engine/elements/buttons/TextureButton.java @@ -1,13 +1,13 @@ -package io.github.hydos.ginger.engine.elements.buttons; +package com.github.hydos.ginger.engine.elements.buttons; import java.util.List; import org.lwjgl.glfw.GLFW; -import io.github.hydos.ginger.engine.elements.GuiTexture; -import io.github.hydos.ginger.engine.io.Window; -import io.github.hydos.ginger.engine.math.vectors.Vector2f; -import io.github.hydos.ginger.engine.utils.Loader; +import com.github.hydos.ginger.engine.elements.GuiTexture; +import com.github.hydos.ginger.engine.io.Window; +import com.github.hydos.ginger.engine.math.vectors.Vector2f; +import com.github.hydos.ginger.engine.utils.Loader; public class TextureButton{ diff --git a/src/main/java/io/github/hydos/ginger/engine/elements/objects/Light.java b/src/main/java/com/github/hydos/ginger/engine/elements/objects/Light.java similarity index 86% rename from src/main/java/io/github/hydos/ginger/engine/elements/objects/Light.java rename to src/main/java/com/github/hydos/ginger/engine/elements/objects/Light.java index 2f8b983..63e9c04 100644 --- a/src/main/java/io/github/hydos/ginger/engine/elements/objects/Light.java +++ b/src/main/java/com/github/hydos/ginger/engine/elements/objects/Light.java @@ -1,6 +1,6 @@ -package io.github.hydos.ginger.engine.elements.objects; +package com.github.hydos.ginger.engine.elements.objects; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.math.vectors.Vector3f; public class Light { diff --git a/src/main/java/io/github/hydos/ginger/engine/elements/objects/Player.java b/src/main/java/com/github/hydos/ginger/engine/elements/objects/Player.java similarity index 84% rename from src/main/java/io/github/hydos/ginger/engine/elements/objects/Player.java rename to src/main/java/com/github/hydos/ginger/engine/elements/objects/Player.java index e63b903..5c5c503 100644 --- a/src/main/java/io/github/hydos/ginger/engine/elements/objects/Player.java +++ b/src/main/java/com/github/hydos/ginger/engine/elements/objects/Player.java @@ -1,12 +1,12 @@ -package io.github.hydos.ginger.engine.elements.objects; +package com.github.hydos.ginger.engine.elements.objects; import org.lwjgl.glfw.GLFW; -import io.github.hydos.ginger.engine.io.Window; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; -import io.github.hydos.ginger.engine.render.models.TexturedModel; -import io.github.hydos.ginger.engine.terrain.Terrain; -import io.github.hydos.ginger.main.settings.Constants; +import com.github.hydos.ginger.engine.io.Window; +import com.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.render.models.TexturedModel; +import com.github.hydos.ginger.engine.terrain.Terrain; +import com.github.hydos.ginger.main.settings.Constants; public class Player extends RenderObject{ diff --git a/src/main/java/io/github/hydos/ginger/engine/elements/objects/RenderObject.java b/src/main/java/com/github/hydos/ginger/engine/elements/objects/RenderObject.java similarity index 88% rename from src/main/java/io/github/hydos/ginger/engine/elements/objects/RenderObject.java rename to src/main/java/com/github/hydos/ginger/engine/elements/objects/RenderObject.java index d2570a8..ffdc34d 100644 --- a/src/main/java/io/github/hydos/ginger/engine/elements/objects/RenderObject.java +++ b/src/main/java/com/github/hydos/ginger/engine/elements/objects/RenderObject.java @@ -1,7 +1,7 @@ -package io.github.hydos.ginger.engine.elements.objects; +package com.github.hydos.ginger.engine.elements.objects; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; -import io.github.hydos.ginger.engine.render.models.TexturedModel; +import com.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.render.models.TexturedModel; public class RenderObject { diff --git a/src/main/java/io/github/hydos/ginger/engine/font/Character.java b/src/main/java/com/github/hydos/ginger/engine/font/Character.java similarity index 98% rename from src/main/java/io/github/hydos/ginger/engine/font/Character.java rename to src/main/java/com/github/hydos/ginger/engine/font/Character.java index 1cd9bb0..fce8ce2 100644 --- a/src/main/java/io/github/hydos/ginger/engine/font/Character.java +++ b/src/main/java/com/github/hydos/ginger/engine/font/Character.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.font; +package com.github.hydos.ginger.engine.font; /** * Simple data structure class holding information about a certain glyph in the diff --git a/src/main/java/io/github/hydos/ginger/engine/font/FontType.java b/src/main/java/com/github/hydos/ginger/engine/font/FontType.java similarity index 96% rename from src/main/java/io/github/hydos/ginger/engine/font/FontType.java rename to src/main/java/com/github/hydos/ginger/engine/font/FontType.java index 66a4cc6..e102e6c 100644 --- a/src/main/java/io/github/hydos/ginger/engine/font/FontType.java +++ b/src/main/java/com/github/hydos/ginger/engine/font/FontType.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.font; +package com.github.hydos.ginger.engine.font; /** * Represents a font. It holds the font's texture atlas as well as having the diff --git a/src/main/java/io/github/hydos/ginger/engine/font/GUIText.java b/src/main/java/com/github/hydos/ginger/engine/font/GUIText.java similarity index 96% rename from src/main/java/io/github/hydos/ginger/engine/font/GUIText.java rename to src/main/java/com/github/hydos/ginger/engine/font/GUIText.java index 3ca08fa..e958ee7 100644 --- a/src/main/java/io/github/hydos/ginger/engine/font/GUIText.java +++ b/src/main/java/com/github/hydos/ginger/engine/font/GUIText.java @@ -1,7 +1,6 @@ -package io.github.hydos.ginger.engine.font; +package com.github.hydos.ginger.engine.font; -import io.github.hydos.ginger.engine.math.vectors.Vector2f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.math.vectors.*; /** * Represents a piece of text in the game. @@ -255,5 +254,12 @@ public class GUIText { this.outlineColour = outlineColour; } + public void setText(String string) { + this.remove(); + this.textString = string; + TextMaster.loadText(this); + + } + } diff --git a/src/main/java/io/github/hydos/ginger/engine/font/Line.java b/src/main/java/com/github/hydos/ginger/engine/font/Line.java similarity index 97% rename from src/main/java/io/github/hydos/ginger/engine/font/Line.java rename to src/main/java/com/github/hydos/ginger/engine/font/Line.java index aad5803..b5a51db 100644 --- a/src/main/java/io/github/hydos/ginger/engine/font/Line.java +++ b/src/main/java/com/github/hydos/ginger/engine/font/Line.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.font; +package com.github.hydos.ginger.engine.font; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/io/github/hydos/ginger/engine/font/MetaFile.java b/src/main/java/com/github/hydos/ginger/engine/font/MetaFile.java similarity index 98% rename from src/main/java/io/github/hydos/ginger/engine/font/MetaFile.java rename to src/main/java/com/github/hydos/ginger/engine/font/MetaFile.java index 1628e79..d40612a 100644 --- a/src/main/java/io/github/hydos/ginger/engine/font/MetaFile.java +++ b/src/main/java/com/github/hydos/ginger/engine/font/MetaFile.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.font; +package com.github.hydos.ginger.engine.font; import java.io.BufferedReader; import java.io.IOException; @@ -6,7 +6,7 @@ import java.io.InputStreamReader; import java.util.HashMap; import java.util.Map; -import io.github.hydos.ginger.engine.io.Window; +import com.github.hydos.ginger.engine.io.Window; /** * Provides functionality for getting the values from a font file. diff --git a/src/main/java/io/github/hydos/ginger/engine/font/TextMaster.java b/src/main/java/com/github/hydos/ginger/engine/font/TextMaster.java similarity index 86% rename from src/main/java/io/github/hydos/ginger/engine/font/TextMaster.java rename to src/main/java/com/github/hydos/ginger/engine/font/TextMaster.java index daa257f..ee71266 100644 --- a/src/main/java/io/github/hydos/ginger/engine/font/TextMaster.java +++ b/src/main/java/com/github/hydos/ginger/engine/font/TextMaster.java @@ -1,12 +1,12 @@ -package io.github.hydos.ginger.engine.font; +package com.github.hydos.ginger.engine.font; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import io.github.hydos.ginger.engine.render.renderers.FontRenderer; -import io.github.hydos.ginger.engine.utils.Loader; +import com.github.hydos.ginger.engine.render.renderers.FontRenderer; +import com.github.hydos.ginger.engine.utils.Loader; public class TextMaster { diff --git a/src/main/java/io/github/hydos/ginger/engine/font/TextMeshCreator.java b/src/main/java/com/github/hydos/ginger/engine/font/TextMeshCreator.java similarity index 99% rename from src/main/java/io/github/hydos/ginger/engine/font/TextMeshCreator.java rename to src/main/java/com/github/hydos/ginger/engine/font/TextMeshCreator.java index 5d3662d..381db82 100644 --- a/src/main/java/io/github/hydos/ginger/engine/font/TextMeshCreator.java +++ b/src/main/java/com/github/hydos/ginger/engine/font/TextMeshCreator.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.font; +package com.github.hydos.ginger.engine.font; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/io/github/hydos/ginger/engine/font/TextMeshData.java b/src/main/java/com/github/hydos/ginger/engine/font/TextMeshData.java similarity index 92% rename from src/main/java/io/github/hydos/ginger/engine/font/TextMeshData.java rename to src/main/java/com/github/hydos/ginger/engine/font/TextMeshData.java index ae49b2a..7760cd7 100644 --- a/src/main/java/io/github/hydos/ginger/engine/font/TextMeshData.java +++ b/src/main/java/com/github/hydos/ginger/engine/font/TextMeshData.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.font; +package com.github.hydos.ginger.engine.font; /** * Stores the vertex data for all the quads on which a text will be rendered. diff --git a/src/main/java/io/github/hydos/ginger/engine/font/Word.java b/src/main/java/com/github/hydos/ginger/engine/font/Word.java similarity index 95% rename from src/main/java/io/github/hydos/ginger/engine/font/Word.java rename to src/main/java/com/github/hydos/ginger/engine/font/Word.java index d37a112..e31374d 100644 --- a/src/main/java/io/github/hydos/ginger/engine/font/Word.java +++ b/src/main/java/com/github/hydos/ginger/engine/font/Word.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.font; +package com.github.hydos.ginger.engine.font; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/io/github/hydos/ginger/engine/io/Window.java b/src/main/java/com/github/hydos/ginger/engine/io/Window.java similarity index 96% rename from src/main/java/io/github/hydos/ginger/engine/io/Window.java rename to src/main/java/com/github/hydos/ginger/engine/io/Window.java index 9fd06f3..517ddbb 100644 --- a/src/main/java/io/github/hydos/ginger/engine/io/Window.java +++ b/src/main/java/com/github/hydos/ginger/engine/io/Window.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.io; +package com.github.hydos.ginger.engine.io; import java.nio.DoubleBuffer; @@ -12,9 +12,8 @@ import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GLCapabilities; -import io.github.hydos.ginger.engine.math.vectors.Vector2f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; -import io.github.hydos.ginger.engine.render.texture.Image; +import com.github.hydos.ginger.engine.math.vectors.*; +import com.github.hydos.ginger.engine.render.texture.Image; public class Window { diff --git a/src/main/java/io/github/hydos/ginger/engine/math/Maths.java b/src/main/java/com/github/hydos/ginger/engine/math/Maths.java similarity index 90% rename from src/main/java/io/github/hydos/ginger/engine/math/Maths.java rename to src/main/java/com/github/hydos/ginger/engine/math/Maths.java index 676d5de..dc8f123 100644 --- a/src/main/java/io/github/hydos/ginger/engine/math/Maths.java +++ b/src/main/java/com/github/hydos/ginger/engine/math/Maths.java @@ -1,9 +1,8 @@ -package io.github.hydos.ginger.engine.math; +package com.github.hydos.ginger.engine.math; -import io.github.hydos.ginger.engine.cameras.Camera; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.math.vectors.Vector2f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.cameras.Camera; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.math.vectors.*; public class Maths { diff --git a/src/main/java/io/github/hydos/ginger/engine/math/Quaternion.java b/src/main/java/com/github/hydos/ginger/engine/math/Quaternion.java similarity index 97% rename from src/main/java/io/github/hydos/ginger/engine/math/Quaternion.java rename to src/main/java/com/github/hydos/ginger/engine/math/Quaternion.java index 773b03c..eb41c3b 100644 --- a/src/main/java/io/github/hydos/ginger/engine/math/Quaternion.java +++ b/src/main/java/com/github/hydos/ginger/engine/math/Quaternion.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.github.hydos.ginger.engine.math; +package com.github.hydos.ginger.engine.math; /** * @@ -44,10 +44,8 @@ import java.nio.FloatBuffer; import org.joml.Vector4f; -import io.github.hydos.ginger.engine.math.matrixes.Matrix3f; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.math.vectors.ReadableVector4f; -import io.github.hydos.ginger.engine.math.vectors.Vector; +import com.github.hydos.ginger.engine.math.matrixes.*; +import com.github.hydos.ginger.engine.math.vectors.*; public class Quaternion extends Vector implements ReadableVector4f { private static final long serialVersionUID = 1L; diff --git a/src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix.java b/src/main/java/com/github/hydos/ginger/engine/math/matrixes/Matrix.java similarity index 98% rename from src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix.java rename to src/main/java/com/github/hydos/ginger/engine/math/matrixes/Matrix.java index 95165d5..6ee5a74 100644 --- a/src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix.java +++ b/src/main/java/com/github/hydos/ginger/engine/math/matrixes/Matrix.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.github.hydos.ginger.engine.math.matrixes; +package com.github.hydos.ginger.engine.math.matrixes; import java.io.Serializable; import java.nio.FloatBuffer; diff --git a/src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix2f.java b/src/main/java/com/github/hydos/ginger/engine/math/matrixes/Matrix2f.java similarity index 99% rename from src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix2f.java rename to src/main/java/com/github/hydos/ginger/engine/math/matrixes/Matrix2f.java index 09041c8..bbbb46d 100644 --- a/src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix2f.java +++ b/src/main/java/com/github/hydos/ginger/engine/math/matrixes/Matrix2f.java @@ -29,12 +29,12 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.github.hydos.ginger.engine.math.matrixes; +package com.github.hydos.ginger.engine.math.matrixes; import java.io.Serializable; import java.nio.FloatBuffer; -import io.github.hydos.ginger.engine.math.vectors.Vector2f; +import com.github.hydos.ginger.engine.math.vectors.Vector2f; /** * diff --git a/src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix3f.java b/src/main/java/com/github/hydos/ginger/engine/math/matrixes/Matrix3f.java similarity index 99% rename from src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix3f.java rename to src/main/java/com/github/hydos/ginger/engine/math/matrixes/Matrix3f.java index 1ed0630..040c730 100644 --- a/src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix3f.java +++ b/src/main/java/com/github/hydos/ginger/engine/math/matrixes/Matrix3f.java @@ -31,12 +31,12 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.github.hydos.ginger.engine.math.matrixes; +package com.github.hydos.ginger.engine.math.matrixes; import java.io.Serializable; import java.nio.FloatBuffer; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.math.vectors.Vector3f; /** * diff --git a/src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix4f.java b/src/main/java/com/github/hydos/ginger/engine/math/matrixes/Matrix4f.java similarity index 99% rename from src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix4f.java rename to src/main/java/com/github/hydos/ginger/engine/math/matrixes/Matrix4f.java index 56a6b60..b393b0c 100644 --- a/src/main/java/io/github/hydos/ginger/engine/math/matrixes/Matrix4f.java +++ b/src/main/java/com/github/hydos/ginger/engine/math/matrixes/Matrix4f.java @@ -29,15 +29,14 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.github.hydos.ginger.engine.math.matrixes; +package com.github.hydos.ginger.engine.math.matrixes; import java.io.Serializable; import java.nio.FloatBuffer; import org.joml.Vector4f; -import io.github.hydos.ginger.engine.math.vectors.Vector2f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.math.vectors.*; /** * Holds a 4x4 float matrix. diff --git a/src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector.java b/src/main/java/com/github/hydos/ginger/engine/math/vectors/ReadableVector.java similarity index 97% rename from src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector.java rename to src/main/java/com/github/hydos/ginger/engine/math/vectors/ReadableVector.java index c532128..034247e 100644 --- a/src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector.java +++ b/src/main/java/com/github/hydos/ginger/engine/math/vectors/ReadableVector.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.github.hydos.ginger.engine.math.vectors; +package com.github.hydos.ginger.engine.math.vectors; import java.nio.FloatBuffer; diff --git a/src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector2f.java b/src/main/java/com/github/hydos/ginger/engine/math/vectors/ReadableVector2f.java similarity index 97% rename from src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector2f.java rename to src/main/java/com/github/hydos/ginger/engine/math/vectors/ReadableVector2f.java index 33d920d..e8ffb49 100644 --- a/src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector2f.java +++ b/src/main/java/com/github/hydos/ginger/engine/math/vectors/ReadableVector2f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.github.hydos.ginger.engine.math.vectors; +package com.github.hydos.ginger.engine.math.vectors; /** * @author foo diff --git a/src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector3f.java b/src/main/java/com/github/hydos/ginger/engine/math/vectors/ReadableVector3f.java similarity index 96% rename from src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector3f.java rename to src/main/java/com/github/hydos/ginger/engine/math/vectors/ReadableVector3f.java index 32b8f5d..1269763 100644 --- a/src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector3f.java +++ b/src/main/java/com/github/hydos/ginger/engine/math/vectors/ReadableVector3f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.github.hydos.ginger.engine.math.vectors; +package com.github.hydos.ginger.engine.math.vectors; /** * @author foo diff --git a/src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector4f.java b/src/main/java/com/github/hydos/ginger/engine/math/vectors/ReadableVector4f.java similarity index 96% rename from src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector4f.java rename to src/main/java/com/github/hydos/ginger/engine/math/vectors/ReadableVector4f.java index 0cfaef1..50d5d68 100644 --- a/src/main/java/io/github/hydos/ginger/engine/math/vectors/ReadableVector4f.java +++ b/src/main/java/com/github/hydos/ginger/engine/math/vectors/ReadableVector4f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.github.hydos.ginger.engine.math.vectors; +package com.github.hydos.ginger.engine.math.vectors; /** * @author foo diff --git a/src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector.java b/src/main/java/com/github/hydos/ginger/engine/math/vectors/Vector.java similarity index 98% rename from src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector.java rename to src/main/java/com/github/hydos/ginger/engine/math/vectors/Vector.java index 71e62a6..d197152 100644 --- a/src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector.java +++ b/src/main/java/com/github/hydos/ginger/engine/math/vectors/Vector.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.github.hydos.ginger.engine.math.vectors; +package com.github.hydos.ginger.engine.math.vectors; import java.io.Serializable; import java.nio.FloatBuffer; diff --git a/src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector2f.java b/src/main/java/com/github/hydos/ginger/engine/math/vectors/Vector2f.java similarity index 99% rename from src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector2f.java rename to src/main/java/com/github/hydos/ginger/engine/math/vectors/Vector2f.java index a8ce5dc..680d402 100644 --- a/src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector2f.java +++ b/src/main/java/com/github/hydos/ginger/engine/math/vectors/Vector2f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.github.hydos.ginger.engine.math.vectors; +package com.github.hydos.ginger.engine.math.vectors; import java.io.Serializable; import java.nio.FloatBuffer; diff --git a/src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector3f.java b/src/main/java/com/github/hydos/ginger/engine/math/vectors/Vector3f.java similarity index 99% rename from src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector3f.java rename to src/main/java/com/github/hydos/ginger/engine/math/vectors/Vector3f.java index de05b6d..b35205a 100644 --- a/src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector3f.java +++ b/src/main/java/com/github/hydos/ginger/engine/math/vectors/Vector3f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.github.hydos.ginger.engine.math.vectors; +package com.github.hydos.ginger.engine.math.vectors; import java.io.Serializable; import java.nio.FloatBuffer; diff --git a/src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector4f.java b/src/main/java/com/github/hydos/ginger/engine/math/vectors/Vector4f.java similarity index 99% rename from src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector4f.java rename to src/main/java/com/github/hydos/ginger/engine/math/vectors/Vector4f.java index a37815f..405cae6 100644 --- a/src/main/java/io/github/hydos/ginger/engine/math/vectors/Vector4f.java +++ b/src/main/java/com/github/hydos/ginger/engine/math/vectors/Vector4f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.github.hydos.ginger.engine.math.vectors; +package com.github.hydos.ginger.engine.math.vectors; import java.io.Serializable; import java.nio.FloatBuffer; diff --git a/src/main/java/io/github/hydos/ginger/engine/math/vectors/WritableVector2f.java b/src/main/java/com/github/hydos/ginger/engine/math/vectors/WritableVector2f.java similarity index 97% rename from src/main/java/io/github/hydos/ginger/engine/math/vectors/WritableVector2f.java rename to src/main/java/com/github/hydos/ginger/engine/math/vectors/WritableVector2f.java index f512c77..12e47c7 100644 --- a/src/main/java/io/github/hydos/ginger/engine/math/vectors/WritableVector2f.java +++ b/src/main/java/com/github/hydos/ginger/engine/math/vectors/WritableVector2f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.github.hydos.ginger.engine.math.vectors; +package com.github.hydos.ginger.engine.math.vectors; /** * Writable interface to Vector2fs diff --git a/src/main/java/io/github/hydos/ginger/engine/math/vectors/WritableVector3f.java b/src/main/java/com/github/hydos/ginger/engine/math/vectors/WritableVector3f.java similarity index 97% rename from src/main/java/io/github/hydos/ginger/engine/math/vectors/WritableVector3f.java rename to src/main/java/com/github/hydos/ginger/engine/math/vectors/WritableVector3f.java index e596468..7be3388 100644 --- a/src/main/java/io/github/hydos/ginger/engine/math/vectors/WritableVector3f.java +++ b/src/main/java/com/github/hydos/ginger/engine/math/vectors/WritableVector3f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.github.hydos.ginger.engine.math.vectors; +package com.github.hydos.ginger.engine.math.vectors; /** * Writable interface to Vector3fs diff --git a/src/main/java/io/github/hydos/ginger/engine/math/vectors/WritableVector4f.java b/src/main/java/com/github/hydos/ginger/engine/math/vectors/WritableVector4f.java similarity index 97% rename from src/main/java/io/github/hydos/ginger/engine/math/vectors/WritableVector4f.java rename to src/main/java/com/github/hydos/ginger/engine/math/vectors/WritableVector4f.java index 5ee06a6..6f90572 100644 --- a/src/main/java/io/github/hydos/ginger/engine/math/vectors/WritableVector4f.java +++ b/src/main/java/com/github/hydos/ginger/engine/math/vectors/WritableVector4f.java @@ -29,7 +29,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.github.hydos.ginger.engine.math.vectors; +package com.github.hydos.ginger.engine.math.vectors; /** * Writable interface to Vector4fs diff --git a/src/main/java/com/github/hydos/ginger/engine/obj/Material.java b/src/main/java/com/github/hydos/ginger/engine/obj/Material.java new file mode 100644 index 0000000..3286d91 --- /dev/null +++ b/src/main/java/com/github/hydos/ginger/engine/obj/Material.java @@ -0,0 +1,5 @@ +package com.github.hydos.ginger.engine.obj; + +public class Material { + +} diff --git a/src/main/java/io/github/hydos/ginger/engine/obj/Mesh.java b/src/main/java/com/github/hydos/ginger/engine/obj/Mesh.java similarity index 94% rename from src/main/java/io/github/hydos/ginger/engine/obj/Mesh.java rename to src/main/java/com/github/hydos/ginger/engine/obj/Mesh.java index 6862edc..c9febcb 100644 --- a/src/main/java/io/github/hydos/ginger/engine/obj/Mesh.java +++ b/src/main/java/com/github/hydos/ginger/engine/obj/Mesh.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.obj; +package com.github.hydos.ginger.engine.obj; public class Mesh { diff --git a/src/main/java/io/github/hydos/ginger/engine/obj/ModelLoader.java b/src/main/java/com/github/hydos/ginger/engine/obj/ModelLoader.java similarity index 69% rename from src/main/java/io/github/hydos/ginger/engine/obj/ModelLoader.java rename to src/main/java/com/github/hydos/ginger/engine/obj/ModelLoader.java index 46f08ba..56df292 100644 --- a/src/main/java/io/github/hydos/ginger/engine/obj/ModelLoader.java +++ b/src/main/java/com/github/hydos/ginger/engine/obj/ModelLoader.java @@ -1,9 +1,9 @@ -package io.github.hydos.ginger.engine.obj; +package com.github.hydos.ginger.engine.obj; -import io.github.hydos.ginger.engine.obj.shapes.StaticCube; -import io.github.hydos.ginger.engine.render.models.TexturedModel; -import io.github.hydos.ginger.engine.render.texture.ModelTexture; -import io.github.hydos.ginger.engine.utils.Loader; +import com.github.hydos.ginger.engine.obj.shapes.StaticCube; +import com.github.hydos.ginger.engine.render.models.TexturedModel; +import com.github.hydos.ginger.engine.render.texture.ModelTexture; +import com.github.hydos.ginger.engine.utils.Loader; public class ModelLoader { diff --git a/src/main/java/io/github/hydos/ginger/engine/obj/OBJFileLoader.java b/src/main/java/com/github/hydos/ginger/engine/obj/OBJFileLoader.java similarity index 94% rename from src/main/java/io/github/hydos/ginger/engine/obj/OBJFileLoader.java rename to src/main/java/com/github/hydos/ginger/engine/obj/OBJFileLoader.java index fb32edc..d7e868f 100644 --- a/src/main/java/io/github/hydos/ginger/engine/obj/OBJFileLoader.java +++ b/src/main/java/com/github/hydos/ginger/engine/obj/OBJFileLoader.java @@ -1,14 +1,14 @@ -package io.github.hydos.ginger.engine.obj; +package com.github.hydos.ginger.engine.obj; import org.lwjgl.assimp.AIFace; import org.lwjgl.assimp.AIMesh; import org.lwjgl.assimp.AIScene; import org.lwjgl.assimp.AIVector3D; import org.lwjgl.assimp.AIVector3D.Buffer; -import org.lwjgl.assimp.Assimp; -import io.github.hydos.ginger.engine.math.vectors.Vector2f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.math.vectors.*; + +import org.lwjgl.assimp.Assimp; public class OBJFileLoader { diff --git a/src/main/java/io/github/hydos/ginger/engine/obj/Vertex.java b/src/main/java/com/github/hydos/ginger/engine/obj/Vertex.java similarity index 89% rename from src/main/java/io/github/hydos/ginger/engine/obj/Vertex.java rename to src/main/java/com/github/hydos/ginger/engine/obj/Vertex.java index e5bd42d..b1b870b 100644 --- a/src/main/java/io/github/hydos/ginger/engine/obj/Vertex.java +++ b/src/main/java/com/github/hydos/ginger/engine/obj/Vertex.java @@ -1,7 +1,6 @@ -package io.github.hydos.ginger.engine.obj; +package com.github.hydos.ginger.engine.obj; -import io.github.hydos.ginger.engine.math.vectors.Vector2f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.math.vectors.*; public class Vertex { diff --git a/src/main/java/io/github/hydos/ginger/engine/obj/normals/ModelDataNM.java b/src/main/java/com/github/hydos/ginger/engine/obj/normals/ModelDataNM.java similarity index 94% rename from src/main/java/io/github/hydos/ginger/engine/obj/normals/ModelDataNM.java rename to src/main/java/com/github/hydos/ginger/engine/obj/normals/ModelDataNM.java index c2f55a9..3361f78 100644 --- a/src/main/java/io/github/hydos/ginger/engine/obj/normals/ModelDataNM.java +++ b/src/main/java/com/github/hydos/ginger/engine/obj/normals/ModelDataNM.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.obj.normals; +package com.github.hydos.ginger.engine.obj.normals; public class ModelDataNM { diff --git a/src/main/java/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.java b/src/main/java/com/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.java similarity index 96% rename from src/main/java/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.java rename to src/main/java/com/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.java index 8ca5aca..4508242 100644 --- a/src/main/java/io/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.java +++ b/src/main/java/com/github/hydos/ginger/engine/obj/normals/NormalMappedObjLoader.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.obj.normals; +package com.github.hydos.ginger.engine.obj.normals; import java.io.BufferedReader; import java.io.IOException; @@ -6,10 +6,9 @@ import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; -import io.github.hydos.ginger.engine.math.vectors.Vector2f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; -import io.github.hydos.ginger.engine.render.models.RawModel; -import io.github.hydos.ginger.engine.utils.Loader; +import com.github.hydos.ginger.engine.math.vectors.*; +import com.github.hydos.ginger.engine.render.models.RawModel; +import com.github.hydos.ginger.engine.utils.Loader; public class NormalMappedObjLoader { diff --git a/src/main/java/io/github/hydos/ginger/engine/obj/normals/VertexNM.java b/src/main/java/com/github/hydos/ginger/engine/obj/normals/VertexNM.java similarity index 94% rename from src/main/java/io/github/hydos/ginger/engine/obj/normals/VertexNM.java rename to src/main/java/com/github/hydos/ginger/engine/obj/normals/VertexNM.java index 7f6e5e7..d1b71d8 100644 --- a/src/main/java/io/github/hydos/ginger/engine/obj/normals/VertexNM.java +++ b/src/main/java/com/github/hydos/ginger/engine/obj/normals/VertexNM.java @@ -1,9 +1,9 @@ -package io.github.hydos.ginger.engine.obj.normals; +package com.github.hydos.ginger.engine.obj.normals; import java.util.ArrayList; import java.util.List; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.math.vectors.Vector3f; public class VertexNM { diff --git a/src/main/java/com/github/hydos/ginger/engine/obj/shapes/ShapeMesh.java b/src/main/java/com/github/hydos/ginger/engine/obj/shapes/ShapeMesh.java new file mode 100644 index 0000000..dad0279 --- /dev/null +++ b/src/main/java/com/github/hydos/ginger/engine/obj/shapes/ShapeMesh.java @@ -0,0 +1 @@ +package com.github.hydos.ginger.engine.obj.shapes; diff --git a/src/main/java/io/github/hydos/ginger/engine/obj/shapes/StaticCube.java b/src/main/java/com/github/hydos/ginger/engine/obj/shapes/StaticCube.java similarity index 93% rename from src/main/java/io/github/hydos/ginger/engine/obj/shapes/StaticCube.java rename to src/main/java/com/github/hydos/ginger/engine/obj/shapes/StaticCube.java index 51c3897..c63c888 100644 --- a/src/main/java/io/github/hydos/ginger/engine/obj/shapes/StaticCube.java +++ b/src/main/java/com/github/hydos/ginger/engine/obj/shapes/StaticCube.java @@ -1,6 +1,6 @@ -package io.github.hydos.ginger.engine.obj.shapes; +package com.github.hydos.ginger.engine.obj.shapes; -import io.github.hydos.ginger.engine.obj.Mesh; +import com.github.hydos.ginger.engine.obj.Mesh; public class StaticCube { diff --git a/src/main/java/io/github/hydos/ginger/engine/particle/InsertionSort.java b/src/main/java/com/github/hydos/ginger/engine/particle/InsertionSort.java similarity index 95% rename from src/main/java/io/github/hydos/ginger/engine/particle/InsertionSort.java rename to src/main/java/com/github/hydos/ginger/engine/particle/InsertionSort.java index b709e4a..8a299e3 100644 --- a/src/main/java/io/github/hydos/ginger/engine/particle/InsertionSort.java +++ b/src/main/java/com/github/hydos/ginger/engine/particle/InsertionSort.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.particle; +package com.github.hydos.ginger.engine.particle; import java.util.List; diff --git a/src/main/java/io/github/hydos/ginger/engine/particle/Particle.java b/src/main/java/com/github/hydos/ginger/engine/particle/Particle.java similarity index 88% rename from src/main/java/io/github/hydos/ginger/engine/particle/Particle.java rename to src/main/java/com/github/hydos/ginger/engine/particle/Particle.java index 25b442a..5cb8337 100644 --- a/src/main/java/io/github/hydos/ginger/engine/particle/Particle.java +++ b/src/main/java/com/github/hydos/ginger/engine/particle/Particle.java @@ -1,10 +1,9 @@ -package io.github.hydos.ginger.engine.particle; +package com.github.hydos.ginger.engine.particle; -import io.github.hydos.ginger.engine.cameras.Camera; -import io.github.hydos.ginger.engine.io.Window; -import io.github.hydos.ginger.engine.math.vectors.Vector2f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; -import io.github.hydos.ginger.main.settings.Constants; +import com.github.hydos.ginger.engine.cameras.Camera; +import com.github.hydos.ginger.engine.io.Window; +import com.github.hydos.ginger.engine.math.vectors.*; +import com.github.hydos.ginger.main.settings.Constants; public class Particle { diff --git a/src/main/java/io/github/hydos/ginger/engine/particle/ParticleMaster.java b/src/main/java/com/github/hydos/ginger/engine/particle/ParticleMaster.java similarity index 85% rename from src/main/java/io/github/hydos/ginger/engine/particle/ParticleMaster.java rename to src/main/java/com/github/hydos/ginger/engine/particle/ParticleMaster.java index 9619b96..c29995b 100644 --- a/src/main/java/io/github/hydos/ginger/engine/particle/ParticleMaster.java +++ b/src/main/java/com/github/hydos/ginger/engine/particle/ParticleMaster.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.particle; +package com.github.hydos.ginger.engine.particle; import java.util.ArrayList; import java.util.HashMap; @@ -7,9 +7,9 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import io.github.hydos.ginger.engine.cameras.Camera; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.render.renderers.ParticleRenderer; +import com.github.hydos.ginger.engine.cameras.Camera; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.render.renderers.ParticleRenderer; public class ParticleMaster { diff --git a/src/main/java/io/github/hydos/ginger/engine/particle/ParticleSystem.java b/src/main/java/com/github/hydos/ginger/engine/particle/ParticleSystem.java similarity index 95% rename from src/main/java/io/github/hydos/ginger/engine/particle/ParticleSystem.java rename to src/main/java/com/github/hydos/ginger/engine/particle/ParticleSystem.java index 72531b8..a990e00 100644 --- a/src/main/java/io/github/hydos/ginger/engine/particle/ParticleSystem.java +++ b/src/main/java/com/github/hydos/ginger/engine/particle/ParticleSystem.java @@ -1,12 +1,12 @@ -package io.github.hydos.ginger.engine.particle; +package com.github.hydos.ginger.engine.particle; import java.util.Random; import org.joml.Vector4f; -import io.github.hydos.ginger.engine.io.Window; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.io.Window; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.math.vectors.Vector3f; public class ParticleSystem { diff --git a/src/main/java/io/github/hydos/ginger/engine/particle/ParticleTexture.java b/src/main/java/com/github/hydos/ginger/engine/particle/ParticleTexture.java similarity index 87% rename from src/main/java/io/github/hydos/ginger/engine/particle/ParticleTexture.java rename to src/main/java/com/github/hydos/ginger/engine/particle/ParticleTexture.java index 15a0937..738ba44 100644 --- a/src/main/java/io/github/hydos/ginger/engine/particle/ParticleTexture.java +++ b/src/main/java/com/github/hydos/ginger/engine/particle/ParticleTexture.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.particle; +package com.github.hydos.ginger.engine.particle; public class ParticleTexture { diff --git a/src/main/java/io/github/hydos/ginger/engine/postprocessing/ContrastChanger.java b/src/main/java/com/github/hydos/ginger/engine/postprocessing/ContrastChanger.java similarity index 90% rename from src/main/java/io/github/hydos/ginger/engine/postprocessing/ContrastChanger.java rename to src/main/java/com/github/hydos/ginger/engine/postprocessing/ContrastChanger.java index da891d0..a01254b 100644 --- a/src/main/java/io/github/hydos/ginger/engine/postprocessing/ContrastChanger.java +++ b/src/main/java/com/github/hydos/ginger/engine/postprocessing/ContrastChanger.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.postprocessing; +package com.github.hydos.ginger.engine.postprocessing; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL13; diff --git a/src/main/java/io/github/hydos/ginger/engine/postprocessing/ContrastShader.java b/src/main/java/com/github/hydos/ginger/engine/postprocessing/ContrastShader.java similarity index 76% rename from src/main/java/io/github/hydos/ginger/engine/postprocessing/ContrastShader.java rename to src/main/java/com/github/hydos/ginger/engine/postprocessing/ContrastShader.java index 12e57d7..974bb09 100644 --- a/src/main/java/io/github/hydos/ginger/engine/postprocessing/ContrastShader.java +++ b/src/main/java/com/github/hydos/ginger/engine/postprocessing/ContrastShader.java @@ -1,6 +1,6 @@ -package io.github.hydos.ginger.engine.postprocessing; +package com.github.hydos.ginger.engine.postprocessing; -import io.github.hydos.ginger.engine.render.shaders.ShaderProgram; +import com.github.hydos.ginger.engine.render.shaders.ShaderProgram; public class ContrastShader extends ShaderProgram { diff --git a/src/main/java/io/github/hydos/ginger/engine/postprocessing/Fbo.java b/src/main/java/com/github/hydos/ginger/engine/postprocessing/Fbo.java similarity index 97% rename from src/main/java/io/github/hydos/ginger/engine/postprocessing/Fbo.java rename to src/main/java/com/github/hydos/ginger/engine/postprocessing/Fbo.java index 0e3bfa9..f7ab360 100644 --- a/src/main/java/io/github/hydos/ginger/engine/postprocessing/Fbo.java +++ b/src/main/java/com/github/hydos/ginger/engine/postprocessing/Fbo.java @@ -1,5 +1,5 @@ -package io.github.hydos.ginger.engine.postprocessing; +package com.github.hydos.ginger.engine.postprocessing; import static org.lwjgl.opengl.ARBFramebufferObject.*; @@ -12,7 +12,7 @@ import org.lwjgl.glfw.GLFWFramebufferSizeCallback; import org.lwjgl.glfw.GLFWKeyCallback; import org.lwjgl.system.Callback; -import io.github.hydos.ginger.engine.io.Window; +import com.github.hydos.ginger.engine.io.Window; public class Fbo { diff --git a/src/main/java/io/github/hydos/ginger/engine/postprocessing/ImageRenderer.java b/src/main/java/com/github/hydos/ginger/engine/postprocessing/ImageRenderer.java similarity index 90% rename from src/main/java/io/github/hydos/ginger/engine/postprocessing/ImageRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/postprocessing/ImageRenderer.java index 476aace..e27af1d 100644 --- a/src/main/java/io/github/hydos/ginger/engine/postprocessing/ImageRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/postprocessing/ImageRenderer.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.postprocessing; +package com.github.hydos.ginger.engine.postprocessing; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/io/github/hydos/ginger/engine/postprocessing/PostProcessing.java b/src/main/java/com/github/hydos/ginger/engine/postprocessing/PostProcessing.java similarity index 83% rename from src/main/java/io/github/hydos/ginger/engine/postprocessing/PostProcessing.java rename to src/main/java/com/github/hydos/ginger/engine/postprocessing/PostProcessing.java index dd3bba4..92942e3 100644 --- a/src/main/java/io/github/hydos/ginger/engine/postprocessing/PostProcessing.java +++ b/src/main/java/com/github/hydos/ginger/engine/postprocessing/PostProcessing.java @@ -1,11 +1,11 @@ -package io.github.hydos.ginger.engine.postprocessing; +package com.github.hydos.ginger.engine.postprocessing; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL30; -import io.github.hydos.ginger.engine.render.models.RawModel; -import io.github.hydos.ginger.engine.utils.Loader; +import com.github.hydos.ginger.engine.render.models.RawModel; +import com.github.hydos.ginger.engine.utils.Loader; public class PostProcessing { diff --git a/src/main/java/io/github/hydos/ginger/engine/render/MasterRenderer.java b/src/main/java/com/github/hydos/ginger/engine/render/MasterRenderer.java similarity index 83% rename from src/main/java/io/github/hydos/ginger/engine/render/MasterRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/render/MasterRenderer.java index 97d1f60..c292f00 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/MasterRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/MasterRenderer.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.render; +package com.github.hydos.ginger.engine.render; import java.util.ArrayList; import java.util.HashMap; @@ -9,23 +9,16 @@ import org.joml.Vector4f; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL13; -import io.github.hydos.ginger.engine.cameras.Camera; -import io.github.hydos.ginger.engine.elements.GuiTexture; -import io.github.hydos.ginger.engine.elements.objects.RenderObject; -import io.github.hydos.ginger.engine.elements.objects.Light; -import io.github.hydos.ginger.engine.io.Window; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.render.models.TexturedModel; -import io.github.hydos.ginger.engine.render.renderers.EntityRenderer; -import io.github.hydos.ginger.engine.render.renderers.GuiRenderer; -import io.github.hydos.ginger.engine.render.renderers.NormalMappingRenderer; -import io.github.hydos.ginger.engine.render.renderers.SkyboxRenderer; -import io.github.hydos.ginger.engine.render.renderers.TerrainRenderer; -import io.github.hydos.ginger.engine.render.shaders.GuiShader; -import io.github.hydos.ginger.engine.render.shaders.StaticShader; -import io.github.hydos.ginger.engine.render.shaders.TerrainShader; -import io.github.hydos.ginger.engine.shadow.ShadowMapMasterRenderer; -import io.github.hydos.ginger.engine.terrain.Terrain; +import com.github.hydos.ginger.engine.cameras.Camera; +import com.github.hydos.ginger.engine.elements.GuiTexture; +import com.github.hydos.ginger.engine.elements.objects.*; +import com.github.hydos.ginger.engine.io.Window; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.render.models.TexturedModel; +import com.github.hydos.ginger.engine.render.renderers.*; +import com.github.hydos.ginger.engine.render.shaders.*; +import com.github.hydos.ginger.engine.shadow.ShadowMapMasterRenderer; +import com.github.hydos.ginger.engine.terrain.Terrain; public class MasterRenderer { diff --git a/src/main/java/io/github/hydos/ginger/engine/render/models/RawModel.java b/src/main/java/com/github/hydos/ginger/engine/render/models/RawModel.java similarity index 84% rename from src/main/java/io/github/hydos/ginger/engine/render/models/RawModel.java rename to src/main/java/com/github/hydos/ginger/engine/render/models/RawModel.java index 2698d71..4fd53a3 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/models/RawModel.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/models/RawModel.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.render.models; +package com.github.hydos.ginger.engine.render.models; public class RawModel { diff --git a/src/main/java/io/github/hydos/ginger/engine/render/models/TexturedModel.java b/src/main/java/com/github/hydos/ginger/engine/render/models/TexturedModel.java similarity index 73% rename from src/main/java/io/github/hydos/ginger/engine/render/models/TexturedModel.java rename to src/main/java/com/github/hydos/ginger/engine/render/models/TexturedModel.java index 2c2b566..577b5d2 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/models/TexturedModel.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/models/TexturedModel.java @@ -1,6 +1,6 @@ -package io.github.hydos.ginger.engine.render.models; +package com.github.hydos.ginger.engine.render.models; -import io.github.hydos.ginger.engine.render.texture.ModelTexture; +import com.github.hydos.ginger.engine.render.texture.ModelTexture; public class TexturedModel { diff --git a/src/main/java/io/github/hydos/ginger/engine/render/renderers/EntityRenderer.java b/src/main/java/com/github/hydos/ginger/engine/render/renderers/EntityRenderer.java similarity index 78% rename from src/main/java/io/github/hydos/ginger/engine/render/renderers/EntityRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/render/renderers/EntityRenderer.java index 0cf20c4..02effae 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/renderers/EntityRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/renderers/EntityRenderer.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.render.renderers; +package com.github.hydos.ginger.engine.render.renderers; import java.util.List; import java.util.Map; @@ -8,14 +8,13 @@ import org.lwjgl.opengl.GL13; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL30; -import io.github.hydos.ginger.engine.elements.objects.RenderObject; -import io.github.hydos.ginger.engine.math.Maths; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.render.MasterRenderer; -import io.github.hydos.ginger.engine.render.models.RawModel; -import io.github.hydos.ginger.engine.render.models.TexturedModel; -import io.github.hydos.ginger.engine.render.shaders.StaticShader; -import io.github.hydos.ginger.engine.render.texture.ModelTexture; +import com.github.hydos.ginger.engine.elements.objects.RenderObject; +import com.github.hydos.ginger.engine.math.Maths; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.render.MasterRenderer; +import com.github.hydos.ginger.engine.render.models.*; +import com.github.hydos.ginger.engine.render.shaders.StaticShader; +import com.github.hydos.ginger.engine.render.texture.ModelTexture; public class EntityRenderer { diff --git a/src/main/java/io/github/hydos/ginger/engine/render/renderers/FontRenderer.java b/src/main/java/com/github/hydos/ginger/engine/render/renderers/FontRenderer.java similarity index 86% rename from src/main/java/io/github/hydos/ginger/engine/render/renderers/FontRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/render/renderers/FontRenderer.java index 2879560..8bb18e6 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/renderers/FontRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/renderers/FontRenderer.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.render.renderers; +package com.github.hydos.ginger.engine.render.renderers; import java.util.List; import java.util.Map; @@ -9,9 +9,8 @@ import org.lwjgl.opengl.GL14; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL30; -import io.github.hydos.ginger.engine.font.FontType; -import io.github.hydos.ginger.engine.font.GUIText; -import io.github.hydos.ginger.engine.render.shaders.FontShader; +import com.github.hydos.ginger.engine.font.*; +import com.github.hydos.ginger.engine.render.shaders.FontShader; public class FontRenderer { diff --git a/src/main/java/io/github/hydos/ginger/engine/render/renderers/GuiRenderer.java b/src/main/java/com/github/hydos/ginger/engine/render/renderers/GuiRenderer.java similarity index 75% rename from src/main/java/io/github/hydos/ginger/engine/render/renderers/GuiRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/render/renderers/GuiRenderer.java index 4c81acc..ec9358a 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/renderers/GuiRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/renderers/GuiRenderer.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.render.renderers; +package com.github.hydos.ginger.engine.render.renderers; import java.util.List; @@ -7,12 +7,12 @@ import org.lwjgl.opengl.GL13; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL30; -import io.github.hydos.ginger.engine.elements.GuiTexture; -import io.github.hydos.ginger.engine.math.Maths; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.render.models.RawModel; -import io.github.hydos.ginger.engine.render.shaders.GuiShader; -import io.github.hydos.ginger.engine.utils.Loader; +import com.github.hydos.ginger.engine.elements.GuiTexture; +import com.github.hydos.ginger.engine.math.Maths; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.render.models.RawModel; +import com.github.hydos.ginger.engine.render.shaders.GuiShader; +import com.github.hydos.ginger.engine.utils.Loader; public class GuiRenderer { diff --git a/src/main/java/io/github/hydos/ginger/engine/render/renderers/NormalMappingRenderer.java b/src/main/java/com/github/hydos/ginger/engine/render/renderers/NormalMappingRenderer.java similarity index 79% rename from src/main/java/io/github/hydos/ginger/engine/render/renderers/NormalMappingRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/render/renderers/NormalMappingRenderer.java index 260e86f..cb4087b 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/renderers/NormalMappingRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/renderers/NormalMappingRenderer.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.render.renderers; +package com.github.hydos.ginger.engine.render.renderers; import java.util.List; import java.util.Map; @@ -9,17 +9,15 @@ import org.lwjgl.opengl.GL13; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL30; -import io.github.hydos.ginger.engine.cameras.Camera; -import io.github.hydos.ginger.engine.elements.objects.RenderObject; -import io.github.hydos.ginger.engine.elements.objects.Light; -import io.github.hydos.ginger.engine.io.Window; -import io.github.hydos.ginger.engine.math.Maths; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.render.MasterRenderer; -import io.github.hydos.ginger.engine.render.models.RawModel; -import io.github.hydos.ginger.engine.render.models.TexturedModel; -import io.github.hydos.ginger.engine.render.shaders.NormalMappingShader; -import io.github.hydos.ginger.engine.render.texture.ModelTexture; +import com.github.hydos.ginger.engine.cameras.Camera; +import com.github.hydos.ginger.engine.elements.objects.*; +import com.github.hydos.ginger.engine.io.Window; +import com.github.hydos.ginger.engine.math.Maths; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.render.MasterRenderer; +import com.github.hydos.ginger.engine.render.models.*; +import com.github.hydos.ginger.engine.render.shaders.NormalMappingShader; +import com.github.hydos.ginger.engine.render.texture.ModelTexture; public class NormalMappingRenderer { diff --git a/src/main/java/io/github/hydos/ginger/engine/render/renderers/ParticleRenderer.java b/src/main/java/com/github/hydos/ginger/engine/render/renderers/ParticleRenderer.java similarity index 90% rename from src/main/java/io/github/hydos/ginger/engine/render/renderers/ParticleRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/render/renderers/ParticleRenderer.java index 94287cf..bccb51f 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/renderers/ParticleRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/renderers/ParticleRenderer.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.render.renderers; +package com.github.hydos.ginger.engine.render.renderers; import java.nio.FloatBuffer; import java.util.List; @@ -11,15 +11,14 @@ import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL31; -import io.github.hydos.ginger.engine.cameras.Camera; -import io.github.hydos.ginger.engine.math.Maths; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; -import io.github.hydos.ginger.engine.particle.Particle; -import io.github.hydos.ginger.engine.particle.ParticleTexture; -import io.github.hydos.ginger.engine.render.models.RawModel; -import io.github.hydos.ginger.engine.render.shaders.ParticleShader; -import io.github.hydos.ginger.engine.utils.Loader; +import com.github.hydos.ginger.engine.cameras.Camera; +import com.github.hydos.ginger.engine.math.Maths; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.particle.*; +import com.github.hydos.ginger.engine.render.models.RawModel; +import com.github.hydos.ginger.engine.render.shaders.ParticleShader; +import com.github.hydos.ginger.engine.utils.Loader; public class ParticleRenderer { diff --git a/src/main/java/io/github/hydos/ginger/engine/render/renderers/SkyboxRenderer.java b/src/main/java/com/github/hydos/ginger/engine/render/renderers/SkyboxRenderer.java similarity index 85% rename from src/main/java/io/github/hydos/ginger/engine/render/renderers/SkyboxRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/render/renderers/SkyboxRenderer.java index f601789..76b104d 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/renderers/SkyboxRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/renderers/SkyboxRenderer.java @@ -1,15 +1,15 @@ -package io.github.hydos.ginger.engine.render.renderers; +package com.github.hydos.ginger.engine.render.renderers; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL13; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL30; -import io.github.hydos.ginger.engine.cameras.Camera; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.render.models.RawModel; -import io.github.hydos.ginger.engine.render.shaders.SkyboxShader; -import io.github.hydos.ginger.engine.utils.Loader; +import com.github.hydos.ginger.engine.cameras.Camera; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.render.models.RawModel; +import com.github.hydos.ginger.engine.render.shaders.SkyboxShader; +import com.github.hydos.ginger.engine.utils.Loader; public class SkyboxRenderer { diff --git a/src/main/java/io/github/hydos/ginger/engine/render/renderers/TerrainRenderer.java b/src/main/java/com/github/hydos/ginger/engine/render/renderers/TerrainRenderer.java similarity index 81% rename from src/main/java/io/github/hydos/ginger/engine/render/renderers/TerrainRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/render/renderers/TerrainRenderer.java index 83e0a56..0f02e22 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/renderers/TerrainRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/renderers/TerrainRenderer.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.render.renderers; +package com.github.hydos.ginger.engine.render.renderers; import java.util.List; @@ -7,14 +7,12 @@ import org.lwjgl.opengl.GL13; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL30; -import io.github.hydos.ginger.engine.math.Maths; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; -import io.github.hydos.ginger.engine.render.models.RawModel; -import io.github.hydos.ginger.engine.render.shaders.TerrainShader; -import io.github.hydos.ginger.engine.terrain.Terrain; -import io.github.hydos.ginger.engine.terrain.TerrainTexture; -import io.github.hydos.ginger.engine.terrain.TerrainTexturePack; +import com.github.hydos.ginger.engine.math.Maths; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.render.models.RawModel; +import com.github.hydos.ginger.engine.render.shaders.TerrainShader; +import com.github.hydos.ginger.engine.terrain.*; public class TerrainRenderer { diff --git a/src/main/java/io/github/hydos/ginger/engine/render/shaders/FontShader.java b/src/main/java/com/github/hydos/ginger/engine/render/shaders/FontShader.java similarity index 87% rename from src/main/java/io/github/hydos/ginger/engine/render/shaders/FontShader.java rename to src/main/java/com/github/hydos/ginger/engine/render/shaders/FontShader.java index ea22a19..759314c 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/shaders/FontShader.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/shaders/FontShader.java @@ -1,8 +1,7 @@ -package io.github.hydos.ginger.engine.render.shaders; +package com.github.hydos.ginger.engine.render.shaders; -import io.github.hydos.ginger.engine.font.GUIText; -import io.github.hydos.ginger.engine.math.vectors.Vector2f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.font.GUIText; +import com.github.hydos.ginger.engine.math.vectors.*; public class FontShader extends ShaderProgram{ diff --git a/src/main/java/io/github/hydos/ginger/engine/render/shaders/GuiShader.java b/src/main/java/com/github/hydos/ginger/engine/render/shaders/GuiShader.java similarity index 86% rename from src/main/java/io/github/hydos/ginger/engine/render/shaders/GuiShader.java rename to src/main/java/com/github/hydos/ginger/engine/render/shaders/GuiShader.java index 258502b..b1f6e59 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/shaders/GuiShader.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/shaders/GuiShader.java @@ -1,6 +1,6 @@ -package io.github.hydos.ginger.engine.render.shaders; +package com.github.hydos.ginger.engine.render.shaders; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; public class GuiShader extends ShaderProgram{ diff --git a/src/main/java/io/github/hydos/ginger/engine/render/shaders/NormalMappingShader.java b/src/main/java/com/github/hydos/ginger/engine/render/shaders/NormalMappingShader.java similarity index 93% rename from src/main/java/io/github/hydos/ginger/engine/render/shaders/NormalMappingShader.java rename to src/main/java/com/github/hydos/ginger/engine/render/shaders/NormalMappingShader.java index 865c875..a2d57c4 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/shaders/NormalMappingShader.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/shaders/NormalMappingShader.java @@ -1,13 +1,12 @@ -package io.github.hydos.ginger.engine.render.shaders; +package com.github.hydos.ginger.engine.render.shaders; import java.util.List; import org.joml.Vector4f; -import io.github.hydos.ginger.engine.elements.objects.Light; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.math.vectors.Vector2f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.elements.objects.Light; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.math.vectors.*; public class NormalMappingShader extends ShaderProgram{ diff --git a/src/main/java/io/github/hydos/ginger/engine/render/shaders/ParticleShader.java b/src/main/java/com/github/hydos/ginger/engine/render/shaders/ParticleShader.java similarity index 89% rename from src/main/java/io/github/hydos/ginger/engine/render/shaders/ParticleShader.java rename to src/main/java/com/github/hydos/ginger/engine/render/shaders/ParticleShader.java index 76f63ff..c08aac1 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/shaders/ParticleShader.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/shaders/ParticleShader.java @@ -1,6 +1,6 @@ -package io.github.hydos.ginger.engine.render.shaders; +package com.github.hydos.ginger.engine.render.shaders; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; public class ParticleShader extends ShaderProgram { diff --git a/src/main/java/io/github/hydos/ginger/engine/render/shaders/ShaderProgram.java b/src/main/java/com/github/hydos/ginger/engine/render/shaders/ShaderProgram.java similarity index 93% rename from src/main/java/io/github/hydos/ginger/engine/render/shaders/ShaderProgram.java rename to src/main/java/com/github/hydos/ginger/engine/render/shaders/ShaderProgram.java index ec26563..163869a 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/shaders/ShaderProgram.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/shaders/ShaderProgram.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.render.shaders; +package com.github.hydos.ginger.engine.render.shaders; import java.io.BufferedReader; import java.io.IOException; @@ -10,9 +10,8 @@ import org.lwjgl.BufferUtils; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL20; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.math.vectors.Vector2f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.math.vectors.*; public abstract class ShaderProgram { diff --git a/src/main/java/io/github/hydos/ginger/engine/render/shaders/SkyboxShader.java b/src/main/java/com/github/hydos/ginger/engine/render/shaders/SkyboxShader.java similarity index 80% rename from src/main/java/io/github/hydos/ginger/engine/render/shaders/SkyboxShader.java rename to src/main/java/com/github/hydos/ginger/engine/render/shaders/SkyboxShader.java index 950abd4..60ee6a1 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/shaders/SkyboxShader.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/shaders/SkyboxShader.java @@ -1,8 +1,8 @@ -package io.github.hydos.ginger.engine.render.shaders; +package com.github.hydos.ginger.engine.render.shaders; -import io.github.hydos.ginger.engine.cameras.Camera; -import io.github.hydos.ginger.engine.math.Maths; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.cameras.Camera; +import com.github.hydos.ginger.engine.math.Maths; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; public class SkyboxShader extends ShaderProgram{ diff --git a/src/main/java/io/github/hydos/ginger/engine/render/shaders/StaticShader.java b/src/main/java/com/github/hydos/ginger/engine/render/shaders/StaticShader.java similarity index 89% rename from src/main/java/io/github/hydos/ginger/engine/render/shaders/StaticShader.java rename to src/main/java/com/github/hydos/ginger/engine/render/shaders/StaticShader.java index 86cc5d6..c04ca49 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/shaders/StaticShader.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/shaders/StaticShader.java @@ -1,12 +1,12 @@ -package io.github.hydos.ginger.engine.render.shaders; +package com.github.hydos.ginger.engine.render.shaders; import java.util.List; -import io.github.hydos.ginger.engine.cameras.Camera; -import io.github.hydos.ginger.engine.elements.objects.Light; -import io.github.hydos.ginger.engine.math.Maths; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.cameras.Camera; +import com.github.hydos.ginger.engine.elements.objects.Light; +import com.github.hydos.ginger.engine.math.Maths; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.math.vectors.Vector3f; public class StaticShader extends ShaderProgram{ diff --git a/src/main/java/io/github/hydos/ginger/engine/render/shaders/TerrainShader.java b/src/main/java/com/github/hydos/ginger/engine/render/shaders/TerrainShader.java similarity index 92% rename from src/main/java/io/github/hydos/ginger/engine/render/shaders/TerrainShader.java rename to src/main/java/com/github/hydos/ginger/engine/render/shaders/TerrainShader.java index d548550..fac69e0 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/shaders/TerrainShader.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/shaders/TerrainShader.java @@ -1,12 +1,12 @@ -package io.github.hydos.ginger.engine.render.shaders; +package com.github.hydos.ginger.engine.render.shaders; import java.util.List; -import io.github.hydos.ginger.engine.cameras.Camera; -import io.github.hydos.ginger.engine.elements.objects.Light; -import io.github.hydos.ginger.engine.math.Maths; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.cameras.Camera; +import com.github.hydos.ginger.engine.elements.objects.Light; +import com.github.hydos.ginger.engine.math.Maths; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.math.vectors.Vector3f; public class TerrainShader extends ShaderProgram{ diff --git a/src/main/java/io/github/hydos/ginger/engine/render/texture/Image.java b/src/main/java/com/github/hydos/ginger/engine/render/texture/Image.java similarity index 96% rename from src/main/java/io/github/hydos/ginger/engine/render/texture/Image.java rename to src/main/java/com/github/hydos/ginger/engine/render/texture/Image.java index e5bda68..3a1a99c 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/texture/Image.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/texture/Image.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.render.texture; +package com.github.hydos.ginger.engine.render.texture; import static org.lwjgl.stb.STBImage.stbi_failure_reason; import static org.lwjgl.stb.STBImage.stbi_info_from_memory; @@ -11,7 +11,7 @@ import java.nio.IntBuffer; import org.lwjgl.system.MemoryStack; -import io.github.hydos.ginger.engine.render.tools.IOUtil; +import com.github.hydos.ginger.engine.render.tools.IOUtil; public class Image { diff --git a/src/main/java/io/github/hydos/ginger/engine/render/texture/ModelTexture.java b/src/main/java/com/github/hydos/ginger/engine/render/texture/ModelTexture.java similarity index 97% rename from src/main/java/io/github/hydos/ginger/engine/render/texture/ModelTexture.java rename to src/main/java/com/github/hydos/ginger/engine/render/texture/ModelTexture.java index 707a4a0..f0dea0c 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/texture/ModelTexture.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/texture/ModelTexture.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.render.texture; +package com.github.hydos.ginger.engine.render.texture; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL14; diff --git a/src/main/java/io/github/hydos/ginger/engine/render/tools/IOUtil.java b/src/main/java/com/github/hydos/ginger/engine/render/tools/IOUtil.java similarity index 96% rename from src/main/java/io/github/hydos/ginger/engine/render/tools/IOUtil.java rename to src/main/java/com/github/hydos/ginger/engine/render/tools/IOUtil.java index cd7c365..53d5228 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/tools/IOUtil.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/tools/IOUtil.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.render.tools; +package com.github.hydos.ginger.engine.render.tools; import static org.lwjgl.BufferUtils.createByteBuffer; diff --git a/src/main/java/io/github/hydos/ginger/engine/render/tools/MousePicker.java b/src/main/java/com/github/hydos/ginger/engine/render/tools/MousePicker.java similarity index 89% rename from src/main/java/io/github/hydos/ginger/engine/render/tools/MousePicker.java rename to src/main/java/com/github/hydos/ginger/engine/render/tools/MousePicker.java index b84d4a9..573d1bc 100644 --- a/src/main/java/io/github/hydos/ginger/engine/render/tools/MousePicker.java +++ b/src/main/java/com/github/hydos/ginger/engine/render/tools/MousePicker.java @@ -1,14 +1,13 @@ -package io.github.hydos.ginger.engine.render.tools; +package com.github.hydos.ginger.engine.render.tools; import org.joml.Vector4f; -import io.github.hydos.ginger.engine.cameras.Camera; -import io.github.hydos.ginger.engine.io.Window; -import io.github.hydos.ginger.engine.math.Maths; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.math.vectors.Vector2f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; -import io.github.hydos.ginger.engine.terrain.Terrain; +import com.github.hydos.ginger.engine.cameras.Camera; +import com.github.hydos.ginger.engine.io.Window; +import com.github.hydos.ginger.engine.math.Maths; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.math.vectors.*; +import com.github.hydos.ginger.engine.terrain.Terrain; public class MousePicker { diff --git a/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowBox.java b/src/main/java/com/github/hydos/ginger/engine/shadow/ShadowBox.java similarity index 96% rename from src/main/java/io/github/hydos/ginger/engine/shadow/ShadowBox.java rename to src/main/java/com/github/hydos/ginger/engine/shadow/ShadowBox.java index fc62084..d86c5c9 100644 --- a/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowBox.java +++ b/src/main/java/com/github/hydos/ginger/engine/shadow/ShadowBox.java @@ -1,12 +1,12 @@ -package io.github.hydos.ginger.engine.shadow; +package com.github.hydos.ginger.engine.shadow; import org.joml.Vector4f; -import io.github.hydos.ginger.engine.cameras.Camera; -import io.github.hydos.ginger.engine.io.Window; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; -import io.github.hydos.ginger.engine.render.MasterRenderer; +import com.github.hydos.ginger.engine.cameras.Camera; +import com.github.hydos.ginger.engine.io.Window; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.render.MasterRenderer; /** * Represents the 3D cuboidal area of the world in which objects will cast diff --git a/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowFrameBuffer.java b/src/main/java/com/github/hydos/ginger/engine/shadow/ShadowFrameBuffer.java similarity index 97% rename from src/main/java/io/github/hydos/ginger/engine/shadow/ShadowFrameBuffer.java rename to src/main/java/com/github/hydos/ginger/engine/shadow/ShadowFrameBuffer.java index f8c18c2..3afe2a2 100644 --- a/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowFrameBuffer.java +++ b/src/main/java/com/github/hydos/ginger/engine/shadow/ShadowFrameBuffer.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.shadow; +package com.github.hydos.ginger.engine.shadow; import java.nio.ByteBuffer; @@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL14; import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL32; -import io.github.hydos.ginger.engine.io.Window; +import com.github.hydos.ginger.engine.io.Window; /** * The frame buffer for the shadow pass. This class sets up the depth texture diff --git a/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.java b/src/main/java/com/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.java similarity index 87% rename from src/main/java/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.java index 53ba86d..cfa2902 100644 --- a/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/shadow/ShadowMapEntityRenderer.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.shadow; +package com.github.hydos.ginger.engine.shadow; import java.util.List; import java.util.Map; @@ -8,12 +8,11 @@ import org.lwjgl.opengl.GL13; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL30; -import io.github.hydos.ginger.engine.elements.objects.RenderObject; -import io.github.hydos.ginger.engine.math.Maths; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.render.MasterRenderer; -import io.github.hydos.ginger.engine.render.models.RawModel; -import io.github.hydos.ginger.engine.render.models.TexturedModel; +import com.github.hydos.ginger.engine.elements.objects.RenderObject; +import com.github.hydos.ginger.engine.math.Maths; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.render.MasterRenderer; +import com.github.hydos.ginger.engine.render.models.*; public class ShadowMapEntityRenderer { diff --git a/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.java b/src/main/java/com/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.java similarity index 94% rename from src/main/java/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.java rename to src/main/java/com/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.java index 94a8b8a..76ddc3f 100644 --- a/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.java +++ b/src/main/java/com/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.java @@ -1,17 +1,15 @@ -package io.github.hydos.ginger.engine.shadow; +package com.github.hydos.ginger.engine.shadow; import java.util.List; import java.util.Map; import org.lwjgl.opengl.GL11; -import io.github.hydos.ginger.engine.cameras.Camera; -import io.github.hydos.ginger.engine.elements.objects.RenderObject; -import io.github.hydos.ginger.engine.elements.objects.Light; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.math.vectors.Vector2f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; -import io.github.hydos.ginger.engine.render.models.TexturedModel; +import com.github.hydos.ginger.engine.cameras.Camera; +import com.github.hydos.ginger.engine.elements.objects.*; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.math.vectors.*; +import com.github.hydos.ginger.engine.render.models.TexturedModel; /** * This class is in charge of using all of the classes in the shadows package to diff --git a/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowShader.java b/src/main/java/com/github/hydos/ginger/engine/shadow/ShadowShader.java similarity index 79% rename from src/main/java/io/github/hydos/ginger/engine/shadow/ShadowShader.java rename to src/main/java/com/github/hydos/ginger/engine/shadow/ShadowShader.java index 78b2ca2..2e231c9 100644 --- a/src/main/java/io/github/hydos/ginger/engine/shadow/ShadowShader.java +++ b/src/main/java/com/github/hydos/ginger/engine/shadow/ShadowShader.java @@ -1,7 +1,7 @@ -package io.github.hydos.ginger.engine.shadow; +package com.github.hydos.ginger.engine.shadow; -import io.github.hydos.ginger.engine.math.matrixes.Matrix4f; -import io.github.hydos.ginger.engine.render.shaders.ShaderProgram; +import com.github.hydos.ginger.engine.math.matrixes.Matrix4f; +import com.github.hydos.ginger.engine.render.shaders.ShaderProgram; public class ShadowShader extends ShaderProgram { diff --git a/src/main/java/io/github/hydos/ginger/engine/terrain/Terrain.java b/src/main/java/com/github/hydos/ginger/engine/terrain/Terrain.java similarity index 92% rename from src/main/java/io/github/hydos/ginger/engine/terrain/Terrain.java rename to src/main/java/com/github/hydos/ginger/engine/terrain/Terrain.java index 02fbd42..3eb39e3 100644 --- a/src/main/java/io/github/hydos/ginger/engine/terrain/Terrain.java +++ b/src/main/java/com/github/hydos/ginger/engine/terrain/Terrain.java @@ -1,16 +1,15 @@ -package io.github.hydos.ginger.engine.terrain; +package com.github.hydos.ginger.engine.terrain; import java.awt.image.BufferedImage; import java.io.IOException; import javax.imageio.ImageIO; -import io.github.hydos.ginger.engine.math.Maths; -import io.github.hydos.ginger.engine.math.vectors.Vector2f; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; -import io.github.hydos.ginger.engine.render.models.RawModel; -import io.github.hydos.ginger.engine.utils.Loader; -import io.github.hydos.ginger.main.settings.Constants; +import com.github.hydos.ginger.engine.math.Maths; +import com.github.hydos.ginger.engine.math.vectors.*; +import com.github.hydos.ginger.engine.render.models.RawModel; +import com.github.hydos.ginger.engine.utils.Loader; +import com.github.hydos.ginger.main.settings.Constants; public class Terrain { diff --git a/src/main/java/io/github/hydos/ginger/engine/terrain/TerrainTexture.java b/src/main/java/com/github/hydos/ginger/engine/terrain/TerrainTexture.java similarity index 80% rename from src/main/java/io/github/hydos/ginger/engine/terrain/TerrainTexture.java rename to src/main/java/com/github/hydos/ginger/engine/terrain/TerrainTexture.java index 44b3683..1486065 100644 --- a/src/main/java/io/github/hydos/ginger/engine/terrain/TerrainTexture.java +++ b/src/main/java/com/github/hydos/ginger/engine/terrain/TerrainTexture.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.terrain; +package com.github.hydos.ginger.engine.terrain; public class TerrainTexture { diff --git a/src/main/java/io/github/hydos/ginger/engine/terrain/TerrainTexturePack.java b/src/main/java/com/github/hydos/ginger/engine/terrain/TerrainTexturePack.java similarity index 93% rename from src/main/java/io/github/hydos/ginger/engine/terrain/TerrainTexturePack.java rename to src/main/java/com/github/hydos/ginger/engine/terrain/TerrainTexturePack.java index 7f48040..1436866 100644 --- a/src/main/java/io/github/hydos/ginger/engine/terrain/TerrainTexturePack.java +++ b/src/main/java/com/github/hydos/ginger/engine/terrain/TerrainTexturePack.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.terrain; +package com.github.hydos.ginger.engine.terrain; public class TerrainTexturePack { diff --git a/src/main/java/io/github/hydos/ginger/engine/utils/Loader.java b/src/main/java/com/github/hydos/ginger/engine/utils/Loader.java similarity index 96% rename from src/main/java/io/github/hydos/ginger/engine/utils/Loader.java rename to src/main/java/com/github/hydos/ginger/engine/utils/Loader.java index 6957394..f3c3d28 100644 --- a/src/main/java/io/github/hydos/ginger/engine/utils/Loader.java +++ b/src/main/java/com/github/hydos/ginger/engine/utils/Loader.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.engine.utils; +package com.github.hydos.ginger.engine.utils; import java.nio.FloatBuffer; import java.nio.IntBuffer; @@ -15,11 +15,10 @@ import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL33; -import io.github.hydos.ginger.engine.io.Window; -import io.github.hydos.ginger.engine.render.models.RawModel; -import io.github.hydos.ginger.engine.render.texture.Image; -import io.github.hydos.ginger.engine.render.texture.ModelTexture; -import io.github.hydos.ginger.engine.terrain.TerrainTexture; +import com.github.hydos.ginger.engine.io.Window; +import com.github.hydos.ginger.engine.render.models.RawModel; +import com.github.hydos.ginger.engine.render.texture.*; +import com.github.hydos.ginger.engine.terrain.TerrainTexture; public class Loader { diff --git a/src/main/java/io/github/hydos/ginger/main/GingerMain.java b/src/main/java/com/github/hydos/ginger/main/GingerMain.java similarity index 58% rename from src/main/java/io/github/hydos/ginger/main/GingerMain.java rename to src/main/java/com/github/hydos/ginger/main/GingerMain.java index c665898..394e958 100644 --- a/src/main/java/io/github/hydos/ginger/main/GingerMain.java +++ b/src/main/java/com/github/hydos/ginger/main/GingerMain.java @@ -1,12 +1,11 @@ -package io.github.hydos.ginger.main; +package com.github.hydos.ginger.main; -import io.github.hydos.ginger.engine.font.TextMaster; -import io.github.hydos.ginger.engine.obj.ModelLoader; -import io.github.hydos.ginger.engine.obj.normals.NormalMappedObjLoader; -import io.github.hydos.ginger.engine.render.MasterRenderer; -import io.github.hydos.ginger.engine.render.models.RawModel; -import io.github.hydos.ginger.engine.render.models.TexturedModel; -import io.github.hydos.ginger.engine.render.texture.ModelTexture; +import com.github.hydos.ginger.engine.font.TextMaster; +import com.github.hydos.ginger.engine.obj.ModelLoader; +import com.github.hydos.ginger.engine.obj.normals.NormalMappedObjLoader; +import com.github.hydos.ginger.engine.render.MasterRenderer; +import com.github.hydos.ginger.engine.render.models.*; +import com.github.hydos.ginger.engine.render.texture.ModelTexture; public class GingerMain { diff --git a/src/main/java/io/github/hydos/ginger/main/settings/Constants.java b/src/main/java/com/github/hydos/ginger/main/settings/Constants.java similarity index 88% rename from src/main/java/io/github/hydos/ginger/main/settings/Constants.java rename to src/main/java/com/github/hydos/ginger/main/settings/Constants.java index cade8c9..e2ed915 100644 --- a/src/main/java/io/github/hydos/ginger/main/settings/Constants.java +++ b/src/main/java/com/github/hydos/ginger/main/settings/Constants.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.main.settings; +package com.github.hydos.ginger.main.settings; public class Constants { diff --git a/src/main/java/io/github/hydos/ginger/main/tools/GSceneBuilder.java b/src/main/java/com/github/hydos/ginger/main/tools/GSceneBuilder.java similarity index 73% rename from src/main/java/io/github/hydos/ginger/main/tools/GSceneBuilder.java rename to src/main/java/com/github/hydos/ginger/main/tools/GSceneBuilder.java index 0f0db36..e431fbb 100644 --- a/src/main/java/io/github/hydos/ginger/main/tools/GSceneBuilder.java +++ b/src/main/java/com/github/hydos/ginger/main/tools/GSceneBuilder.java @@ -1,4 +1,4 @@ -package io.github.hydos.ginger.main.tools; +package com.github.hydos.ginger.main.tools; public class GSceneBuilder { diff --git a/src/main/java/com/github/hydos/litecraft/Block.java b/src/main/java/com/github/hydos/litecraft/Block.java new file mode 100644 index 0000000..763ad15 --- /dev/null +++ b/src/main/java/com/github/hydos/litecraft/Block.java @@ -0,0 +1,13 @@ +package com.github.hydos.litecraft; + +import com.github.hydos.ginger.engine.elements.objects.RenderObject; +import com.github.hydos.ginger.engine.math.vectors.Vector3f; +import com.github.hydos.ginger.engine.render.models.TexturedModel; + +public class Block extends RenderObject{ + + public Block(TexturedModel blockModel, Vector3f position) { + super(blockModel, position, 0, 0, 0, new Vector3f(1f,1f,1f)); + } + +} diff --git a/src/main/java/io/github/hydos/ginger/engine/obj/Material.java b/src/main/java/io/github/hydos/ginger/engine/obj/Material.java deleted file mode 100644 index e1bfc4a..0000000 --- a/src/main/java/io/github/hydos/ginger/engine/obj/Material.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.github.hydos.ginger.engine.obj; - -public class Material { - -} diff --git a/src/main/java/io/github/hydos/ginger/engine/obj/shapes/ShapeMesh.java b/src/main/java/io/github/hydos/ginger/engine/obj/shapes/ShapeMesh.java deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/java/io/github/hydos/litecraft/Block.java b/src/main/java/io/github/hydos/litecraft/Block.java deleted file mode 100644 index 9301a12..0000000 --- a/src/main/java/io/github/hydos/litecraft/Block.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.github.hydos.litecraft; - -import io.github.hydos.ginger.engine.elements.objects.RenderObject; -import io.github.hydos.ginger.engine.math.vectors.Vector3f; -import io.github.hydos.ginger.engine.render.models.TexturedModel; - -public class Block extends RenderObject{ - - public Block(TexturedModel blockModel, Vector3f position) { - super(blockModel, position, 0, 0, 0, new Vector3f(1f,1f,1f)); - } - -} diff --git a/src/main/java/tk/valoeghese/gateways/client/io/InitialPressHandler.java b/src/main/java/tk/valoeghese/gateways/client/io/InitialPressHandler.java new file mode 100644 index 0000000..57d09b2 --- /dev/null +++ b/src/main/java/tk/valoeghese/gateways/client/io/InitialPressHandler.java @@ -0,0 +1,21 @@ +package tk.valoeghese.gateways.client.io; + +/* + * Author: Valoeghese + */ +public final class InitialPressHandler implements KeyListener +{ + public InitialPressHandler(KeyCallback callback) + { this.callback = callback; } + + private boolean activatedPreviously = false; + private final KeyCallback callback; + + @Override + public void listen(boolean active) + { + if (!activatedPreviously && active) + { callback.onCallback(); } + activatedPreviously = active; + } +} diff --git a/src/main/java/tk/valoeghese/gateways/client/io/Input.java b/src/main/java/tk/valoeghese/gateways/client/io/Input.java new file mode 100644 index 0000000..f7fdf38 --- /dev/null +++ b/src/main/java/tk/valoeghese/gateways/client/io/Input.java @@ -0,0 +1,31 @@ +package tk.valoeghese.gateways.client.io; + +import java.util.*; + +/* + * Author: Valoeghese + */ +public class Input +{ + private static final Map> CALLBACKS = new HashMap<>(); + private static final Map> LISTENERS = new HashMap<>(); + + public static void addPressCallback(Keybind key, KeyCallback callback) + { CALLBACKS.computeIfAbsent(key, listener -> new ArrayList<>()).add(callback); } + + public static void addListener(Keybind key, KeyListener callback) + { LISTENERS.computeIfAbsent(key, listener -> new ArrayList<>()).add(callback); } + + public static void invokeAllListeners() + { + CALLBACKS.forEach((keybind, listeners) -> + { + if (keybind.isActive()) + { listeners.forEach(callback -> callback.onCallback()); } + }); + LISTENERS.forEach((keybind, listeners) -> + { + listeners.forEach(listener -> listener.listen(keybind.isActive())); + }); + } +} diff --git a/src/main/java/tk/valoeghese/gateways/client/io/KeyCallback.java b/src/main/java/tk/valoeghese/gateways/client/io/KeyCallback.java new file mode 100644 index 0000000..fd370a1 --- /dev/null +++ b/src/main/java/tk/valoeghese/gateways/client/io/KeyCallback.java @@ -0,0 +1,9 @@ +package tk.valoeghese.gateways.client.io; + +/* + * Author: Valoeghese + */ +public interface KeyCallback +{ + public void onCallback(); +} diff --git a/src/main/java/tk/valoeghese/gateways/client/io/KeyCallbackHandler.java b/src/main/java/tk/valoeghese/gateways/client/io/KeyCallbackHandler.java new file mode 100644 index 0000000..75fc62f --- /dev/null +++ b/src/main/java/tk/valoeghese/gateways/client/io/KeyCallbackHandler.java @@ -0,0 +1,32 @@ +package tk.valoeghese.gateways.client.io; + +import org.lwjgl.glfw.*; + +/* + * Author: Valoeghese + */ +public class KeyCallbackHandler extends GLFWKeyCallback +{ + private KeyCallbackHandler() + {} + + private static final KeyCallbackHandler INSTANCE = new KeyCallbackHandler(); + + public static void trackWindow(long window) + { GLFW.glfwSetKeyCallback(window, INSTANCE); } + + public static boolean[] keys = new boolean[GLFW.GLFW_KEY_LAST]; + + @Override + public void invoke(long window, int key, int scancode, int action, int mods) + { + try + { + keys[key] = action != GLFW.GLFW_RELEASE; + } + catch (ArrayIndexOutOfBoundsException e) + { + // Probably just changing the volume + } + } +} diff --git a/src/main/java/tk/valoeghese/gateways/client/io/KeyListener.java b/src/main/java/tk/valoeghese/gateways/client/io/KeyListener.java new file mode 100644 index 0000000..24ad811 --- /dev/null +++ b/src/main/java/tk/valoeghese/gateways/client/io/KeyListener.java @@ -0,0 +1,9 @@ +package tk.valoeghese.gateways.client.io; + +/* + * Author: Valoeghese + */ +public interface KeyListener +{ + public void listen(boolean active); +} diff --git a/src/main/java/tk/valoeghese/gateways/client/io/Keybind.java b/src/main/java/tk/valoeghese/gateways/client/io/Keybind.java new file mode 100644 index 0000000..1c793d8 --- /dev/null +++ b/src/main/java/tk/valoeghese/gateways/client/io/Keybind.java @@ -0,0 +1,30 @@ +package tk.valoeghese.gateways.client.io; + +import org.lwjgl.glfw.GLFW; + +/* + * Author: Valoeghese + */ +public final class Keybind +{ + public int value; + public boolean mouse; + public static final Keybind MOVE_UP = new Keybind(GLFW.GLFW_KEY_W, false); + public static final Keybind MOVE_DOWN = new Keybind(GLFW.GLFW_KEY_S, false); + public static final Keybind MOVE_LEFT = new Keybind(GLFW.GLFW_KEY_A, false); + public static final Keybind MOVE_RIGHT = new Keybind(GLFW.GLFW_KEY_D, false); + public static final Keybind USE = new Keybind(GLFW.GLFW_MOUSE_BUTTON_1, true); + public static final Keybind SELECT_0 = new Keybind(GLFW.GLFW_KEY_1, false); + public static final Keybind SELECT_1 = new Keybind(GLFW.GLFW_KEY_2, false); + public static final Keybind SELECT_2 = new Keybind(GLFW.GLFW_KEY_3, false); + public static final Keybind EXIT = new Keybind(GLFW.GLFW_KEY_ESCAPE, false); + + public Keybind(int initValue, boolean isMouse) + { + this.value = initValue; + this.mouse = isMouse; + } + + public boolean isActive() + { return mouse ? MouseCallbackHandler.buttons[value] : KeyCallbackHandler.keys[value]; } +} diff --git a/src/main/java/tk/valoeghese/gateways/client/io/MouseCallbackHandler.java b/src/main/java/tk/valoeghese/gateways/client/io/MouseCallbackHandler.java new file mode 100644 index 0000000..4333964 --- /dev/null +++ b/src/main/java/tk/valoeghese/gateways/client/io/MouseCallbackHandler.java @@ -0,0 +1,23 @@ +package tk.valoeghese.gateways.client.io; + +import org.lwjgl.glfw.*; + +/* + * Author: Valoeghese + */ +public class MouseCallbackHandler extends GLFWMouseButtonCallback +{ + private MouseCallbackHandler() + {} + + private static final MouseCallbackHandler INSTANCE = new MouseCallbackHandler(); + + public static void trackWindow(long window) + { GLFW.glfwSetMouseButtonCallback(window, INSTANCE); } + + public static boolean[] buttons = new boolean[GLFW.GLFW_MOUSE_BUTTON_LAST]; + + @Override + public void invoke(long window, int button, int action, int mods) + { buttons[button] = action != GLFW.GLFW_RELEASE; } +}