renamed player class (will name back in future to avoid problems)
parent
68a5d6e8ac
commit
76083a94fc
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue