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

src/main/java/com/github/halotroop/litecraft/Litecraft.java

@@ -39,7 +39,7 @@ public class Litecraft extends Game
 		Window.create(1200, 800, "LiteCraft", 60);
 		GingerUtils.init();
 		Window.setBackgroundColour(0.2f, 0.2f, 0.6f);
-		TexturedModel dirtModel = ModelLoader.loadGenericCube("block/cubes/soil/gravel.png");
+		TexturedModel dirtModel = ModelLoader.loadGenericCube("block/cubes/stone/brick/stonebrick.png");
 		StaticCube.scaleCube(1);
 		Player player = new Player(dirtModel, new Vector3f(0, 0, -3), 0, 180f, 0, new Vector3f(0.2f, 0.2f, 0.2f));
 		Camera camera = new Camera(new Vector3f(0, 0.1f, 0), player);

src/main/java/com/github/halotroop/litecraft/types/block/Block.java

@@ -5,17 +5,15 @@ import com.github.hydos.ginger.engine.render.models.TexturedModel;
 
 public class Block
 {
+	public static final Block AIR = new Block(new Properties().visible(false));
+	public static final Block DIRT = new Block("block/cubes/soil/dirt.png", new Properties());
+	public static final Block STONE = new Block("block/cubes/stone/basic/gneiss.png", new Properties());
+	
 	public static class Properties
 	{ // add properties to this builder!
 		private boolean visible = true;
 		private boolean fullCube = true;
 
-		public Properties visible(boolean visible)
-		{
-			this.visible = visible;
-			return this;
-		}
-
 		public Properties fullCube(boolean fullCube)
 		{
 			this.fullCube = fullCube;
@@ -27,14 +25,20 @@ public class Block
 
 		public boolean isVisible()
 		{ return visible; }
+
+		public Properties visible(boolean visible)
+		{
+			this.visible = visible;
+			return this;
+		}
 	}
 	
-	public static final Block AIR = new Block(new Properties().visible(false));
-	public static final Block DIRT = new Block("block/cubes/soil/dirt.png", new Properties());
-	public static final Block STONE = new Block("block/cubes/stone/cobblestone.png", new Properties());
 	public final TexturedModel model;
 	public final boolean visible;
 
+	protected Block(Properties properties)
+	{ this((TexturedModel) null, properties); }
+
 	protected Block(String texture, Properties properties)
 	{ this(ModelLoader.loadGenericCube(texture), properties); }
 
@@ -43,7 +47,4 @@ public class Block
 		this.model = model;
 		this.visible = properties.visible;
 	}
-
-	protected Block(Properties properties)
-	{ this((TexturedModel) null, properties); }
 }

src/main/java/com/github/hydos/ginger/engine/cameras/FirstPersonCamera.java

@@ -12,6 +12,7 @@ public class FirstPersonCamera extends Camera
 	public FirstPersonCamera(Player player)
 	{
 		super(player);
+		player.isVisible = false;
 	}
 
 	public float getPitch()
@@ -35,6 +36,5 @@ public class FirstPersonCamera extends Camera
 		roll = player.getRotX();
 		yaw = -player.getRotY() + 180;
 		pitch = player.getRotZ();
-		
 	}
 }

src/main/java/com/github/hydos/ginger/engine/obj/ModelLoader.java

@@ -16,8 +16,7 @@ public class ModelLoader
 
 	public static TexturedModel loadModel(String objPath, String texturePath)
 	{
-		Mesh data = OBJFileLoader.loadModel(objPath, texturePath);
+		Mesh data = OBJFileLoader.loadModel(objPath);
-		TexturedModel tm = new TexturedModel(Loader.loadToVAO(data.getVertices(), data.getIndices(), data.getNormals(), data.getTextureCoords()), new ModelTexture(texturePath));
+		return new TexturedModel(Loader.loadToVAO(data.getVertices(), data.getIndices(),data.getNormals(), data.getTextureCoords()), new ModelTexture(texturePath));
-		return tm;
 	}
 }

src/main/java/com/github/hydos/ginger/engine/obj/OBJFileLoader.java

@@ -7,9 +7,9 @@ import com.github.hydos.ginger.engine.math.vectors.*;
 
 public class OBJFileLoader
 {
-	public static String resourceLocation = "C:/Users/Hayden/Desktop/Ginger3D/src/main/resources/models/";
+	public static String resourceLocation = "~/Desktop/Ginger3D/src/main/resources/models/";
 
-	public static Mesh loadModel(String filePath, String texturePath)
+	public static Mesh loadModel(String filePath)
 	{
 		AIScene scene = null;
 		try

src/main/java/com/github/hydos/ginger/engine/render/texture/ModelTexture.java

@@ -24,6 +24,7 @@ public class ModelTexture
 
 	public ModelTexture(String file)
 	{
+		// TODO: Add a missing texture placholder in case of null file.
 		texture = Image.createImage("/textures/" + file);
 		GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.textureID);
 		GL11.glTexParameterf(GL11.GL_TEXTURE_2D, 10241, 9729.0f);

src/main/resources/models/Objects/work_table.mtl

@@ -0,0 +1,6 @@
+# Made in Blockbench 3.3.1
+newmtl 0
+map_Kd textures/blocks/cubes/wood/planks/planks_oak.png 
+newmtl 1
+map_Kd textures/blocks/cubes/wood/logs/side/log_oak.png 
+newmtl none

src/main/resources/textures/block/cubes/mineral_blocks/desktop.ini

@@ -1,7 +0,0 @@
-[LocalizedFileNames]
-emerald_block.png=@emerald_block.png,0
-lapis_block.png=@lapis_block.png,0
-diamond_block.png=@diamond_block.png,0
-iron_block.png=@iron_block.png,0
-coal_block.png=@coal_block.png,0
-gold_block.png=@gold_block.png,0

src/main/resources/textures/block/cubes/ore/desktop.ini

@@ -1,8 +0,0 @@
-[LocalizedFileNames]
-emerald_ore.png=@emerald_ore.png,0
-lapis_ore.png=@lapis_ore.png,0
-diamond_ore.png=@diamond_ore.png,0
-iron_ore.png=@iron_ore.png,0
-coal_ore.png=@coal_ore.png,0
-gold_ore.png=@gold_ore.png,0
-quartz_ore.png=@quartz_ore.png,0