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.javapull/12/head
commit
b535c09420
|
@ -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.api.*;
|
||||||
import com.github.hydos.ginger.engine.opengl.postprocessing.PostProcessing;
|
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.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.render.models.GLTexturedModel;
|
||||||
|
import com.github.hydos.ginger.engine.opengl.utils.GLLoader;
|
||||||
|
|
||||||
import tk.valoeghese.gateways.client.io.*;
|
import tk.valoeghese.gateways.client.io.*;
|
||||||
|
|
||||||
public class Litecraft extends Game
|
public class Litecraft extends Game
|
||||||
|
|
|
@ -85,11 +85,10 @@ public class World implements BlockAccess, WorldGenConstants
|
||||||
|
|
||||||
public PlayerEntity spawnPlayer(float x, float y, float z)
|
public PlayerEntity spawnPlayer(float x, float y, float z)
|
||||||
{
|
{
|
||||||
// Player model and stuff
|
|
||||||
|
|
||||||
GLTexturedModel dirtModel = ModelLoader.loadGenericCube("block/cubes/soil/dirt.png");
|
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 = new PlayerEntity(dirtModel, new Vector3f(x, y, z), 0, 180f, 0, new Vector3f(0.2f, 0.2f, 0.2f));
|
||||||
this.playerEntity.setVisible(false);
|
this.playerEntity.setVisible(false);
|
||||||
|
|
||||||
// Generate world around player
|
// Generate world around player
|
||||||
long time = System.currentTimeMillis();
|
long time = System.currentTimeMillis();
|
||||||
System.out.println("Generating world!");
|
System.out.println("Generating world!");
|
||||||
|
|
Loading…
Reference in New Issue