Textures and mapping

3D/MapScenes/TestLevel.tscn

@@ -37,7 +37,7 @@
 [ext_resource type="Material" uid="uid://br4foqdn2f8ge" path="res://textures/Manual/Wall_Corner.tres" id="27_c4mw0"]
 [ext_resource type="Material" uid="uid://bijkqqi8bqi3c" path="res://textures/Floors/Floor26.tres" id="28_btjo4"]
 [ext_resource type="Material" uid="uid://fc0n5jo05seu" path="res://textures/Manual/Wall_Light_Test.tres" id="30_pvlbf"]
-[ext_resource type="Material" path="res://textures/Manual/Chevron.tres" id="30_um16p"]
+[ext_resource type="Material" uid="uid://dfs1tc2ry78pb" path="res://textures/Manual/Chevron.tres" id="30_um16p"]
 [ext_resource type="Material" uid="uid://0x6sr7ehv4t1" path="res://textures/Floors/Floor167.tres" id="31_bbydx"]
 [ext_resource type="Script" uid="uid://crjplbs250g75" path="res://3D/TrenchBroom/EntityScripts/Lights/light_spot.gd" id="31_c2mph"]
 [ext_resource type="Material" uid="uid://l3g1l0y47c7r" path="res://textures/Manual/Electric_Panel_Wall.tres" id="32_k4tgc"]

3D/TrenchBroom/EntityDefinitions/point/actors/Actor_Capacitor_Mini.tres

@@ -24,7 +24,7 @@ class_property_descriptions = {}
 auto_apply_to_matching_node_properties = false
 meta_properties = {
 "size": AABB(-8, -8, -8, 8, 8, 8),
-"studio": "\"3D/MapModels/actor_capacitor_mini.glb\""
+"studio": "\"3D\\MapModels/actor_capacitor_mini.glb\""
 }
 node_class = ""
 name_property = ""

3D/TrenchBroom/EntityDefinitions/point/actors/Actor_Furniture_Box.tres

@@ -23,7 +23,7 @@ class_properties = {}
 class_property_descriptions = {}
 auto_apply_to_matching_node_properties = false
 meta_properties = {
-"model": "\"3D/MapModels/actor_furniture_box.glb\"",
+"model": "\"3D\\MapModels/actor_furniture_box.glb\"",
 "size": AABB(-2, -2, -2, 2, 2, 2)
 }
 node_class = ""

3D/TrenchBroom/EntityDefinitions/point/actors/Actor_Furniture_Can.tres

@@ -23,7 +23,7 @@ class_properties = {}
 class_property_descriptions = {}
 auto_apply_to_matching_node_properties = false
 meta_properties = {
-"model": "\"3D/MapModels/actor_furniture_can.glb\"",
+"model": "\"3D\\MapModels/actor_furniture_can.glb\"",
 "size": AABB(-2, -2, -2, 2, 2, 2)
 }
 node_class = ""

3D/TrenchBroom/EntityDefinitions/point/actors/Actor_Furniture_Shelf.tres

@@ -23,7 +23,7 @@ class_properties = {}
 class_property_descriptions = {}
 auto_apply_to_matching_node_properties = false
 meta_properties = {
-"model": "\"3D/MapModels/actor_furniture_shelf.glb\"",
+"model": "\"3D\\MapModels/actor_furniture_shelf.glb\"",
 "size": AABB(-4, -8, -1, 4, 8, 1)
 }
 node_class = ""

3D/TrenchBroom/EntityDefinitions/point/actors/Actor_Tank_Large.tres

@@ -24,7 +24,7 @@ class_property_descriptions = {}
 auto_apply_to_matching_node_properties = false
 meta_properties = {
 "size": AABB(-32, -16, -16, 32, 16, 16),
-"studio": "\"3D/MapModels/actor_tank_large.glb\""
+"studio": "\"3D\\MapModels/actor_tank_large.glb\""
 }
 node_class = ""
 name_property = ""

3D/TrenchBroom/EntityDefinitions/point/actors/actor_chest.tres

@@ -25,7 +25,7 @@ class_properties = {
 class_property_descriptions = {}
 auto_apply_to_matching_node_properties = false
 meta_properties = {
-"model": "\"3D/MapModels/actor_chest_1.glb\"",
+"model": "\"3D\\MapModels/actor_chest_1.glb\"",
 "size": AABB(-8, -8, -8, 8, 8, 8)
 }
 node_class = ""

3D/TrenchBroom/EntityDefinitions/point/actors/actor_controlpad.tres

@@ -26,7 +26,7 @@ class_property_descriptions = {}
 auto_apply_to_matching_node_properties = false
 meta_properties = {
 "size": AABB(-4, -4, -4, 4, 4, 4),
-"studio": "\"3D/MapModels/actor_controlpad.glb\""
+"studio": "\"3D\\MapModels/actor_controlpad.glb\""
 }
 node_class = ""
 name_property = ""

ExternalMaterial/HexGrid/Floor_Tiled_002_Source.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://1bekq0f0t4n2"
+path="res://.godot/imported/Floor_Tiled_002_Source.png-1eec552d950514e41512725b39e04a41.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ExternalMaterial/HexGrid/Floor_Tiled_002_Source.png"
+dest_files=["res://.godot/imported/Floor_Tiled_002_Source.png-1eec552d950514e41512725b39e04a41.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

ExternalMaterial/HexGrid/Singles/Floors/Floor_Tiled_Blue_0.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://jmo6osyubtdx"
+path="res://.godot/imported/Floor_Tiled_Blue_0.png-c3ce628abc376b246465e86d6ead1cb1.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://textures/Floors/Floor_Tiled_Blue_0.png"
+dest_files=["res://.godot/imported/Floor_Tiled_Blue_0.png-c3ce628abc376b246465e86d6ead1cb1.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

ExternalMaterial/HexGrid/Singles/Floors/Floor_Tiled_Blue_1.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bieub0bsba6w3"
+path="res://.godot/imported/Floor_Tiled_Blue_1.png-e0fd0f58626e709c3b3c530088029ee5.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://textures/Floors/Floor_Tiled_Blue_1.png"
+dest_files=["res://.godot/imported/Floor_Tiled_Blue_1.png-e0fd0f58626e709c3b3c530088029ee5.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

ExternalMaterial/HexGrid/Singles/Floors/Floor_Tiled_Blue_1.tres

@@ -0,0 +1,8 @@
+[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://bp8cpybnoi5f0"]
+
+[ext_resource type="Texture2D" uid="uid://bieub0bsba6w3" path="res://textures/Floors/Floor_Tiled_Blue_1.png" id="1_ctp3y"]
+
+[resource]
+albedo_texture = ExtResource("1_ctp3y")
+metallic_specular = 0.0
+texture_filter = 2

ExternalMaterial/HexGrid/Singles/Floors/Floor_Tiled_Blue_2.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://7cwh73yt5jva"
+path="res://.godot/imported/Floor_Tiled_Blue_2.png-50971074cfc7d7b7086ce24fe978de24.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://textures/Floors/Floor_Tiled_Blue_2.png"
+dest_files=["res://.godot/imported/Floor_Tiled_Blue_2.png-50971074cfc7d7b7086ce24fe978de24.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

ExternalMaterial/HexGrid/Singles/Floors/Floor_Tiled_Blue_2.tres

@@ -0,0 +1,8 @@
+[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://bsjiq4pwd8t4j"]
+
+[ext_resource type="Texture2D" uid="uid://7cwh73yt5jva" path="res://textures/Floors/Floor_Tiled_Blue_2.png" id="1_tt7lx"]
+
+[resource]
+albedo_texture = ExtResource("1_tt7lx")
+metallic_specular = 0.0
+texture_filter = 2

ExternalMaterial/HexGrid/Singles/Floors/Floor_Tiled_Blue_3.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://doxbekwtoyxdv"
+path="res://.godot/imported/Floor_Tiled_Blue_3.png-d98c88cf67d81d0cbfa1340823246579.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://textures/Floors/Floor_Tiled_Blue_3.png"
+dest_files=["res://.godot/imported/Floor_Tiled_Blue_3.png-d98c88cf67d81d0cbfa1340823246579.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

Scripts/Activables/3D/Teleporter3D.cs

@@ -1,8 +1,11 @@
-using System.Threading;
+using System;
+using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Cirno.Scripts.Components.FSM;
 using Cirno.Scripts.Components.FSM._3DPlayer;
 using Godot;
+using Godot.Collections;
 using GTweensGodot.Extensions;
 
 namespace Cirno.Scripts.Activables._3D;
@@ -17,6 +20,8 @@ public partial class Teleporter3D : StaticBody3D, IActivable
     public bool IsPrimed { get; private set; }
 
     [Export] public Teleporter3D Target { get; set; }
+    [Export] public string TargetGroup { get; set; }
+    [Export] public string TargetName { get; set; }
 
     [Export] public float ParticleEmitTime { get; private set; } = 2f;
 
@@ -29,6 +34,14 @@ public partial class Teleporter3D : StaticBody3D, IActivable
 
     [Export] public StringName DefaultAnimationName { get; private set; } = "Default";
 
+    public void _func_godot_apply_properties(Dictionary<string, string> props)
+    {
+        TargetGroup = props["target"];
+
+        TargetName = props["targetname"];
+        IsEnabled = bool.Parse(props["enabled"]);
+    }
+
     private void PlayAnimation(StringName name)
     {
     }
@@ -49,6 +62,10 @@ public partial class Teleporter3D : StaticBody3D, IActivable
 
         if (Engine.IsEditorHint()) return;
 
+        if (!string.IsNullOrEmpty(TargetName))
+        {
+            this.AddToGroup(TargetName);
+        }
 
         IsPrimed = true;
         StopParticles();
@@ -137,7 +154,22 @@ public partial class Teleporter3D : StaticBody3D, IActivable
 
     protected virtual async Task Teleport(IsoPlayerStateMachine player)
     {
-        if (Target is null) return;
+        if (Target is null)
+        {
+            if (string.IsNullOrWhiteSpace(TargetGroup))
+            {
+                return;
+            }
+
+            var foundTarget = GetTree().GetNodesInGroup(TargetGroup).FirstOrDefault();
+            if (foundTarget is not Teleporter3D teleporterTarget)
+            {
+                GD.Print($"No target for teleportation found with group {TargetGroup}");
+                return;
+            }
+            Target = teleporterTarget;
+            
+        };
         //player.RequestMovementDisable(true);
         player.SetState(PlayerState.Cutscene);
 
@@ -155,7 +187,7 @@ public partial class Teleporter3D : StaticBody3D, IActivable
         await Task.Delay((int)(TeleportAnimationLength * 1000));
 
         Target.PrepareForReceiving();
-        player.MainObject.GlobalPosition = Target.GlobalPosition + TeleportOffset; 
+        player.MainObject.GlobalPosition = Target.GlobalPosition + TeleportOffset;
         Target.PlayTeleportEndSound();
         //await player.UnTeleport();
 
@@ -168,12 +200,10 @@ public partial class Teleporter3D : StaticBody3D, IActivable
 
     public void PlayTeleportStartSound()
     {
-        
     }
 
     public void PlayTeleportEndSound()
     {
-        
     }
 
     protected async Task TweenPlayer(CharacterBody3D player)

textures/Manual/Chevron_2.tres

@@ -0,0 +1,8 @@
+[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://dsily2e64c7a8"]
+
+[ext_resource type="Texture2D" uid="uid://bxepcnr6o3dx3" path="res://textures/Manual/Chevron_2.png" id="1_phplt"]
+
+[resource]
+albedo_texture = ExtResource("1_phplt")
+metallic_specular = 0.0
+texture_filter = 2

textures/Manual/Floor_Tiled_001.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dc3paqu5dp6yt"
+path="res://.godot/imported/Floor_Tiled_001.png-65e6ab4df7eb5386da29ecdc8eff0293.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://textures/Manual/Floor_Tiled_001.png"
+dest_files=["res://.godot/imported/Floor_Tiled_001.png-65e6ab4df7eb5386da29ecdc8eff0293.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

textures/Manual/Floor_Tiled_001.tres

@@ -0,0 +1,8 @@
+[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://dh13e7gnetf3m"]
+
+[ext_resource type="Texture2D" uid="uid://dc3paqu5dp6yt" path="res://textures/Manual/Floor_Tiled_001.png" id="1_aon1e"]
+
+[resource]
+albedo_texture = ExtResource("1_aon1e")
+metallic_specular = 0.0
+texture_filter = 2

textures/Manual/Floor_Tiled_002.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://beh8f2xibujte"
+path="res://.godot/imported/Floor_Tiled_002.png-7bdbdaa9433e9e6f68ec0513bfdaac47.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://textures/Manual/Floor_Tiled_002.png"
+dest_files=["res://.godot/imported/Floor_Tiled_002.png-7bdbdaa9433e9e6f68ec0513bfdaac47.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

textures/Manual/Floor_Tiled_002.tres

@@ -0,0 +1,8 @@
+[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://n73v24hfsvt8"]
+
+[ext_resource type="Texture2D" uid="uid://beh8f2xibujte" path="res://textures/Manual/Floor_Tiled_002.png" id="1_kieg1"]
+
+[resource]
+albedo_texture = ExtResource("1_kieg1")
+metallic_specular = 0.0
+texture_filter = 2