halotroop
/
Ginger3D
1
0
Fork 0
Code Pull Requests Packages Releases Activity

Merge branch 'Vulkan' of https://github.com/halotroop/Ginger3D.git into Vulkan 

Conflicts:
	src/main/java/com/github/halotroop/litecraft/Litecraft.java
	src/main/java/com/github/halotroop/litecraft/world/World.java
	src/main/java/com/github/hydos/ginger/engine/common/obj/ModelLoader.java
	src/main/java/com/github/hydos/ginger/engine/opengl/utils/GlLoader.java
pull/12/head
hYdos 2020-03-03 16:34:53 +10:00
parent a635c549c1 4f4e41d990
commit b535c09420
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/github/halotroop/litecraft/Litecraft.java
View File

@ -20,8 +20,9 @@ import com.github.hydos.ginger.engine.common.obj.ModelLoader;
import com.github.hydos.ginger.engine.opengl.api.*;
import com.github.hydos.ginger.engine.opengl.postprocessing.PostProcessing;
import com.github.hydos.ginger.engine.opengl.render.MasterRenderer;
import com.github.hydos.ginger.engine.opengl.utils.GLLoader;
import com.github.hydos.ginger.engine.opengl.render.models.GLTexturedModel;
import com.github.hydos.ginger.engine.opengl.utils.GLLoader;
import tk.valoeghese.gateways.client.io.*;
public class Litecraft extends Game

3
src/main/java/com/github/halotroop/litecraft/world/World.java
View File

@ -85,11 +85,10 @@ public class World implements BlockAccess, WorldGenConstants
public PlayerEntity spawnPlayer(float x, float y, float z)
{
// Player model and stuff
GLTexturedModel dirtModel = ModelLoader.loadGenericCube("block/cubes/soil/dirt.png");
this.playerEntity = new PlayerEntity(dirtModel, new Vector3f(x, y, z), 0, 180f, 0, new Vector3f(0.2f, 0.2f, 0.2f));
this.playerEntity.setVisible(false);
// Generate world around player
long time = System.currentTimeMillis();
System.out.println("Generating world!");