diff --git a/3D/Maps/Factory4.map b/3D/Maps/Factory4.map index 18b9d7ec..c6e03c4c 100644 --- a/3D/Maps/Factory4.map +++ b/3D/Maps/Factory4.map @@ -2557,22 +2557,17 @@ } // entity 107 { -"classname" "actor_level_teleporter" -"origin" "48 128 17" -} -// entity 108 -{ "classname" "marker_spawn_item" "origin" "-40 -28 30" "resource_path" "res://Resources/Items/IcicleRepeater.tres" } -// entity 109 +// entity 108 { "classname" "marker_spawn_item" "origin" "-40 -40 30" "resource_path" "res://Resources/Items/Ammo1.tres" } -// entity 110 +// entity 109 { "classname" "trigger_area" "target" "door_intro" @@ -2587,20 +2582,20 @@ ( 96 28 20 ) ( 96 28 21 ) ( 96 29 20 ) special/trigger [ 0 1 0 4 ] [ 0 0 -1 0 ] 90 1 1 } } -// entity 111 +// entity 110 { "classname" "actor_keypad" "origin" "152 -56 32" "angles" "0 90 0" } -// entity 112 +// entity 111 { "classname" "actor_door_1" "origin" "-312 324 72" "angles" "0 90 0" "targetname" "door_3" } -// entity 113 +// entity 112 { "classname" "acid_area" // brush 0 @@ -2640,7 +2635,7 @@ ( -264 184 40 ) ( -264 184 41 ) ( -264 185 40 ) special/clip [ 0 -1 0 -8 ] [ 0 0 -1 0 ] 90 1 1 } } -// entity 114 +// entity 113 { "classname" "actor_emitter_floor" "origin" "-220 220 60" @@ -2650,7 +2645,7 @@ "targetname" "danmaku_room_1" "indestructible" "1" } -// entity 115 +// entity 114 { "classname" "trigger_area" "target" "danmaku_room_1" @@ -2665,7 +2660,7 @@ ( -288 312 64 ) ( -288 312 65 ) ( -288 313 64 ) special/trigger [ 0 1 0 8 ] [ 0 0 -1 0 ] 270 1 1 } } -// entity 116 +// entity 115 { "classname" "actor_emitter_floor" "origin" "-348 220 60" @@ -2675,235 +2670,235 @@ "targetname" "danmaku_room_1" "indestructible" "1" } -// entity 117 +// entity 116 { "classname" "actor_stairs_mini" "origin" "-448 264 60" "angles" "0 90 0" } -// entity 118 +// entity 117 { "classname" "actor_stairs_mini" "origin" "-432 264 60" "angles" "0 90 0" } -// entity 119 +// entity 118 { "classname" "actor_stairs_mini" "origin" "-432 176 60" "angles" "0 -90 0" } -// entity 120 +// entity 119 { "classname" "actor_stairs_mini" "origin" "-448 176 60" "angles" "0 -90 0" } -// entity 121 +// entity 120 { "classname" "actor_door_1" "origin" "-216 116 72" "angles" "0 90 0" } -// entity 122 +// entity 121 { "classname" "actor_door_1" "origin" "-100 168 72" "targetname" "door_5" } -// entity 123 +// entity 122 { "classname" "actor_switch" "origin" "-252 120 76" "angles" "0 90 0" } -// entity 124 +// entity 123 { "classname" "actor_controlpad" "origin" "-96 304 72" "target" "door_2" } -// entity 125 +// entity 124 { "classname" "actor_controlpad" "origin" "-292 328 72" "angles" "0 90 0" "target" "door_3" } -// entity 126 +// entity 125 { "classname" "actor_controlpad" "origin" "-152 164 72" "target" "door_5" } -// entity 127 +// entity 126 { "classname" "actor_securitycamera" "origin" "-272 24 76" } -// entity 128 +// entity 127 { "classname" "actor_box_red" "origin" "-216 24 60" } -// entity 129 +// entity 128 { "classname" "actor_box_blue_tall" "origin" "-172 28 65" } -// entity 130 +// entity 129 { "classname" "actor_box_blue_tall" "origin" "-256 80 65" } -// entity 131 +// entity 130 { "classname" "actor_box_green" "origin" "-192 44 60" } -// entity 132 +// entity 131 { "classname" "actor_box_blue" "origin" "-192 8 60" } -// entity 133 +// entity 132 { "classname" "actor_box_blue" "origin" "-192 24 60" } -// entity 134 +// entity 133 { "classname" "actor_table" "origin" "-156 12 60" } -// entity 135 +// entity 134 { "classname" "actor_table" "origin" "-140 12 60" } -// entity 136 +// entity 135 { "classname" "actor_table" "origin" "-124 12 60" } -// entity 137 +// entity 136 { "classname" "actor_box_wood" "origin" "-152 36 60" "angles" "0 90 0" } -// entity 138 +// entity 137 { "classname" "actor_box_wood" "origin" "-136 36 60" "angles" "0 90 0" } -// entity 139 +// entity 138 { "classname" "actor_box_wood" "origin" "-128 48 60" "angles" "0 90 0" } -// entity 140 +// entity 139 { "classname" "actor_box_wood" "origin" "-120 36 60" "angles" "0 90 0" } -// entity 141 +// entity 140 { "classname" "actor_box_wood" "origin" "-144 48 60" "angles" "0 90 0" } -// entity 142 +// entity 141 { "classname" "actor_locker" "origin" "-268 0 68" } -// entity 143 +// entity 142 { "classname" "actor_teleporter" "origin" "-240 0 57" } -// entity 144 +// entity 143 { "classname" "actor_tank_standalone" "origin" "-400 128 64" } -// entity 145 +// entity 144 { "classname" "actor_tank_standalone" "origin" "-416 128 64" } -// entity 146 +// entity 145 { "classname" "actor_tank_standalone" "origin" "-432 128 64" } -// entity 147 +// entity 146 { "classname" "actor_tank_standalone" "origin" "-448 128 64" } -// entity 148 +// entity 147 { "classname" "actor_tank_standalone" "origin" "-464 128 64" } -// entity 149 +// entity 148 { "classname" "actor_tube_straight_long" "origin" "-464 128 80" } -// entity 150 +// entity 149 { "classname" "actor_tube_straight_long" "origin" "-464 160 80" } -// entity 151 +// entity 150 { "classname" "actor_tube_straight_long" "origin" "-464 192 80" } -// entity 152 +// entity 151 { "classname" "actor_tube_straight_long" "origin" "-464 240 80" } -// entity 153 +// entity 152 { "classname" "actor_tube_straight_long" "origin" "-464 272 80" } -// entity 154 +// entity 153 { "classname" "actor_tube_straight_long" "origin" "-464 304 80" } -// entity 155 +// entity 154 { "classname" "actor_tube_straight" "origin" "-464 216 80" } -// entity 156 +// entity 155 { "classname" "marker_spawn_enemy" "origin" "124 272 22" "resource_path" "res://Resources/Enemies/Fairy_Guard_3D.tres" "targetname" "room_1" } -// entity 157 +// entity 156 { "classname" "actor_box_blue_tall" "origin" "176 8 25" } -// entity 158 +// entity 157 { "classname" "actor_box_blue_tall" "origin" "176 48 25" } -// entity 159 +// entity 158 { "classname" "solid_bullet_permeable" // brush 0 @@ -2916,7 +2911,7 @@ ( 184 16 16 ) ( 184 16 17 ) ( 184 17 16 ) Various/Various3 [ 6.123233995736766e-17 1 0 4 ] [ 0 0 -1 8 ] 270 1 1 } } -// entity 160 +// entity 159 { "classname" "solid_bullet_permeable" // brush 0 @@ -2929,58 +2924,79 @@ ( 184 36 16 ) ( 184 36 17 ) ( 184 37 16 ) Various/Various3 [ 6.123233995736766e-17 1 0 0 ] [ 0 0 -1 8 ] 180 1 1 } } -// entity 161 +// entity 160 { "classname" "marker_spawn_enemy_fairy_guard" "origin" "164 136 22" } -// entity 162 +// entity 161 { "classname" "marker_spawn_enemy_fairy_guard" "origin" "168 72 22" } -// entity 163 +// entity 162 { "classname" "marker_spawn_enemy_fairy_guard" "origin" "132 188 22" } -// entity 164 +// entity 163 { "classname" "marker_spawn_enemy_fairy_small" "origin" "56 172 22" } -// entity 165 +// entity 164 { "classname" "marker_spawn_enemy_fairy_small" "origin" "132 232 22" } -// entity 166 +// entity 165 { "classname" "marker_spawn_enemy_fairy_small" "origin" "84 272 62" } -// entity 167 +// entity 166 { "classname" "marker_spawn_enemy_fairy_small" "origin" "-76 220 62" } -// entity 168 +// entity 167 { "classname" "marker_spawn_enemy_fairy_small" "origin" "-188 364 62" } -// entity 169 +// entity 168 { "classname" "marker_spawn_enemy_fairy_small" "origin" "-260 396 62" } -// entity 170 +// entity 169 { "classname" "marker_spawn_enemy_fairy_guard" "origin" "-140 388 62" } -// entity 171 +// entity 170 { "classname" "marker_spawn_enemy_fairy_guard" "origin" "48 128 22" +"autospawn" "0" +"targetname" "camera_1" +} +// entity 171 +{ +"classname" "actor_teleporter" +"origin" "48 128 17" +} +// entity 172 +{ +"classname" "marker_spawn_enemy_fairy_guard" +"origin" "104 -40 22" +"autospawn" "0" +"targetname" "intro_enemies_later" +} +// entity 173 +{ +"classname" "marker_spawn_enemy_fairy_guard" +"origin" "148 -44 22" +"autospawn" "0" +"targetname" "intro_enemies_later" } diff --git a/3D/TrenchBroom/EntityDefinitions/base/enemy_base.tres b/3D/TrenchBroom/EntityDefinitions/base/enemy_base.tres index 40674fb8..7aadd950 100644 --- a/3D/TrenchBroom/EntityDefinitions/base/enemy_base.tres +++ b/3D/TrenchBroom/EntityDefinitions/base/enemy_base.tres @@ -10,7 +10,7 @@ classname = "Enemy" base_classes = Array[Resource]([ExtResource("1_f3dmh"), ExtResource("2_foxys")]) class_properties = { "autospawn": true, -"respource_path": "" +"resource_path": "resource_path" } class_property_descriptions = { "autospawn": "Whether to spawn automatically or not", diff --git a/IsoTest/Factory4.tscn b/IsoTest/Factory4.tscn index 7b58097b..27c9557d 100644 --- a/IsoTest/Factory4.tscn +++ b/IsoTest/Factory4.tscn @@ -83,7 +83,6 @@ [ext_resource type="Resource" uid="uid://4qxicyti4hwr" path="res://Resources/Enemies/Base_Fairy_3D.tres" id="75_4t1lx"] [ext_resource type="PackedScene" uid="uid://c8wwioforxms3" path="res://3D/Scenes/Props/Box_3D_Green.tscn" id="75_ky75o"] [ext_resource type="PackedScene" uid="uid://c2enjjxlfb5or" path="res://3D/Scenes/Props/barrel_3d.tscn" id="76_hiw3o"] -[ext_resource type="PackedScene" uid="uid://bn7hkgapi5oka" path="res://3D/Scenes/Props/Level_Teleporter_3D.tscn" id="77_uqa55"] [ext_resource type="Script" uid="uid://b88cmj87g78mx" path="res://Scripts/Actors/ItemMarker3D.cs" id="81_uulpl"] [ext_resource type="Resource" uid="uid://bgcgeg187vg1h" path="res://Resources/Items/IcicleRepeater.tres" id="82_67tii"] [ext_resource type="Resource" uid="uid://ct1fa2huvy34n" path="res://Resources/Items/Ammo1.tres" id="83_iwq7w"] @@ -98,6 +97,7 @@ [ext_resource type="PackedScene" uid="uid://d2kqcbr5rufxb" path="res://3D/Scenes/Props/Wooden_Box.tscn" id="95_dbn2g"] [ext_resource type="PackedScene" uid="uid://byyrqmraqy0ns" path="res://3D/BlockbenchModels/Tank/Tank_3D_Standalone.tscn" id="96_7lpec"] [ext_resource type="PackedScene" uid="uid://xxq6rhhdlbk3" path="res://3D/Scenes/Props/Tube_3D_Straight_Long.tscn" id="97_r76n2"] +[ext_resource type="Texture2D" uid="uid://cpyt4ipdi4c4k" path="res://Sprites/Actors/Fairy_Dead.png" id="99_dbn2g"] [sub_resource type="Environment" id="Environment_d6hgs"] background_mode = 1 @@ -2592,25 +2592,21 @@ mesh = SubResource("ArrayMesh_0ei4f") [node name="entity_103_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_103_solid_bullet_permeable"] shape = SubResource("ConvexPolygonShape3D_f66vw") -[node name="entity_104_actor_level_teleporter" parent="FuncGodotMap" instance=ExtResource("77_uqa55")] -transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 8, 1.0625, 3) -MapId = &"" - -[node name="entity_105_marker_spawn_item" type="Marker3D" parent="FuncGodotMap"] +[node name="entity_104_marker_spawn_item" type="Marker3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.75, 1.875, -2.5) script = ExtResource("81_uulpl") Item = ExtResource("82_67tii") AutoSpawn = true Billboard = true -[node name="entity_106_marker_spawn_item" type="Marker3D" parent="FuncGodotMap"] +[node name="entity_105_marker_spawn_item" type="Marker3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.5, 1.875, -2.5) script = ExtResource("81_uulpl") Item = ExtResource("83_iwq7w") AutoSpawn = true Billboard = true -[node name="entity_107_trigger_area" type="Area3D" parent="FuncGodotMap"] +[node name="entity_106_trigger_area" type="Area3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 1.375, 4) collision_layer = 4 collision_mask = 2 @@ -2619,44 +2615,44 @@ script = ExtResource("84_iwq7w") Target = "door_intro" ActivationType = 5 -[node name="entity_107_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_107_trigger_area"] +[node name="entity_106_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_106_trigger_area"] shape = SubResource("ConvexPolygonShape3D_32yyg") -[node name="entity_108_actor_keypad" parent="FuncGodotMap" node_paths=PackedStringArray("Targets") instance=ExtResource("85_k53eg")] +[node name="entity_107_actor_keypad" parent="FuncGodotMap" node_paths=PackedStringArray("Targets") instance=ExtResource("85_k53eg")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, -3.5, 2, 9.5) Targets = Array[ExtResource("66_bk01g")]([]) RequirementKeys = Array[StringName]([&"BLUE_KEY"]) -[node name="entity_109_actor_door_1" parent="FuncGodotMap" instance=ExtResource("19_hhok7")] +[node name="entity_108_actor_door_1" parent="FuncGodotMap" instance=ExtResource("19_hhok7")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 20.25, 4.5, -19.5) GroupName = "door_3" -[node name="entity_110_acid_area" type="Area3D" parent="FuncGodotMap" groups=["Acid"]] +[node name="entity_109_acid_area" type="Area3D" parent="FuncGodotMap" groups=["Acid"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.75, 2.25, -19.75) collision_layer = 256 collision_mask = 2 script = ExtResource("89_82p5w") -[node name="entity_110_mesh_instance" type="MeshInstance3D" parent="FuncGodotMap/entity_110_acid_area"] +[node name="entity_109_mesh_instance" type="MeshInstance3D" parent="FuncGodotMap/entity_109_acid_area"] cast_shadow = 0 mesh = SubResource("ArrayMesh_bux3k") -[node name="entity_110_occluder_instance" type="OccluderInstance3D" parent="FuncGodotMap/entity_110_acid_area"] +[node name="entity_109_occluder_instance" type="OccluderInstance3D" parent="FuncGodotMap/entity_109_acid_area"] occluder = SubResource("ArrayOccluder3D_qotpt") -[node name="entity_110_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_110_acid_area"] +[node name="entity_109_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_109_acid_area"] shape = SubResource("ConvexPolygonShape3D_cjtkw") -[node name="entity_110_brush_1_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_110_acid_area"] +[node name="entity_109_brush_1_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_109_acid_area"] shape = SubResource("ConvexPolygonShape3D_t0qbk") -[node name="entity_110_brush_2_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_110_acid_area"] +[node name="entity_109_brush_2_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_109_acid_area"] shape = SubResource("ConvexPolygonShape3D_6e6fe") -[node name="entity_110_brush_3_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_110_acid_area"] +[node name="entity_109_brush_3_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_109_acid_area"] shape = SubResource("ConvexPolygonShape3D_cqyqj") -[node name="entity_111_actor_emitter_floor" parent="FuncGodotMap" instance=ExtResource("50_25ipq")] +[node name="entity_110_actor_emitter_floor" parent="FuncGodotMap" instance=ExtResource("50_25ipq")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 13.75, 3.75, -13.75) Script = ExtResource("91_tfdl3") ActivationGroup = "danmaku_room_1" @@ -2664,7 +2660,7 @@ EmitOnStart = false Indestructible = true Health = 5.0 -[node name="entity_112_trigger_area" type="Area3D" parent="FuncGodotMap"] +[node name="entity_111_trigger_area" type="Area3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.5, 3.75, -19.25) collision_layer = 4 collision_mask = 2 @@ -2673,10 +2669,10 @@ script = ExtResource("84_iwq7w") Target = "danmaku_room_1" ActivationType = 1 -[node name="entity_112_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_112_trigger_area"] +[node name="entity_111_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_111_trigger_area"] shape = SubResource("ConvexPolygonShape3D_jkqpx") -[node name="entity_113_actor_emitter_floor" parent="FuncGodotMap" instance=ExtResource("50_25ipq")] +[node name="entity_112_actor_emitter_floor" parent="FuncGodotMap" instance=ExtResource("50_25ipq")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 13.75, 3.75, -21.75) Script = ExtResource("91_tfdl3") ActivationGroup = "danmaku_room_1" @@ -2684,157 +2680,157 @@ EmitOnStart = false Indestructible = true Health = 5.0 -[node name="entity_114_actor_stairs_mini" parent="FuncGodotMap" instance=ExtResource("91_t205v")] +[node name="entity_113_actor_stairs_mini" parent="FuncGodotMap" instance=ExtResource("91_t205v")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 16.5, 3.75, -28) -[node name="entity_115_actor_stairs_mini" parent="FuncGodotMap" instance=ExtResource("91_t205v")] +[node name="entity_114_actor_stairs_mini" parent="FuncGodotMap" instance=ExtResource("91_t205v")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 16.5, 3.75, -27) -[node name="entity_116_actor_stairs_mini" parent="FuncGodotMap" instance=ExtResource("91_t205v")] +[node name="entity_115_actor_stairs_mini" parent="FuncGodotMap" instance=ExtResource("91_t205v")] transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 11, 3.75, -27) -[node name="entity_117_actor_stairs_mini" parent="FuncGodotMap" instance=ExtResource("91_t205v")] +[node name="entity_116_actor_stairs_mini" parent="FuncGodotMap" instance=ExtResource("91_t205v")] transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 11, 3.75, -28) -[node name="entity_118_actor_door_1" parent="FuncGodotMap" instance=ExtResource("19_hhok7")] +[node name="entity_117_actor_door_1" parent="FuncGodotMap" instance=ExtResource("19_hhok7")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 7.25, 4.5, -13.5) -[node name="entity_119_actor_door_1" parent="FuncGodotMap" instance=ExtResource("19_hhok7")] +[node name="entity_118_actor_door_1" parent="FuncGodotMap" instance=ExtResource("19_hhok7")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 10.5, 4.5, -6.25) GroupName = "door_5" -[node name="entity_120_actor_switch" parent="FuncGodotMap" instance=ExtResource("93_82p5w")] +[node name="entity_119_actor_switch" parent="FuncGodotMap" instance=ExtResource("93_82p5w")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 7.5, 4.75, -15.75) ActivationType = 6 -[node name="entity_121_actor_controlpad" parent="FuncGodotMap" instance=ExtResource("94_cw08v")] +[node name="entity_120_actor_controlpad" parent="FuncGodotMap" instance=ExtResource("94_cw08v")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 19, 4.5, -6) TargetGroup = "door_2" ActivationType = 6 -[node name="entity_122_actor_controlpad" parent="FuncGodotMap" instance=ExtResource("94_cw08v")] +[node name="entity_121_actor_controlpad" parent="FuncGodotMap" instance=ExtResource("94_cw08v")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 20.5, 4.5, -18.25) TargetGroup = "door_3" ActivationType = 6 -[node name="entity_123_actor_controlpad" parent="FuncGodotMap" instance=ExtResource("94_cw08v")] +[node name="entity_122_actor_controlpad" parent="FuncGodotMap" instance=ExtResource("94_cw08v")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 10.25, 4.5, -9.5) TargetGroup = "door_5" ActivationType = 6 -[node name="entity_124_actor_securitycamera" parent="FuncGodotMap" instance=ExtResource("65_tuguo")] +[node name="entity_123_actor_securitycamera" parent="FuncGodotMap" instance=ExtResource("65_tuguo")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 1.5, 4.75, -17) ActivationType = 6 DamageResistances = Array[ExtResource("66_bk01g")]([]) ActivationType = 6 -[node name="entity_125_actor_box_red" parent="FuncGodotMap" instance=ExtResource("74_sx5yh")] +[node name="entity_124_actor_box_red" parent="FuncGodotMap" instance=ExtResource("74_sx5yh")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 1.5, 3.75, -13.5) Health = 10.0 ActivationType = 6 -[node name="entity_126_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")] +[node name="entity_125_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.75, 4.0625, -10.75) Health = 10.0 ActivationType = 6 -[node name="entity_127_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")] +[node name="entity_126_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 4.0625, -16) Health = 10.0 ActivationType = 6 -[node name="entity_128_actor_box_green" parent="FuncGodotMap" instance=ExtResource("75_ky75o")] +[node name="entity_127_actor_box_green" parent="FuncGodotMap" instance=ExtResource("75_ky75o")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 2.75, 3.75, -12) Health = 10.0 ActivationType = 6 -[node name="entity_129_actor_box_blue" parent="FuncGodotMap" instance=ExtResource("69_e0jxh")] +[node name="entity_128_actor_box_blue" parent="FuncGodotMap" instance=ExtResource("69_e0jxh")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 3.75, -12) Health = 10.0 ActivationType = 6 -[node name="entity_130_actor_box_blue" parent="FuncGodotMap" instance=ExtResource("69_e0jxh")] +[node name="entity_129_actor_box_blue" parent="FuncGodotMap" instance=ExtResource("69_e0jxh")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5, 3.75, -12) Health = 10.0 ActivationType = 6 -[node name="entity_131_actor_table" parent="FuncGodotMap" instance=ExtResource("13_bv7qr")] +[node name="entity_130_actor_table" parent="FuncGodotMap" instance=ExtResource("13_bv7qr")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0.75, 3.75, -9.75) -[node name="entity_132_actor_table" parent="FuncGodotMap" instance=ExtResource("13_bv7qr")] +[node name="entity_131_actor_table" parent="FuncGodotMap" instance=ExtResource("13_bv7qr")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0.75, 3.75, -8.75) -[node name="entity_133_actor_table" parent="FuncGodotMap" instance=ExtResource("13_bv7qr")] +[node name="entity_132_actor_table" parent="FuncGodotMap" instance=ExtResource("13_bv7qr")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0.75, 3.75, -7.75) -[node name="entity_134_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")] +[node name="entity_133_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 2.25, 3.75, -9.5) Health = 10.0 ActivationType = 6 -[node name="entity_135_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")] +[node name="entity_134_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 2.25, 3.75, -8.5) Health = 10.0 ActivationType = 6 -[node name="entity_136_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")] +[node name="entity_135_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 3, 3.75, -8) Health = 10.0 ActivationType = 6 -[node name="entity_137_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")] +[node name="entity_136_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 2.25, 3.75, -7.5) Health = 10.0 ActivationType = 6 -[node name="entity_138_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")] +[node name="entity_137_actor_box_wood" parent="FuncGodotMap" instance=ExtResource("95_dbn2g")] transform = Transform3D(1.1924881e-08, 0, -1, 0, 1, 0, 1, 0, 1.1924881e-08, 3, 3.75, -9) Health = 10.0 ActivationType = 6 -[node name="entity_139_actor_locker" parent="FuncGodotMap" instance=ExtResource("14_14ntx")] +[node name="entity_138_actor_locker" parent="FuncGodotMap" instance=ExtResource("14_14ntx")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 4.25, -16.75) -[node name="entity_140_actor_teleporter" parent="FuncGodotMap" instance=ExtResource("12_mtei5")] +[node name="entity_139_actor_teleporter" parent="FuncGodotMap" instance=ExtResource("12_mtei5")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 3.5625, -15) -[node name="entity_141_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")] +[node name="entity_140_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 8, 4, -25) -[node name="entity_142_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")] +[node name="entity_141_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 8, 4, -26) -[node name="entity_143_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")] +[node name="entity_142_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 8, 4, -27) -[node name="entity_144_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")] +[node name="entity_143_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 8, 4, -28) -[node name="entity_145_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")] +[node name="entity_144_actor_tank_standalone" parent="FuncGodotMap" instance=ExtResource("96_7lpec")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 8, 4, -29) -[node name="entity_146_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")] +[node name="entity_145_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 8, 5, -29) -[node name="entity_147_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")] +[node name="entity_146_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 10, 5, -29) -[node name="entity_148_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")] +[node name="entity_147_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 12, 5, -29) -[node name="entity_149_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")] +[node name="entity_148_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 15, 5, -29) -[node name="entity_150_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")] +[node name="entity_149_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 17, 5, -29) -[node name="entity_151_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")] +[node name="entity_150_actor_tube_straight_long" parent="FuncGodotMap" instance=ExtResource("97_r76n2")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 19, 5, -29) -[node name="entity_152_actor_tube_straight" parent="FuncGodotMap" instance=ExtResource("62_qopdo")] +[node name="entity_151_actor_tube_straight" parent="FuncGodotMap" instance=ExtResource("62_qopdo")] transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 13.5, 5, -29) -[node name="entity_153_marker_spawn_enemy" type="Marker3D" parent="FuncGodotMap"] +[node name="entity_152_marker_spawn_enemy" type="Marker3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17, 1.375, 7.75) script = ExtResource("73_xhmq5") Enemy = ExtResource("74_4mxrl") @@ -2842,39 +2838,39 @@ AutoSpawn = true TargetName = &"room_1" Billboard = true -[node name="entity_154_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")] +[node name="entity_153_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 1.5625, 11) Health = 10.0 ActivationType = 6 -[node name="entity_155_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")] +[node name="entity_154_actor_box_blue_tall" parent="FuncGodotMap" instance=ExtResource("68_v32ux")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 1.5625, 11) Health = 10.0 ActivationType = 6 -[node name="entity_156_solid_bullet_permeable" type="StaticBody3D" parent="FuncGodotMap"] +[node name="entity_155_solid_bullet_permeable" type="StaticBody3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.125, 1.375, 10.75) collision_layer = 512 collision_mask = 0 -[node name="entity_156_mesh_instance" type="MeshInstance3D" parent="FuncGodotMap/entity_156_solid_bullet_permeable"] +[node name="entity_155_mesh_instance" type="MeshInstance3D" parent="FuncGodotMap/entity_155_solid_bullet_permeable"] mesh = SubResource("ArrayMesh_wef30") -[node name="entity_156_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_156_solid_bullet_permeable"] +[node name="entity_155_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_155_solid_bullet_permeable"] shape = SubResource("ConvexPolygonShape3D_qqk3g") -[node name="entity_157_solid_bullet_permeable" type="StaticBody3D" parent="FuncGodotMap"] +[node name="entity_156_solid_bullet_permeable" type="StaticBody3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.375, 1.375, 10.75) collision_layer = 512 collision_mask = 0 -[node name="entity_157_mesh_instance" type="MeshInstance3D" parent="FuncGodotMap/entity_157_solid_bullet_permeable"] +[node name="entity_156_mesh_instance" type="MeshInstance3D" parent="FuncGodotMap/entity_156_solid_bullet_permeable"] mesh = SubResource("ArrayMesh_jglqp") -[node name="entity_157_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_157_solid_bullet_permeable"] +[node name="entity_156_brush_0_collision_shape" type="CollisionShape3D" parent="FuncGodotMap/entity_156_solid_bullet_permeable"] shape = SubResource("ConvexPolygonShape3D_5qvsf") -[node name="entity_158_marker_spawn_enemy_fairy_guard" type="Marker3D" parent="FuncGodotMap"] +[node name="entity_157_marker_spawn_enemy_fairy_guard" type="Marker3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.5, 1.375, 10.25) script = ExtResource("73_xhmq5") Enemy = ExtResource("74_4mxrl") @@ -2882,7 +2878,7 @@ AutoSpawn = true TargetName = &"" Billboard = true -[node name="entity_159_marker_spawn_enemy_fairy_guard" type="Marker3D" parent="FuncGodotMap"] +[node name="entity_158_marker_spawn_enemy_fairy_guard" type="Marker3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.5, 1.375, 10.5) script = ExtResource("73_xhmq5") Enemy = ExtResource("74_4mxrl") @@ -2890,7 +2886,7 @@ AutoSpawn = true TargetName = &"" Billboard = true -[node name="entity_160_marker_spawn_enemy_fairy_guard" type="Marker3D" parent="FuncGodotMap"] +[node name="entity_159_marker_spawn_enemy_fairy_guard" type="Marker3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 11.75, 1.375, 8.25) script = ExtResource("73_xhmq5") Enemy = ExtResource("74_4mxrl") @@ -2898,7 +2894,7 @@ AutoSpawn = true TargetName = &"" Billboard = true -[node name="entity_161_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"] +[node name="entity_160_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.75, 1.375, 3.5) script = ExtResource("73_xhmq5") Enemy = ExtResource("75_4t1lx") @@ -2906,7 +2902,7 @@ AutoSpawn = true TargetName = &"" Billboard = true -[node name="entity_162_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"] +[node name="entity_161_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.5, 1.375, 8.25) script = ExtResource("73_xhmq5") Enemy = ExtResource("75_4t1lx") @@ -2914,7 +2910,7 @@ AutoSpawn = true TargetName = &"" Billboard = true -[node name="entity_163_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"] +[node name="entity_162_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17, 3.875, 5.25) script = ExtResource("73_xhmq5") Enemy = ExtResource("75_4t1lx") @@ -2922,7 +2918,7 @@ AutoSpawn = true TargetName = &"" Billboard = true -[node name="entity_164_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"] +[node name="entity_163_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.75, 3.875, -4.75) script = ExtResource("73_xhmq5") Enemy = ExtResource("75_4t1lx") @@ -2930,7 +2926,7 @@ AutoSpawn = true TargetName = &"" Billboard = true -[node name="entity_165_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"] +[node name="entity_164_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 22.75, 3.875, -11.75) script = ExtResource("73_xhmq5") Enemy = ExtResource("75_4t1lx") @@ -2938,7 +2934,7 @@ AutoSpawn = true TargetName = &"" Billboard = true -[node name="entity_166_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"] +[node name="entity_165_marker_spawn_enemy_fairy_small" type="Marker3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 24.75, 3.875, -16.25) script = ExtResource("73_xhmq5") Enemy = ExtResource("75_4t1lx") @@ -2946,7 +2942,7 @@ AutoSpawn = true TargetName = &"" Billboard = true -[node name="entity_167_marker_spawn_enemy_fairy_guard" type="Marker3D" parent="FuncGodotMap"] +[node name="entity_166_marker_spawn_enemy_fairy_guard" type="Marker3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 24.25, 3.875, -8.75) script = ExtResource("73_xhmq5") Enemy = ExtResource("74_4mxrl") @@ -2954,18 +2950,42 @@ AutoSpawn = true TargetName = &"" Billboard = true -[node name="entity_168_marker_spawn_enemy_fairy_guard" type="Marker3D" parent="FuncGodotMap"] +[node name="entity_167_marker_spawn_enemy_fairy_guard" type="Marker3D" parent="FuncGodotMap"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 1.375, 3) script = ExtResource("73_xhmq5") Enemy = ExtResource("74_4mxrl") -AutoSpawn = true -TargetName = &"" +TargetName = &"camera_1" +Billboard = true + +[node name="entity_168_actor_teleporter" parent="FuncGodotMap" instance=ExtResource("12_mtei5")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 8, 1.0625, 3) + +[node name="entity_169_marker_spawn_enemy_fairy_guard" type="Marker3D" parent="FuncGodotMap"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.5, 1.375, 6.5) +script = ExtResource("73_xhmq5") +Enemy = ExtResource("74_4mxrl") +TargetName = &"intro_enemies_later" +Billboard = true + +[node name="entity_170_marker_spawn_enemy_fairy_guard" type="Marker3D" parent="FuncGodotMap"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.75, 1.375, 9.25) +script = ExtResource("73_xhmq5") +Enemy = ExtResource("74_4mxrl") +TargetName = &"intro_enemies_later" Billboard = true [node name="Enemies" type="Node3D" parent="."] [node name="Items" type="Node3D" parent="."] +[node name="Sprite3D" type="Sprite3D" parent="Items"] +transform = Transform3D(0.70710677, -0.49999997, 0.49999997, 0, 0.70710677, 0.70710677, -0.70710677, -0.49999997, 0.49999997, 0.31903076, 2.4449463, 1.3727417) +visible = false +modulate = Color(1, 1, 1, 0.43529412) +pixel_size = 0.05 +texture_filter = 0 +texture = ExtResource("99_dbn2g") + [node name="NavigationRegion3D" type="NavigationRegion3D" parent="."] visible = false navigation_mesh = SubResource("NavigationMesh_xhmq5") diff --git a/Scripts/Actors/EnemyMarker3D.cs b/Scripts/Actors/EnemyMarker3D.cs index 25e0a3ac..fba91313 100644 --- a/Scripts/Actors/EnemyMarker3D.cs +++ b/Scripts/Actors/EnemyMarker3D.cs @@ -41,12 +41,15 @@ public partial class EnemyMarker3D : PreviewMarker3D, IActivable { if (_autoSpawn) { - SetSpriteAlpha(1); + Alpha = 1.0f; + // SetSpriteAlpha(1); } else { - SetSpriteAlpha(0.5f); + Alpha = 0.5f; + //SetSpriteAlpha(0.5f); } + QueueRedraw(); } } } @@ -59,8 +62,20 @@ public partial class EnemyMarker3D : PreviewMarker3D, IActivable { //GroupName = (string)props["targetname"]; this.AddToGroup("EnemyMarkers"); - AutoSpawn = props["autospawn"].AsBool(); + _billboard = true; + _autoSpawn = props["autospawn"].AsBool(); + if (_autoSpawn) + { + _alpha = 1.0f; + // SetSpriteAlpha(1); + } + else + { + _alpha = 0.5f; + //SetSpriteAlpha(0.5f); + } + var scriptPath = props["resource_path"].AsString(); if (!string.IsNullOrWhiteSpace(scriptPath)) { @@ -73,10 +88,28 @@ public partial class EnemyMarker3D : PreviewMarker3D, IActivable TargetName = props["targetname"].AsStringName(); - Billboard = true; + + + //QueueRedraw(); // Redraw should be automatic when enemy was changed and texture updated //MarkerId = props["id"].AsInt32(); } + protected override void QueueRedraw() + { + if (!Engine.IsEditorHint()) return; + if (_autoSpawn) + { + _alpha = 1.0f; + // SetSpriteAlpha(1); + } + else + { + _alpha = 0.5f; + //SetSpriteAlpha(0.5f); + } + base.QueueRedraw(); + } + public override void _Ready() { base._Ready(); diff --git a/Scripts/Actors/PreviewMarker3D.cs b/Scripts/Actors/PreviewMarker3D.cs index 9c3e0cf7..98764905 100644 --- a/Scripts/Actors/PreviewMarker3D.cs +++ b/Scripts/Actors/PreviewMarker3D.cs @@ -5,7 +5,7 @@ namespace Cirno.Scripts.Actors; [Tool] public partial class PreviewMarker3D : Marker3D { - private Texture2D _texture; + protected Texture2D _texture; protected Texture2D Texture { get => _texture; @@ -19,9 +19,9 @@ public partial class PreviewMarker3D : Marker3D } } - private bool _fixedSize; - private bool _billboard; - private float _pixelSize = 0.05f; + protected bool _fixedSize; + protected bool _billboard; + protected float _pixelSize = 0.05f; [Export] protected bool FixedSize @@ -64,6 +64,21 @@ public partial class PreviewMarker3D : Marker3D } } } + + protected float _alpha = 1.0f; + + protected float Alpha + { + get => _alpha; + set + { + _alpha = value; + if (Engine.IsEditorHint()) + { + QueueRedraw(); + } + } + } [ExportToolButton("Update Icon")] public Callable RedrawButton => Callable.From(Redraw); [ExportToolButton("Clear Children")] public Callable ClearChildrenButton => Callable.From(ClearChildren); @@ -99,7 +114,7 @@ public partial class PreviewMarker3D : Marker3D _sprite = null; } - protected void QueueRedraw() + protected virtual void QueueRedraw() { if (!Engine.IsEditorHint()) return; if (_texture is null) return; @@ -112,12 +127,18 @@ public partial class PreviewMarker3D : Marker3D //_sprite.Owner = GetTree().EditedSceneRoot; } + _sprite.Modulate = new Color(_sprite.Modulate.R, _sprite.Modulate.G, _sprite.Modulate.B, Alpha); + _sprite.Texture = _texture; //_sprite.SetRotationDegrees(new Vector3(-45, 45, 0)); _sprite.FixedSize = FixedSize; _sprite.SetBillboardMode(Billboard ? BaseMaterial3D.BillboardModeEnum.Enabled : BaseMaterial3D.BillboardModeEnum.Disabled); _sprite.TextureFilter = BaseMaterial3D.TextureFilterEnum.Nearest; _sprite.PixelSize = PixelSize; + + //GD.Print($"Modulating alpha: {Alpha}"); + + //_sprite.SetModulate(new Color(_sprite.Modulate.R, _sprite.Modulate.G, _sprite.Modulate.B, Alpha)); } protected void SetSpriteAlpha(float alpha) @@ -130,7 +151,7 @@ public partial class PreviewMarker3D : Marker3D } else { - GD.Print("Sprite was null"); + //GD.Print("Sprite was null"); } } } \ No newline at end of file