fix some stuffz

pull/1/head
hYdos 2020-02-20 18:45:26 +10:00
parent 3be93932e5
commit e35aae6d79
26 changed files with 24 additions and 11 deletions

View File

@ -50,6 +50,12 @@
</properties>
</profile>
</profiles>
<repositories>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>
<properties>
<lwjgl.version>3.2.2</lwjgl.version>
<maven.compiler.source>1.8</maven.compiler.source>

View File

@ -71,6 +71,13 @@
</plugins>
</build>
<repositories>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.lwjgl</groupId>

View File

@ -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;

View File

@ -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;

View File

@ -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);
}

View File

@ -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;

View File

@ -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

Binary file not shown.