diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml index 9e03676..757f1d6 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -50,6 +50,12 @@ + + + jitpack.io + https://jitpack.io + + 3.2.2 1.8 diff --git a/pom.xml b/pom.xml index 02c3cc6..19de227 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,14 @@ - + + + + jitpack.io + https://jitpack.io + + + org.lwjgl diff --git a/src/main/java/io/github/hydos/ginger/Example.java b/src/main/java/io/github/hydos/ginger/Example.java index d0ad2fd..25e9074 100644 --- a/src/main/java/io/github/hydos/ginger/Example.java +++ b/src/main/java/io/github/hydos/ginger/Example.java @@ -10,7 +10,7 @@ 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.Entity; import io.github.hydos.ginger.engine.elements.objects.Light; -import io.github.hydos.ginger.engine.elements.objects.Player; +import io.github.hydos.ginger.engine.elements.objects.RenderPlayer; import io.github.hydos.ginger.engine.font.FontType; import io.github.hydos.ginger.engine.font.GUIText; import io.github.hydos.ginger.engine.font.TextMaster; @@ -64,7 +64,7 @@ public class Example { TexturedModel tModel = ModelLoader.loadModel("stall.obj", "stallTexture.png"); tModel.getTexture().setReflectivity(1f); tModel.getTexture().setShineDamper(7f); - Player entity = new Player(tModel, new Vector3f(0,0,-3),0,180f,0, new Vector3f(0.2f, 0.2f, 0.2f)); + RenderPlayer entity = new RenderPlayer(tModel, new Vector3f(0,0,-3),0,180f,0, new Vector3f(0.2f, 0.2f, 0.2f)); Constants.movementSpeed = 0.000005f; Constants.turnSpeed = 0.00002f; Constants.gravity = -0.000000000005f; diff --git a/src/main/java/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.java b/src/main/java/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.java index 27e8ea3..752cdf0 100644 --- a/src/main/java/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.java +++ b/src/main/java/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.java @@ -3,7 +3,7 @@ package io.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.elements.objects.RenderPlayer; import io.github.hydos.ginger.engine.io.Window; import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f; @@ -18,15 +18,15 @@ public class ThirdPersonCamera { private float roll; - private Player player; + private RenderPlayer player; - public ThirdPersonCamera(Player player) { + public ThirdPersonCamera(RenderPlayer player) { this.player = player; } - public ThirdPersonCamera(Vector3f vector3f, Player player) { + public ThirdPersonCamera(Vector3f vector3f, RenderPlayer player) { this.position = vector3f; this.player = player; diff --git a/src/main/java/io/github/hydos/ginger/engine/elements/objects/Player.java b/src/main/java/io/github/hydos/ginger/engine/elements/objects/RenderPlayer.java similarity index 93% rename from src/main/java/io/github/hydos/ginger/engine/elements/objects/Player.java rename to src/main/java/io/github/hydos/ginger/engine/elements/objects/RenderPlayer.java index 72bcfd1..2b62aba 100644 --- a/src/main/java/io/github/hydos/ginger/engine/elements/objects/Player.java +++ b/src/main/java/io/github/hydos/ginger/engine/elements/objects/RenderPlayer.java @@ -8,7 +8,7 @@ import io.github.hydos.ginger.engine.renderEngine.models.TexturedModel; import io.github.hydos.ginger.engine.terrain.Terrain; import io.github.hydos.ginger.main.settings.Constants; -public class Player extends Entity{ +public class RenderPlayer extends Entity{ // private static float RUN_SPEED = 0.3f; // private static float TURN_SPEED = 0.7f; @@ -24,7 +24,7 @@ public class Player extends Entity{ private boolean isInAir = false; - public Player(TexturedModel model, Vector3f position, float rotX, float rotY, float rotZ, Vector3f scale) { + public RenderPlayer(TexturedModel model, Vector3f position, float rotX, float rotY, float rotZ, Vector3f scale) { super(model, position, rotX, rotY, rotZ, scale); } diff --git a/src/main/java/io/github/hydos/ginger/engine/obj/OBJFileLoader.java b/src/main/java/io/github/hydos/ginger/engine/obj/OBJFileLoader.java index 6b44233..8fa26cd 100644 --- a/src/main/java/io/github/hydos/ginger/engine/obj/OBJFileLoader.java +++ b/src/main/java/io/github/hydos/ginger/engine/obj/OBJFileLoader.java @@ -11,7 +11,7 @@ import io.github.hydos.ginger.engine.mathEngine.vectors.Vector3f; public class OBJFileLoader { - private static final String RES_LOC = "/models/"; + private static final String RES_LOC = "models/"; public static ModelData loadOBJ(String objFileName) { String objFile = RES_LOC + objFileName; diff --git a/target/classes/io/github/hydos/ginger/Example.class b/target/classes/io/github/hydos/ginger/Example.class index f8fb1bf..48bb95b 100644 Binary files a/target/classes/io/github/hydos/ginger/Example.class and b/target/classes/io/github/hydos/ginger/Example.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera$1.class b/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera$1.class index d754d7e..672d221 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera$1.class and b/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera$1.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.class b/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.class index 2a6a7d5..e4eae53 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.class and b/target/classes/io/github/hydos/ginger/engine/cameras/ThirdPersonCamera.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/mathEngine/Maths.class b/target/classes/io/github/hydos/ginger/engine/mathEngine/Maths.class index 49469c9..ab4a36a 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/mathEngine/Maths.class and b/target/classes/io/github/hydos/ginger/engine/mathEngine/Maths.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/obj/ModelLoader.class b/target/classes/io/github/hydos/ginger/engine/obj/ModelLoader.class index 99d6422..6dbdbcc 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/obj/ModelLoader.class and b/target/classes/io/github/hydos/ginger/engine/obj/ModelLoader.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/obj/OBJFileLoader.class b/target/classes/io/github/hydos/ginger/engine/obj/OBJFileLoader.class index 918565d..801298b 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/obj/OBJFileLoader.class and b/target/classes/io/github/hydos/ginger/engine/obj/OBJFileLoader.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/particle/Particle.class b/target/classes/io/github/hydos/ginger/engine/particle/Particle.class index 6bac8ab..869ea42 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/particle/Particle.class and b/target/classes/io/github/hydos/ginger/engine/particle/Particle.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/particle/ParticleMaster.class b/target/classes/io/github/hydos/ginger/engine/particle/ParticleMaster.class index d41608f..0e12499 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/particle/ParticleMaster.class and b/target/classes/io/github/hydos/ginger/engine/particle/ParticleMaster.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/MasterRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/MasterRenderer.class index 3f445d0..e0f8d62 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/MasterRenderer.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/MasterRenderer.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/NormalMappingRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/NormalMappingRenderer.class index 6a1a5f6..d306b5e 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/NormalMappingRenderer.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/NormalMappingRenderer.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.class index d450ebc..a6bf241 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/ParticleRenderer.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/SkyboxRenderer.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/SkyboxRenderer.class index 9f765c1..06acb95 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/SkyboxRenderer.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/renderers/SkyboxRenderer.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/SkyboxShader.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/SkyboxShader.class index da29b7d..ff89f64 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/SkyboxShader.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/SkyboxShader.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/StaticShader.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/StaticShader.class index 82b07c2..df60fa1 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/StaticShader.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/StaticShader.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/TerrainShader.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/TerrainShader.class index 710fdaa..f717529 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/TerrainShader.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/shaders/TerrainShader.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/renderEngine/tools/MousePicker.class b/target/classes/io/github/hydos/ginger/engine/renderEngine/tools/MousePicker.class index 3c43228..43b3238 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/renderEngine/tools/MousePicker.class and b/target/classes/io/github/hydos/ginger/engine/renderEngine/tools/MousePicker.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowBox.class b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowBox.class index 19de8fb..aba8579 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowBox.class and b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowBox.class differ diff --git a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.class b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.class index bc031f7..929c7fd 100644 Binary files a/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.class and b/target/classes/io/github/hydos/ginger/engine/shadow/ShadowMapMasterRenderer.class differ diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index 119d2a6..b0694d3 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Feb 20 16:43:50 AEST 2020 +#Thu Feb 20 16:49:21 AEST 2020 version=NIGHTLY groupId=me.hydos artifactId=ginger diff --git a/target/original-ginger-NIGHTLY.jar b/target/original-ginger-NIGHTLY.jar index 83cc7a8..c60494f 100644 Binary files a/target/original-ginger-NIGHTLY.jar and b/target/original-ginger-NIGHTLY.jar differ