X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=data%2Fdefault.shapes;h=694995a8547fca4599d5025fad5c7664717280b2;hb=60f45e233bcf6c051f35f813179fe34f01e61719;hp=7185db7402d91a3c914ef063a355fa5b69c3bad8;hpb=ce188a87e4759cd31639da023fdf69ad9feea94c;p=blank-assets.git

diff --git a/data/default.shapes b/data/default.shapes
index 7185db7..694995a 100644
--- a/data/default.shapes
+++ b/data/default.shapes
@@ -41,32 +41,31 @@ uniform_block = {
 uniform_low_slab = {
 	bounds = Cuboid([ -0.5, -0.5, -0.5 ], [ 0.5, 0.0, 0.5 ]);
 	vertices = {
-		// TODO: fix tex coords
 		//      position            normal       texture
-		{ [ -0.5, -0.5,  0.0 ], [ 0,  0,  1 ], [ 0, 1 ], 0 }, // front
-		{ [  0.0, -0.5,  0.0 ], [ 0,  0,  1 ], [ 1, 1 ], 0 },
-		{ [ -0.5,  0.0,  0.0 ], [ 0,  0,  1 ], [ 0, 0 ], 0 },
-		{ [  0.0,  0.0,  0.0 ], [ 0,  0,  1 ], [ 1, 0 ], 0 },
-		{ [ -0.5, -0.5, -0.5 ], [ 0,  0, -1 ], [ 1, 1 ], 0 }, // back
-		{ [ -0.5,  0.0, -0.5 ], [ 0,  0, -1 ], [ 1, 0 ], 0 },
-		{ [  0.0, -0.5, -0.5 ], [ 0,  0, -1 ], [ 0, 1 ], 0 },
-		{ [  0.0,  0.0, -0.5 ], [ 0,  0, -1 ], [ 0, 0 ], 0 },
-		{ [ -0.5,  0.0, -0.5 ], [ 0,  1,  0 ], [ 0, 0 ], 0 }, // top
-		{ [ -0.5,  0.0,  0.0 ], [ 0,  1,  0 ], [ 0, 1 ], 0 },
-		{ [  0.0,  0.0, -0.5 ], [ 0,  1,  0 ], [ 1, 0 ], 0 },
-		{ [  0.0,  0.0,  0.0 ], [ 0,  1,  0 ], [ 1, 1 ], 0 },
-		{ [ -0.5, -0.5, -0.5 ], [ 0, -1,  0 ], [ 1, 0 ], 0 }, // bottom
-		{ [  0.0, -0.5, -0.5 ], [ 0, -1,  0 ], [ 0, 0 ], 0 },
-		{ [ -0.5, -0.5,  0.0 ], [ 0, -1,  0 ], [ 1, 1 ], 0 },
-		{ [  0.0, -0.5,  0.0 ], [ 0, -1,  0 ], [ 0, 1 ], 0 },
-		{ [ -0.5, -0.5, -0.5 ], [-1,  0,  0 ], [ 0, 1 ], 0 }, // left
-		{ [ -0.5, -0.5,  0.0 ], [-1,  0,  0 ], [ 1, 1 ], 0 },
-		{ [ -0.5,  0.0, -0.5 ], [-1,  0,  0 ], [ 0, 0 ], 0 },
-		{ [ -0.5,  0.0,  0.0 ], [-1,  0,  0 ], [ 1, 0 ], 0 },
-		{ [  0.0, -0.5, -0.5 ], [ 1,  0,  0 ], [ 1, 1 ], 0 }, // right
-		{ [  0.0,  0.0, -0.5 ], [ 1,  0,  0 ], [ 1, 0 ], 0 },
-		{ [  0.0, -0.5,  0.0 ], [ 1,  0,  0 ], [ 0, 1 ], 0 },
-		{ [  0.0,  0.0,  0.0 ], [ 1,  0,  0 ], [ 0, 0 ], 0 },
+		{ [ -0.5, -0.5,  0.5 ], [ 0,  0,  1 ], [ 0.0, 1.0 ], 0 }, // front
+		{ [  0.5, -0.5,  0.5 ], [ 0,  0,  1 ], [ 1.0, 1.0 ], 0 },
+		{ [ -0.5,  0.0,  0.5 ], [ 0,  0,  1 ], [ 0.0, 0.5 ], 0 },
+		{ [  0.5,  0.0,  0.5 ], [ 0,  0,  1 ], [ 1.0, 0.5 ], 0 },
+		{ [ -0.5, -0.5, -0.5 ], [ 0,  0, -1 ], [ 1.0, 1.0 ], 0 }, // back
+		{ [ -0.5,  0.0, -0.5 ], [ 0,  0, -1 ], [ 1.0, 0.5 ], 0 },
+		{ [  0.5, -0.5, -0.5 ], [ 0,  0, -1 ], [ 0.0, 1.0 ], 0 },
+		{ [  0.5,  0.0, -0.5 ], [ 0,  0, -1 ], [ 0.0, 0.5 ], 0 },
+		{ [ -0.5,  0.0, -0.5 ], [ 0,  1,  0 ], [ 0.0, 0.5 ], 0 }, // top
+		{ [ -0.5,  0.0,  0.5 ], [ 0,  1,  0 ], [ 0.0, 1.0 ], 0 },
+		{ [  0.5,  0.0, -0.5 ], [ 0,  1,  0 ], [ 1.0, 0.5 ], 0 },
+		{ [  0.5,  0.0,  0.5 ], [ 0,  1,  0 ], [ 1.0, 1.0 ], 0 },
+		{ [ -0.5, -0.5, -0.5 ], [ 0, -1,  0 ], [ 1.0, 0.5 ], 0 }, // bottom
+		{ [  0.5, -0.5, -0.5 ], [ 0, -1,  0 ], [ 0.0, 0.5 ], 0 },
+		{ [ -0.5, -0.5,  0.5 ], [ 0, -1,  0 ], [ 1.0, 1.0 ], 0 },
+		{ [  0.5, -0.5,  0.5 ], [ 0, -1,  0 ], [ 0.0, 1.0 ], 0 },
+		{ [ -0.5, -0.5, -0.5 ], [-1,  0,  0 ], [ 0.0, 1.0 ], 0 }, // left
+		{ [ -0.5, -0.5,  0.5 ], [-1,  0,  0 ], [ 1.0, 1.0 ], 0 },
+		{ [ -0.5,  0.0, -0.5 ], [-1,  0,  0 ], [ 0.0, 0.5 ], 0 },
+		{ [ -0.5,  0.0,  0.5 ], [-1,  0,  0 ], [ 1.0, 0.5 ], 0 },
+		{ [  0.5, -0.5, -0.5 ], [ 1,  0,  0 ], [ 1.0, 1.0 ], 0 }, // right
+		{ [  0.5,  0.0, -0.5 ], [ 1,  0,  0 ], [ 1.0, 0.5 ], 0 },
+		{ [  0.5, -0.5,  0.5 ], [ 1,  0,  0 ], [ 0.0, 1.0 ], 0 },
+		{ [  0.5,  0.0,  0.5 ], [ 1,  0,  0 ], [ 0.0, 0.5 ], 0 },
 	};
 	indices = {
 		 0,  1,  2,  2,  1,  3, // front
@@ -180,34 +179,72 @@ pipe_block = {
 };
 
 // temporary fix for missing skeleton loader
-player_head_block = {
-	bounds = Cuboid([ -0.5, -0.5, -0.5 ], [ 0.5, 0.5, 0.5 ]);
+player_body = {
+	bounds = Cuboid([ -0.25, -0.25, -0.125 ], [ 0.25, 0.25, 0.125 ]);
 	vertices = {
 		//      position            normal       texture
-		{ [ -0.5, -0.5,  0.5 ], [ 0,  0,  1 ], [ 0, 1 ], 0 }, // front
-		{ [  0.5, -0.5,  0.5 ], [ 0,  0,  1 ], [ 1, 1 ], 0 },
-		{ [ -0.5,  0.5,  0.5 ], [ 0,  0,  1 ], [ 0, 0 ], 0 },
-		{ [  0.5,  0.5,  0.5 ], [ 0,  0,  1 ], [ 1, 0 ], 0 },
-		{ [ -0.5, -0.5, -0.5 ], [ 0,  0, -1 ], [ 1, 1 ], 1 }, // back
-		{ [ -0.5,  0.5, -0.5 ], [ 0,  0, -1 ], [ 1, 0 ], 1 },
-		{ [  0.5, -0.5, -0.5 ], [ 0,  0, -1 ], [ 0, 1 ], 1 },
-		{ [  0.5,  0.5, -0.5 ], [ 0,  0, -1 ], [ 0, 0 ], 1 },
-		{ [ -0.5,  0.5, -0.5 ], [ 0,  1,  0 ], [ 0, 0 ], 0 }, // top
-		{ [ -0.5,  0.5,  0.5 ], [ 0,  1,  0 ], [ 0, 1 ], 0 },
-		{ [  0.5,  0.5, -0.5 ], [ 0,  1,  0 ], [ 1, 0 ], 0 },
-		{ [  0.5,  0.5,  0.5 ], [ 0,  1,  0 ], [ 1, 1 ], 0 },
-		{ [ -0.5, -0.5, -0.5 ], [ 0, -1,  0 ], [ 1, 0 ], 0 }, // bottom
-		{ [  0.5, -0.5, -0.5 ], [ 0, -1,  0 ], [ 0, 0 ], 0 },
-		{ [ -0.5, -0.5,  0.5 ], [ 0, -1,  0 ], [ 1, 1 ], 0 },
-		{ [  0.5, -0.5,  0.5 ], [ 0, -1,  0 ], [ 0, 1 ], 0 },
-		{ [ -0.5, -0.5, -0.5 ], [-1,  0,  0 ], [ 0, 1 ], 0 }, // left
-		{ [ -0.5, -0.5,  0.5 ], [-1,  0,  0 ], [ 1, 1 ], 0 },
-		{ [ -0.5,  0.5, -0.5 ], [-1,  0,  0 ], [ 0, 0 ], 0 },
-		{ [ -0.5,  0.5,  0.5 ], [-1,  0,  0 ], [ 1, 0 ], 0 },
-		{ [  0.5, -0.5, -0.5 ], [ 1,  0,  0 ], [ 1, 1 ], 0 }, // right
-		{ [  0.5,  0.5, -0.5 ], [ 1,  0,  0 ], [ 1, 0 ], 0 },
-		{ [  0.5, -0.5,  0.5 ], [ 1,  0,  0 ], [ 0, 1 ], 0 },
-		{ [  0.5,  0.5,  0.5 ], [ 1,  0,  0 ], [ 0, 0 ], 0 },
+		{ [ -0.25, -0.25,  0.125 ], [ 0,  0,  1 ], [ 0.0, 1.0 ], 0 }, // front
+		{ [  0.25, -0.25,  0.125 ], [ 0,  0,  1 ], [ 1.0, 1.0 ], 0 },
+		{ [ -0.25,  0.25,  0.125 ], [ 0,  0,  1 ], [ 0.0, 0.0 ], 0 },
+		{ [  0.25,  0.25,  0.125 ], [ 0,  0,  1 ], [ 1.0, 0.0 ], 0 },
+		{ [ -0.25, -0.25, -0.125 ], [ 0,  0, -1 ], [ 1.0, 1.0 ], 0 }, // back
+		{ [ -0.25,  0.25, -0.125 ], [ 0,  0, -1 ], [ 1.0, 0.0 ], 0 },
+		{ [  0.25, -0.25, -0.125 ], [ 0,  0, -1 ], [ 0.0, 1.0 ], 0 },
+		{ [  0.25,  0.25, -0.125 ], [ 0,  0, -1 ], [ 0.0, 0.0 ], 0 },
+		{ [ -0.25,  0.25, -0.125 ], [ 0,  1,  0 ], [ 0.0, 0.0 ], 0 }, // top
+		{ [ -0.25,  0.25,  0.125 ], [ 0,  1,  0 ], [ 0.0, 0.5 ], 0 },
+		{ [  0.25,  0.25, -0.125 ], [ 0,  1,  0 ], [ 1.0, 0.0 ], 0 },
+		{ [  0.25,  0.25,  0.125 ], [ 0,  1,  0 ], [ 1.0, 0.5 ], 0 },
+		{ [ -0.25, -0.25, -0.125 ], [ 0, -1,  0 ], [ 0.5, 0.0 ], 0 }, // bottom
+		{ [  0.25, -0.25, -0.125 ], [ 0, -1,  0 ], [ 0.0, 0.0 ], 0 },
+		{ [ -0.25, -0.25,  0.125 ], [ 0, -1,  0 ], [ 0.5, 0.5 ], 0 },
+		{ [  0.25, -0.25,  0.125 ], [ 0, -1,  0 ], [ 0.0, 0.5 ], 0 },
+		{ [ -0.25, -0.25, -0.125 ], [-1,  0,  0 ], [ 0.0, 1.0 ], 0 }, // left
+		{ [ -0.25, -0.25,  0.125 ], [-1,  0,  0 ], [ 0.5, 1.0 ], 0 },
+		{ [ -0.25,  0.25, -0.125 ], [-1,  0,  0 ], [ 0.0, 0.0 ], 0 },
+		{ [ -0.25,  0.25,  0.125 ], [-1,  0,  0 ], [ 0.5, 0.0 ], 0 },
+		{ [  0.25, -0.25, -0.125 ], [ 1,  0,  0 ], [ 0.5, 1.0 ], 0 }, // right
+		{ [  0.25,  0.25, -0.125 ], [ 1,  0,  0 ], [ 0.5, 0.0 ], 0 },
+		{ [  0.25, -0.25,  0.125 ], [ 1,  0,  0 ], [ 0.0, 1.0 ], 0 },
+		{ [  0.25,  0.25,  0.125 ], [ 1,  0,  0 ], [ 0.0, 0.0 ], 0 },
+	};
+	indices = {
+		 0,  1,  2,  2,  1,  3, // front
+		 4,  5,  6,  6,  5,  7, // back
+		 8,  9, 10, 10,  9, 11, // top
+		12, 13, 14, 14, 13, 15, // bottom
+		16, 17, 18, 18, 17, 19, // left
+		20, 21, 22, 22, 21, 23, // right
+	};
+};
+player_head = {
+	bounds = Cuboid([ -0.15, -0.15, -0.15 ], [ 0.15, 0.15, 0.15 ]);
+	vertices = {
+		//      position            normal       texture
+		{ [ -0.15, -0.15,  0.15 ], [ 0,  0,  1 ], [ 0, 1 ], 0 }, // front
+		{ [  0.15, -0.15,  0.15 ], [ 0,  0,  1 ], [ 1, 1 ], 0 },
+		{ [ -0.15,  0.15,  0.15 ], [ 0,  0,  1 ], [ 0, 0 ], 0 },
+		{ [  0.15,  0.15,  0.15 ], [ 0,  0,  1 ], [ 1, 0 ], 0 },
+		{ [ -0.15, -0.15, -0.15 ], [ 0,  0, -1 ], [ 1, 1 ], 1 }, // back
+		{ [ -0.15,  0.15, -0.15 ], [ 0,  0, -1 ], [ 1, 0 ], 1 },
+		{ [  0.15, -0.15, -0.15 ], [ 0,  0, -1 ], [ 0, 1 ], 1 },
+		{ [  0.15,  0.15, -0.15 ], [ 0,  0, -1 ], [ 0, 0 ], 1 },
+		{ [ -0.15,  0.15, -0.15 ], [ 0,  1,  0 ], [ 0, 0 ], 0 }, // top
+		{ [ -0.15,  0.15,  0.15 ], [ 0,  1,  0 ], [ 0, 1 ], 0 },
+		{ [  0.15,  0.15, -0.15 ], [ 0,  1,  0 ], [ 1, 0 ], 0 },
+		{ [  0.15,  0.15,  0.15 ], [ 0,  1,  0 ], [ 1, 1 ], 0 },
+		{ [ -0.15, -0.15, -0.15 ], [ 0, -1,  0 ], [ 1, 0 ], 0 }, // bottom
+		{ [  0.15, -0.15, -0.15 ], [ 0, -1,  0 ], [ 0, 0 ], 0 },
+		{ [ -0.15, -0.15,  0.15 ], [ 0, -1,  0 ], [ 1, 1 ], 0 },
+		{ [  0.15, -0.15,  0.15 ], [ 0, -1,  0 ], [ 0, 1 ], 0 },
+		{ [ -0.15, -0.15, -0.15 ], [-1,  0,  0 ], [ 0, 1 ], 0 }, // left
+		{ [ -0.15, -0.15,  0.15 ], [-1,  0,  0 ], [ 1, 1 ], 0 },
+		{ [ -0.15,  0.15, -0.15 ], [-1,  0,  0 ], [ 0, 0 ], 0 },
+		{ [ -0.15,  0.15,  0.15 ], [-1,  0,  0 ], [ 1, 0 ], 0 },
+		{ [  0.15, -0.15, -0.15 ], [ 1,  0,  0 ], [ 1, 1 ], 0 }, // right
+		{ [  0.15,  0.15, -0.15 ], [ 1,  0,  0 ], [ 1, 0 ], 0 },
+		{ [  0.15, -0.15,  0.15 ], [ 1,  0,  0 ], [ 0, 1 ], 0 },
+		{ [  0.15,  0.15,  0.15 ], [ 1,  0,  0 ], [ 0, 0 ], 0 },
 	};
 	indices = {
 		 0,  1,  2,  2,  1,  3, // front
@@ -217,5 +254,4 @@ player_head_block = {
 		16, 17, 18, 18, 17, 19, // left
 		20, 21, 22, 22, 21, 23, // right
 	};
-	fill = [ true, true, true, true, true, true ];
 };