From 164c18620138940b21a9d6ddcc848d6e514f9338 Mon Sep 17 00:00:00 2001 From: Marco Date: Tue, 24 Jun 2025 15:00:27 +0200 Subject: [PATCH] Chest animation, alarm box entity --- .../AlarmBox/Alarm_Box.bbmodel | 2 +- 3D/BlockbenchModels/AlarmBox/Alarm_Box.gltf | 2 +- .../ControlPad/Control_Pad.gltf.import | 9 +++- .../ControlPad/Control_Pad_0_emission.png | 3 ++ .../Control_Pad_0_emission.png.import | 34 ++++++++++++++ .../ControlPad/material_0.tres | 17 +++++++ 3D/MapModels/actor_alarmbox.glb | Bin 0 -> 3668 bytes 3D/MapModels/actor_controlpad.glb | Bin 4036 -> 4352 bytes 3D/MapScenes/RebelBase3D.tscn | 1 + 3D/MapScenes/TestLevel.tscn | 5 ++- 3D/Maps/Level1.map | 5 +++ 3D/Scenes/Props/Alarm_Box_3D.tscn | 17 ++----- 3D/Scenes/Props/Terminal_3D.tscn | 3 +- 3D/Scenes/Props/chest_3d.tscn | 4 ++ 3D/Scenes/Props/control_pad_3d.tscn | 2 + .../point/actors/actor_alarmbox.tres | 31 +++++++++++++ 3D/TrenchBroom/fgd_point.tres | 5 ++- IsoTest/IsoMapTest2.tscn | 2 +- .../{Terminal3D.cs => DialogueActor3D.cs} | 2 +- ...rminal3D.cs.uid => DialogueActor3D.cs.uid} | 0 Scripts/Components/Actors/3D/Chest3D.cs | 4 ++ .../Components/Actors/3D/ModelAnimation3D.cs | 8 ++++ .../Actors/3D/ModelAnimation3D.cs.uid | 1 + Scripts/Interactables/AlarmBox3D.cs | 42 ++++++++++++++++++ Scripts/Interactables/AlarmBox3D.cs.uid | 1 + 25 files changed, 177 insertions(+), 23 deletions(-) create mode 100644 3D/BlockbenchModels/ControlPad/Control_Pad_0_emission.png create mode 100644 3D/BlockbenchModels/ControlPad/Control_Pad_0_emission.png.import create mode 100644 3D/BlockbenchModels/ControlPad/material_0.tres create mode 100644 3D/MapModels/actor_alarmbox.glb create mode 100644 3D/TrenchBroom/EntityDefinitions/point/actors/actor_alarmbox.tres rename Scripts/Activables/{Terminal3D.cs => DialogueActor3D.cs} (96%) rename Scripts/Activables/{Terminal3D.cs.uid => DialogueActor3D.cs.uid} (100%) create mode 100644 Scripts/Components/Actors/3D/ModelAnimation3D.cs create mode 100644 Scripts/Components/Actors/3D/ModelAnimation3D.cs.uid create mode 100644 Scripts/Interactables/AlarmBox3D.cs create mode 100644 Scripts/Interactables/AlarmBox3D.cs.uid diff --git a/3D/BlockbenchModels/AlarmBox/Alarm_Box.bbmodel b/3D/BlockbenchModels/AlarmBox/Alarm_Box.bbmodel index 06c47b07..249272d5 100644 --- a/3D/BlockbenchModels/AlarmBox/Alarm_Box.bbmodel +++ b/3D/BlockbenchModels/AlarmBox/Alarm_Box.bbmodel @@ -1 +1 @@ -{"meta":{"format_version":"4.10","model_format":"free","box_uv":false},"name":"Alarm_Box","model_identifier":"","visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"timeline_setups":[],"unhandled_root_fields":{},"resolution":{"width":32,"height":32},"elements":[{"name":"cuboid","color":7,"origin":[0,0,0],"rotation":[0,-180,0],"export":true,"visibility":true,"locked":false,"render_order":"default","allow_mirror_modeling":true,"vertices":{"5opu":[3,4,1],"Cl1p":[3,4,-1],"AICL":[3,-4,1],"Byg2":[3,-4,-1],"wCv1":[-3,4,1],"8LyQ":[-3,4,-1],"1jpQ":[-3,-4,1],"GO5x":[-3,-4,-1]},"faces":{"miXhwLeZ":{"uv":{"Byg2":[2,17],"Cl1p":[2,9],"AICL":[0,17],"5opu":[0,9]},"vertices":["5opu","AICL","Cl1p","Byg2"],"texture":0},"GOaUCZp2":{"uv":{"GO5x":[3,17],"1jpQ":[5,17],"8LyQ":[3,9],"wCv1":[5,9]},"vertices":["wCv1","8LyQ","1jpQ","GO5x"],"texture":0},"pjBt281A":{"uv":{"8LyQ":[6,9],"wCv1":[6,11],"Cl1p":[12,9],"5opu":[12,11]},"vertices":["5opu","Cl1p","wCv1","8LyQ"],"texture":0},"NkP4CMPs":{"uv":{"GO5x":[6,14],"Byg2":[12,14],"1jpQ":[6,12],"AICL":[12,12]},"vertices":["AICL","1jpQ","Byg2","GO5x"],"texture":0},"cekcPWGv":{"uv":{"1jpQ":[0,8],"AICL":[6,8],"wCv1":[0,0],"5opu":[6,0]},"vertices":["5opu","wCv1","AICL","1jpQ"],"texture":0},"NTRKbQIG":{"uv":{"GO5x":[13,8],"8LyQ":[13,0],"Byg2":[7,8],"Cl1p":[7,0]},"vertices":["Cl1p","Byg2","8LyQ","GO5x"],"texture":0}},"type":"mesh","uuid":"d9ea70d8-4592-8eee-08a5-e00b25615461"}],"outliner":["d9ea70d8-4592-8eee-08a5-e00b25615461"],"textures":[{"path":"K:\\godot\\cirno\\3D\\BlockbenchModels\\AlarmBox\\Alarm_Box_Texture.png","name":"Alarm_Box_Texture.png","folder":"block","namespace":"","id":"0","group":"","width":32,"height":32,"uv_width":32,"uv_height":32,"particle":false,"use_as_default":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","pbr_channel":"color","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"b7f62370-e6b7-1dff-7e06-688881b59fe2","relative_path":"Alarm_Box_Texture.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAJpJREFUWEdjdOBK+c+ABRz4NocRnxw2PeSI4bUE5IBIwe0o5i5/78kAchw5lmHTQ5QDzMXEwHpPvnrFMOqAkRkCyImH7iGAK4tSLRdQyyByzYFnQ+SCh16FEMjRg9cB5AYpqfoGbwjQoyLCmwZIDUpy1eOMAnINJFXfwDuAVBdTWz3VGhbkOmzUAaMhMBoCoyEwGgKjITDgIQAAHa2uIYnXDQAAAAAASUVORK5CYII="}],"export_options":{"gltf":{"encoding":"ascii","scale":16,"embed_textures":true,"armature":false,"animations":true}}} \ No newline at end of file +{"meta":{"format_version":"4.10","model_format":"free","box_uv":false},"name":"Alarm_Box","model_identifier":"","visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"timeline_setups":[],"unhandled_root_fields":{},"reexport":{"codec":"gltf","codec_options":{"encoding":"ascii","scale":16,"embed_textures":true,"armature":false,"animations":true},"path":".\\Alarm_Box.gltf","enabled":true},"resolution":{"width":32,"height":32},"elements":[{"name":"cuboid","color":7,"origin":[0,0,0],"rotation":[0,0,0],"export":true,"visibility":true,"locked":false,"render_order":"default","allow_mirror_modeling":true,"vertices":{"5opu":[3,4,1],"Cl1p":[3,4,-1],"AICL":[3,-4,1],"Byg2":[3,-4,-1],"wCv1":[-3,4,1],"8LyQ":[-3,4,-1],"1jpQ":[-3,-4,1],"GO5x":[-3,-4,-1]},"faces":{"miXhwLeZ":{"uv":{"Byg2":[2,17],"Cl1p":[2,9],"AICL":[0,17],"5opu":[0,9]},"vertices":["5opu","AICL","Cl1p","Byg2"],"texture":0},"GOaUCZp2":{"uv":{"GO5x":[3,17],"1jpQ":[5,17],"8LyQ":[3,9],"wCv1":[5,9]},"vertices":["wCv1","8LyQ","1jpQ","GO5x"],"texture":0},"pjBt281A":{"uv":{"8LyQ":[6,9],"wCv1":[6,11],"Cl1p":[12,9],"5opu":[12,11]},"vertices":["5opu","Cl1p","wCv1","8LyQ"],"texture":0},"NkP4CMPs":{"uv":{"GO5x":[6,14],"Byg2":[12,14],"1jpQ":[6,12],"AICL":[12,12]},"vertices":["AICL","1jpQ","Byg2","GO5x"],"texture":0},"cekcPWGv":{"uv":{"1jpQ":[0,8],"AICL":[6,8],"wCv1":[0,0],"5opu":[6,0]},"vertices":["5opu","wCv1","AICL","1jpQ"],"texture":0},"NTRKbQIG":{"uv":{"GO5x":[13,8],"8LyQ":[13,0],"Byg2":[7,8],"Cl1p":[7,0]},"vertices":["Cl1p","Byg2","8LyQ","GO5x"],"texture":0}},"type":"mesh","uuid":"d9ea70d8-4592-8eee-08a5-e00b25615461"}],"outliner":["d9ea70d8-4592-8eee-08a5-e00b25615461"],"textures":[{"path":"D:\\Maddo\\cirnogodot\\3D\\BlockbenchModels\\AlarmBox\\Alarm_Box_Texture.png","name":"Alarm_Box_Texture.png","folder":"block","namespace":"","id":"0","group":"","width":32,"height":32,"uv_width":32,"uv_height":32,"particle":false,"use_as_default":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","pbr_channel":"color","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"b7f62370-e6b7-1dff-7e06-688881b59fe2","relative_path":"Alarm_Box_Texture.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAJpJREFUWEdjdOBK+c+ABRz4NocRnxw2PeSI4bUE5IBIwe0o5i5/78kAchw5lmHTQ5QDzMXEwHpPvnrFMOqAkRkCyImH7iGAK4tSLRdQyyByzYFnQ+SCh16FEMjRg9cB5AYpqfoGbwjQoyLCmwZIDUpy1eOMAnINJFXfwDuAVBdTWz3VGhbkOmzUAaMhMBoCoyEwGgKjITDgIQAAHa2uIYnXDQAAAAAASUVORK5CYII="}],"export_options":{"gltf":{"encoding":"ascii","scale":16,"embed_textures":true,"armature":false,"animations":true}}} \ No newline at end of file diff --git a/3D/BlockbenchModels/AlarmBox/Alarm_Box.gltf b/3D/BlockbenchModels/AlarmBox/Alarm_Box.gltf index e3a90740..9c8511a9 100644 --- a/3D/BlockbenchModels/AlarmBox/Alarm_Box.gltf +++ b/3D/BlockbenchModels/AlarmBox/Alarm_Box.gltf @@ -1 +1 @@ -{"asset":{"version":"2.0","generator":"Blockbench 4.12.4 glTF exporter"},"scenes":[{"nodes":[1],"name":"blockbench_export"}],"scene":0,"nodes":[{"rotation":[0,-1,0,6.123233995736766e-17],"name":"cuboid","mesh":0},{"children":[0]}],"bufferViews":[{"buffer":0,"byteOffset":0,"byteLength":288,"target":34962,"byteStride":12},{"buffer":0,"byteOffset":288,"byteLength":288,"target":34962,"byteStride":12},{"buffer":0,"byteOffset":576,"byteLength":192,"target":34962,"byteStride":8},{"buffer":0,"byteOffset":768,"byteLength":72,"target":34963}],"buffers":[{"byteLength":840,"uri":"data:application/octet-stream;base64,AABAPgAAgD4AAIA9AABAPgAAgL4AAIA9AABAPgAAgD4AAIC9AABAPgAAgL4AAIC9AABAvgAAgD4AAIA9AABAvgAAgD4AAIC9AABAvgAAgL4AAIA9AABAvgAAgL4AAIC9AABAPgAAgD4AAIA9AABAPgAAgD4AAIC9AABAvgAAgD4AAIA9AABAvgAAgD4AAIC9AABAPgAAgL4AAIA9AABAvgAAgL4AAIA9AABAPgAAgL4AAIC9AABAvgAAgL4AAIC9AABAPgAAgD4AAIA9AABAvgAAgD4AAIA9AABAPgAAgL4AAIA9AABAvgAAgL4AAIA9AABAPgAAgD4AAIC9AABAPgAAgL4AAIC9AABAvgAAgD4AAIC9AABAvgAAgL4AAIC9AACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAkD4AAAAAAAAIPwAAgD0AAJA+AACAPQAACD8AACA+AACQPgAAwD0AAJA+AAAgPgAACD8AAMA9AAAIPwAAwD4AALA+AADAPgAAkD4AAEA+AACwPgAAQD4AAJA+AADAPgAAwD4AAEA+AADAPgAAwD4AAOA+AABAPgAA4D4AAEA+AAAAAAAAAAAAAAAAAABAPgAAgD4AAAAAAACAPgAAYD4AAAAAAABgPgAAgD4AANA+AAAAAAAA0D4AAIA+AgAAAAEAAgABAAMABgAEAAUABgAFAAcACgAIAAkACgAJAAsADgAMAA0ADgANAA8AEgAQABEAEgARABMAFgAUABUAFgAVABcA"}],"accessors":[{"bufferView":0,"componentType":5126,"count":24,"max":[0.1875,0.25,0.0625],"min":[-0.1875,-0.25,-0.0625],"type":"VEC3"},{"bufferView":1,"componentType":5126,"count":24,"max":[1,1,1],"min":[-1,-1,-1],"type":"VEC3"},{"bufferView":2,"componentType":5126,"count":24,"max":[0.40625,0.53125],"min":[0,0],"type":"VEC2"},{"bufferView":3,"componentType":5123,"count":36,"max":[23],"min":[0],"type":"SCALAR"}],"materials":[{"pbrMetallicRoughness":{"metallicFactor":0,"roughnessFactor":1,"baseColorTexture":{"index":0}},"alphaMode":"MASK","alphaCutoff":0.05,"doubleSided":true}],"textures":[{"sampler":0,"source":0,"name":"Control_Pad_Texture"}],"samplers":[{"magFilter":9728,"minFilter":9728,"wrapS":33071,"wrapT":33071}],"images":[{"mimeType":"image/png","uri":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAJpJREFUWEdjdOBK+c+ABRz4NocRnxw2PeSI4bUE5IBIwe0o5i5/78kAchw5lmHTQ5QDzMXEwHpPvnrFMOqAkRkCyImH7iGAK4tSLRdQyyByzYFnQ+SCh16FEMjRg9cB5AYpqfoGbwjQoyLCmwZIDUpy1eOMAnINJFXfwDuAVBdTWz3VGhbkOmzUAaMhMBoCoyEwGgKjITDgIQAAHa2uIYnXDQAAAAAASUVORK5CYII="}],"meshes":[{"primitives":[{"mode":4,"attributes":{"POSITION":0,"NORMAL":1,"TEXCOORD_0":2},"indices":3,"material":0}]}]} \ No newline at end of file +{"asset":{"version":"2.0","generator":"Blockbench 4.12.5 glTF exporter"},"scenes":[{"nodes":[1],"name":"blockbench_export"}],"scene":0,"nodes":[{"name":"cuboid","mesh":0},{"children":[0]}],"bufferViews":[{"buffer":0,"byteOffset":0,"byteLength":288,"target":34962,"byteStride":12},{"buffer":0,"byteOffset":288,"byteLength":288,"target":34962,"byteStride":12},{"buffer":0,"byteOffset":576,"byteLength":192,"target":34962,"byteStride":8},{"buffer":0,"byteOffset":768,"byteLength":72,"target":34963}],"buffers":[{"byteLength":840,"uri":"data:application/octet-stream;base64,AABAPgAAgD4AAIA9AABAPgAAgL4AAIA9AABAPgAAgD4AAIC9AABAPgAAgL4AAIC9AABAvgAAgD4AAIA9AABAvgAAgD4AAIC9AABAvgAAgL4AAIA9AABAvgAAgL4AAIC9AABAPgAAgD4AAIA9AABAPgAAgD4AAIC9AABAvgAAgD4AAIA9AABAvgAAgD4AAIC9AABAPgAAgL4AAIA9AABAvgAAgL4AAIA9AABAPgAAgL4AAIC9AABAvgAAgL4AAIC9AABAPgAAgD4AAIA9AABAvgAAgD4AAIA9AABAPgAAgL4AAIA9AABAvgAAgL4AAIA9AABAPgAAgD4AAIC9AABAPgAAgL4AAIC9AABAvgAAgD4AAIC9AABAvgAAgL4AAIC9AACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAPwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAACAvwAAAAAAAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgD8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAgL8AAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIA/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAAAAAAIC/AAAAAAAAkD4AAAAAAAAIPwAAgD0AAJA+AACAPQAACD8AACA+AACQPgAAwD0AAJA+AAAgPgAACD8AAMA9AAAIPwAAwD4AALA+AADAPgAAkD4AAEA+AACwPgAAQD4AAJA+AADAPgAAwD4AAEA+AADAPgAAwD4AAOA+AABAPgAA4D4AAEA+AAAAAAAAAAAAAAAAAABAPgAAgD4AAAAAAACAPgAAYD4AAAAAAABgPgAAgD4AANA+AAAAAAAA0D4AAIA+AgAAAAEAAgABAAMABgAEAAUABgAFAAcACgAIAAkACgAJAAsADgAMAA0ADgANAA8AEgAQABEAEgARABMAFgAUABUAFgAVABcA"}],"accessors":[{"bufferView":0,"componentType":5126,"count":24,"max":[0.1875,0.25,0.0625],"min":[-0.1875,-0.25,-0.0625],"type":"VEC3"},{"bufferView":1,"componentType":5126,"count":24,"max":[1,1,1],"min":[-1,-1,-1],"type":"VEC3"},{"bufferView":2,"componentType":5126,"count":24,"max":[0.40625,0.53125],"min":[0,0],"type":"VEC2"},{"bufferView":3,"componentType":5123,"count":36,"max":[23],"min":[0],"type":"SCALAR"}],"materials":[{"pbrMetallicRoughness":{"metallicFactor":0,"roughnessFactor":1,"baseColorTexture":{"index":0}},"alphaMode":"MASK","alphaCutoff":0.05,"doubleSided":true}],"textures":[{"sampler":0,"source":0,"name":"Alarm_Box_Texture.png"}],"samplers":[{"magFilter":9728,"minFilter":9728,"wrapS":33071,"wrapT":33071}],"images":[{"mimeType":"image/png","uri":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAJpJREFUWEdjdOBK+c+ABRz4NocRnxw2PeSI4bUE5IBIwe0o5i5/78kAchw5lmHTQ5QDzMXEwHpPvnrFMOqAkRkCyImH7iGAK4tSLRdQyyByzYFnQ+SCh16FEMjRg9cB5AYpqfoGbwjQoyLCmwZIDUpy1eOMAnINJFXfwDuAVBdTWz3VGhbkOmzUAaMhMBoCoyEwGgKjITDgIQAAHa2uIYnXDQAAAAAASUVORK5CYII="}],"meshes":[{"primitives":[{"mode":4,"attributes":{"POSITION":0,"NORMAL":1,"TEXCOORD_0":2},"indices":3,"material":0}]}]} \ No newline at end of file diff --git a/3D/BlockbenchModels/ControlPad/Control_Pad.gltf.import b/3D/BlockbenchModels/ControlPad/Control_Pad.gltf.import index 74daa4a4..742e475f 100644 --- a/3D/BlockbenchModels/ControlPad/Control_Pad.gltf.import +++ b/3D/BlockbenchModels/ControlPad/Control_Pad.gltf.import @@ -32,6 +32,13 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" -_subresources={} +_subresources={ +"materials": { +"material_0": { +"use_external/enabled": true, +"use_external/path": "res://3D/BlockbenchModels/ControlPad/material_0.tres" +} +} +} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/3D/BlockbenchModels/ControlPad/Control_Pad_0_emission.png b/3D/BlockbenchModels/ControlPad/Control_Pad_0_emission.png new file mode 100644 index 00000000..8c168b6c --- /dev/null +++ b/3D/BlockbenchModels/ControlPad/Control_Pad_0_emission.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6814a6c5b348eacd6695178224d1a1c6e9138c60e59cdef59dde30662f409e1d +size 140 diff --git a/3D/BlockbenchModels/ControlPad/Control_Pad_0_emission.png.import b/3D/BlockbenchModels/ControlPad/Control_Pad_0_emission.png.import new file mode 100644 index 00000000..e44f0a9e --- /dev/null +++ b/3D/BlockbenchModels/ControlPad/Control_Pad_0_emission.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://biu14wagvbn1e" +path="res://.godot/imported/Control_Pad_0_emission.png-e930e791b6ce706e3c12107603ebb6ac.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://3D/BlockbenchModels/ControlPad/Control_Pad_0_emission.png" +dest_files=["res://.godot/imported/Control_Pad_0_emission.png-e930e791b6ce706e3c12107603ebb6ac.ctex"] + +[params] + +compress/mode=3 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/3D/BlockbenchModels/ControlPad/material_0.tres b/3D/BlockbenchModels/ControlPad/material_0.tres new file mode 100644 index 00000000..919c412b --- /dev/null +++ b/3D/BlockbenchModels/ControlPad/material_0.tres @@ -0,0 +1,17 @@ +[gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://chudetvke2c5p"] + +[ext_resource type="Texture2D" uid="uid://bny1n60ahhech" path="res://3D/BlockbenchModels/ControlPad/Control_Pad_0.png" id="1_gscmb"] +[ext_resource type="Texture2D" uid="uid://biu14wagvbn1e" path="res://3D/BlockbenchModels/ControlPad/Control_Pad_0_emission.png" id="2_0cxsk"] + +[resource] +resource_name = "material_0" +transparency = 2 +alpha_scissor_threshold = 0.05 +alpha_antialiasing_mode = 0 +cull_mode = 2 +albedo_texture = ExtResource("1_gscmb") +emission_enabled = true +emission_operator = 1 +emission_texture = ExtResource("2_0cxsk") +texture_filter = 0 +texture_repeat = false diff --git a/3D/MapModels/actor_alarmbox.glb b/3D/MapModels/actor_alarmbox.glb new file mode 100644 index 0000000000000000000000000000000000000000..df94450e725b6db39a485e620243ac2bceed9cd7 GIT binary patch literal 3668 zcmbtXU1$_n6uxmarcq}Kfh%ywqh zp9FEM6)Y4K3O)#>KlVXdP@xYMC2pWCv@hy|g_b^;r$T)zZJ~uU_MF+7%_IS{>cYME zoO91P_sn?W@V0*6&ek)T*yyly`sT3C-`YeItpHx02>Jh{Y-$vi3xGR zgRrG)u(iY4gB3Pmc6K%0C`mwL{a2}5&w>Pn}>!kED4``g7D`Lbr7`! zbtj1bp|LE5l7Gxtn1BFxCorPGFd{FC0stH2Sx(?0LRb*E5EpKM2{0n;%LT_R0SZ!T z*$jjaa59jGWUOZ($9t}Fxs%g<@!|L=Jr3bXrk&}Nw4i8;Az8XXqjX5m=~mBxR!}vi z=dchE0&Kvvq-;?MlyprG==r=Vt5R{7AWFfk9L|Q=P&UU1p@=APazs=jVm2oUY(B_v z0xN_B>ZgYl!&G&s2+9Q*_-s$zdF!xIgTsneu*RXtB9SGKAVO)&P;*d`ETont83n9Y zUJygveB~_h#YYyw+i>3S27or}tzqo8i%{4}^MaB&)rc5!x{>P*aA-C(HxM^6 z7K(qNHUAKpIBaa*EM!4~$x?5X&UL{ZxOc<~LIn4fqn4uKEt_wd*w+rwp;Uh=GiIt< zp{R@*x^7WWQ%h1o@m_kp`3A9NmXvyh%IBm+)R~tGRIH_WQ?@6j^IR#z} z297H^eq9gPGpOMn;!45oam2QynBxv;;LVWiDC+r;gt!rygW$Ams3p}>4?C)o1!a=0 zSjbM&WNLIIJ`6SGr+ZWBL?)3++BK4iCx-@-87L+{%?#}COQlBp;p?N2Bp9#?&n1o8 zk6ry1Y@?D5FXRPArvZZ@Oj3DVE#?dbpFS2h>X>GWy8KR7(d6+ll39x}Kh%OREUkok+r8DZ65XRB=o>^i805dgLyRa@4`q)xkC9kt2=z zD97RIyK-D{pxmWheXsnc#};YS!F`v;6^HA`E01~fT^jcn>v(Nl8ugKO^{2Lf{zJG* zs$r1VVDvr#-@C}ZDIRUAaK8TF#5YJk0gvC{wQrjLqBFt#x;_zc?H`e^-JiPgRbcAI z*N*+8^1blw;m_b6(7p+}hFCfJ%hE2csNW=wanv0BWof|e8Wb7)s=dw7fD>OO1Z=9c zW@z%qiJj->&O+W2a^}HmxL^3619^}m|LN>=F=S$bNp03SKz3|I<$v6Dni`?cenc3WR@yqX@7pvzF-ECRfwcY3Q zef#6vS6Xki+)e)dbNBR_p>3aZ|I|%hDQ=<$ Eei-=M^oo)hB6!~g_>3=9oi8~N;5Cr@ON7BMlvZ_|f%u7kF09sMIc@>*EvjWi2;>6s7oK&D@peu^= zON)|$>I`dRYZVj}QrI>>T95z$ delta 56 zcmV-80LTA;BE%mKXKYkP0ssI2#18-f&XWPnS+hb1Gy?@) OeIVEcvz7|o1pxrTybw(_activationSoundName); + + if (AlarmManager.Instance is not null) + { + AlarmManager.Instance.AlarmEnabled3D += OnAlarmEnabled3D; + } + } + + private void OnAlarmEnabled3D(Vector3 location) + { + // TODO: set animation, make blinky + GD.Print($"Enabled alarm in box {this.Name}"); + } + + public override bool Activate(ActivationType activationType = ActivationType.Toggle) + { + EmitSignal(SignalName.OnActivated, (int)activationType); + + if (AlarmManager.Instance is not null) + { + _activationSound.Play(); + AlarmManager.Instance.DisableAlarm(); + } + + return true; + } +} \ No newline at end of file diff --git a/Scripts/Interactables/AlarmBox3D.cs.uid b/Scripts/Interactables/AlarmBox3D.cs.uid new file mode 100644 index 00000000..913122a2 --- /dev/null +++ b/Scripts/Interactables/AlarmBox3D.cs.uid @@ -0,0 +1 @@ +uid://dxhf1twoxf4j0