From 95012054b30a83d2f02a520990331947419ab918 Mon Sep 17 00:00:00 2001 From: Marco Date: Thu, 19 Jun 2025 11:08:55 +0200 Subject: [PATCH] Tweaks --- 3D/Maps/Level1.map | 175 ++++++++---------- .../Actors/KeyboardInputProvider.cs | 10 - 2 files changed, 79 insertions(+), 106 deletions(-) diff --git a/3D/Maps/Level1.map b/3D/Maps/Level1.map index 15f69a7e..517dd58d 100644 --- a/3D/Maps/Level1.map +++ b/3D/Maps/Level1.map @@ -2225,449 +2225,432 @@ // entity 69 { "classname" "actor_box_red" -"origin" "376 456 20" +"origin" "328 440 20" "targetname" "actor_elevator_test" } // entity 70 { "classname" "actor_box_red" -"origin" "328 440 20" +"origin" "328 456 20" "targetname" "actor_elevator_test" } // entity 71 { "classname" "actor_box_red" -"origin" "328 456 20" +"origin" "328 488 20" "targetname" "actor_elevator_test" } // entity 72 { "classname" "actor_box_red" -"origin" "328 488 20" +"origin" "344 456 20" "targetname" "actor_elevator_test" } // entity 73 { "classname" "actor_box_red" -"origin" "344 456 20" +"origin" "344 440 20" "targetname" "actor_elevator_test" } // entity 74 { "classname" "actor_box_red" -"origin" "344 440 20" +"origin" "360 440 20" "targetname" "actor_elevator_test" } // entity 75 { "classname" "actor_box_red" -"origin" "360 440 20" +"origin" "360 456 20" "targetname" "actor_elevator_test" } // entity 76 { "classname" "actor_box_red" -"origin" "360 456 20" -"targetname" "actor_elevator_test" -} -// entity 77 -{ -"classname" "actor_box_red" "origin" "376 440 20" "targetname" "actor_elevator_test" } -// entity 78 +// entity 77 { "classname" "actor_box_red" "origin" "392 448 20" "angle" "45" "targetname" "actor_elevator_test" } -// entity 79 +// entity 78 { "classname" "actor_box_blue" "origin" "360 488 20" "targetname" "actor_elevator_test" } -// entity 80 +// entity 79 { "classname" "actor_box_blue" "origin" "360 488 28" "targetname" "actor_elevator_test" } -// entity 81 +// entity 80 { "classname" "actor_box_blue" "origin" "360 456 28" "targetname" "actor_elevator_test" } -// entity 82 +// entity 81 { "classname" "actor_box_blue" "origin" "344 440 28" "targetname" "actor_elevator_test" } -// entity 83 +// entity 82 { "classname" "actor_box_blue" "origin" "136 456 20" "targetname" "actor_elevator_test" } -// entity 84 +// entity 83 { "classname" "actor_box_wood" "origin" "268 192 20" "targetname" "actor_elevator_test" } -// entity 85 +// entity 84 { "classname" "actor_box_wood" "origin" "276 192 20" "targetname" "actor_elevator_test" } -// entity 86 +// entity 85 { "classname" "actor_box_wood" "origin" "268 208 20" "targetname" "actor_elevator_test" } -// entity 87 +// entity 86 { "classname" "actor_box_wood" "origin" "268 192 28" "targetname" "actor_elevator_test" } -// entity 88 +// entity 87 { "classname" "actor_box_wood" "origin" "268 272 20" "targetname" "actor_elevator_test" } -// entity 89 +// entity 88 { "classname" "actor_box_wood" "origin" "276 272 20" "targetname" "actor_elevator_test" } -// entity 90 +// entity 89 { "classname" "actor_box_wood" "origin" "268 256 20" "targetname" "actor_elevator_test" } -// entity 91 +// entity 90 { "classname" "actor_box_wood" "origin" "268 272 28" "targetname" "actor_elevator_test" } -// entity 92 +// entity 91 { "classname" "actor_box_wood" "origin" "356 272 20" "targetname" "actor_elevator_test" } -// entity 93 +// entity 92 { "classname" "actor_box_wood" "origin" "356 184 20" "targetname" "actor_elevator_test" } -// entity 94 +// entity 93 { "classname" "actor_box_wood" "origin" "356 272 28" "targetname" "actor_elevator_test" } -// entity 95 +// entity 94 { "classname" "actor_box_wood" "origin" "356 184 28" "targetname" "actor_elevator_test" } -// entity 96 +// entity 95 { "classname" "actor_box_wood" "origin" "364 184 20" "targetname" "actor_elevator_test" } -// entity 97 +// entity 96 { "classname" "actor_box_wood" "origin" "364 272 20" "targetname" "actor_elevator_test" } -// entity 98 +// entity 97 { "classname" "actor_table" "origin" "272 232 20" "targetname" "actor_elevator_test" } -// entity 99 +// entity 98 { "classname" "actor_box_blue" "origin" "336 192 20" "targetname" "actor_elevator_test" } -// entity 100 +// entity 99 { "classname" "actor_box_red" "origin" "336 192 28" "targetname" "actor_elevator_test" } -// entity 101 +// entity 100 { "classname" "actor_box_blue" "origin" "336 272 20" "targetname" "actor_elevator_test" } -// entity 102 +// entity 101 { "classname" "actor_box_blue" "origin" "336 272 28" "targetname" "actor_elevator_test" } -// entity 103 +// entity 102 { "classname" "actor_barrel_1" "origin" "248 360 24" "targetname" "actor_elevator_test" } -// entity 104 +// entity 103 { "classname" "actor_barrel_1" "origin" "232 360 24" "targetname" "actor_elevator_test" } -// entity 105 +// entity 104 { "classname" "actor_barrel_1" "origin" "232 360 32" "targetname" "actor_elevator_test" } -// entity 106 +// entity 105 { "classname" "actor_tank" "origin" "432 544 24" "targetname" "actor_elevator_test" } -// entity 107 +// entity 106 { "classname" "actor_ac_unit" -"origin" "440 416 24" -"targetname" "actor_elevator_test" -} -// entity 108 -{ -"classname" "actor_ac_unit" -"origin" "440 360 24" +"origin" "312 360 24" "angle" "270" "targetname" "actor_elevator_test" } -// entity 109 +// entity 107 { "classname" "actor_ac_unit" "origin" "168 552 24" "angle" "180" "targetname" "actor_elevator_test" } -// entity 110 +// entity 108 { "classname" "actor_terminal" "origin" "272 232 28" "targetname" "actor_elevator_test" } -// entity 111 +// entity 109 { "classname" "actor_ac_unit" "origin" "304 188 24" "angle" "270" "targetname" "actor_elevator_test" } -// entity 112 +// entity 110 { "classname" "actor_tube_corner" "origin" "216 488 24" "angle" "270" "targetname" "actor_elevator_test" } -// entity 113 +// entity 111 { "classname" "actor_tube_corner" "origin" "216 440 24" "angle" "180" "targetname" "actor_elevator_test" } -// entity 114 +// entity 112 { "classname" "actor_box_green" "origin" "328 472 20" "targetname" "actor_elevator_test" } -// entity 115 +// entity 113 { "classname" "actor_box_green" "origin" "344 472 20" "targetname" "actor_elevator_test" } -// entity 116 +// entity 114 { "classname" "actor_box_yellow" "origin" "344 488 20" "targetname" "actor_elevator_test" } -// entity 117 +// entity 115 { "classname" "actor_box_green" "origin" "328 488 28" "targetname" "actor_elevator_test" } -// entity 118 +// entity 116 { "classname" "actor_box_yellow" "origin" "328 440 28" "targetname" "actor_elevator_test" } -// entity 119 +// entity 117 { "classname" "actor_box_yellow" "origin" "360 472 20" "targetname" "actor_elevator_test" } -// entity 120 +// entity 118 { "classname" "actor_capacitor" "origin" "528 136 28" "targetname" "actor_elevator_test" } -// entity 121 +// entity 119 { "classname" "actor_capacitor" "origin" "496 136 28" "targetname" "actor_elevator_test" } -// entity 122 +// entity 120 { "classname" "actor_box_green" "origin" "248 712 20" "targetname" "actor_elevator_test" } -// entity 123 +// entity 121 { "classname" "actor_box_wood" "origin" "244 792 28" "targetname" "actor_elevator_test" } -// entity 124 +// entity 122 { "classname" "actor_box_wood" "origin" "244 792 20" "targetname" "actor_elevator_test" } -// entity 125 +// entity 123 { "classname" "actor_table" "origin" "248 732 20" "targetname" "actor_elevator_test" } -// entity 126 +// entity 124 { "classname" "actor_box_green" "origin" "280 792 20" "targetname" "actor_elevator_test" } -// entity 127 +// entity 125 { "classname" "actor_box_red" "origin" "296 784 20" "targetname" "actor_elevator_test" } -// entity 128 +// entity 126 { "classname" "actor_box_blue" "origin" "312 760 20" "targetname" "actor_elevator_test" } -// entity 129 +// entity 127 { "classname" "actor_box_yellow" "origin" "320 792 20" "targetname" "actor_elevator_test" } -// entity 130 +// entity 128 { "classname" "actor_box_blue" "origin" "248 712 28" "targetname" "actor_elevator_test" } -// entity 131 +// entity 129 { "classname" "actor_box_wood" "origin" "244 776 20" "targetname" "actor_elevator_test" } -// entity 132 +// entity 130 { "classname" "actor_box_wood" "origin" "252 792 20" "targetname" "actor_elevator_test" } -// entity 133 +// entity 131 { "classname" "actor_box_wood" "origin" "308 792 20" "targetname" "actor_elevator_test" } -// entity 134 +// entity 132 { "classname" "actor_ac_unit" "origin" "284 708 24" "angle" "270" "targetname" "actor_elevator_test" } -// entity 135 +// entity 133 { "classname" "actor_vendingmachine" "origin" "248 760 28" "targetname" "actor_elevator_test" } -// entity 136 +// entity 134 { "classname" "actor_vendingmachine" "origin" "280 744 28" "angle" "270" "targetname" "actor_elevator_test" } -// entity 137 -{ -"classname" "trigger_area" -"target" "actor_elevator_test" -"targetname" "" -// brush 0 -{ -( 360 352 16 ) ( 360 353 16 ) ( 360 352 17 ) special/clip [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1 -( 360 352 16 ) ( 360 352 17 ) ( 361 352 16 ) special/clip [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 -( 360 352 16 ) ( 361 352 16 ) ( 360 353 16 ) special/clip [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 -( 384 384 24 ) ( 384 385 24 ) ( 385 384 24 ) special/clip [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1 -( 384 384 24 ) ( 385 384 24 ) ( 384 384 25 ) special/clip [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1 -( 384 384 24 ) ( 384 384 25 ) ( 384 385 24 ) special/clip [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1 -} -} -// entity 138 +// entity 135 { "classname" "actor_elevator_1" "origin" "376 416 18" "targetname" "actor_elevator_test" } -// entity 139 +// entity 136 { "classname" "actor_controlpad" "origin" "420 356 28" "targetname" "" "target" "actor_elevator_test" } -// entity 140 +// entity 137 { "classname" "actor_terminal_big" "origin" "168 532 28" } +// entity 138 +{ +"classname" "actor_box_green" +"origin" "376 456 20" +} +// entity 139 +{ +"classname" "actor_box_green" +"origin" "376 456 28" +} diff --git a/Scripts/Components/Actors/KeyboardInputProvider.cs b/Scripts/Components/Actors/KeyboardInputProvider.cs index efad25e0..83ea5296 100644 --- a/Scripts/Components/Actors/KeyboardInputProvider.cs +++ b/Scripts/Components/Actors/KeyboardInputProvider.cs @@ -123,17 +123,7 @@ public partial class KeyboardInputProvider : InputProvider private Vector2 GetMouseAimInput() { - return _mouseAImProvider?.GetMouseAimInput() ?? Vector2.Zero; - // //Camera2D camera = GetViewport().GetCamera2D(); - // //if (camera == null) return Vector2.Zero; // Ensure there's a valid camera - // - // //Vector2 mouseScreenPos = GetViewport().get_local_mouse_position(); - // if (GameManager.Instance is null) return Vector2.Zero; - // - // Vector2 mouseWorldPos = DisplayServer.MouseGetPosition();// GameManager.Instance.GetGlobalMousePosition(); - // - // return mouseWorldPos - GameManager.Instance.PlayerPosition.Value; // Get direction vector } public override bool GetActionJustPressed(string action)