diff --git a/Assets/Textures/Sand/M_Sand.tres b/Assets/Textures/Sand/M_Sand.tres index 650d1c8..b072710 100644 --- a/Assets/Textures/Sand/M_Sand.tres +++ b/Assets/Textures/Sand/M_Sand.tres @@ -7,3 +7,4 @@ albedo_texture = ExtResource("1_vwott") normal_enabled = true normal_texture = ExtResource("2_clsr1") +uv1_scale = Vector3(5, 5, 5) diff --git a/Nodes/Train_P1.tscn b/Nodes/Train_P1.tscn index 6d0404f..487599c 100644 --- a/Nodes/Train_P1.tscn +++ b/Nodes/Train_P1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=41 format=3 uid="uid://md2ofbviios3"] +[gd_scene load_steps=45 format=3 uid="uid://md2ofbviios3"] [ext_resource type="Script" path="res://scripts/Train.gd" id="1_0x664"] [ext_resource type="PackedScene" uid="uid://bhivunrkj87cy" path="res://Nodes/engine.tscn" id="3_1ix85"] @@ -28,8 +28,10 @@ [ext_resource type="Texture2D" uid="uid://cpb1ashccd2ki" path="res://Assets/Textures/Opera_senza_titolo (4).png" id="19_crlxr"] [ext_resource type="PackedScene" uid="uid://dhev2lm3feo0q" path="res://Assets/Model/Objects/AmmoPile.glb" id="27_s7kr6"] [ext_resource type="PackedScene" uid="uid://c06gvrsynr7p7" path="res://Assets/Model/Objects/GunpowerBarrel.glb" id="27_vnaiu"] -[ext_resource type="PackedScene" uid="uid://rpsw0254tsue" path="res://Assets/Model/Modules/Coal.glb" id="28_4ee2i"] +[ext_resource type="PackedScene" uid="uid://cbvbqqwwnkut5" path="res://Assets/Model/Modules/Coal.glb" id="28_4ee2i"] [ext_resource type="PackedScene" uid="uid://dtur8jn3vpeuv" path="res://Assets/Model/Objects/Trashcan.glb" id="30_1bsq2"] +[ext_resource type="Shader" path="res://Nodes/game.gdshader" id="31_tn7tf"] +[ext_resource type="Texture2D" uid="uid://cy6x8d3xe8lux" path="res://icon.svg" id="32_yykqx"] [sub_resource type="SpriteFrames" id="SpriteFrames_6p0y6"] animations = [{ @@ -121,6 +123,17 @@ size = Vector3(1.83216, 2.38974, 1.62541) [sub_resource type="BoxShape3D" id="BoxShape3D_enmqk"] size = Vector3(1.6991, 2.76277, 1) +[sub_resource type="ShaderMaterial" id="ShaderMaterial_0sh6y"] +render_priority = 0 +shader = ExtResource("31_tn7tf") +shader_parameter/albedo = ExtResource("32_yykqx") +shader_parameter/direction_and_speed = Vector2(0, -1) +shader_parameter/flip = null +shader_parameter/scale = Vector2(3, 5) + +[sub_resource type="BoxMesh" id="BoxMesh_1njd7"] +material = SubResource("ShaderMaterial_0sh6y") + [node name="Train1" type="Node3D"] transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 0, 0, 0) script = ExtResource("1_0x664") @@ -241,3 +254,7 @@ shape = SubResource("BoxShape3D_cedqu") [node name="CollisionShape3D11" type="CollisionShape3D" parent="train/StaticBody3D2"] transform = Transform3D(0.712443, 0, -0.70173, 0, 1, 0, 0.70173, 0, 0.712443, 3.79233, 1.464, -10.9914) shape = SubResource("BoxShape3D_enmqk") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +transform = Transform3D(50, 0, 0, 0, 1, 0, 0, 0, 512, 0, -4.40884, 0) +mesh = SubResource("BoxMesh_1njd7") diff --git a/Nodes/Train_P2.tscn b/Nodes/Train_P2.tscn index cf6169e..89351fa 100644 --- a/Nodes/Train_P2.tscn +++ b/Nodes/Train_P2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=41 format=3 uid="uid://bikdn7ep2vpxw"] +[gd_scene load_steps=45 format=3 uid="uid://bikdn7ep2vpxw"] [ext_resource type="Script" path="res://scripts/Train.gd" id="1_mcmgl"] [ext_resource type="PackedScene" uid="uid://c1mymb38wqdg6" path="res://Nodes/train.tscn" id="2_xoa1a"] @@ -29,8 +29,10 @@ [ext_resource type="Texture2D" uid="uid://cpb1ashccd2ki" path="res://Assets/Textures/Opera_senza_titolo (4).png" id="25_a3u45"] [ext_resource type="PackedScene" uid="uid://c06gvrsynr7p7" path="res://Assets/Model/Objects/GunpowerBarrel.glb" id="26_x4cx5"] [ext_resource type="PackedScene" uid="uid://dhev2lm3feo0q" path="res://Assets/Model/Objects/AmmoPile.glb" id="27_xdgc0"] -[ext_resource type="PackedScene" uid="uid://rpsw0254tsue" path="res://Assets/Model/Modules/Coal.glb" id="28_11itx"] +[ext_resource type="PackedScene" uid="uid://cbvbqqwwnkut5" path="res://Assets/Model/Modules/Coal.glb" id="28_11itx"] [ext_resource type="PackedScene" uid="uid://dtur8jn3vpeuv" path="res://Assets/Model/Objects/Trashcan.glb" id="29_mo2mr"] +[ext_resource type="Shader" path="res://Nodes/game.gdshader" id="32_aqtbn"] +[ext_resource type="Texture2D" uid="uid://cy6x8d3xe8lux" path="res://icon.svg" id="33_mdav0"] [sub_resource type="SpriteFrames" id="SpriteFrames_ltjyh"] animations = [{ @@ -119,6 +121,17 @@ size = Vector3(2, 1, 2) [sub_resource type="BoxShape3D" id="BoxShape3D_euqoo"] size = Vector3(1.83216, 2.38974, 1.62541) +[sub_resource type="ShaderMaterial" id="ShaderMaterial_ocpcq"] +render_priority = 0 +shader = ExtResource("32_aqtbn") +shader_parameter/albedo = ExtResource("33_mdav0") +shader_parameter/direction_and_speed = Vector2(0, -1) +shader_parameter/flip = null +shader_parameter/scale = Vector2(3, 5) + +[sub_resource type="BoxMesh" id="BoxMesh_e1woo"] +material = SubResource("ShaderMaterial_ocpcq") + [node name="Train2" type="Node3D"] transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 0, 0, 0) script = ExtResource("1_mcmgl") @@ -235,3 +248,7 @@ shape = SubResource("BoxShape3D_tqsqw") [node name="CollisionShape3D10" type="CollisionShape3D" parent="train2/StaticBody3D2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.53467, 1.22896, 10.6981) shape = SubResource("BoxShape3D_euqoo") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +transform = Transform3D(50, 0, 0, 0, 1, 0, 0, 0, 512, 0, -40.4088, 0) +mesh = SubResource("BoxMesh_e1woo") diff --git a/Nodes/game.tscn b/Nodes/game.tscn index 58646a3..fcd4974 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -9,19 +9,19 @@ [ext_resource type="AudioStream" uid="uid://c5jhukuk8r3mf" path="res://Assets/Sounds/_MUSIC_/GameJamGameLoop.wav" id="7_wagg2"] [ext_resource type="AudioStream" uid="uid://n4ynf7hg2pcl" path="res://Assets/Sounds/_SOUNDFX_/GleiseLoop.wav" id="8_c6uwu"] [ext_resource type="AudioStream" uid="uid://dovvnflvxtqpi" path="res://Assets/Sounds/_SOUNDFX_/WindLoop.wav" id="9_q7v3t"] +[ext_resource type="Texture2D" uid="uid://c2ptxav0ud0kg" path="res://Assets/Textures/Sand/Sand_Diffuse.png" id="10_g8pl7"] [ext_resource type="Shader" path="res://Nodes/game.gdshader" id="10_ugxfo"] -[ext_resource type="Texture2D" uid="uid://cy6x8d3xe8lux" path="res://icon.svg" id="11_afstx"] -[sub_resource type="ShaderMaterial" id="ShaderMaterial_8kilj"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_nox6d"] render_priority = 0 shader = ExtResource("10_ugxfo") -shader_parameter/albedo = ExtResource("11_afstx") -shader_parameter/direction_and_speed = Vector2(0, 0) +shader_parameter/albedo = ExtResource("10_g8pl7") +shader_parameter/direction_and_speed = Vector2(0, -1) shader_parameter/flip = null -shader_parameter/scale = null +shader_parameter/scale = Vector2(5, 5) [sub_resource type="BoxMesh" id="BoxMesh_seoe7"] -material = SubResource("ShaderMaterial_8kilj") +material = SubResource("ShaderMaterial_nox6d") [node name="Game" type="Node"] script = ExtResource("1_dubwq") @@ -59,5 +59,5 @@ volume_db = -2.476 autoplay = true [node name="MeshInstance3D" type="MeshInstance3D" parent="."] -transform = Transform3D(79.3975, 0, 0, 0, 1, 0, 0, 0, 41.4052, 0, -1.65796, 0) +transform = Transform3D(512, 0, 0, 0, 1, 0, 0, 0, 512, 0, -40.4088, 0) mesh = SubResource("BoxMesh_seoe7") diff --git a/project.godot b/project.godot index 6e9e2ef..11cc347 100644 --- a/project.godot +++ b/project.godot @@ -29,7 +29,7 @@ _global_script_classes=[{ "language": &"GDScript", "path": "res://scripts/Logic/MapNode.gd" }, { -"base": "Node", +"base": "StaticBody3D", "class": &"Module", "language": &"GDScript", "path": "res://scripts/Modules/Module.gd"