Add b3d format cart model

10 files changed, 8 insertions, 351 deletions

diff --git a/LICENSE.txt b/LICENSE.txt
index 0379e1c..abad9e1 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -10,16 +10,12 @@ Authors of media files:
 
 HybridDog: WTFPL
 
-  cart.png
-  cart_bottom.png
-  cart_side.png
-  cart_top.png
+  railcart.png
+  railcart_bottom.png
+  railcart_side.png
+  railcart_top.png
 
 rarkenin:
 
   cart_rail_*.png
 
-Zeg9:
-
-  cart.x
-
diff --git a/railcart/init.lua b/railcart/init.lua
index 821971c..ea4893c 100644
--- a/railcart/init.lua
+++ b/railcart/init.lua
@@ -134,8 +134,8 @@ railcart:register_entity("railcart:cart_entity", {
 
 minetest.register_craftitem("railcart:cart", {
 	description = "Railcart",
-	inventory_image = minetest.inventorycube("cart_top.png", "cart_side.png", "cart_side.png"),
-	wield_image = "cart_side.png",
+	inventory_image = minetest.inventorycube("railcart_top.png", "railcart_side.png", "railcart_side.png"),
+	wield_image = "railcart_side.png",
 	on_place = function(itemstack, placer, pointed_thing)
 		local name = placer:get_player_name()
 		if not name or pointed_thing.type ~= "node" then
diff --git a/railcart/models/railcart.b3d b/railcart/models/railcart.b3d
new file mode 100644
index 0000000..0918c2c
--- /dev/null
+++ b/railcart/models/railcart.b3d
diff --git a/railcart/models/railcart.blend b/railcart/models/railcart.blend
new file mode 100644
index 0000000..2f41f53
--- /dev/null
+++ b/railcart/models/railcart.blend
diff --git a/railcart/models/railcart.x b/railcart/models/railcart.x
deleted file mode 100644
index 3325aaf..0000000
--- a/railcart/models/railcart.x
+++ /dev/null
@@ -1,339 +0,0 @@
-xof 0303txt 0032
-
-Frame Root {
-  FrameTransformMatrix {
-     1.000000, 0.000000, 0.000000, 0.000000,
-     0.000000, 0.000000, 1.000000, 0.000000,
-     0.000000, 1.000000,-0.000000, 0.000000,
-     0.000000, 0.000000, 0.000000, 1.000000;;
-  }
-  Frame Cube {
-    FrameTransformMatrix {
-       5.000000, 0.000000,-0.000000, 0.000000,
-      -0.000000, 3.535534, 3.535534, 0.000000,
-       0.000000,-3.535534, 3.535534, 0.000000,
-       0.000000,-3.000000, 3.000000, 1.000000;;
-    }
-    Mesh { //Cube_001 Mesh
-      72;
-      -1.000000; 1.000000;-1.000000;,
-      -1.000000;-1.000000;-1.000000;,
-       1.000000;-1.000000;-1.000000;,
-       1.000000; 1.000000;-1.000000;,
-      -0.833334;-1.000000; 1.000000;,
-      -1.000000;-1.000000; 1.000000;,
-      -1.000000;-0.833333; 1.000000;,
-      -0.833334;-0.833333; 1.000000;,
-      -1.000000;-1.000000;-1.000000;,
-      -1.000000;-1.000000; 1.000000;,
-       0.999999;-1.000001; 1.000000;,
-       1.000000;-1.000000;-1.000000;,
-       0.999999;-1.000001; 1.000000;,
-       0.833332;-1.000000; 1.000000;,
-       0.833333;-0.833334; 1.000000;,
-       1.000000;-0.833334; 1.000000;,
-       0.833332;-1.000000; 1.000000;,
-      -0.833334;-1.000000; 1.000000;,
-      -0.833334;-0.833333; 1.000000;,
-       0.833333;-0.833334; 1.000000;,
-       1.000000; 0.833333; 1.000000;,
-       0.833334; 0.833333; 1.000000;,
-       0.833334; 1.000000; 1.000000;,
-       1.000000; 0.999999; 1.000000;,
-       1.000000;-0.833334; 1.000000;,
-       0.833333;-0.833334; 1.000000;,
-       0.833334; 0.833333; 1.000000;,
-       1.000000; 0.833333; 1.000000;,
-       0.833334; 0.833333; 1.000000;,
-      -0.833333; 0.833333; 1.000000;,
-      -0.833333; 1.000000; 1.000000;,
-       0.833334; 1.000000; 1.000000;,
-       0.833334; 0.833333;-0.800000;,
-      -0.833333; 0.833333;-0.800000;,
-      -0.833333; 0.833333; 1.000000;,
-       0.833334; 0.833333; 1.000000;,
-      -0.833333; 0.833333; 1.000000;,
-      -1.000000; 0.833333; 1.000000;,
-      -1.000000; 1.000000; 1.000000;,
-      -0.833333; 1.000000; 1.000000;,
-      -0.833334;-0.833333; 1.000000;,
-      -1.000000;-0.833333; 1.000000;,
-      -1.000000; 0.833333; 1.000000;,
-      -0.833333; 0.833333; 1.000000;,
-       0.833333;-0.833334;-0.800000;,
-      -0.833334;-0.833333;-0.800000;,
-      -0.833333; 0.833333;-0.800000;,
-       0.833334; 0.833333;-0.800000;,
-      -0.833333; 0.833333;-0.800000;,
-      -0.833334;-0.833333;-0.800000;,
-      -0.833334;-0.833333; 1.000000;,
-      -0.833333; 0.833333; 1.000000;,
-      -0.833334;-0.833333;-0.800000;,
-       0.833333;-0.833334;-0.800000;,
-       0.833333;-0.833334; 1.000000;,
-      -0.833334;-0.833333; 1.000000;,
-       0.833333;-0.833334;-0.800000;,
-       0.833334; 0.833333;-0.800000;,
-       0.833334; 0.833333; 1.000000;,
-       0.833333;-0.833334; 1.000000;,
-      -1.000000; 1.000000;-1.000000;,
-      -1.000000; 1.000000; 1.000000;,
-      -1.000000;-1.000000; 1.000000;,
-      -1.000000;-1.000000;-1.000000;,
-      -1.000000; 1.000000; 1.000000;,
-      -1.000000; 1.000000;-1.000000;,
-       1.000000; 1.000000;-1.000000;,
-       1.000000; 0.999999; 1.000000;,
-       1.000000;-1.000000;-1.000000;,
-       0.999999;-1.000001; 1.000000;,
-       1.000000; 0.999999; 1.000000;,
-       1.000000; 1.000000;-1.000000;;
-      18;
-      4;0;1;2;3;,
-      4;4;5;6;7;,
-      4;8;9;10;11;,
-      4;12;13;14;15;,
-      4;16;17;18;19;,
-      4;20;21;22;23;,
-      4;24;25;26;27;,
-      4;28;29;30;31;,
-      4;32;33;34;35;,
-      4;36;37;38;39;,
-      4;40;41;42;43;,
-      4;44;45;46;47;,
-      4;48;49;50;51;,
-      4;52;53;54;55;,
-      4;56;57;58;59;,
-      4;60;61;62;63;,
-      4;64;65;66;67;,
-      4;68;69;70;71;;
-      MeshNormals { //Cube_001 Normals
-        72;
-         0.000000; 0.000000;-1.000000;,
-         0.000000; 0.000000;-1.000000;,
-         0.000000; 0.000000;-1.000000;,
-         0.000000; 0.000000;-1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-        -0.000000;-1.000000;-0.000000;,
-        -0.000000;-1.000000;-0.000000;,
-        -0.000000;-1.000000;-0.000000;,
-        -0.000000;-1.000000;-0.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-        -0.000000;-1.000000; 0.000000;,
-        -0.000000;-1.000000; 0.000000;,
-        -0.000000;-1.000000; 0.000000;,
-        -0.000000;-1.000000; 0.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         0.000000;-0.000000; 1.000000;,
-         1.000000;-0.000000; 0.000000;,
-         1.000000;-0.000000; 0.000000;,
-         1.000000;-0.000000; 0.000000;,
-         1.000000;-0.000000; 0.000000;,
-         0.000000; 1.000000; 0.000000;,
-         0.000000; 1.000000; 0.000000;,
-         0.000000; 1.000000; 0.000000;,
-         0.000000; 1.000000; 0.000000;,
-        -1.000000; 0.000000; 0.000000;,
-        -1.000000; 0.000000; 0.000000;,
-        -1.000000; 0.000000; 0.000000;,
-        -1.000000; 0.000000; 0.000000;,
-        -1.000000; 0.000000;-0.000000;,
-        -1.000000; 0.000000;-0.000000;,
-        -1.000000; 0.000000;-0.000000;,
-        -1.000000; 0.000000;-0.000000;,
-         0.000000; 1.000000; 0.000000;,
-         0.000000; 1.000000; 0.000000;,
-         0.000000; 1.000000; 0.000000;,
-         0.000000; 1.000000; 0.000000;,
-         1.000000;-0.000000; 0.000000;,
-         1.000000;-0.000000; 0.000000;,
-         1.000000;-0.000000; 0.000000;,
-         1.000000;-0.000000; 0.000000;;
-        18;
-        4;0;1;2;3;,
-        4;4;5;6;7;,
-        4;8;9;10;11;,
-        4;12;13;14;15;,
-        4;16;17;18;19;,
-        4;20;21;22;23;,
-        4;24;25;26;27;,
-        4;28;29;30;31;,
-        4;32;33;34;35;,
-        4;36;37;38;39;,
-        4;40;41;42;43;,
-        4;44;45;46;47;,
-        4;48;49;50;51;,
-        4;52;53;54;55;,
-        4;56;57;58;59;,
-        4;60;61;62;63;,
-        4;64;65;66;67;,
-        4;68;69;70;71;;
-      } //End of Cube_001 Normals
-      MeshMaterialList { //Cube_001 Material List
-        1;
-        18;
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0;;
-        Material Material {
-           0.640000; 0.640000; 0.640000; 1.000000;;
-           96.078431;
-           0.500000; 0.500000; 0.500000;;
-           0.000000; 0.000000; 0.000000;;
-          TextureFilename {"cart.png";}
-        }
-      } //End of Cube_001 Material List
-      MeshTextureCoords { //Cube_001 UV Coordinates
-        72;
-         0.000000; 0.500000;,
-         0.500000; 0.500000;,
-         0.500000; 1.000000;,
-         0.000000; 1.000000;,
-         0.031250; 0.500000;,
-        -0.000000; 0.500000;,
-        -0.000000; 0.468750;,
-         0.031250; 0.468750;,
-         0.500000; 0.500000;,
-         0.500000; 0.000000;,
-         1.000000; 0.000000;,
-         1.000000; 0.500000;,
-         0.468750; 0.468750;,
-         0.500000; 0.468750;,
-         0.500000; 0.500000;,
-         0.468750; 0.500000;,
-         0.031250; 0.468750;,
-         0.468750; 0.468750;,
-         0.468750; 0.500000;,
-         0.031250; 0.500000;,
-         0.468750; 0.000000;,
-         0.500000; 0.000000;,
-         0.500000; 0.031250;,
-         0.468750; 0.031250;,
-         0.468750; 0.031250;,
-         0.500000; 0.031250;,
-         0.500000; 0.468750;,
-         0.468750; 0.468750;,
-         0.468750; 0.031250;,
-         0.031250; 0.031250;,
-         0.031250; 0.000000;,
-         0.468750; 0.000000;,
-         1.000000; 0.500000;,
-         0.500000; 0.500000;,
-         0.500000; 0.000000;,
-         1.000000; 0.000000;,
-         0.031250; 0.031250;,
-         0.000000; 0.031250;,
-         0.000000; 0.000000;,
-         0.031250; 0.000000;,
-         0.031250; 0.468750;,
-        -0.000000; 0.468750;,
-         0.000000; 0.031250;,
-         0.031250; 0.031250;,
-         0.000000; 0.500000;,
-         0.500000; 0.500000;,
-         0.500000; 1.000000;,
-         0.000000; 1.000000;,
-         1.000000; 0.500000;,
-         0.500000; 0.500000;,
-         0.500000; 0.000000;,
-         1.000000; 0.000000;,
-         1.000000; 0.500000;,
-         0.500000; 0.500000;,
-         0.500000; 0.000000;,
-         1.000000; 0.000000;,
-         1.000000; 0.500000;,
-         0.500000; 0.500000;,
-         0.500000; 0.000000;,
-         1.000000; 0.000000;,
-         0.500000; 0.500000;,
-         0.500000; 0.000000;,
-         1.000000; 0.000000;,
-         1.000000; 0.500000;,
-         1.000000; 0.000000;,
-         1.000000; 0.500000;,
-         0.500000; 0.500000;,
-         0.500000; 0.000000;,
-         0.500000; 0.500000;,
-         0.500000; 0.000000;,
-         1.000000; 0.000000;,
-         1.000000; 0.500000;;
-      } //End of Cube_001 UV Coordinates
-    } //End of Cube_001 Mesh
-  } //End of Cube
-} //End of Root Frame
-AnimationSet {
-  Animation {
-    {Cube}
-    AnimationKey { //Position
-      2;
-      4;
-      0;3;     0.000000, 0.000000, 0.000000;;,
-      1;3;     0.000000, 3.000000, 3.000000;;,
-      2;3;     0.000000,-3.000000, 3.000000;;,
-      3;3;     0.000000,-3.000000, 3.000000;;;
-    }
-    AnimationKey { //Rotation
-      0;
-      4;
-      0;4;    -1.000000, 0.000000, 0.000000, 0.000000;;,
-      1;4;    -0.923880,-0.382683,-0.000000, 0.000000;;,
-      2;4;    -0.923880, 0.382683, 0.000000, 0.000000;;,
-      3;4;    -0.923880, 0.382683, 0.000000, 0.000000;;;
-    }
-    AnimationKey { //Scale
-      1;
-      4;
-      0;3;     5.000000, 5.000000, 5.000000;;,
-      1;3;     5.000000, 5.000000, 5.000000;;,
-      2;3;     5.000000, 5.000000, 5.000000;;,
-      3;3;     5.000000, 5.000000, 5.000000;;;
-    }
-  }
-} //End of AnimationSet
diff --git a/railcart/railcart.lua b/railcart/railcart.lua
index dcaa80e..f6d671a 100644
--- a/railcart/railcart.lua
+++ b/railcart/railcart.lua
@@ -13,9 +13,9 @@ railcart = {
 		physical = false,
 		collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
 		visual = "mesh",
-		mesh = "railcart.x",
+		mesh = "railcart.b3d",
 		visual_size = {x=1, y=1},
-		textures = {"cart.png"},
+		textures = {"railcart.png"},
 		cart = nil,
 		driver = nil,
 		timer = 0,
diff --git a/railcart/textures/cart.png b/railcart/textures/railcart.png
index 51464af..51464af 100644
--- a/railcart/textures/cart.png
+++ b/railcart/textures/railcart.png
diff --git a/railcart/textures/cart_bottom.png b/railcart/textures/railcart_bottom.png
index e74ef2b..e74ef2b 100644
--- a/railcart/textures/cart_bottom.png
+++ b/railcart/textures/railcart_bottom.png
diff --git a/railcart/textures/cart_side.png b/railcart/textures/railcart_side.png
index 913f5a4..913f5a4 100644
--- a/railcart/textures/cart_side.png
+++ b/railcart/textures/railcart_side.png
diff --git a/railcart/textures/cart_top.png b/railcart/textures/railcart_top.png
index f574191..f574191 100644
--- a/railcart/textures/cart_top.png
+++ b/railcart/textures/railcart_top.png