diff --git a/3D Input/ground.blend b/3D Input/ground.blend index cfd9d98..f5fcfc1 100644 Binary files a/3D Input/ground.blend and b/3D Input/ground.blend differ diff --git a/3D Input/ground.blend1 b/3D Input/ground.blend1 index c11ab83..e6bca6b 100644 Binary files a/3D Input/ground.blend1 and b/3D Input/ground.blend1 differ diff --git a/3D Input/ground.glb b/3D Input/ground.glb index 5ba1c4d..9a3d020 100644 Binary files a/3D Input/ground.glb and b/3D Input/ground.glb differ diff --git a/3D Input/textures_painter/gravestone1_Material_AlbedoTransparency.png.import b/3D Input/textures_painter/gravestone1_Material_AlbedoTransparency.png.import index d28a249..51d81ad 100644 --- a/3D Input/textures_painter/gravestone1_Material_AlbedoTransparency.png.import +++ b/3D Input/textures_painter/gravestone1_Material_AlbedoTransparency.png.import @@ -2,33 +2,35 @@ importer="texture" type="StreamTexture" -path="res://.import/gravestone1_Material_AlbedoTransparency.png-e7e47eb9e8b84be712d657ebda1db81f.stex" +path.s3tc="res://.import/gravestone1_Material_AlbedoTransparency.png-e7e47eb9e8b84be712d657ebda1db81f.s3tc.stex" +path.etc2="res://.import/gravestone1_Material_AlbedoTransparency.png-e7e47eb9e8b84be712d657ebda1db81f.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": [ "s3tc", "etc2" ], +"vram_texture": true } [deps] source_file="res://3D Input/textures_painter/gravestone1_Material_AlbedoTransparency.png" -dest_files=[ "res://.import/gravestone1_Material_AlbedoTransparency.png-e7e47eb9e8b84be712d657ebda1db81f.stex" ] +dest_files=[ "res://.import/gravestone1_Material_AlbedoTransparency.png-e7e47eb9e8b84be712d657ebda1db81f.s3tc.stex", "res://.import/gravestone1_Material_AlbedoTransparency.png-e7e47eb9e8b84be712d657ebda1db81f.etc2.stex" ] [params] -compress/mode=0 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 -flags/repeat=0 +flags/repeat=true flags/filter=true -flags/mipmaps=false +flags/mipmaps=true flags/anisotropic=false -flags/srgb=2 +flags/srgb=1 process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false stream=false size_limit=0 -detect_3d=true +detect_3d=false svg/scale=1.0 diff --git a/3D Input/textures_painter/gravestone1_Material_MetallicSmoothness.png.import b/3D Input/textures_painter/gravestone1_Material_MetallicSmoothness.png.import index 304a63d..92e6fa1 100644 --- a/3D Input/textures_painter/gravestone1_Material_MetallicSmoothness.png.import +++ b/3D Input/textures_painter/gravestone1_Material_MetallicSmoothness.png.import @@ -2,26 +2,28 @@ importer="texture" type="StreamTexture" -path="res://.import/gravestone1_Material_MetallicSmoothness.png-a3e4ac80d82747df2b7f6964c493d179.stex" +path.s3tc="res://.import/gravestone1_Material_MetallicSmoothness.png-a3e4ac80d82747df2b7f6964c493d179.s3tc.stex" +path.etc2="res://.import/gravestone1_Material_MetallicSmoothness.png-a3e4ac80d82747df2b7f6964c493d179.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": [ "s3tc", "etc2" ], +"vram_texture": true } [deps] source_file="res://3D Input/textures_painter/gravestone1_Material_MetallicSmoothness.png" -dest_files=[ "res://.import/gravestone1_Material_MetallicSmoothness.png-a3e4ac80d82747df2b7f6964c493d179.stex" ] +dest_files=[ "res://.import/gravestone1_Material_MetallicSmoothness.png-a3e4ac80d82747df2b7f6964c493d179.s3tc.stex", "res://.import/gravestone1_Material_MetallicSmoothness.png-a3e4ac80d82747df2b7f6964c493d179.etc2.stex" ] [params] -compress/mode=0 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 -flags/repeat=0 +flags/repeat=true flags/filter=true -flags/mipmaps=false +flags/mipmaps=true flags/anisotropic=false flags/srgb=2 process/fix_alpha_border=true @@ -30,5 +32,5 @@ process/HDR_as_SRGB=false process/invert_color=false stream=false size_limit=0 -detect_3d=true +detect_3d=false svg/scale=1.0 diff --git a/3D Input/textures_painter/gravestone1_Material_Normal.png.import b/3D Input/textures_painter/gravestone1_Material_Normal.png.import index ab925fb..9eaf8b0 100644 --- a/3D Input/textures_painter/gravestone1_Material_Normal.png.import +++ b/3D Input/textures_painter/gravestone1_Material_Normal.png.import @@ -2,26 +2,28 @@ importer="texture" type="StreamTexture" -path="res://.import/gravestone1_Material_Normal.png-1ae979772a6858364649499beb22014a.stex" +path.s3tc="res://.import/gravestone1_Material_Normal.png-1ae979772a6858364649499beb22014a.s3tc.stex" +path.etc2="res://.import/gravestone1_Material_Normal.png-1ae979772a6858364649499beb22014a.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": [ "s3tc", "etc2" ], +"vram_texture": true } [deps] source_file="res://3D Input/textures_painter/gravestone1_Material_Normal.png" -dest_files=[ "res://.import/gravestone1_Material_Normal.png-1ae979772a6858364649499beb22014a.stex" ] +dest_files=[ "res://.import/gravestone1_Material_Normal.png-1ae979772a6858364649499beb22014a.s3tc.stex", "res://.import/gravestone1_Material_Normal.png-1ae979772a6858364649499beb22014a.etc2.stex" ] [params] -compress/mode=0 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_mode=0 compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 +compress/normal_map=1 +flags/repeat=true flags/filter=true -flags/mipmaps=false +flags/mipmaps=true flags/anisotropic=false flags/srgb=2 process/fix_alpha_border=true @@ -30,5 +32,5 @@ process/HDR_as_SRGB=false process/invert_color=false stream=false size_limit=0 -detect_3d=true +detect_3d=false svg/scale=1.0 diff --git a/Ingame/Arena.tscn b/Ingame/Arena.tscn index 3837ad2..d5c7ad1 100644 --- a/Ingame/Arena.tscn +++ b/Ingame/Arena.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://Ingame/Level/Torch.tscn" type="PackedScene" id=1] [ext_resource path="res://Ingame/Level/Ground.tscn" type="PackedScene" id=2] [ext_resource path="res://default_env.tres" type="Environment" id=3] [ext_resource path="res://3D Input/Fertige GLBs/Kopf_Mensch.glb" type="PackedScene" id=4] [ext_resource path="res://Ingame/Level/Fence.tscn" type="PackedScene" id=5] +[ext_resource path="res://Ingame/Level/Gravestone.tscn" type="PackedScene" id=6] [sub_resource type="Curve3D" id=1] _data = { @@ -15,25 +16,25 @@ _data = { [node name="Arena" type="Spatial"] [node name="Torch" parent="." instance=ExtResource( 1 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 46.6609, 0, -46.1498 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 57.6609, 0, -63.1498 ) [node name="Torch3" parent="." instance=ExtResource( 1 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -40.7873, 0, -66.7423 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -29.7873, 0, -83.7423 ) [node name="Torch2" parent="." instance=ExtResource( 1 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -80.7649, 0, 4.33311 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -69.7649, 0, -12.6669 ) [node name="Torch4" parent="." instance=ExtResource( 1 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -55.8087, 0, 76.6803 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -44.8087, 0, 59.6803 ) [node name="Torch5" parent="." instance=ExtResource( 1 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 52.7943, 0, 76.6803 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 63.7943, 0, 59.6803 ) [node name="Torch6" parent="." instance=ExtResource( 1 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 27.8085, 0, 49.812 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 38.8085, 0, 32.812 ) [node name="Torch7" parent="." instance=ExtResource( 1 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -35.1849, 0, -15.9355 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -24.1849, 0, -32.9355 ) [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = ExtResource( 3 ) @@ -41,9 +42,10 @@ environment = ExtResource( 3 ) [node name="ground" parent="." instance=ExtResource( 2 )] [node name="Kopf_Mensch" parent="." instance=ExtResource( 4 )] -transform = Transform( 3.58646, 0.324361, 1.74129, -1.09151, 3.50169, 1.59586, -1.39495, -1.90603, 3.22817, -62.8568, 12.0891, -17.4997 ) +transform = Transform( 3.58646, 0.324361, 1.74129, -1.09151, 3.50169, 1.59586, -1.39495, -1.90603, 3.22817, -51.8568, 12.0891, -34.4997 ) [node name="Path" type="Path" parent="."] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 11, 0, -17 ) curve = SubResource( 1 ) [node name="PathFollow" type="PathFollow" parent="Path"] @@ -181,3 +183,51 @@ rotation_mode = 4 [node name="Fence" parent="Path/PathFollow17" instance=ExtResource( 5 )] transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 ) + +[node name="Gravestone" parent="." instance=ExtResource( 6 )] +transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -74.388, 0, -0.0179996 ) + +[node name="Gravestone2" parent="." instance=ExtResource( 6 )] +transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -69.2116, 0, 19.3005 ) + +[node name="Gravestone3" parent="." instance=ExtResource( 6 )] +transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -64.0352, 0, 38.619 ) + +[node name="Gravestone4" parent="." instance=ExtResource( 6 )] +transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -58.8589, 0, 57.9375 ) + +[node name="Gravestone8" parent="." instance=ExtResource( 6 )] +transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -104.332, 0, 8.00538 ) + +[node name="Gravestone7" parent="." instance=ExtResource( 6 )] +transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -99.1553, 0, 27.3239 ) + +[node name="Gravestone6" parent="." instance=ExtResource( 6 )] +transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -93.9789, 0, 46.6424 ) + +[node name="Gravestone5" parent="." instance=ExtResource( 6 )] +transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -88.8026, 0, 65.9609 ) + +[node name="Gravestone16" parent="." instance=ExtResource( 6 )] +transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, 46.2977, 0, -90.3632 ) + +[node name="Gravestone15" parent="." instance=ExtResource( 6 )] +transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, 26.2977, 0, -90.3632 ) + +[node name="Gravestone14" parent="." instance=ExtResource( 6 )] +transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, 6.2977, 0, -90.3631 ) + +[node name="Gravestone13" parent="." instance=ExtResource( 6 )] +transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, -13.7023, 0, -90.3632 ) + +[node name="Gravestone12" parent="." instance=ExtResource( 6 )] +transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, 46.2977, 0, -121.363 ) + +[node name="Gravestone11" parent="." instance=ExtResource( 6 )] +transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, 26.2977, 0, -121.363 ) + +[node name="Gravestone10" parent="." instance=ExtResource( 6 )] +transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, 6.29771, 0, -121.363 ) + +[node name="Gravestone9" parent="." instance=ExtResource( 6 )] +transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, -13.7022, 0, -121.363 ) diff --git a/Ingame/Level/Gravestone.tscn b/Ingame/Level/Gravestone.tscn new file mode 100644 index 0000000..22ed314 --- /dev/null +++ b/Ingame/Level/Gravestone.tscn @@ -0,0 +1,19 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://3D Input/textures_painter/gravestone1_Material_AlbedoTransparency.png" type="Texture" id=1] +[ext_resource path="res://3D Input/textures_painter/gravestone1_Material_Normal.png" type="Texture" id=2] +[ext_resource path="res://3D Input/textures_painter/gravestone1_Material_MetallicSmoothness.png" type="Texture" id=3] +[ext_resource path="res://3D Input/Fertige GLBs/gravestone1.glb" type="PackedScene" id=4] + +[sub_resource type="SpatialMaterial" id=1] +albedo_texture = ExtResource( 1 ) +metallic_texture = ExtResource( 3 ) +normal_enabled = true +normal_scale = 1.0 +normal_texture = ExtResource( 2 ) + +[node name="Gravestone" instance=ExtResource( 4 )] +transform = Transform( 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0 ) + +[node name="Cube" parent="." index="0"] +material/0 = SubResource( 1 )