From 76083a94fcef5d1fc466c8db60b1e77595896d22 Mon Sep 17 00:00:00 2001 From: hYdos Date: Sun, 23 Feb 2020 07:15:47 +1000 Subject: [PATCH] renamed player class (will name back in future to avoid problems) --- .../java/io/github/hydos/ginger/Example.java | 4 ++-- .../engine/cameras/ThirdPersonCamera.java | 8 ++++---- .../{RenderPlayer.java => Player.java} | 4 ++-- .../io/github/hydos/ginger/Example.class | Bin 11143 -> 11125 bytes .../engine/cameras/ThirdPersonCamera.class | Bin 3848 -> 3824 bytes 5 files changed, 8 insertions(+), 8 deletions(-) rename src/main/java/io/github/hydos/ginger/engine/elements/objects/{RenderPlayer.java => Player.java} (93%) diff --git a/src/main/java/io/github/hydos/ginger/Example.java b/src/main/java/io/github/hydos/ginger/Example.java index b82a02d..5b41d7f 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.RenderPlayer; +import io.github.hydos.ginger.engine.elements.objects.Player; 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); - RenderPlayer entity = new RenderPlayer(tModel, new Vector3f(0,0,-3),0,180f,0, new Vector3f(0.2f, 0.2f, 0.2f)); + Player entity = new Player(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 64a59f9..d962c94 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.RenderPlayer; +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; @@ -18,15 +18,15 @@ public class ThirdPersonCamera { private float roll; - private RenderPlayer player; + private Player player; - public ThirdPersonCamera(RenderPlayer player) { + public ThirdPersonCamera(Player player) { this.player = player; } - public ThirdPersonCamera(Vector3f vector3f, RenderPlayer player) { + public ThirdPersonCamera(Vector3f vector3f, Player player) { this.position = vector3f; this.player = player; diff --git a/src/main/java/io/github/hydos/ginger/engine/elements/objects/RenderPlayer.java b/src/main/java/io/github/hydos/ginger/engine/elements/objects/Player.java similarity index 93% rename from src/main/java/io/github/hydos/ginger/engine/elements/objects/RenderPlayer.java rename to src/main/java/io/github/hydos/ginger/engine/elements/objects/Player.java index 450c9ad..214cd53 100644 --- a/src/main/java/io/github/hydos/ginger/engine/elements/objects/RenderPlayer.java +++ b/src/main/java/io/github/hydos/ginger/engine/elements/objects/Player.java @@ -8,7 +8,7 @@ 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; -public class RenderPlayer extends Entity{ +public class Player extends Entity{ // private static float RUN_SPEED = 0.3f; // private static float TURN_SPEED = 0.7f; @@ -24,7 +24,7 @@ public class RenderPlayer extends Entity{ private boolean isInAir = false; - public RenderPlayer(TexturedModel model, Vector3f position, float rotX, float rotY, float rotZ, Vector3f scale) { + public Player(TexturedModel model, Vector3f position, float rotX, float rotY, float rotZ, Vector3f scale) { super(model, position, rotX, rotY, rotZ, scale); } diff --git a/target/classes/io/github/hydos/ginger/Example.class b/target/classes/io/github/hydos/ginger/Example.class index 98c6292a39ac64c45d977fd17b020826e2435cc8..efb30447ecce12204af7febbdda29204493777c2 100644 GIT binary patch delta 56 zcmZn<{~ESo2P>oL3#mJaH`Jt%7WCc;-$^N`bVBt`XbWuk0$p_^O KHh-3#!V3Uo5fqmI delta 69 zcmeww)*ilL2P>oXclFIayuGL}wGlu(##z-v1Bf~+7+#*-sml+kwb NMp*-x$V1sFya0NG7{~ws 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 de1311681954b6a530755ba85b1c45f0245395fd..da9b3d20a1284c46d218b8ea47e2fe034588d026 100644 GIT binary patch delta 88 zcmeB>`ye~vEt9#=WI;B$$-In$q5(OHm8nJ6j0|ixnR%Hdc8m;G8gSXod5o-#%=u7( awJc(jS1}oEe!#@W$Y=^PVY3X&8!iAXMHc@6 delta 107 zcmew$+aWjMEt9R!w(L*laTMGE3|j85|}XG8(c$ nWH%=9Pk