Work on meatcreek

2022-12-26 11:18:31 -07:00 · 2022-12-26 11:18:31 -07:00 · e28d880025
commit e28d880025
parent 36d4d61c89
50 changed files with 161 additions and 96 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -12,4 +12,4 @@
 *.mp4 filter=lfs diff=lfs merge=lfs -text lockable
 *.blend filter=lfs diff=lfs merge=lfs -text lockable
 *.zip filter=lfs diff=lfs merge=lfs -text lockable
-
+*.pc2 filter=lfs diff=lfs merge=lfs -text lockable
--- a/blends/large_meat_tunnel.blend
+++ b/blends/large_meat_tunnel.blend
--- a/blends/levels/2-reset-tunnelBake.pc2
+++ b/blends/levels/2-reset-tunnelBake.pc2
--- a/blends/levels/reset_elevator_texture.png
+++ b/blends/levels/reset_elevator_texture.png
--- a/blends/levels/reset_tunnel.mdd
+++ b/blends/levels/reset_tunnel.mdd
--- a/blends/levels/side_tunnel_1.blend
+++ b/blends/levels/side_tunnel_1.blend
--- a/blends/levels/vaexport/normals.png
+++ b/blends/levels/vaexport/normals.png
--- a/blends/levels/vaexport/offsets.exr
+++ b/blends/levels/vaexport/offsets.exr
--- a/blends/meat_elevator.blend
+++ b/blends/meat_elevator.blend
--- a/godot/.import/creek_cage.glb-53be5e6586cbe0df562549341527c2c1.md5
+++ b/godot/.import/creek_cage.glb-53be5e6586cbe0df562549341527c2c1.md5
@ -1,3 +1,3 @@
-source_md5="aa978bdf8cd273bd1e95fd5e9582f56d"
-dest_md5="ae80905a1efe4da3397c3e15bfe6dbdd"
+source_md5="6929a25c3e27c26b9da92ac96646dd8d"
+dest_md5="4e1398144e148a69735c5296354ea7f8"

--- a/godot/.import/creek_cage.glb-53be5e6586cbe0df562549341527c2c1.scn
+++ b/godot/.import/creek_cage.glb-53be5e6586cbe0df562549341527c2c1.scn
--- a/godot/.import/meat_elevator_entrance.glb-8d6c8197bd1caf195e4bbcd33c347142.md5
+++ b/godot/.import/meat_elevator_entrance.glb-8d6c8197bd1caf195e4bbcd33c347142.md5
@ -1,3 +1,3 @@
-source_md5="f80a82ea17c361d29ac53a1d39720858"
-dest_md5="da3b3a6dd66a27a827097049d4676d55"
+source_md5="19514b1f75c1ccb5bd81391f7aaef7ad"
+dest_md5="a0d20f08d7c912cd75c0f614e9ef4a0d"

--- a/godot/.import/meat_elevator_entrance.glb-8d6c8197bd1caf195e4bbcd33c347142.scn
+++ b/godot/.import/meat_elevator_entrance.glb-8d6c8197bd1caf195e4bbcd33c347142.scn
--- a/godot/.import/meat_elevator_exit.glb-5e980769f692fcc7ac29b92d6ae58ad0.md5
+++ b/godot/.import/meat_elevator_exit.glb-5e980769f692fcc7ac29b92d6ae58ad0.md5
@ -1,3 +1,3 @@
-source_md5="e55bb71268689e80e8179dc98a36f3d5"
-dest_md5="5b14464029f30ecd5dd82201d098c938"
+source_md5="be6ed6e62806e445c9c5dc23316fb9b0"
+dest_md5="3a798a79eebda2897bdc14b0d5b1a605"

--- a/godot/.import/meat_elevator_exit.glb-5e980769f692fcc7ac29b92d6ae58ad0.scn
+++ b/godot/.import/meat_elevator_exit.glb-5e980769f692fcc7ac29b92d6ae58ad0.scn
--- a/godot/.import/normals.png-e4a51084f44a4774e0a88f2da93e423c.etc2.stex
+++ b/godot/.import/normals.png-e4a51084f44a4774e0a88f2da93e423c.etc2.stex
--- a/godot/.import/normals.png-e4a51084f44a4774e0a88f2da93e423c.md5
+++ b/godot/.import/normals.png-e4a51084f44a4774e0a88f2da93e423c.md5
@ -0,0 +1,3 @@
+source_md5="130ede86de34314953b1cf6ffaba523f"
+dest_md5="50b4efa1d9abb8ec72dc56cb1b452891"
+
--- a/godot/.import/normals.png-e4a51084f44a4774e0a88f2da93e423c.s3tc.stex
+++ b/godot/.import/normals.png-e4a51084f44a4774e0a88f2da93e423c.s3tc.stex
--- a/godot/.import/normals.png-e4a51084f44a4774e0a88f2da93e423c.stex
+++ b/godot/.import/normals.png-e4a51084f44a4774e0a88f2da93e423c.stex
--- a/godot/.import/offsets.exr-3e76105f11ae0bc058b1b5491f856049.etc2.stex
+++ b/godot/.import/offsets.exr-3e76105f11ae0bc058b1b5491f856049.etc2.stex
--- a/godot/.import/offsets.exr-3e76105f11ae0bc058b1b5491f856049.md5
+++ b/godot/.import/offsets.exr-3e76105f11ae0bc058b1b5491f856049.md5
@ -0,0 +1,3 @@
+source_md5="b19bf40b7b28ef4c530c9325c00fea94"
+dest_md5="676fbf8dd06fd4c9b37ea8caf8ab4d40"
+
--- a/godot/.import/offsets.exr-3e76105f11ae0bc058b1b5491f856049.s3tc.stex
+++ b/godot/.import/offsets.exr-3e76105f11ae0bc058b1b5491f856049.s3tc.stex
--- a/godot/.import/offsets.exr-3e76105f11ae0bc058b1b5491f856049.stex
+++ b/godot/.import/offsets.exr-3e76105f11ae0bc058b1b5491f856049.stex
--- a/godot/.import/reset_elevator_texture.png-8967f134160325e0b0360fd72c4b5a85.etc2.stex
+++ b/godot/.import/reset_elevator_texture.png-8967f134160325e0b0360fd72c4b5a85.etc2.stex
--- a/godot/.import/reset_elevator_texture.png-8967f134160325e0b0360fd72c4b5a85.md5
+++ b/godot/.import/reset_elevator_texture.png-8967f134160325e0b0360fd72c4b5a85.md5
@ -0,0 +1,3 @@
+source_md5="9b700dcce101319dd351271fc1f2ca56"
+dest_md5="c8170dd8bca1e1f543cd5dbe3a72b4de"
+
--- a/godot/.import/reset_elevator_texture.png-8967f134160325e0b0360fd72c4b5a85.s3tc.stex
+++ b/godot/.import/reset_elevator_texture.png-8967f134160325e0b0360fd72c4b5a85.s3tc.stex
--- a/godot/.import/reset_elevator_texture.png-8967f134160325e0b0360fd72c4b5a85.stex
+++ b/godot/.import/reset_elevator_texture.png-8967f134160325e0b0360fd72c4b5a85.stex
--- a/godot/.import/reset_tunnel.glb-0140f2ecf1355477111e3cfcd6df5350.md5
+++ b/godot/.import/reset_tunnel.glb-0140f2ecf1355477111e3cfcd6df5350.md5
@ -0,0 +1,3 @@
+source_md5="e6fde222be2d1d2abd935c103d878f9b"
+dest_md5="2340745ef51eebb6d778373d04781640"
+
--- a/godot/.import/reset_tunnel.glb-0140f2ecf1355477111e3cfcd6df5350.scn
+++ b/godot/.import/reset_tunnel.glb-0140f2ecf1355477111e3cfcd6df5350.scn
--- a/godot/.import/reset_tunnel_material.glb-aa636d2cd78eec4ea5332c98b2a661b2.md5
+++ b/godot/.import/reset_tunnel_material.glb-aa636d2cd78eec4ea5332c98b2a661b2.md5
@ -0,0 +1,3 @@
+source_md5="95a54f3bc479185cc7028fc32f83bcfa"
+dest_md5="80c2ffcb7c2d3f3bca0b699fa5dd8291"
+
--- a/godot/.import/reset_tunnel_material.glb-aa636d2cd78eec4ea5332c98b2a661b2.scn
+++ b/godot/.import/reset_tunnel_material.glb-aa636d2cd78eec4ea5332c98b2a661b2.scn
--- a/godot/.import/tracker.glb-5b403bb06cbf8364cf6ac02b55acdbbf.md5
+++ b/godot/.import/tracker.glb-5b403bb06cbf8364cf6ac02b55acdbbf.md5
@ -0,0 +1,3 @@
+source_md5="264a6f013122c9999a39406e5bbb8872"
+dest_md5="51d02d9ea4b879bbb7d1644e41b38914"
+
--- a/godot/.import/tracker.glb-5b403bb06cbf8364cf6ac02b55acdbbf.scn
+++ b/godot/.import/tracker.glb-5b403bb06cbf8364cf6ac02b55acdbbf.scn
--- a/godot/assets/meat_creek/Lee_hair.material
+++ b/godot/assets/meat_creek/Lee_hair.material
--- a/godot/assets/meat_creek/Material_001.material
+++ b/godot/assets/meat_creek/Material_001.material
--- a/godot/assets/meat_creek/Material_002.material
+++ b/godot/assets/meat_creek/Material_002.material
--- a/godot/assets/meat_creek/NPC_Lee.material
+++ b/godot/assets/meat_creek/NPC_Lee.material
--- a/godot/assets/meat_creek/creek_cage.glb
+++ b/godot/assets/meat_creek/creek_cage.glb
--- a/godot/assets/meat_creek/creek_cage.tscn
+++ b/godot/assets/meat_creek/creek_cage.tscn
--- a/godot/assets/meat_creek/side_tunnel_1.tscn
+++ b/godot/assets/meat_creek/side_tunnel_1.tscn
--- a/godot/assets/models/Material_004.material
+++ b/godot/assets/models/Material_004.material
--- a/godot/assets/models/meat_creek_elevator.gd
+++ b/godot/assets/models/meat_creek_elevator.gd
@ -0,0 +1,8 @@
+extends Spatial
+
+
+func _ready():
+	var _ignore = $elevator/meat_elevator_tracker/MeatElevatorTracker.connect("arrived", self, "reset_level")
+	
+func reset_level():
+	var _ignore = get_tree().reload_current_scene()
--- a/godot/assets/models/meat_creek_elevator.tscn
+++ b/godot/assets/models/meat_creek_elevator.tscn
@ -0,0 +1,9 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://assets/models/meat_creek_elevator.gd" type="Script" id=1]
+[ext_resource path="res://effects/elevator.tscn" type="PackedScene" id=2]
+
+[node name="Spatial" type="Spatial"]
+script = ExtResource( 1 )
+
+[node name="elevator" parent="." instance=ExtResource( 2 )]
--- a/godot/assets/models/meat_elevator_entrance.glb
+++ b/godot/assets/models/meat_elevator_entrance.glb
--- a/godot/assets/models/meat_elevator_entrance.tscn
+++ b/godot/assets/models/meat_elevator_entrance.tscn
--- a/godot/assets/models/meat_elevator_exit.glb
+++ b/godot/assets/models/meat_elevator_exit.glb
--- a/godot/assets/models/meat_elevator_exit.tscn
+++ b/godot/assets/models/meat_elevator_exit.tscn
--- a/godot/effects/elevator.tscn
+++ b/godot/effects/elevator.tscn
--- a/godot/tests/meat_creek/reset_tunnel.tscn
+++ b/godot/tests/meat_creek/reset_tunnel.tscn
@ -0,0 +1,10 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://assets/meat_creek/reset_tunnel/reset_tunnel.tscn" type="PackedScene" id=1]
+
+[node name="Spatial" type="Spatial"]
+
+[node name="Spatial" parent="." instance=ExtResource( 1 )]
+
+[node name="Camera" type="Camera" parent="Spatial"]
+transform = Transform( 0.704027, 0, 0.710173, 0, 1, 0, -0.710173, 0, 0.704027, -66.7821, 0, -112.358 )
--- a/meatpics/downscaled/tube_meat.jpg
+++ b/meatpics/downscaled/tube_meat.jpg