From 9c400f7d435b4b1c303f1dd5ac31a8a52b263355 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Tue, 17 Jan 2017 20:02:25 +0100 Subject: Model, animate, texture and integrate new subway wagon engine follows! --- advtrains/advtrains_train_subway/init.lua | 10 +++++++--- .../models/advtrains_subway_train.b3d | Bin 95856 -> 0 bytes .../models/advtrains_subway_wagon.b3d | Bin 0 -> 459309 bytes .../textures/advtrains_subway_train.png | Bin 12002 -> 0 bytes .../textures/advtrains_subway_train_inv.png | Bin 900 -> 0 bytes .../textures/advtrains_subway_wagon.png | Bin 0 -> 3618 bytes .../textures/advtrains_subway_wagon_inv.png | Bin 0 -> 900 bytes assets/blender/subway-train.blend | Bin 536268 -> 518888 bytes assets/blender/subway-train.blend1 | Bin 538188 -> 536268 bytes assets/blender/subway-train_animate.blend | Bin 0 -> 568668 bytes assets/blender/subway-train_animate.blend1 | Bin 0 -> 558980 bytes assets/blender/subway-train_animate_mirrored.blend | Bin 0 -> 798328 bytes .../blender/subway-train_animate_mirrored.blend1 | Bin 0 -> 863656 bytes .../subway-train_animate_mirrored_solidify.blend | Bin 0 -> 879916 bytes .../subway-train_animate_mirrored_solidify.blend1 | Bin 0 -> 879884 bytes ...subway-train_animate_mirrored_solidify_uv.blend | Bin 0 -> 832204 bytes ...ubway-train_animate_mirrored_solidify_uv.blend1 | Bin 0 -> 832396 bytes .../subway-train_animate_mirrored_solidify_uv.png | Bin 0 -> 177111 bytes .../subway-train_animate_mirrored_solidify_uv.xcf | Bin 0 -> 369791 bytes 19 files changed, 7 insertions(+), 3 deletions(-) delete mode 100644 advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d create mode 100644 advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d delete mode 100644 advtrains/advtrains_train_subway/textures/advtrains_subway_train.png delete mode 100644 advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png create mode 100644 advtrains/advtrains_train_subway/textures/advtrains_subway_wagon.png create mode 100644 advtrains/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png create mode 100644 assets/blender/subway-train_animate.blend create mode 100644 assets/blender/subway-train_animate.blend1 create mode 100644 assets/blender/subway-train_animate_mirrored.blend create mode 100644 assets/blender/subway-train_animate_mirrored.blend1 create mode 100644 assets/blender/subway-train_animate_mirrored_solidify.blend create mode 100644 assets/blender/subway-train_animate_mirrored_solidify.blend1 create mode 100644 assets/blender/subway-train_animate_mirrored_solidify_uv.blend create mode 100644 assets/blender/subway-train_animate_mirrored_solidify_uv.blend1 create mode 100644 assets/blender/subway-train_animate_mirrored_solidify_uv.png create mode 100644 assets/blender/subway-train_animate_mirrored_solidify_uv.xcf diff --git a/advtrains/advtrains_train_subway/init.lua b/advtrains/advtrains_train_subway/init.lua index b5bdb18..c68395c 100644 --- a/advtrains/advtrains_train_subway/init.lua +++ b/advtrains/advtrains_train_subway/init.lua @@ -1,7 +1,7 @@ advtrains.register_wagon("subway_wagon", { - mesh="advtrains_subway_train.b3d", - textures = {"advtrains_subway_train.png"}, + mesh="advtrains_subway_wagon.b3d", + textures = {"advtrains_subway_wagon.png"}, drives_on={default=true}, max_speed=15, seats = { @@ -17,7 +17,11 @@ advtrains.register_wagon("subway_wagon", { collisionbox = {-1.0,-0.5,-1.0, 1.0,2.5,1.0}, is_locomotive=true, drops={"default:steelblock 4"}, -}, "Subway Passenger Wagon", "advtrains_subway_train_inv.png") + --custom_on_activate = function(self, dtime_s) + -- atprint("subway custom_on_activate") + -- self.object:set_animation({x=1,y=80}, 15, 0, true) + --end, +}, "Subway Passenger Wagon", "advtrains_subway_wagon_inv.png") --wagons minetest.register_craft({ diff --git a/advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d b/advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d deleted file mode 100644 index a824d33..0000000 Binary files a/advtrains/advtrains_train_subway/models/advtrains_subway_train.b3d and /dev/null differ diff --git a/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d b/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d new file mode 100644 index 0000000..8f35769 Binary files /dev/null and b/advtrains/advtrains_train_subway/models/advtrains_subway_wagon.b3d differ diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_train.png b/advtrains/advtrains_train_subway/textures/advtrains_subway_train.png deleted file mode 100644 index 1d569f3..0000000 Binary files a/advtrains/advtrains_train_subway/textures/advtrains_subway_train.png and /dev/null differ diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png b/advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png deleted file mode 100644 index 1d0e809..0000000 Binary files a/advtrains/advtrains_train_subway/textures/advtrains_subway_train_inv.png and /dev/null differ diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon.png b/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon.png new file mode 100644 index 0000000..079d797 Binary files /dev/null and b/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon.png differ diff --git a/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png b/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png new file mode 100644 index 0000000..1d0e809 Binary files /dev/null and b/advtrains/advtrains_train_subway/textures/advtrains_subway_wagon_inv.png differ diff --git a/assets/blender/subway-train.blend b/assets/blender/subway-train.blend index 690d87b..01bb233 100644 Binary files a/assets/blender/subway-train.blend and b/assets/blender/subway-train.blend differ diff --git a/assets/blender/subway-train.blend1 b/assets/blender/subway-train.blend1 index 86d1f92..690d87b 100644 Binary files a/assets/blender/subway-train.blend1 and b/assets/blender/subway-train.blend1 differ diff --git a/assets/blender/subway-train_animate.blend b/assets/blender/subway-train_animate.blend new file mode 100644 index 0000000..75cdc52 Binary files /dev/null and b/assets/blender/subway-train_animate.blend differ diff --git a/assets/blender/subway-train_animate.blend1 b/assets/blender/subway-train_animate.blend1 new file mode 100644 index 0000000..04171fc Binary files /dev/null and b/assets/blender/subway-train_animate.blend1 differ diff --git a/assets/blender/subway-train_animate_mirrored.blend b/assets/blender/subway-train_animate_mirrored.blend new file mode 100644 index 0000000..aa11c34 Binary files /dev/null and b/assets/blender/subway-train_animate_mirrored.blend differ diff --git a/assets/blender/subway-train_animate_mirrored.blend1 b/assets/blender/subway-train_animate_mirrored.blend1 new file mode 100644 index 0000000..4d64915 Binary files /dev/null and b/assets/blender/subway-train_animate_mirrored.blend1 differ diff --git a/assets/blender/subway-train_animate_mirrored_solidify.blend b/assets/blender/subway-train_animate_mirrored_solidify.blend new file mode 100644 index 0000000..7a25b6f Binary files /dev/null and b/assets/blender/subway-train_animate_mirrored_solidify.blend differ diff --git a/assets/blender/subway-train_animate_mirrored_solidify.blend1 b/assets/blender/subway-train_animate_mirrored_solidify.blend1 new file mode 100644 index 0000000..f81e303 Binary files /dev/null and b/assets/blender/subway-train_animate_mirrored_solidify.blend1 differ diff --git a/assets/blender/subway-train_animate_mirrored_solidify_uv.blend b/assets/blender/subway-train_animate_mirrored_solidify_uv.blend new file mode 100644 index 0000000..b05b0a5 Binary files /dev/null and b/assets/blender/subway-train_animate_mirrored_solidify_uv.blend differ diff --git a/assets/blender/subway-train_animate_mirrored_solidify_uv.blend1 b/assets/blender/subway-train_animate_mirrored_solidify_uv.blend1 new file mode 100644 index 0000000..145137b Binary files /dev/null and b/assets/blender/subway-train_animate_mirrored_solidify_uv.blend1 differ diff --git a/assets/blender/subway-train_animate_mirrored_solidify_uv.png b/assets/blender/subway-train_animate_mirrored_solidify_uv.png new file mode 100644 index 0000000..e63a7f2 Binary files /dev/null and b/assets/blender/subway-train_animate_mirrored_solidify_uv.png differ diff --git a/assets/blender/subway-train_animate_mirrored_solidify_uv.xcf b/assets/blender/subway-train_animate_mirrored_solidify_uv.xcf new file mode 100644 index 0000000..42adace Binary files /dev/null and b/assets/blender/subway-train_animate_mirrored_solidify_uv.xcf differ -- cgit v1.2.3