diff --git a/Assets/Meshes/House/HouseTest_Paia_1.fbx b/Assets/Meshes/House/HouseTest_Paia_1.fbx new file mode 100644 index 0000000..3d61e37 Binary files /dev/null and b/Assets/Meshes/House/HouseTest_Paia_1.fbx differ diff --git a/Assets/Meshes/House/HouseTest_Paia_1.fbx.import b/Assets/Meshes/House/HouseTest_Paia_1.fbx.import new file mode 100644 index 0000000..b3eb7b0 --- /dev/null +++ b/Assets/Meshes/House/HouseTest_Paia_1.fbx.import @@ -0,0 +1,44 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://ewguxhxuwva" +path="res://.godot/imported/HouseTest_Paia_1.fbx-2a5d6c85a3041d4218482d7f4844df90.scn" + +[deps] + +source_file="res://Assets/Meshes/House/HouseTest_Paia_1.fbx" +dest_files=["res://.godot/imported/HouseTest_Paia_1.fbx-2a5d6c85a3041d4218482d7f4844df90.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=true +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +fbx/importer=0 +fbx/allow_geometry_helper_nodes=false +fbx/embedded_image_handling=1 +fbx/naming_version=2 diff --git a/Assets/Textures/Texture_Train.png b/Assets/Textures/Texture_Train.png index 8b59a22..e36e134 100644 Binary files a/Assets/Textures/Texture_Train.png and b/Assets/Textures/Texture_Train.png differ diff --git a/Materials/House.tres b/Materials/House.tres index 14d925e..3f3f211 100644 --- a/Materials/House.tres +++ b/Materials/House.tres @@ -20,7 +20,7 @@ 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 = 3.0000001425 +shader_parameter/glint_intensity = 2.000000095 shader_parameter/glint_sharpness = 7.000000285 shader_parameter/emission_color = Color(0, 0, 0, 1) shader_parameter/emission_energy = 0.0 diff --git a/Scenes/Chunk_Scene/Chunk/Campagna/Chunk_C_L_2.tscn b/Scenes/Chunk_Scene/Chunk/Campagna/Chunk_C_L_2.tscn index 440fa70..dce278c 100644 --- a/Scenes/Chunk_Scene/Chunk/Campagna/Chunk_C_L_2.tscn +++ b/Scenes/Chunk_Scene/Chunk/Campagna/Chunk_C_L_2.tscn @@ -18,7 +18,7 @@ [ext_resource type="PackedScene" uid="uid://igbtt2ypx0ks" path="res://Scenes/Chunk_Scene/Prop/Staccionate.tscn" id="9_aqvmj"] [ext_resource type="Material" uid="uid://wkegx4a21x7u" path="res://Materials/Staccionata.tres" id="10_is3ra"] [ext_resource type="PackedScene" uid="uid://co3scydwgpvgc" path="res://Scenes/Chunk_Scene/Orto/test_orto_big.tscn" id="11_is3ra"] -[ext_resource type="PackedScene" uid="uid://mj15bepbgy02" path="res://Scenes/house_test_4.tscn" id="18_26pld"] +[ext_resource type="PackedScene" uid="uid://bw7bkveyj6c5r" path="res://Scenes/house_test_paia_1.tscn" id="20_e6du4"] [ext_resource type="PackedScene" uid="uid://4iye3qapad4y" path="res://Scenes/Test/Colonnina_Blockout.tscn" id="20_raxwl"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_e6du4"] @@ -459,12 +459,12 @@ material_override = SubResource("ShaderMaterial_gpw8b") cast_shadow = 0 multimesh = SubResource("MultiMesh_6bpc0") -[node name="HouseTest_4" parent="." index="35" unique_id=1727780766 instance=ExtResource("18_26pld")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.123956, 0, 5.567298) - -[node name="ArtTest3" parent="." index="36" unique_id=143340255 instance=ExtResource("20_raxwl")] +[node name="ArtTest3" parent="." index="35" unique_id=143340255 instance=ExtResource("20_raxwl")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.3400893, 0, 0.8650651) +[node name="HouseTest_Paia_1" parent="." index="36" unique_id=395840673 instance=ExtResource("20_e6du4")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 6.381235, 0, 5.6316314) + [editable path="Grass4"] [editable path="Grass2"] [editable path="Grass6"] diff --git a/Scenes/Gameplay.tscn b/Scenes/Gameplay.tscn index 9599c1f..519060b 100644 --- a/Scenes/Gameplay.tscn +++ b/Scenes/Gameplay.tscn @@ -782,9 +782,9 @@ script = ExtResource("1_cr3ar") color_mattina = Color(0.9342753, 0.77912414, 0.6057529, 1) color_pomeriggio = Color(0.9485261, 0.6254264, 0.38133258, 1) color_notte = Color(0.18353948, 0.18552834, 0.48496485, 1) -rotazione_sole_mattina = Vector3(-66, 85, 0) -rotazione_sole_pomeriggio = Vector3(-150, 8, 0) -rotazione_sole_notte = Vector3(-66, 85, 0) +rotazione_sole_mattina = Vector3(-50, -90, 0) +rotazione_sole_pomeriggio = Vector3(-120, -90, 0) +rotazione_sole_notte = Vector3(-130, -90, 0) esposizione_mattina = 0.8 esposizione_pomeriggio = 0.7 esposizione_notte = 0.7 diff --git a/Scenes/house_test_paia_1.tscn b/Scenes/house_test_paia_1.tscn new file mode 100644 index 0000000..cf7d45b --- /dev/null +++ b/Scenes/house_test_paia_1.tscn @@ -0,0 +1,72 @@ +[gd_scene format=3 uid="uid://bw7bkveyj6c5r"] + +[ext_resource type="PackedScene" uid="uid://ewguxhxuwva" path="res://Assets/Meshes/House/HouseTest_Paia_1.fbx" id="1_086pn"] +[ext_resource type="Shader" uid="uid://do0tct77dfhef" path="res://Shaders/snow.gdshader" id="2_0ypm1"] +[ext_resource type="Shader" uid="uid://c0dy1aqj1b4q3" path="res://Shaders/trunk_shader.gdshader" id="2_ceun5"] +[ext_resource type="Material" uid="uid://dbmyfi5t0yfy" path="res://Materials/House_Emissiv.tres" id="3_0ypm1"] +[ext_resource type="Texture2D" uid="uid://diocw7vrerh45" path="res://Assets/Textures/Texture_Train.png" id="3_axbqd"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_axbqd"] +render_priority = 0 +shader = ExtResource("2_0ypm1") +shader_parameter/snow_color = Color(0.95, 0.98, 1, 1) + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_iqk7h"] +render_priority = 0 +shader = ExtResource("2_ceun5") +shader_parameter/albedo_color = Color(1, 1, 1, 1) +shader_parameter/albedo_texture = ExtResource("3_axbqd") +shader_parameter/use_texture = true +shader_parameter/uv_scale = Vector2(1, 1) +shader_parameter/palette_shift_y = 0.0 +shader_parameter/gradient_start_y = 0.0 +shader_parameter/gradient_end_y = 10.0 +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 = 2.000000095 +shader_parameter/glint_sharpness = 7.000000285 +shader_parameter/emission_color = Color(0, 0, 0, 1) +shader_parameter/emission_energy = 0.0 + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_pe8jl"] +render_priority = 0 +shader = ExtResource("2_0ypm1") +shader_parameter/snow_color = Color(0.95, 0.98, 1, 1) + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_ph6yh"] +render_priority = 0 +shader = ExtResource("2_ceun5") +shader_parameter/albedo_color = Color(1, 1, 1, 1) +shader_parameter/albedo_texture = ExtResource("3_axbqd") +shader_parameter/use_texture = true +shader_parameter/uv_scale = Vector2(1, 1) +shader_parameter/palette_shift_y = 0.0 +shader_parameter/gradient_start_y = 0.0 +shader_parameter/gradient_end_y = 10.0 +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 = 2.000000095 +shader_parameter/glint_sharpness = 7.000000285 +shader_parameter/emission_color = Color(0, 0, 0, 1) +shader_parameter/emission_energy = 0.0 + +[node name="HouseTest_Paia_1" unique_id=1814542734 instance=ExtResource("1_086pn")] + +[node name="Cube_004" parent="." index="0" unique_id=271000650] +material_overlay = SubResource("ShaderMaterial_axbqd") +surface_material_override/0 = SubResource("ShaderMaterial_iqk7h") + +[node name="Cube_284" parent="." index="1" unique_id=1649613992] +material_overlay = SubResource("ShaderMaterial_pe8jl") +surface_material_override/0 = SubResource("ShaderMaterial_ph6yh") +surface_material_override/1 = ExtResource("3_0ypm1")