diff --git a/src/main/java/com/github/halotroop/litecraft/Litecraft.java b/src/main/java/com/github/halotroop/litecraft/Litecraft.java index c81d02a..77e82db 100644 --- a/src/main/java/com/github/halotroop/litecraft/Litecraft.java +++ b/src/main/java/com/github/halotroop/litecraft/Litecraft.java @@ -30,7 +30,7 @@ public class Litecraft extends Game { Constants.movementSpeed = 0.00005f; Constants.turnSpeed = 0.00006f; - Constants.gravity = -0.0000000005f; + Constants.gravity = new org.joml.Vector3f(0, -0.0000000005f, 0); Constants.jumpPower = 0.00005f; Window.create(1200, 800, "LiteCraft", 60); GingerUtils.init(); @@ -85,7 +85,7 @@ public class Litecraft extends Game } oldWindowWidth = Window.width; oldWindowHeight = Window.height; - ginger3D.masterRenderer.renderShadowMap(data.entities, data.lights.get(0)); + ginger3D.gingerRegister.masterRenderer.renderShadowMap(data.entities, data.lights.get(0)); if (isInWorld) { ginger3D.renderWithoutTerrain(this, world); } ginger3D.renderOverlays(this); diff --git a/src/main/java/com/github/hydos/ginger/Litecraft.java b/src/main/java/com/github/hydos/ginger/Litecraft.java index cc6180c..87dd62d 100644 --- a/src/main/java/com/github/hydos/ginger/Litecraft.java +++ b/src/main/java/com/github/hydos/ginger/Litecraft.java @@ -30,7 +30,7 @@ public class Litecraft extends Game { Constants.movementSpeed = 0.00005f; Constants.turnSpeed = 0.00006f; - Constants.gravity = -0.0000000005f; + Constants.gravity = new org.joml.Vector3f(0,-0.0000000005f,0); Constants.jumpPower = 0.00005f; Window.create(1200, 800, "LiteCraft", 60); GingerUtils.init(); diff --git a/src/main/java/com/github/hydos/ginger/engine/elements/objects/Player.java b/src/main/java/com/github/hydos/ginger/engine/elements/objects/Player.java index 73157ae..d73fadd 100644 --- a/src/main/java/com/github/hydos/ginger/engine/elements/objects/Player.java +++ b/src/main/java/com/github/hydos/ginger/engine/elements/objects/Player.java @@ -68,7 +68,7 @@ public class Player extends RenderObject if (t != null) { terrainHeight = t.getHeightOfTerrain(super.getPosition().x, super.getPosition().z); } super.increasePosition(0, (float) (upwardsSpeed * (Window.getTime())), 0); - upwardsSpeed += Constants.gravity * Window.getTime(); + upwardsSpeed += Constants.gravity.y() * Window.getTime(); if (super.getPosition().y < terrainHeight) { isInAir = false; diff --git a/src/main/java/com/github/hydos/ginger/engine/particle/Particle.java b/src/main/java/com/github/hydos/ginger/engine/particle/Particle.java index 5312f9d..ed35a74 100644 --- a/src/main/java/com/github/hydos/ginger/engine/particle/Particle.java +++ b/src/main/java/com/github/hydos/ginger/engine/particle/Particle.java @@ -69,7 +69,7 @@ public class Particle public boolean update(Camera camera) { float time = (float) Window.getTime() / 1000000; - velocity.y += Constants.gravity * gravityEffect * time; + velocity.y += Constants.gravity.y() * gravityEffect * time; Vector3f change = new Vector3f(velocity); change.scale(time); Vector3f.add(change, position, position); diff --git a/src/main/java/com/github/hydos/ginger/main/settings/Constants.java b/src/main/java/com/github/hydos/ginger/main/settings/Constants.java index 186f8e6..ae647c4 100644 --- a/src/main/java/com/github/hydos/ginger/main/settings/Constants.java +++ b/src/main/java/com/github/hydos/ginger/main/settings/Constants.java @@ -1,9 +1,11 @@ package com.github.hydos.ginger.main.settings; +import org.joml.Vector3f; + public class Constants { //player variables - public static float gravity = 0; + public static Vector3f gravity = new Vector3f(0,0,0); public static float jumpPower = 0; public static float turnSpeed = 0; public static double movementSpeed = 0;