From 54fcfe1866b3858bd78cf998af704a9033a9944a Mon Sep 17 00:00:00 2001 From: PfandBoss <68470553+PfandBoss@users.noreply.github.com> Date: Sun, 11 Dec 2022 02:58:09 +0100 Subject: [PATCH] added moving backround --- Nodes/Train_P1.tscn | 4 ++-- Nodes/Train_P2.tscn | 2 +- Nodes/game.gdshader | 13 +++++++++++++ Nodes/game.tscn | 23 +++++++++++++++++++++-- Storage.tscn | 1 + project.godot | 2 +- scripts/Logic/Game.gd | 2 +- 7 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 Nodes/game.gdshader diff --git a/Nodes/Train_P1.tscn b/Nodes/Train_P1.tscn index b6ec077..ad3df12 100644 --- a/Nodes/Train_P1.tscn +++ b/Nodes/Train_P1.tscn @@ -112,7 +112,7 @@ transform = Transform3D(-6.55671e-08, 0, 1.5, 0, 1.5, 0, -1.5, 0, -6.55671e-08, transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.70291, -0.287106, 10.1948) [node name="Storage3" parent="." instance=ExtResource("4_5jw5g")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4, 0, -11) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.63306, -0.159192, -10.7834) currentType = 1 icon = ExtResource("19_5df2b") audioClip = ExtResource("17_ajifv") @@ -122,7 +122,7 @@ transform = Transform3D(-6.55671e-08, 0, 1.5, 0, 1.5, 0, -1.5, 0, -6.55671e-08, [node name="StaticBody3D2" type="StaticBody3D" parent="train"] transform = Transform3D(-2.91409e-08, 0, -0.666667, 0, 0.666667, 0, 0.666667, 0, -2.91409e-08, 6, -0.137826, -1.33333) -collision_layer = 4 +collision_layer = 2 [node name="CollisionShape3D2" type="CollisionShape3D" parent="train/StaticBody3D2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.5, 2, 4.23516e-22) diff --git a/Nodes/Train_P2.tscn b/Nodes/Train_P2.tscn index 6680a49..5c5278d 100644 --- a/Nodes/Train_P2.tscn +++ b/Nodes/Train_P2.tscn @@ -86,7 +86,7 @@ transform = Transform3D(1.96701e-07, 0, -1.5, 0, 1.5, 0, 1.5, 0, 1.96701e-07, -3 [node name="StaticBody3D2" type="StaticBody3D" parent="train"] transform = Transform3D(-2.91409e-08, 0, -0.666667, 0, 0.666667, 0, 0.666667, 0, -2.91409e-08, 6, -0.137826, -1.33333) -collision_layer = 4 +collision_layer = 2 [node name="CollisionShape3D2" type="CollisionShape3D" parent="train/StaticBody3D2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.5, 2, 4.23516e-22) diff --git a/Nodes/game.gdshader b/Nodes/game.gdshader new file mode 100644 index 0000000..77f7fde --- /dev/null +++ b/Nodes/game.gdshader @@ -0,0 +1,13 @@ +shader_type spatial; +render_mode unshaded; + +uniform vec2 direction_and_speed = vec2(0.25, 0.00); +uniform vec2 scale = vec2(1.0); +uniform bool flip = false; +uniform sampler2D albedo; + +void fragment() { + vec2 uv = UV * scale - direction_and_speed * TIME; + if (flip) { uv = 1.0 - uv; } + ALBEDO = texture(albedo, uv).rgb; +} \ No newline at end of file diff --git a/Nodes/game.tscn b/Nodes/game.tscn index 16b0fe0..6f9d132 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=10 format=3 uid="uid://b8u4bo4mklj55"] +[gd_scene load_steps=14 format=3 uid="uid://b8u4bo4mklj55"] [ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_dubwq"] -[ext_resource type="PackedScene" uid="uid://nxapkgcq2c70" path="res://Nodes/light_setup.tscn" id="2_1lh4t"] +[ext_resource type="PackedScene" path="res://Nodes/light_setup.tscn" id="2_1lh4t"] [ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="3_xcgy2"] [ext_resource type="PackedScene" uid="uid://md2ofbviios3" path="res://Nodes/Train_P1.tscn" id="4_gg4ea"] [ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="5_wi6pu"] @@ -9,6 +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="Shader" path="res://Nodes/game.gdshader" id="10_s0qsw"] +[ext_resource type="Texture2D" uid="uid://cy6x8d3xe8lux" path="res://icon.svg" id="11_1bton"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_l0twu"] +render_priority = 0 +shader = ExtResource("10_s0qsw") +shader_parameter/albedo = ExtResource("11_1bton") +shader_parameter/direction_and_speed = null +shader_parameter/flip = null +shader_parameter/scale = null + +[sub_resource type="BoxMesh" id="BoxMesh_ygh83"] +material = SubResource("ShaderMaterial_l0twu") [node name="Game" type="Node"] script = ExtResource("1_dubwq") @@ -44,3 +57,9 @@ autoplay = true stream = ExtResource("9_q7v3t") volume_db = -2.476 autoplay = true + +[node name="Node3D" type="Node3D" parent="."] + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Node3D"] +transform = Transform3D(-3.93402e-06, 0, 90, 0, 1.168, 0, -90, 0, -3.93402e-06, 0, -1.88459, 0) +mesh = SubResource("BoxMesh_ygh83") diff --git a/Storage.tscn b/Storage.tscn index ade95e8..66a5103 100644 --- a/Storage.tscn +++ b/Storage.tscn @@ -33,6 +33,7 @@ shape = SubResource("CylinderShape3D_orr2n") [node name="Sprite3D2" type="Sprite3D" parent="."] transform = Transform3D(0.15, 0, 0, 0, -6.55671e-09, 0.15, 0, -0.15, -6.55671e-09, 0, 3.10039, 0) +visible = false texture = ExtResource("3_ojyse") [connection signal="body_entered" from="Area3D" to="." method="on_Player_enter"] diff --git a/project.godot b/project.godot index 54075ea..30b5e90 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" diff --git a/scripts/Logic/Game.gd b/scripts/Logic/Game.gd index 96c3f24..f0c5f5e 100644 --- a/scripts/Logic/Game.gd +++ b/scripts/Logic/Game.gd @@ -172,4 +172,4 @@ func fight(): emit_signal("shoot") tween.tween_callback(func(): fight_state = FOUGHT).set_delay(0.7) - #Hallo + #Halloa