From d252d4cfe6bbf8f83ef90af27bd98cf58167b15f Mon Sep 17 00:00:00 2001 From: Spencer Killen Date: Tue, 3 Jan 2023 13:19:39 -0700 Subject: [PATCH] sink blocks --- .../meat_bore/BoreMeatSinkParameters.tscn | 6 + godot/assets/meat_bore/level.tscn | 6 +- .../meat_bore/meat_module/level_clark.tscn | 6 +- .../meat_bore/meat_module/level_wally.tscn | 6 +- godot/effects/MeatSinkParameters.gd | 2 +- godot/effects/SinkBlock.gd | 17 +- godot/effects/SinkBlock.tscn | 1 + godot/effects/WorldEnvironment.tscn | 11 +- godot/effects/sink_block_wavy_meat_part2.tres | 3 + godot/mono_crash.0.0.json | 695 ++++++++++++++++++ godot/tests/bore_hole/test_level_alexis.tscn | 15 + godot/tests/bore_hole/test_level_clark.tscn | 15 + godot/tests/bore_hole/test_level_common.tscn | 22 + godot/tests/bore_hole/test_level_jackie.tscn | 14 +- godot/tests/bore_hole/test_level_lee.tscn | 15 + godot/tests/bore_hole/test_level_wally.tscn | 15 + godot/util.gd | 1 + 17 files changed, 820 insertions(+), 30 deletions(-) create mode 100644 godot/assets/meat_bore/BoreMeatSinkParameters.tscn create mode 100644 godot/mono_crash.0.0.json create mode 100644 godot/tests/bore_hole/test_level_alexis.tscn create mode 100644 godot/tests/bore_hole/test_level_clark.tscn create mode 100644 godot/tests/bore_hole/test_level_common.tscn create mode 100644 godot/tests/bore_hole/test_level_lee.tscn create mode 100644 godot/tests/bore_hole/test_level_wally.tscn diff --git a/godot/assets/meat_bore/BoreMeatSinkParameters.tscn b/godot/assets/meat_bore/BoreMeatSinkParameters.tscn new file mode 100644 index 0000000..0abff5a --- /dev/null +++ b/godot/assets/meat_bore/BoreMeatSinkParameters.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://effects/MeatSinkParameters.tscn" type="PackedScene" id=1] + +[node name="MeatSinkParameters" instance=ExtResource( 1 )] +sink_factor = Vector3( 0.9, 0.08, 0.9 ) diff --git a/godot/assets/meat_bore/level.tscn b/godot/assets/meat_bore/level.tscn index b075823..d1523b5 100644 --- a/godot/assets/meat_bore/level.tscn +++ b/godot/assets/meat_bore/level.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://player/player.tscn" type="PackedScene" id=3] [ext_resource path="res://effects/WorldEnvironment.tscn" type="PackedScene" id=4] [ext_resource path="res://effects/grainy_shader.tscn" type="PackedScene" id=5] -[ext_resource path="res://effects/MeatSinkParameters.tscn" type="PackedScene" id=6] +[ext_resource path="res://assets/meat_bore/BoreMeatSinkParameters.tscn" type="PackedScene" id=6] [ext_resource path="res://assets/meat_bore/meat_module/level_clark.tscn" type="PackedScene" id=7] [ext_resource path="res://assets/meat_bore/meat_module/level_alexis.tscn" type="PackedScene" id=8] [ext_resource path="res://assets/meat_bore/meat_module/level_lee.tscn" type="PackedScene" id=9] @@ -41,8 +41,6 @@ glow_bloom = 1.0 [node name="bore_level" type="Spatial"] -[node name="MeatSinkParameters" parent="." instance=ExtResource( 6 )] - [node name="meat_tunnel_top" parent="." instance=ExtResource( 1 )] [node name="Player" parent="." instance=ExtResource( 3 )] @@ -125,3 +123,5 @@ transform = Transform( -0.452271, 0.189509, 0.236865, -0.0433815, 0.487985, -0.3 [node name="level_wally" parent="." instance=ExtResource( 2 )] [node name="level_jackie" parent="." instance=ExtResource( 10 )] + +[node name="MeatSinkParameters" parent="." instance=ExtResource( 6 )] diff --git a/godot/assets/meat_bore/meat_module/level_clark.tscn b/godot/assets/meat_bore/meat_module/level_clark.tscn index cf40119..d18168f 100644 --- a/godot/assets/meat_bore/meat_module/level_clark.tscn +++ b/godot/assets/meat_bore/meat_module/level_clark.tscn @@ -1,12 +1,10 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://assets/meat_bore/meat_module/meat_module.tscn" type="PackedScene" id=1] [ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_2.png" type="Texture" id=2] -[ext_resource path="res://assets/meat_bore/meat_module/meat_module.gd" type="Script" id=3] [node name="level_clark" type="Spatial"] -[node name="meat_module_2" type="Spatial" parent="." instance=ExtResource( 1 )] +[node name="meat_module_2" parent="." instance=ExtResource( 1 )] transform = Transform( 0.742409, 0, 0.669947, 0, 1, 0, -0.669947, 0, 0.742409, 0, -114.811, 0 ) -script = ExtResource( 3 ) texture = ExtResource( 2 ) diff --git a/godot/assets/meat_bore/meat_module/level_wally.tscn b/godot/assets/meat_bore/meat_module/level_wally.tscn index c5e2c59..49d3d0a 100644 --- a/godot/assets/meat_bore/meat_module/level_wally.tscn +++ b/godot/assets/meat_bore/meat_module/level_wally.tscn @@ -1,12 +1,10 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://assets/meat_bore/meat_module/meat_module.tscn" type="PackedScene" id=1] [ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_4.png" type="Texture" id=2] -[ext_resource path="res://assets/meat_bore/meat_module/meat_module.gd" type="Script" id=3] [node name="level_wally" type="Spatial"] -[node name="meat_module_4" type="Spatial" parent="." instance=ExtResource( 1 )] +[node name="meat_module_4" parent="." instance=ExtResource( 1 )] transform = Transform( 0.882693, 0, 0.469949, 0, 1, 0, -0.469949, 0, 0.882693, 0, -344.433, 0 ) -script = ExtResource( 3 ) texture = ExtResource( 2 ) diff --git a/godot/effects/MeatSinkParameters.gd b/godot/effects/MeatSinkParameters.gd index 14b6510..429ad70 100644 --- a/godot/effects/MeatSinkParameters.gd +++ b/godot/effects/MeatSinkParameters.gd @@ -5,5 +5,5 @@ export var mind_fuck = false func _ready(): Util.meat_sink_parameters = self - + Util.emit_signal("meat_sink_parameters") diff --git a/godot/effects/SinkBlock.gd b/godot/effects/SinkBlock.gd index 2f95481..8330863 100644 --- a/godot/effects/SinkBlock.gd +++ b/godot/effects/SinkBlock.gd @@ -1,14 +1,21 @@ -extends Node +extends MeshInstance -onready var util = get_node("/root/Util") onready var global_event_bus = get_node("/root/GlobalEventBus") -onready var player = util.player + +func _ready(): + var mat = get_active_material(0).next_pass + if Util.meat_sink_parameters == null: + yield(Util, "meat_sink_parameters") + if not Util.meat_sink_parameters.mind_fuck: + mat.set_shader_param("alpha", 0.07) + else: + mat.set_shader_param("alpha", 1.0) func _on_SinkRegion_body_entered(body: Node): - if body.get_parent() == player: + if body.get_parent() == Util.player: global_event_bus.emit_signal("player_entered_meat_sink") func _on_SinkRegion_body_exited(body: Node): - if body.get_parent() == player: + if body.get_parent() == Util.player: global_event_bus.emit_signal("player_exited_meat_sink") diff --git a/godot/effects/SinkBlock.tscn b/godot/effects/SinkBlock.tscn index e8ccc8c..0025422 100644 --- a/godot/effects/SinkBlock.tscn +++ b/godot/effects/SinkBlock.tscn @@ -60,6 +60,7 @@ shader_param/texture_albedo = ExtResource( 3 ) [sub_resource type="BoxShape" id=4] [node name="SinkBlock" type="MeshInstance"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00414968, 0.00430012, 0.0115683 ) mesh = SubResource( 3 ) material/0 = SubResource( 7 ) script = ExtResource( 2 ) diff --git a/godot/effects/WorldEnvironment.tscn b/godot/effects/WorldEnvironment.tscn index 2987c52..25bdd4f 100644 --- a/godot/effects/WorldEnvironment.tscn +++ b/godot/effects/WorldEnvironment.tscn @@ -1,17 +1,10 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://assets/Starbox3.png" type="Texture" id=1] - -[sub_resource type="PanoramaSky" id=2] -panorama = ExtResource( 1 ) +[gd_scene load_steps=2 format=2] [sub_resource type="Environment" id=3] -background_mode = 2 -background_sky = SubResource( 2 ) +background_mode = 1 ambient_light_color = Color( 0.329412, 0.231373, 0.231373, 1 ) ambient_light_energy = 2.22 ambient_light_sky_contribution = 0.0 -fog_enabled = true fog_color = Color( 0.0117647, 0.0156863, 0.0156863, 1 ) fog_sun_color = Color( 0.639216, 0.541176, 0.345098, 1 ) fog_depth_begin = 1.0 diff --git a/godot/effects/sink_block_wavy_meat_part2.tres b/godot/effects/sink_block_wavy_meat_part2.tres index d7ca1d4..eade9d3 100644 --- a/godot/effects/sink_block_wavy_meat_part2.tres +++ b/godot/effects/sink_block_wavy_meat_part2.tres @@ -7,14 +7,17 @@ code = "shader_type spatial; render_mode unshaded, cull_front; uniform sampler2D texture_albedo : hint_albedo; +uniform float alpha = 1.0; void fragment() { vec2 uv = SCREEN_UV; uv.x += sin((TIME + SCREEN_UV.y) * 5.0)/5.0; ALBEDO = texture(texture_albedo, uv).rgb; + ALPHA = alpha; } " [resource] shader = SubResource( 12 ) +shader_param/alpha = 1.0 shader_param/texture_albedo = ExtResource( 1 ) diff --git a/godot/mono_crash.0.0.json b/godot/mono_crash.0.0.json new file mode 100644 index 0000000..dfb2769 --- /dev/null +++ b/godot/mono_crash.0.0.json @@ -0,0 +1,695 @@ +{ + "protocol_version" : "0.0.6", + "configuration" : { + "version" : "(6.12.0) ((no/6051b710)", + "tlc" : "normal", + "sigsgev" : "altstack", + "notifications" : "epoll", + "architecture" : "amd64", + "disabled_features" : "none", + "smallconfig" : "disabled", + "bigarrays" : "disabled", + "softdebug" : "enabled", + "interpreter" : "enabled", + "llvm_support" : "disabled", + "suspend" : "preemptive" + }, + "memory" : { + "minor_gc_time" : "18298", + "major_gc_time" : "0", + "minor_gc_count" : "4", + "major_gc_count" : "0", + "major_gc_time_concurrent" : "0" + }, + "threads" : [ + { + "is_managed" : false, + "offset_free_hash" : "0x0", + "offset_rich_hash" : "0x0", + "crashed" : false, + "native_thread_id" : "0x7f7fee77b640", + "thread_info_addr" : "0x7f7fe4000b70", + "thread_name" : "Finalizer", + "ctx" : { + "IP" : "0x7f800ec97197", + "SP" : "0x7f7fee77ac20", + "BP" : "(nil)" + }, + "unmanaged_frames" : [ + { + "is_managed" : "false", + "native_address" : "0xff351b", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x118bf3e", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1194c07", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x100215a", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x7f800ec48520", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x7f800ec97197", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x7f800eca2cf8", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x10bedf8", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x11914c7", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x7f800ec9ab43", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x7f800ed2ca00", + "native_offset" : "0x00000" + } + + ] + }, + { + "is_managed" : false, + "offset_free_hash" : "0x0", + "offset_rich_hash" : "0x0", + "crashed" : false, + "native_thread_id" : "0x7f7fcdffa640", + "thread_info_addr" : "0x7f7fc8000b70", + "thread_name" : "Thread Pool I/O", + "ctx" : { + "IP" : "0x7f800ed1ed7f", + "SP" : "0x7f7fcdff9be0", + "BP" : "0x1182780" + }, + "unmanaged_frames" : [ + { + "is_managed" : "false", + "native_address" : "0xff351b", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x118bf3e", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1194c07", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x100215a", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x7f800ec48520", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x7f800ed1ed7f", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x11820f0", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1183010", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x11914c7", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x7f800ec9ab43", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x7f800ed2ca00", + "native_offset" : "0x00000" + } + + ] + }, + { + "is_managed" : true, + "offset_free_hash" : "0x9bfc75a2d", + "offset_rich_hash" : "0x9bfc75bf7", + "crashed" : false, + "native_thread_id" : "0x7f7f97acf640", + "thread_info_addr" : "0x7f7f6c000b70", + "thread_name" : "Timer-Scheduler", + "ctx" : { + "IP" : "0x7f800ec97197", + "SP" : "0x7f7f97acdef0", + "BP" : "0xa842e90" + }, + "managed_frames" : [ + { + "is_managed" : "false", + "native_address" : "unregistered" + } +, + { + "is_managed" : "true", + "guid" : "02071A39-C8A3-4187-BDD1-F58E4BE38764", + "token" : "0x00000", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x472000", + "timestamp" : "0xbdaa207d", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "02071A39-C8A3-4187-BDD1-F58E4BE38764", + "token" : "0x6002050", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x472000", + "timestamp" : "0xbdaa207d", + "il_offset" : "0x00044" + } +, + { + "is_managed" : "true", + "guid" : "02071A39-C8A3-4187-BDD1-F58E4BE38764", + "token" : "0x600203c", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x472000", + "timestamp" : "0xbdaa207d", + "il_offset" : "0x00014" + } +, + { + "is_managed" : "true", + "guid" : "02071A39-C8A3-4187-BDD1-F58E4BE38764", + "token" : "0x600203b", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x472000", + "timestamp" : "0xbdaa207d", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "02071A39-C8A3-4187-BDD1-F58E4BE38764", + "token" : "0x6002036", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x472000", + "timestamp" : "0xbdaa207d", + "il_offset" : "0x00019" + } +, + { + "is_managed" : "true", + "guid" : "02071A39-C8A3-4187-BDD1-F58E4BE38764", + "token" : "0x6002039", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x472000", + "timestamp" : "0xbdaa207d", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "02071A39-C8A3-4187-BDD1-F58E4BE38764", + "token" : "0x60020f5", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x472000", + "timestamp" : "0xbdaa207d", + "il_offset" : "0x0003c" + } +, + { + "is_managed" : "true", + "guid" : "02071A39-C8A3-4187-BDD1-F58E4BE38764", + "token" : "0x6001f1b", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x472000", + "timestamp" : "0xbdaa207d", + "il_offset" : "0x00014" + } +, + { + "is_managed" : "true", + "guid" : "02071A39-C8A3-4187-BDD1-F58E4BE38764", + "token" : "0x6001ec3", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x472000", + "timestamp" : "0xbdaa207d", + "il_offset" : "0x00071" + } +, + { + "is_managed" : "true", + "guid" : "02071A39-C8A3-4187-BDD1-F58E4BE38764", + "token" : "0x6001ec1", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x472000", + "timestamp" : "0xbdaa207d", + "il_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "02071A39-C8A3-4187-BDD1-F58E4BE38764", + "token" : "0x6001ec0", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x472000", + "timestamp" : "0xbdaa207d", + "il_offset" : "0x0002b" + } +, + { + "is_managed" : "true", + "guid" : "02071A39-C8A3-4187-BDD1-F58E4BE38764", + "token" : "0x6001f1d", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x472000", + "timestamp" : "0xbdaa207d", + "il_offset" : "0x00008" + } +, + { + "is_managed" : "true", + "guid" : "02071A39-C8A3-4187-BDD1-F58E4BE38764", + "token" : "0x00000", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x472000", + "timestamp" : "0xbdaa207d", + "il_offset" : "0x00065" + } + + ], + "unmanaged_frames" : [ + { + "is_managed" : "false", + "native_address" : "0xff351b", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x118bf3e", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1194c07", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x100215a", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x7f800ec48520", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x7f800ec97197", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x7f800ec99ac1", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1204f45", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x11a1daa", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x11a33e4", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x11a3ea8", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x11928aa", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x10e6662", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "true", + "guid" : "02071A39-C8A3-4187-BDD1-F58E4BE38764", + "token" : "0x00000", + "native_offset" : "0x0", + "filename" : "mscorlib.dll", + "sizeofimage" : "0x472000", + "timestamp" : "0xbdaa207d", + "il_offset" : "0x00000" + } + + ] +}, +{ + "is_managed" : false, + "offset_free_hash" : "0x0", + "offset_rich_hash" : "0x0", + "crashed" : true, + "native_thread_id" : "0x7f800eaae7c0", + "thread_info_addr" : "0xa841420", + "thread_name" : "godot_mono", + "ctx" : { + "IP" : "0x2ba1376", + "SP" : "0x7ffd4b47b6b0", + "BP" : "0x7ffd4b47b830" + }, + "unmanaged_frames" : [ + { + "is_managed" : "false", + "native_address" : "0xff351b", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x118bf3e", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1194d34", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1002da5", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1002fa9", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0xff565f", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0xf6c4c0", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x2ba1376", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x2083f83", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x2158154", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x12ea38c", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3abd809", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3b331e3", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3b3a60d", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3b3a940", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x12ea38c", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3abd809", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3adb17a", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x2d7987b", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x2d7ac6d", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x15412fd", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3abd3b7", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x2be56c1", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x2bfb536", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x2bfd7f5", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x2bfd9ab", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x15412fd", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3abd809", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x3aacc0e", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x2bc20bb", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x2be3a10", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1257060", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1258279", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x12714e4", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x1273e90", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0xf2536e", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x7f800ec2fd90", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0x7f800ec2fe40", + "native_offset" : "0x00000" + } +, + { + "is_managed" : "false", + "native_address" : "0xf29d3e", + "native_offset" : "0x00000" + } + + ] +} +] +} \ No newline at end of file diff --git a/godot/tests/bore_hole/test_level_alexis.tscn b/godot/tests/bore_hole/test_level_alexis.tscn new file mode 100644 index 0000000..a054786 --- /dev/null +++ b/godot/tests/bore_hole/test_level_alexis.tscn @@ -0,0 +1,15 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://assets/meat_bore/meat_module/level_alexis.tscn" type="PackedScene" id=1] +[ext_resource path="res://tests/bore_hole/test_level_common.tscn" type="PackedScene" id=2] +[ext_resource path="res://effects/SinkBlock.tscn" type="PackedScene" id=4] + +[node name="Spatial" type="Spatial"] + +[node name="SinkBlock" parent="." instance=ExtResource( 4 )] +transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 19.8, 24.8621, 36.3761, 1.22013 ) + +[node name="test_level_common" parent="." instance=ExtResource( 2 )] + +[node name="level_alexis" parent="." instance=ExtResource( 1 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 269.296, 0 ) diff --git a/godot/tests/bore_hole/test_level_clark.tscn b/godot/tests/bore_hole/test_level_clark.tscn new file mode 100644 index 0000000..528d985 --- /dev/null +++ b/godot/tests/bore_hole/test_level_clark.tscn @@ -0,0 +1,15 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://assets/meat_bore/meat_module/level_clark.tscn" type="PackedScene" id=1] +[ext_resource path="res://tests/bore_hole/test_level_common.tscn" type="PackedScene" id=2] +[ext_resource path="res://effects/SinkBlock.tscn" type="PackedScene" id=4] + +[node name="Spatial" type="Spatial"] + +[node name="SinkBlock" parent="." instance=ExtResource( 4 )] +transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 19.8, 24.8621, 36.3761, 1.22013 ) + +[node name="test_level_common" parent="." instance=ExtResource( 2 )] + +[node name="level_clark" parent="." instance=ExtResource( 1 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 155.819, 0 ) diff --git a/godot/tests/bore_hole/test_level_common.tscn b/godot/tests/bore_hole/test_level_common.tscn new file mode 100644 index 0000000..4d194d4 --- /dev/null +++ b/godot/tests/bore_hole/test_level_common.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://player/player.tscn" type="PackedScene" id=1] +[ext_resource path="res://assets/meat_bore/BoreMeatSinkParameters.tscn" type="PackedScene" id=2] +[ext_resource path="res://effects/grainy_shader.tscn" type="PackedScene" id=3] +[ext_resource path="res://assets/meat_bore/dialogue_platform.tscn" type="PackedScene" id=4] +[ext_resource path="res://effects/WorldEnvironment.tscn" type="PackedScene" id=5] + +[node name="test_level_common" type="Spatial"] + +[node name="MeatSinkParameters" parent="." instance=ExtResource( 2 )] +sink_factor = Vector3( 0.9, 0.001, 0.9 ) + +[node name="Player" parent="MeatSinkParameters" instance=ExtResource( 1 )] +transform = Transform( -0.167027, 0, 0.985952, 0, 1, 0, -0.985952, 0, -0.167027, 17.4571, 45.3387, -5.13576 ) + +[node name="dialogue_platform" parent="MeatSinkParameters" instance=ExtResource( 4 )] +transform = Transform( -0.167027, 0, 0.985952, 0, 1, 0, -0.985952, 0, -0.167027, 17.4571, 44.1776, -5.13576 ) + +[node name="WorldEnvironment" parent="." instance=ExtResource( 5 )] + +[node name="shader" parent="." instance=ExtResource( 3 )] diff --git a/godot/tests/bore_hole/test_level_jackie.tscn b/godot/tests/bore_hole/test_level_jackie.tscn index 05f8b26..4ed795b 100644 --- a/godot/tests/bore_hole/test_level_jackie.tscn +++ b/godot/tests/bore_hole/test_level_jackie.tscn @@ -1,12 +1,18 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://assets/meat_bore/meat_module/level_jackie.tscn" type="PackedScene" id=1] -[ext_resource path="res://player/player.tscn" type="PackedScene" id=2] +[ext_resource path="res://tests/bore_hole/test_level_common.tscn" type="PackedScene" id=2] +[ext_resource path="res://effects/SinkBlock.tscn" type="PackedScene" id=4] [node name="Spatial" type="Spatial"] [node name="level_jackie" parent="." instance=ExtResource( 1 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 500, 0 ) -[node name="Player" parent="." instance=ExtResource( 2 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -27.5821, -21.1078, -5.13576 ) +[node name="SinkBlock" parent="." instance=ExtResource( 4 )] +transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 19.8, 24.8621, 42.319, 1.22013 ) + +[node name="SinkBlock2" parent="." instance=ExtResource( 4 )] +transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 19.8, 24.8621, 23.3509, 1.22013 ) + +[node name="test_level_common" parent="." instance=ExtResource( 2 )] diff --git a/godot/tests/bore_hole/test_level_lee.tscn b/godot/tests/bore_hole/test_level_lee.tscn new file mode 100644 index 0000000..5a05a02 --- /dev/null +++ b/godot/tests/bore_hole/test_level_lee.tscn @@ -0,0 +1,15 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://assets/meat_bore/meat_module/level_lee.tscn" type="PackedScene" id=1] +[ext_resource path="res://tests/bore_hole/test_level_common.tscn" type="PackedScene" id=2] +[ext_resource path="res://effects/SinkBlock.tscn" type="PackedScene" id=4] + +[node name="Spatial" type="Spatial"] + +[node name="SinkBlock" parent="." instance=ExtResource( 4 )] +transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 19.8, 24.8621, 36.3761, 1.22013 ) + +[node name="test_level_common" parent="." instance=ExtResource( 2 )] + +[node name="level_lee" parent="." instance=ExtResource( 1 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 40.1207, 0 ) diff --git a/godot/tests/bore_hole/test_level_wally.tscn b/godot/tests/bore_hole/test_level_wally.tscn new file mode 100644 index 0000000..450eb4f --- /dev/null +++ b/godot/tests/bore_hole/test_level_wally.tscn @@ -0,0 +1,15 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://assets/meat_bore/meat_module/level_wally.tscn" type="PackedScene" id=1] +[ext_resource path="res://tests/bore_hole/test_level_common.tscn" type="PackedScene" id=2] +[ext_resource path="res://effects/SinkBlock.tscn" type="PackedScene" id=4] + +[node name="Spatial" type="Spatial"] + +[node name="SinkBlock" parent="." instance=ExtResource( 4 )] +transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 19.8, 24.8621, 36.3761, 1.22013 ) + +[node name="test_level_common" parent="." instance=ExtResource( 2 )] + +[node name="level_wally" parent="." instance=ExtResource( 1 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 382.358, 0 ) diff --git a/godot/util.gd b/godot/util.gd index dd8297d..13c9afd 100644 --- a/godot/util.gd +++ b/godot/util.gd @@ -3,6 +3,7 @@ extends Node # Updated by player onready var player = null onready var meat_sink_parameters = null +signal meat_sink_parameters func vec3_componentwise_clamp(vec: Vector3, lower: float, upper: float) -> Vector3: return Vector3(