diff --git a/docs/zoos/zoo_countryside.tscn b/docs/zoos/zoo_countryside.tscn index 1549ea7..c53c7b8 100644 --- a/docs/zoos/zoo_countryside.tscn +++ b/docs/zoos/zoo_countryside.tscn @@ -192,7 +192,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14, 0, -31) [node name="chunk_country_tea_end_03" parent="tea" unique_id=1151749985 instance=ExtResource("37_v124u")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14, 0, -53) -[node name="chunk_country_straight_02" parent="tea" unique_id=633808392 instance=ExtResource("38_isiap")] +[node name="chunk_country_straight_02" parent="tea" unique_id=1254684922 instance=ExtResource("38_isiap")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9, 0, -9) [node name="chunk_country_straight_03" parent="tea" unique_id=97143720 instance=ExtResource("39_ebd04")] diff --git a/tgcc/chunk/material/decal/vending2_decal.png b/tgcc/chunk/material/decal/vending2_decal.png new file mode 100644 index 0000000..66faed4 Binary files /dev/null and b/tgcc/chunk/material/decal/vending2_decal.png differ diff --git a/tgcc/chunk/material/decal/vending2_decal.png.import b/tgcc/chunk/material/decal/vending2_decal.png.import new file mode 100644 index 0000000..f34aa57 --- /dev/null +++ b/tgcc/chunk/material/decal/vending2_decal.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ca8e3502yq276" +path.s3tc="res://.godot/imported/vending2_decal.png-20fcee0a16aba7cc8ad877f6f2e729a3.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://tgcc/chunk/material/decal/vending2_decal.png" +dest_files=["res://.godot/imported/vending2_decal.png-20fcee0a16aba7cc8ad877f6f2e729a3.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/tgcc/chunk/material/decal/vending2_decal_emissiv.png b/tgcc/chunk/material/decal/vending2_decal_emissiv.png new file mode 100644 index 0000000..6665704 Binary files /dev/null and b/tgcc/chunk/material/decal/vending2_decal_emissiv.png differ diff --git a/tgcc/chunk/material/decal/vending2_decal_emissiv.png.import b/tgcc/chunk/material/decal/vending2_decal_emissiv.png.import new file mode 100644 index 0000000..26af8ec --- /dev/null +++ b/tgcc/chunk/material/decal/vending2_decal_emissiv.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://pedvtcwmldux" +path.s3tc="res://.godot/imported/vending2_decal_emissiv.png-5d34b4a8193e10b275e5997fd2137ed5.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://tgcc/chunk/material/decal/vending2_decal_emissiv.png" +dest_files=["res://.godot/imported/vending2_decal_emissiv.png-5d34b4a8193e10b275e5997fd2137ed5.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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 diff --git a/tgcc/chunk/material/decal/vending_decal.png b/tgcc/chunk/material/decal/vending_decal.png new file mode 100644 index 0000000..8acb3b7 Binary files /dev/null and b/tgcc/chunk/material/decal/vending_decal.png differ diff --git a/tgcc/chunk/material/decal/vending_decal.png.import b/tgcc/chunk/material/decal/vending_decal.png.import new file mode 100644 index 0000000..00090ae --- /dev/null +++ b/tgcc/chunk/material/decal/vending_decal.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://j4m5wsf4magb" +path="res://.godot/imported/vending_decal.png-40a07165c8836c73547bf84a8f243938.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://tgcc/chunk/material/decal/vending_decal.png" +dest_files=["res://.godot/imported/vending_decal.png-40a07165c8836c73547bf84a8f243938.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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=1 diff --git a/tgcc/chunk/material/decal/vending_decal_emissiv.png b/tgcc/chunk/material/decal/vending_decal_emissiv.png new file mode 100644 index 0000000..8d1f407 Binary files /dev/null and b/tgcc/chunk/material/decal/vending_decal_emissiv.png differ diff --git a/tgcc/chunk/material/decal/vending_decal_emissiv.png.import b/tgcc/chunk/material/decal/vending_decal_emissiv.png.import new file mode 100644 index 0000000..5b76ada --- /dev/null +++ b/tgcc/chunk/material/decal/vending_decal_emissiv.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ekcd1ei5erku" +path="res://.godot/imported/vending_decal_emissiv.png-9aa400fc3b8142b556b6d1e986491322.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://tgcc/chunk/material/decal/vending_decal_emissiv.png" +dest_files=["res://.godot/imported/vending_decal_emissiv.png-9aa400fc3b8142b556b6d1e986491322.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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=1 diff --git a/tgcc/chunk/prop/housevendingmachine/House Vending machine 1.fbx b/tgcc/chunk/prop/housevendingmachine/House Vending machine 1.fbx index 4155b54..5eb794c 100644 Binary files a/tgcc/chunk/prop/housevendingmachine/House Vending machine 1.fbx and b/tgcc/chunk/prop/housevendingmachine/House Vending machine 1.fbx differ diff --git a/tgcc/chunk/prop/housevendingmachine/House Vending machine 2.fbx b/tgcc/chunk/prop/housevendingmachine/House Vending machine 2.fbx index 5c682c3..771c7a8 100644 Binary files a/tgcc/chunk/prop/housevendingmachine/House Vending machine 2.fbx and b/tgcc/chunk/prop/housevendingmachine/House Vending machine 2.fbx differ diff --git a/tgcc/chunk/prop/housevendingmachine/house_vending_machine_1.tscn b/tgcc/chunk/prop/housevendingmachine/house_vending_machine_1.tscn index 78b4810..5af34a4 100644 --- a/tgcc/chunk/prop/housevendingmachine/house_vending_machine_1.tscn +++ b/tgcc/chunk/prop/housevendingmachine/house_vending_machine_1.tscn @@ -4,6 +4,30 @@ [ext_resource type="Material" uid="uid://buxlrrpn7rdgs" path="res://tgcc/chunk/material/wood.tres" id="2_87dko"] [ext_resource type="Material" uid="uid://biaudrjlfoflm" path="res://tgcc/chunk/prop/house/house.tres" id="2_k6vwn"] [ext_resource type="Shader" uid="uid://d0ch5ofrgf7y6" path="res://core/daynight/trunk_shader.gdshader" id="3_87dko"] +[ext_resource type="Material" uid="uid://dbepc80w602ce" path="res://tgcc/chunk/material/wood_bridge.tres" id="3_upq5c"] +[ext_resource type="Texture2D" uid="uid://j4m5wsf4magb" path="res://tgcc/chunk/material/decal/vending_decal.png" id="6_upq5c"] +[ext_resource type="Texture2D" uid="uid://ekcd1ei5erku" path="res://tgcc/chunk/material/decal/vending_decal_emissiv.png" id="7_vp826"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_upq5c"] +render_priority = 0 +shader = ExtResource("3_87dko") +shader_parameter/albedo_color = Color(1, 1, 1, 1) +shader_parameter/use_texture = true +shader_parameter/uv_scale = Vector2(3, 3) +shader_parameter/palette_shift_y = 0.0 +shader_parameter/gradient_start_y = 0.0 +shader_parameter/gradient_end_y = 1.5 +shader_parameter/light_steps = 3.0 +shader_parameter/step_softness = 0.1 +shader_parameter/shadow_color = Color(0.4, 0.4, 0.6, 1) +shader_parameter/shadow_offset = 0.0 +shader_parameter/cast_shadow_strength = 0.6 +shader_parameter/use_ghibli_glint = true +shader_parameter/glint_color = Color(1, 0.95, 0.85, 1) +shader_parameter/glint_intensity = 1.0 +shader_parameter/glint_sharpness = 32.0 +shader_parameter/emission_color = Color(0.942064, 0.5795706, 0, 1) +shader_parameter/emission_energy = 6.000000285 [sub_resource type="ShaderMaterial" id="ShaderMaterial_hadrs"] render_priority = 0 @@ -28,23 +52,36 @@ shader_parameter/emission_energy = 0.0 [node name="House Vending machine 1" unique_id=1191036616 instance=ExtResource("1_3dveo")] -[node name="Cube_026" parent="." index="0" unique_id=1062570853] +[node name="CartelloUp_001" parent="." index="0" unique_id=966893858] +surface_material_override/0 = ExtResource("2_87dko") +surface_material_override/1 = ExtResource("3_upq5c") +surface_material_override/2 = SubResource("ShaderMaterial_upq5c") + +[node name="Cube_026" parent="." index="1" unique_id=731659689] surface_material_override/0 = ExtResource("2_k6vwn") -[node name="Cube_045" parent="." index="1" unique_id=1492461353] +[node name="Cube_045" parent="." index="2" unique_id=1240953209] surface_material_override/0 = ExtResource("2_87dko") -[node name="Cube_047" parent="." index="2" unique_id=1023990189] +[node name="Cube_047" parent="." index="3" unique_id=746181436] surface_material_override/0 = SubResource("ShaderMaterial_hadrs") -[node name="Roof_15|Plane_012|Dupli|" parent="Roof_15" parent_id_path=PackedInt32Array(1037352388) index="0" unique_id=1198268441] +[node name="Roof_15|Plane_012|Dupli|" parent="Roof_15" parent_id_path=PackedInt32Array(1207757879) index="0" unique_id=1497462477] surface_material_override/0 = ExtResource("2_k6vwn") -[node name="Roof_15|Plane_006|Dupli|1" parent="Roof_15" parent_id_path=PackedInt32Array(1037352388) index="1" unique_id=398125033] +[node name="Roof_15|Plane_006|Dupli|1" parent="Roof_15" parent_id_path=PackedInt32Array(1207757879) index="1" unique_id=438968499] surface_material_override/0 = ExtResource("2_k6vwn") -[node name="Roof_15_042|Plane_012|Dupli|" parent="Roof_15_042" parent_id_path=PackedInt32Array(183428294) index="0" unique_id=2105832896] +[node name="Roof_15_042|Plane_012|Dupli|" parent="Roof_15_042" parent_id_path=PackedInt32Array(736395472) index="0" unique_id=1074699023] surface_material_override/0 = ExtResource("2_k6vwn") -[node name="Roof_15_042|Plane_006|Dupli|1" parent="Roof_15_042" parent_id_path=PackedInt32Array(183428294) index="1" unique_id=51390649] +[node name="Roof_15_042|Plane_006|Dupli|1" parent="Roof_15_042" parent_id_path=PackedInt32Array(736395472) index="1" unique_id=1912641686] surface_material_override/0 = ExtResource("2_k6vwn") + +[node name="Decal6" type="Decal" parent="." index="6" unique_id=371017562] +transform = Transform3D(-6.228873e-08, 1.425, -6.228873e-08, 0, -6.228873e-08, -1.425, -1.425, -6.228873e-08, 2.7227266e-15, 1.1932706, 3.2275562, 0) +size = Vector3(0.8820801, 0.1255951, 0.8088379) +texture_albedo = ExtResource("6_upq5c") +texture_emission = ExtResource("7_vp826") +emission_energy = 5.0 +modulate = Color(0.9886375, 0.7964691, 0.64222336, 1) diff --git a/tgcc/chunk/prop/housevendingmachine/house_vending_machine_2.tscn b/tgcc/chunk/prop/housevendingmachine/house_vending_machine_2.tscn index d9ce838..de91a52 100644 --- a/tgcc/chunk/prop/housevendingmachine/house_vending_machine_2.tscn +++ b/tgcc/chunk/prop/housevendingmachine/house_vending_machine_2.tscn @@ -3,7 +3,31 @@ [ext_resource type="PackedScene" uid="uid://djk8mvn4flypv" path="res://tgcc/chunk/prop/housevendingmachine/House Vending machine 2.fbx" id="1_ppyp8"] [ext_resource type="Material" uid="uid://biaudrjlfoflm" path="res://tgcc/chunk/prop/house/house.tres" id="2_cu2ow"] [ext_resource type="Material" uid="uid://buxlrrpn7rdgs" path="res://tgcc/chunk/material/wood.tres" id="3_4ktqj"] +[ext_resource type="Material" uid="uid://dbepc80w602ce" path="res://tgcc/chunk/material/wood_bridge.tres" id="3_qgabi"] [ext_resource type="Shader" uid="uid://d0ch5ofrgf7y6" path="res://core/daynight/trunk_shader.gdshader" id="4_cu2ow"] +[ext_resource type="Texture2D" uid="uid://ca8e3502yq276" path="res://tgcc/chunk/material/decal/vending2_decal.png" id="6_6j8vu"] +[ext_resource type="Texture2D" uid="uid://pedvtcwmldux" path="res://tgcc/chunk/material/decal/vending2_decal_emissiv.png" id="7_tv0p5"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_6j8vu"] +render_priority = 0 +shader = ExtResource("4_cu2ow") +shader_parameter/albedo_color = Color(1, 1, 1, 1) +shader_parameter/use_texture = true +shader_parameter/uv_scale = Vector2(3, 3) +shader_parameter/palette_shift_y = 0.0 +shader_parameter/gradient_start_y = 0.0 +shader_parameter/gradient_end_y = 1.5 +shader_parameter/light_steps = 3.0 +shader_parameter/step_softness = 0.1 +shader_parameter/shadow_color = Color(0.4, 0.4, 0.6, 1) +shader_parameter/shadow_offset = 0.0 +shader_parameter/cast_shadow_strength = 0.6 +shader_parameter/use_ghibli_glint = true +shader_parameter/glint_color = Color(1, 0.95, 0.85, 1) +shader_parameter/glint_intensity = 1.0 +shader_parameter/glint_sharpness = 32.0 +shader_parameter/emission_color = Color(0.9411765, 0.5803922, 0, 1) +shader_parameter/emission_energy = 6.000000285 [sub_resource type="ShaderMaterial" id="ShaderMaterial_4ktqj"] render_priority = 0 @@ -28,35 +52,48 @@ shader_parameter/emission_energy = 0.0 [node name="House Vending machine 2" unique_id=270680581 instance=ExtResource("1_ppyp8")] -[node name="Cube_027" parent="." index="0" unique_id=1192022882] +[node name="CartelloUp_002" parent="." index="0" unique_id=254992501] +surface_material_override/0 = ExtResource("3_4ktqj") +surface_material_override/1 = ExtResource("3_qgabi") +surface_material_override/2 = SubResource("ShaderMaterial_6j8vu") + +[node name="Cube_027" parent="." index="1" unique_id=455155353] surface_material_override/0 = ExtResource("2_cu2ow") -[node name="Cube_028" parent="." index="1" unique_id=216796261] +[node name="Cube_028" parent="." index="2" unique_id=1503963668] surface_material_override/0 = ExtResource("3_4ktqj") -[node name="Cube_029" parent="." index="2" unique_id=277967543] +[node name="Cube_029" parent="." index="3" unique_id=1179133276] surface_material_override/0 = SubResource("ShaderMaterial_4ktqj") -[node name="Roof_15_051|Plane_012|Dupli|" parent="Roof_15_051" parent_id_path=PackedInt32Array(130715109) index="0" unique_id=803074030] +[node name="Roof_15_051|Plane_012|Dupli|" parent="Roof_15_051" parent_id_path=PackedInt32Array(7811287) index="0" unique_id=1474141949] surface_material_override/0 = ExtResource("2_cu2ow") -[node name="Roof_15_051|Plane_006|Dupli|1" parent="Roof_15_051" parent_id_path=PackedInt32Array(130715109) index="1" unique_id=2052820939] +[node name="Roof_15_051|Plane_006|Dupli|1" parent="Roof_15_051" parent_id_path=PackedInt32Array(7811287) index="1" unique_id=125118079] surface_material_override/0 = ExtResource("2_cu2ow") -[node name="Roof_15_052|Plane_012|Dupli|" parent="Roof_15_052" parent_id_path=PackedInt32Array(247121537) index="0" unique_id=1880623857] +[node name="Roof_15_052|Plane_012|Dupli|" parent="Roof_15_052" parent_id_path=PackedInt32Array(1623074285) index="0" unique_id=864962830] surface_material_override/0 = ExtResource("2_cu2ow") -[node name="Roof_15_052|Plane_006|Dupli|1" parent="Roof_15_052" parent_id_path=PackedInt32Array(247121537) index="1" unique_id=568041342] +[node name="Roof_15_052|Plane_006|Dupli|1" parent="Roof_15_052" parent_id_path=PackedInt32Array(1623074285) index="1" unique_id=323633861] surface_material_override/0 = ExtResource("2_cu2ow") -[node name="Roof_15_057|Plane_012|Dupli|" parent="Roof_15_057" parent_id_path=PackedInt32Array(1569569010) index="0" unique_id=1751734884] +[node name="Roof_15_057|Plane_012|Dupli|" parent="Roof_15_057" parent_id_path=PackedInt32Array(774685485) index="0" unique_id=978115649] surface_material_override/0 = ExtResource("2_cu2ow") -[node name="Roof_15_057|Plane_006|Dupli|1" parent="Roof_15_057" parent_id_path=PackedInt32Array(1569569010) index="1" unique_id=1013114712] +[node name="Roof_15_057|Plane_006|Dupli|1" parent="Roof_15_057" parent_id_path=PackedInt32Array(774685485) index="1" unique_id=1446282509] surface_material_override/0 = ExtResource("2_cu2ow") -[node name="Roof_15_058|Plane_012|Dupli|" parent="Roof_15_058" parent_id_path=PackedInt32Array(308472998) index="0" unique_id=349925281] +[node name="Roof_15_058|Plane_012|Dupli|" parent="Roof_15_058" parent_id_path=PackedInt32Array(286462507) index="0" unique_id=538610596] surface_material_override/0 = ExtResource("2_cu2ow") -[node name="Roof_15_058|Plane_006|Dupli|1" parent="Roof_15_058" parent_id_path=PackedInt32Array(308472998) index="1" unique_id=330917499] +[node name="Roof_15_058|Plane_006|Dupli|1" parent="Roof_15_058" parent_id_path=PackedInt32Array(286462507) index="1" unique_id=1802631743] surface_material_override/0 = ExtResource("2_cu2ow") + +[node name="Decal6" type="Decal" parent="." index="8" unique_id=516456326] +transform = Transform3D(-6.228873e-08, 1.425, -6.228873e-08, 0, -6.228873e-08, -1.425, -1.425, -6.228873e-08, 2.7227266e-15, 1.1932706, 3.2408519, -1.0286763) +size = Vector3(0.8820801, 0.1255951, 0.8088379) +texture_albedo = ExtResource("6_6j8vu") +texture_emission = ExtResource("7_tv0p5") +emission_energy = 5.0 +modulate = Color(0.9886375, 0.7964691, 0.64222336, 1) diff --git a/tgcc/chunk/prop/vending machine/vending_machine_2.tscn b/tgcc/chunk/prop/vending machine/vending_machine_2.tscn index a70b8fd..43599f9 100644 --- a/tgcc/chunk/prop/vending machine/vending_machine_2.tscn +++ b/tgcc/chunk/prop/vending machine/vending_machine_2.tscn @@ -288,7 +288,6 @@ light_indirect_energy = 0.0 light_volumetric_fog_energy = 0.0 light_specular = 0.0 light_bake_mode = 1 -shadow_enabled = true shadow_opacity = 0.96 omni_range = 10.0 omni_attenuation = 2.0 diff --git a/tgcc/train/mesh/train.fbx b/tgcc/train/mesh/train.fbx index 162d0c6..f863b21 100644 Binary files a/tgcc/train/mesh/train.fbx and b/tgcc/train/mesh/train.fbx differ diff --git a/tgcc/train/train.tscn b/tgcc/train/train.tscn index 7489e87..b0b9d4f 100644 --- a/tgcc/train/train.tscn +++ b/tgcc/train/train.tscn @@ -6,13 +6,14 @@ [ext_resource type="Material" uid="uid://7eq06nknuhuu" path="res://tgcc/chunk/material/glass_train.tres" id="3_sgpgi"] [ext_resource type="Material" uid="uid://cn20mp8ep3yxu" path="res://tgcc/chunk/material/wires.tres" id="4_gua5y"] [ext_resource type="Material" uid="uid://o31kp0jm07q3" path="res://tgcc/chunk/material/rocks.tres" id="5_pj7tp"] -[ext_resource type="Material" uid="uid://d4vsl672lwv7" path="res://tgcc/chunk/material/rocks2.tres" id="6_5hjh1"] +[ext_resource type="Material" uid="uid://xrxl0d5h6f6s" path="res://tgcc/chunk/material/sign.tres" id="7_ui0td"] [ext_resource type="Shader" uid="uid://d0ch5ofrgf7y6" path="res://core/daynight/trunk_shader.gdshader" id="8_d3e7a"] +[ext_resource type="Texture2D" uid="uid://j4m5wsf4magb" path="res://tgcc/chunk/material/decal/vending_decal.png" id="9_eke0t"] -[sub_resource type="ShaderMaterial" id="ShaderMaterial_fuy7x"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_sgpgi"] render_priority = 0 shader = ExtResource("8_d3e7a") -shader_parameter/albedo_color = Color(0.5128612, 0.093720816, 0.060247816, 1) +shader_parameter/albedo_color = Color(0.4489954, 0.33476463, 0.09283266, 1) shader_parameter/use_texture = true shader_parameter/uv_scale = Vector2(3, 3) shader_parameter/palette_shift_y = 0.0 @@ -27,43 +28,100 @@ shader_parameter/use_ghibli_glint = true shader_parameter/glint_color = Color(1, 0.95, 0.85, 1) shader_parameter/glint_intensity = 1.0 shader_parameter/glint_sharpness = 32.0 -shader_parameter/emission_color = Color(0.3875077, 0.16205889, 0.035861596, 1) -shader_parameter/emission_energy = 12.00000057 +shader_parameter/emission_color = Color(0.96134907, 0.69045985, 0.08067446, 1) +shader_parameter/emission_energy = 6.000000285 + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_eke0t"] +render_priority = 0 +shader = ExtResource("8_d3e7a") +shader_parameter/albedo_color = Color(0.24759284, 0.026148826, 0.01369581, 1) +shader_parameter/use_texture = true +shader_parameter/uv_scale = Vector2(3, 3) +shader_parameter/palette_shift_y = 0.0 +shader_parameter/gradient_start_y = 0.0 +shader_parameter/gradient_end_y = 1.5 +shader_parameter/light_steps = 3.0 +shader_parameter/step_softness = 0.1 +shader_parameter/shadow_color = Color(0.4, 0.4, 0.6, 1) +shader_parameter/shadow_offset = 0.0 +shader_parameter/cast_shadow_strength = 0.6 +shader_parameter/use_ghibli_glint = true +shader_parameter/glint_color = Color(1, 0.95, 0.85, 1) +shader_parameter/glint_intensity = 1.0 +shader_parameter/glint_sharpness = 32.0 +shader_parameter/emission_color = Color(0.5036617, 0, 0.09086562, 1) +shader_parameter/emission_energy = 6.000000285 [node name="Treno" unique_id=1182090923 instance=ExtResource("1_33mei")] -[node name="Finestrini" parent="." index="0" unique_id=1797001001] +[node name="Finestrini" parent="." index="0" unique_id=755457549] surface_material_override/0 = ExtResource("2_bks4l") surface_material_override/1 = ExtResource("3_sgpgi") surface_material_override/2 = ExtResource("4_gua5y") -[node name="Ruote" parent="." index="1" unique_id=226016697] +[node name="Ruote" parent="." index="1" unique_id=2102344646] surface_material_override/0 = ExtResource("5_pj7tp") surface_material_override/1 = ExtResource("4_gua5y") -[node name="Train" parent="." index="2" unique_id=1876679965] -surface_material_override/0 = ExtResource("6_5hjh1") -surface_material_override/1 = ExtResource("2_5yo4e") -surface_material_override/2 = ExtResource("2_bks4l") -surface_material_override/3 = ExtResource("4_gua5y") -surface_material_override/4 = SubResource("ShaderMaterial_fuy7x") +[node name="Train_003" parent="." index="2" unique_id=1756410889] +surface_material_override/0 = ExtResource("2_5yo4e") +surface_material_override/1 = SubResource("ShaderMaterial_sgpgi") +surface_material_override/2 = ExtResource("7_ui0td") +surface_material_override/3 = ExtResource("2_bks4l") +surface_material_override/4 = ExtResource("4_gua5y") +surface_material_override/5 = SubResource("ShaderMaterial_eke0t") [node name="SpotLight3D2" type="SpotLight3D" parent="." index="3" unique_id=806665693] -transform = Transform3D(-0.9991066, -0.007184529, -0.041647732, -0.01454141, 0.9837157, 0.17914264, 0.03968247, 0.1795882, -0.9829412, -1.1868949, 2.2565823, 4.913539) +transform = Transform3D(-0.9991066, -0.0071845297, -0.041647736, -0.024456872, 0.9019672, 0.4311113, 0.034467563, 0.4317447, -0.9013371, -0.9830586, 3.6702201, 4.8446546) light_color = Color(0.8039216, 0.6784314, 0.3254902, 1) light_energy = 6.0 light_cull_mask = 4294967293 -spot_range = 18.0 +spot_range = 20.0 spot_attenuation = 1.2 spot_angle = 35.0 spot_angle_attenuation = 8.876516 -[node name="SpotLight3D3" type="SpotLight3D" parent="." index="4" unique_id=950261246] -transform = Transform3D(-0.9991066, -0.007184529, -0.041647732, -0.01454141, 0.9837157, 0.17914264, 0.03968247, 0.1795882, -0.9829412, 1.1990398, 2.2567835, 5.003469) -light_color = Color(0.8574047, 0.65361816, 0.27671134, 1) +[node name="SpotLight3D4" type="SpotLight3D" parent="." index="4" unique_id=965918399] +transform = Transform3D(-0.9991066, -0.0071845287, -0.041647736, -0.024456872, 0.9019672, 0.43111134, 0.034467563, 0.4317447, -0.9013371, 0.9932612, 3.6702201, 4.8446546) +light_color = Color(0.8039216, 0.6784314, 0.3254902, 1) light_energy = 6.0 light_cull_mask = 4294967293 -spot_range = 18.0 +spot_range = 20.0 spot_attenuation = 1.2 spot_angle = 35.0 spot_angle_attenuation = 8.876516 + +[node name="Decal6" type="Decal" parent="." index="5" unique_id=1240314694] +transform = Transform3D(-3.3876326e-08, 0.775, -3.3876326e-08, 0, -3.3876326e-08, -0.775, -0.775, -3.3876326e-08, 1.4807812e-15, 1.5548337, 1.1559404, 1.508283) +size = Vector3(0.8820801, 0.1255951, 0.8088379) +texture_albedo = ExtResource("9_eke0t") + +[node name="Decal9" type="Decal" parent="." index="6" unique_id=1597716646] +transform = Transform3D(-3.3876326e-08, 0.775, -3.3876326e-08, 0, -3.3876326e-08, -0.775, -0.775, -3.3876326e-08, 1.4807812e-15, 1.5548337, 1.2515475, -3.3485613) +size = Vector3(0.8820801, 0.1255951, 0.8088379) +texture_albedo = ExtResource("9_eke0t") + +[node name="Decal7" type="Decal" parent="." index="7" unique_id=1419606297] +transform = Transform3D(-3.3876326e-08, 0.775, -3.3876326e-08, 0, -3.3876326e-08, -0.775, -0.775, -3.3876326e-08, 1.4807812e-15, 1.5548337, 2.295291, 3.934526) +size = Vector3(0.8820801, 0.1255951, 0.8088379) +texture_albedo = ExtResource("9_eke0t") + +[node name="Decal10" type="Decal" parent="." index="8" unique_id=1014927174] +transform = Transform3D(-3.3876326e-08, 0.775, -3.3876326e-08, 0, -3.3876326e-08, -0.775, -0.775, -3.3876326e-08, 1.4807812e-15, -1.436986, 1.1559404, 1.508283) +size = Vector3(0.8820801, 0.1255951, 0.8088379) +texture_albedo = ExtResource("9_eke0t") + +[node name="Decal11" type="Decal" parent="." index="9" unique_id=1016264157] +transform = Transform3D(-3.3876326e-08, 0.775, -3.3876326e-08, 0, -3.3876326e-08, -0.775, -0.775, -3.3876326e-08, 1.4807812e-15, -1.436986, 1.2515475, -3.3485613) +size = Vector3(0.8820801, 0.1255951, 0.8088379) +texture_albedo = ExtResource("9_eke0t") + +[node name="Decal12" type="Decal" parent="." index="10" unique_id=2116419363] +transform = Transform3D(-3.3876326e-08, 0.775, -3.3876326e-08, 0, -3.3876326e-08, -0.775, -0.775, -3.3876326e-08, 1.4807812e-15, -1.494286, 2.295291, 3.934526) +size = Vector3(0.8820801, 0.1255951, 0.8088379) +texture_albedo = ExtResource("9_eke0t") + +[node name="Decal8" type="Decal" parent="." index="11" unique_id=269641056] +transform = Transform3D(0.775, 0, 0, 0, -3.3876326e-08, -0.775, 0, 0.775, -3.3876326e-08, 0.00564456, 3.8285875, 4.8313127) +size = Vector3(0.8820801, 0.1255951, 0.8088379) +texture_albedo = ExtResource("9_eke0t") diff --git a/tgcc/train/wagon.tscn b/tgcc/train/wagon.tscn index 3a6d235..b5faecc 100644 --- a/tgcc/train/wagon.tscn +++ b/tgcc/train/wagon.tscn @@ -8,6 +8,7 @@ [ext_resource type="Material" uid="uid://d4vsl672lwv7" path="res://tgcc/chunk/material/rocks2.tres" id="6_6ck1e"] [ext_resource type="Material" uid="uid://bsote67noubj2" path="res://tgcc/train/Color1_train.tres" id="7_wglgp"] [ext_resource type="Shader" uid="uid://d0ch5ofrgf7y6" path="res://core/daynight/trunk_shader.gdshader" id="8_1l8o6"] +[ext_resource type="Texture2D" uid="uid://j4m5wsf4magb" path="res://tgcc/chunk/material/decal/vending_decal.png" id="9_t2dm3"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_t2dm3"] render_priority = 0 @@ -50,3 +51,23 @@ surface_material_override/4 = SubResource("ShaderMaterial_t2dm3") [node name="Train_002" parent="." index="3" unique_id=1114714449] surface_material_override/0 = ExtResource("6_6ck1e") + +[node name="Decal6" type="Decal" parent="." index="4" unique_id=207551392] +transform = Transform3D(-3.3876326e-08, 0.775, -3.3876326e-08, 0, -3.3876326e-08, -0.775, -0.775, -3.3876326e-08, 1.4807812e-15, 1.5078804, 1.2809073, 1.508283) +size = Vector3(0.8820801, 0.1255951, 0.8088379) +texture_albedo = ExtResource("9_t2dm3") + +[node name="Decal9" type="Decal" parent="." index="5" unique_id=95484437] +transform = Transform3D(-3.3876326e-08, 0.775, -3.3876326e-08, 0, -3.3876326e-08, -0.775, -0.775, -3.3876326e-08, 1.4807812e-15, 1.5078804, 1.3765143, -3.3485613) +size = Vector3(0.8820801, 0.1255951, 0.8088379) +texture_albedo = ExtResource("9_t2dm3") + +[node name="Decal10" type="Decal" parent="." index="6" unique_id=1339169522] +transform = Transform3D(-3.3876326e-08, 0.775, -3.3876326e-08, 0, -3.3876326e-08, -0.775, -0.775, -3.3876326e-08, 1.4807812e-15, -1.5110519, 1.2418553, 1.508283) +size = Vector3(0.8820801, 0.1255951, 0.8088379) +texture_albedo = ExtResource("9_t2dm3") + +[node name="Decal11" type="Decal" parent="." index="7" unique_id=1737978700] +transform = Transform3D(-3.3876326e-08, 0.775, -3.3876326e-08, 0, -3.3876326e-08, -0.775, -0.775, -3.3876326e-08, 1.4807812e-15, -1.5110519, 1.3374623, -3.3485613) +size = Vector3(0.8820801, 0.1255951, 0.8088379) +texture_albedo = ExtResource("9_t2dm3")