From 22936c467858b9bb219eeaaf6b2b2553b38d1bad Mon Sep 17 00:00:00 2001 From: Marco Date: Thu, 26 Jun 2025 08:32:13 +0200 Subject: [PATCH] force fields --- .../actor_furniture_computertower.glb | Bin 4664 -> 4680 bytes 3D/MapScenes/TestLevel.tscn | 1348 +++++++++-------- 3D/Maps/Level1.map | 74 +- 3D/Scenes/Props/ForceField_3D.tscn | 5 +- .../point/actors/Actor_Capacitor_Mini.tres | 2 +- .../point/actors/Actor_Forcefield.tres | 8 +- .../point/actors/Actor_Furniture_Box.tres | 1 + .../point/actors/Actor_Furniture_Can.tres | 1 + .../point/actors/Actor_Furniture_Shelf.tres | 1 + .../point/actors/Actor_Tank_Large.tres | 2 +- .../point/actors/actor_chest.tres | 2 +- .../point/actors/actor_keypad.tres | 1 + Scripts/Actors/3D/ForceField3D.cs | 113 ++ Scripts/Actors/3D/ForceField3D.cs.uid | 1 + Sprites/Items/BlueKeycard_Small.png.import | 9 +- Sprites/Items/GrayKeycard_Small.png.import | 6 +- Sprites/Items/GreenKeycard_Small.png.import | 6 +- Sprites/Items/RedKeycard_Small.png.import | 6 +- Sprites/Items/YellowKeycard_Small.png.import | 6 +- 19 files changed, 882 insertions(+), 710 deletions(-) create mode 100644 Scripts/Actors/3D/ForceField3D.cs create mode 100644 Scripts/Actors/3D/ForceField3D.cs.uid diff --git a/3D/MapModels/actor_furniture_computertower.glb b/3D/MapModels/actor_furniture_computertower.glb index b7e19b9a7e292af0a5542fd5a63010c08f16bac3..d917d5d935a068377399d1bf7d415bb4c1668979 100644 GIT binary patch delta 436 zcmdm?azceOJtxGCiGhK^V~E0ek9WD{0`M4m&-SO`W48vs zqv;8m!uJtOrvw{X8yg!R0)-B1irKPlwx2Em1P^lNU5|gjrF;3bB+HMV5_UCzjuh0S zsb3Tmc*?*A1R!O88($o}nb9B^+Yr^j8OzZ9lm`g@zqbqcegDhUm;XP`ocmu=LgL^2 z`g3{z;}00Wv}a~!Uiji5cLaxaV?((0WJ#apPB+B)WzrM4OA|cq96C@i@u7w4H)k1! z?rin8TpGL7|wbAb^8B!m&yk~SjT#et~k=|HzPHpa9c z*sN&QFol=1ZPM0ldXaq!W`d8nR7Ki%mijB-bYPUYIpJQz4S@xjdJdXJFL^sowQXT> zSMDs<7+@QmOc&Y2;l2O6F?1sZU<9n_FuU7R4oW5K|%fh&0Z|BWdMlN$xM1LFw* D*czxN delta 419 zcmX@1vO|S4JtxGCiGhK^Vk4&}E0dY&WD{0X8x$z`l^%w`6)lV5PiZr;LL$7p0~ zVr*b+VrFh+ZftI7q+_6GN=RgL3i}&o#s`Z7xmoMgJzX3_B3j>0+33aWDA2Z_yM5`i zF6W>nJKR)iYg$~sNVkV&&Cr%)>@vd4AP@_8rU7M-j- zTUTJP{m+{-=icnU_xZ4g#xd?i7gqfIx%s-K>52Ux8JjdxZ1OMW>oaV!@C{M3c^7-p z=En1Ro_v1UcJHx~pRnuqf79Ms3*=3%3vHP9m9xtva`oyGmU$1AeW&DYW!O}7 zG;HnlA7av?^Ww_&J5HTd+MIat*)pXq+k6DKO)m(Z?q%;V%iipdQGSkfz)bGCn;ZCQ yv~1?`UMpX)N-xs>=&p{#pS$OZ1?=XQ;cGwqu;9u$@k*93<("CollisionShape3D"); + + if (StartActive) + { + Enable(); + } + else + { + Disable(); + } + } + + public void Enable() + { + _enabled = true; + EmitSignalEnabled(); + + CallDeferred(MethodName.ToggleCollisionDeferred, true); + Show(); + } + + public void Disable() + { + _enabled = false; + EmitSignalDisabled(); + + CallDeferred(MethodName.ToggleCollisionDeferred, false); + Hide(); + } + + private void ToggleCollisionDeferred(bool enable) + { + _collisionShape.Disabled = !enable; + } +} \ No newline at end of file diff --git a/Scripts/Actors/3D/ForceField3D.cs.uid b/Scripts/Actors/3D/ForceField3D.cs.uid new file mode 100644 index 00000000..783ed092 --- /dev/null +++ b/Scripts/Actors/3D/ForceField3D.cs.uid @@ -0,0 +1 @@ +uid://buneqosduiwkm diff --git a/Sprites/Items/BlueKeycard_Small.png.import b/Sprites/Items/BlueKeycard_Small.png.import index d7c2d226..1b0a0937 100644 --- a/Sprites/Items/BlueKeycard_Small.png.import +++ b/Sprites/Items/BlueKeycard_Small.png.import @@ -3,20 +3,19 @@ importer="texture" type="CompressedTexture2D" uid="uid://bvybqletsvqgk" -path.s3tc="res://.godot/imported/BlueKeycard_Small.png-b925d0e80a2eaa9ef7fe1ee182ce6c65.s3tc.ctex" +path="res://.godot/imported/BlueKeycard_Small.png-b925d0e80a2eaa9ef7fe1ee182ce6c65.ctex" metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true +"vram_texture": false } [deps] source_file="res://Sprites/Items/BlueKeycard_Small.png" -dest_files=["res://.godot/imported/BlueKeycard_Small.png-b925d0e80a2eaa9ef7fe1ee182ce6c65.s3tc.ctex"] +dest_files=["res://.godot/imported/BlueKeycard_Small.png-b925d0e80a2eaa9ef7fe1ee182ce6c65.ctex"] [params] -compress/mode=2 +compress/mode=3 compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 diff --git a/Sprites/Items/GrayKeycard_Small.png.import b/Sprites/Items/GrayKeycard_Small.png.import index 501d1e0b..84c53587 100644 --- a/Sprites/Items/GrayKeycard_Small.png.import +++ b/Sprites/Items/GrayKeycard_Small.png.import @@ -15,13 +15,13 @@ dest_files=["res://.godot/imported/GrayKeycard_Small.png-78c37a83db89e8ab4ee0abe [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +31,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/Sprites/Items/GreenKeycard_Small.png.import b/Sprites/Items/GreenKeycard_Small.png.import index 6121903d..677cd674 100644 --- a/Sprites/Items/GreenKeycard_Small.png.import +++ b/Sprites/Items/GreenKeycard_Small.png.import @@ -15,13 +15,13 @@ dest_files=["res://.godot/imported/GreenKeycard_Small.png-a8d591427ed9e736d5a900 [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +31,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/Sprites/Items/RedKeycard_Small.png.import b/Sprites/Items/RedKeycard_Small.png.import index 4ba60498..b37abe1a 100644 --- a/Sprites/Items/RedKeycard_Small.png.import +++ b/Sprites/Items/RedKeycard_Small.png.import @@ -15,13 +15,13 @@ dest_files=["res://.godot/imported/RedKeycard_Small.png-11803ebfee263388f1f5d2bd [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +31,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0 diff --git a/Sprites/Items/YellowKeycard_Small.png.import b/Sprites/Items/YellowKeycard_Small.png.import index 869ae1a1..c6b4ce40 100644 --- a/Sprites/Items/YellowKeycard_Small.png.import +++ b/Sprites/Items/YellowKeycard_Small.png.import @@ -15,13 +15,13 @@ dest_files=["res://.godot/imported/YellowKeycard_Small.png-070bc4c2d61c321670798 [params] -compress/mode=0 +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=false +mipmaps/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +31,4 @@ process/normal_map_invert_y=false process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 -detect_3d/compress_to=1 +detect_3d/compress_to=0