fiddled with models a bit

diff --git a/data/default.models b/data/default.models
index 2fe0a1bcd129578ea8f0bb4f6d04b045ba0bab03..e710c7ec62e9eaa538c5a02284f51357e76e7072 100644 (file)
--- a/data/default.models
+++ b/data/default.models
@@ -5,7 +5,7 @@ player = {
                children = [
                        {
                                shape = player_head;
-                               position = [ 0, 0.375, 0 ];
+                               position = [ 0, 0.4, 0 ];
                                textures = [ "rock-1", "rock-face" ];
                        }
                ];
@@ -19,15 +19,15 @@ monster = {
                textures = [ "rock-1" ];
                rgb_mod = [ 1, 1, 0 ];
                children = [{
-                       position = [ 0, 0.375, 0 ];
+                       position = [ 0, 0.4, 0 ];
                        children = [{
                                shape = player_head;
-                               position = [ -0.275, 0.375, 0 ];
+                               position = [ -0.275, 0, 0 ];
                                textures = [ "rock-1", "rock-face" ];
                                rgb_mod = [ 1, 0, 0 ];
                        }, {
                                shape = player_head;
-                               position = [ 0.275, 0.375, 0 ];
+                               position = [ 0.275, 0, 0 ];
                                textures = [ "rock-1", "rock-face" ];
                                rgb_mod = [ 1, 0.5, 0 ];
                        }];

diff --git a/data/default.shapes b/data/default.shapes
index 6706967dc53bc4f4648b6c9ee169ed2b351155ad..c0ac0379ae06a36d1dae3e1c5e0877e2986b35c6 100644 (file)
--- a/data/default.shapes
+++ b/data/default.shapes
@@ -181,33 +181,33 @@ pipe_block = {
 
 // temporary fix for missing skeleton loader
 player_body = {
-       bounds = Cuboid([ -0.25, -0.25, -0.25 ], [ 0.25, 0.25, 0.25 ]);
+       bounds = Cuboid([ -0.25, -0.25, -0.125 ], [ 0.25, 0.25, 0.125 ]);
        vertices = {
                //      position            normal       texture
-               { [ -0.25, -0.25,  0.25 ], [ 0,  0,  1 ], [ 0, 1 ], 0 }, // front
-               { [  0.25, -0.25,  0.25 ], [ 0,  0,  1 ], [ 1, 1 ], 0 },
-               { [ -0.25,  0.25,  0.25 ], [ 0,  0,  1 ], [ 0, 0 ], 0 },
-               { [  0.25,  0.25,  0.25 ], [ 0,  0,  1 ], [ 1, 0 ], 0 },
-               { [ -0.25, -0.25, -0.25 ], [ 0,  0, -1 ], [ 1, 1 ], 0 }, // back
-               { [ -0.25,  0.25, -0.25 ], [ 0,  0, -1 ], [ 1, 0 ], 0 },
-               { [  0.25, -0.25, -0.25 ], [ 0,  0, -1 ], [ 0, 1 ], 0 },
-               { [  0.25,  0.25, -0.25 ], [ 0,  0, -1 ], [ 0, 0 ], 0 },
-               { [ -0.25,  0.25, -0.25 ], [ 0,  1,  0 ], [ 0, 0 ], 0 }, // top
-               { [ -0.25,  0.25,  0.25 ], [ 0,  1,  0 ], [ 0, 1 ], 0 },
-               { [  0.25,  0.25, -0.25 ], [ 0,  1,  0 ], [ 1, 0 ], 0 },
-               { [  0.25,  0.25,  0.25 ], [ 0,  1,  0 ], [ 1, 1 ], 0 },
-               { [ -0.25, -0.25, -0.25 ], [ 0, -1,  0 ], [ 1, 0 ], 0 }, // bottom
-               { [  0.25, -0.25, -0.25 ], [ 0, -1,  0 ], [ 0, 0 ], 0 },
-               { [ -0.25, -0.25,  0.25 ], [ 0, -1,  0 ], [ 1, 1 ], 0 },
-               { [  0.25, -0.25,  0.25 ], [ 0, -1,  0 ], [ 0, 1 ], 0 },
-               { [ -0.25, -0.25, -0.25 ], [-1,  0,  0 ], [ 0, 1 ], 0 }, // left
-               { [ -0.25, -0.25,  0.25 ], [-1,  0,  0 ], [ 1, 1 ], 0 },
-               { [ -0.25,  0.25, -0.25 ], [-1,  0,  0 ], [ 0, 0 ], 0 },
-               { [ -0.25,  0.25,  0.25 ], [-1,  0,  0 ], [ 1, 0 ], 0 },
-               { [  0.25, -0.25, -0.25 ], [ 1,  0,  0 ], [ 1, 1 ], 0 }, // right
-               { [  0.25,  0.25, -0.25 ], [ 1,  0,  0 ], [ 1, 0 ], 0 },
-               { [  0.25, -0.25,  0.25 ], [ 1,  0,  0 ], [ 0, 1 ], 0 },
-               { [  0.25,  0.25,  0.25 ], [ 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
@@ -219,33 +219,33 @@ player_body = {
        };
 };
 player_head = {
-       bounds = Cuboid([ -0.125, -0.125, -0.125 ], [ 0.125, 0.125, 0.125 ]);
+       bounds = Cuboid([ -0.15, -0.15, -0.15 ], [ 0.15, 0.15, 0.15 ]);
        vertices = {
                //      position            normal       texture
-               { [ -0.125, -0.125,  0.125 ], [ 0,  0,  1 ], [ 0, 1 ], 0 }, // front
-               { [  0.125, -0.125,  0.125 ], [ 0,  0,  1 ], [ 1, 1 ], 0 },
-               { [ -0.125,  0.125,  0.125 ], [ 0,  0,  1 ], [ 0, 0 ], 0 },
-               { [  0.125,  0.125,  0.125 ], [ 0,  0,  1 ], [ 1, 0 ], 0 },
-               { [ -0.125, -0.125, -0.125 ], [ 0,  0, -1 ], [ 1, 1 ], 1 }, // back
-               { [ -0.125,  0.125, -0.125 ], [ 0,  0, -1 ], [ 1, 0 ], 1 },
-               { [  0.125, -0.125, -0.125 ], [ 0,  0, -1 ], [ 0, 1 ], 1 },
-               { [  0.125,  0.125, -0.125 ], [ 0,  0, -1 ], [ 0, 0 ], 1 },
-               { [ -0.125,  0.125, -0.125 ], [ 0,  1,  0 ], [ 0, 0 ], 0 }, // top
-               { [ -0.125,  0.125,  0.125 ], [ 0,  1,  0 ], [ 0, 1 ], 0 },
-               { [  0.125,  0.125, -0.125 ], [ 0,  1,  0 ], [ 1, 0 ], 0 },
-               { [  0.125,  0.125,  0.125 ], [ 0,  1,  0 ], [ 1, 1 ], 0 },
-               { [ -0.125, -0.125, -0.125 ], [ 0, -1,  0 ], [ 1, 0 ], 0 }, // bottom
-               { [  0.125, -0.125, -0.125 ], [ 0, -1,  0 ], [ 0, 0 ], 0 },
-               { [ -0.125, -0.125,  0.125 ], [ 0, -1,  0 ], [ 1, 1 ], 0 },
-               { [  0.125, -0.125,  0.125 ], [ 0, -1,  0 ], [ 0, 1 ], 0 },
-               { [ -0.125, -0.125, -0.125 ], [-1,  0,  0 ], [ 0, 1 ], 0 }, // left
-               { [ -0.125, -0.125,  0.125 ], [-1,  0,  0 ], [ 1, 1 ], 0 },
-               { [ -0.125,  0.125, -0.125 ], [-1,  0,  0 ], [ 0, 0 ], 0 },
-               { [ -0.125,  0.125,  0.125 ], [-1,  0,  0 ], [ 1, 0 ], 0 },
-               { [  0.125, -0.125, -0.125 ], [ 1,  0,  0 ], [ 1, 1 ], 0 }, // right
-               { [  0.125,  0.125, -0.125 ], [ 1,  0,  0 ], [ 1, 0 ], 0 },
-               { [  0.125, -0.125,  0.125 ], [ 1,  0,  0 ], [ 0, 1 ], 0 },
-               { [  0.125,  0.125,  0.125 ], [ 1,  0,  0 ], [ 0, 0 ], 0 },
+               { [ -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