From cef356a7b7921cd813970e28a03cc03435c06c96 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Sun, 11 Dec 2022 01:06:41 +0100 Subject: [PATCH] infinite scroll --- .../Model/Train/TrainFloorTile2x2.glb.import | 17 +++++++- .../Model/Train/TrainFloorTile4x4.glb.import | 14 +++++- Assets/Model/Train/TrainFrameTop.glb.import | 14 +++++- .../Train/TrainFrameTopBottom.glb.import | 14 +++++- .../Train/TrainFrameTopBottomLarge.glb.import | 17 +++++++- Assets/Model/Train/TrainPillar.glb.import | 14 +++++- Nodes/Train_P1.tscn | 43 ++++++++++++++++++- Nodes/game.tscn | 9 +++- Nodes/train.tscn | 11 ++--- 9 files changed, 134 insertions(+), 19 deletions(-) diff --git a/Assets/Model/Train/TrainFloorTile2x2.glb.import b/Assets/Model/Train/TrainFloorTile2x2.glb.import index a22f47a..9147f96 100644 --- a/Assets/Model/Train/TrainFloorTile2x2.glb.import +++ b/Assets/Model/Train/TrainFloorTile2x2.glb.import @@ -3,7 +3,7 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://6txyn6ijydsw" +uid="uid://cevww8u6jgj35" path="res://.godot/imported/TrainFloorTile2x2.glb-ba382e99664348325ae483528963462f.scn" [deps] @@ -27,4 +27,17 @@ animation/import=true animation/fps=30 animation/trimming=false import_script/path="" -_subresources={} +_subresources={ +"meshes": { +"TrainFloorTile2x2_Cube": { +"generate/lightmap_uv": 1, +"generate/lods": 0, +"generate/shadow_meshes": 0, +"lods/normal_merge_angle": 60.0, +"lods/normal_split_angle": 25.0, +"save_to_file/enabled": false, +"save_to_file/make_streamable": "", +"save_to_file/path": "" +} +} +} diff --git a/Assets/Model/Train/TrainFloorTile4x4.glb.import b/Assets/Model/Train/TrainFloorTile4x4.glb.import index 6955f7c..2988278 100644 --- a/Assets/Model/Train/TrainFloorTile4x4.glb.import +++ b/Assets/Model/Train/TrainFloorTile4x4.glb.import @@ -3,7 +3,7 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://by5dkvik2ti0a" +uid="uid://vpvpxwfpiao4" path="res://.godot/imported/TrainFloorTile4x4.glb-1f1fdbdfaf196e39d4764fe0b6ca351d.scn" [deps] @@ -33,5 +33,17 @@ _subresources={ "use_external/enabled": true, "use_external/path": "res://Assets/Textures/Wood/M_Wood.tres" } +}, +"meshes": { +"TrainFloorTile4x4_Plane001": { +"generate/lightmap_uv": 1, +"generate/lods": 0, +"generate/shadow_meshes": 0, +"lods/normal_merge_angle": 60.0, +"lods/normal_split_angle": 25.0, +"save_to_file/enabled": false, +"save_to_file/make_streamable": "", +"save_to_file/path": "" +} } } diff --git a/Assets/Model/Train/TrainFrameTop.glb.import b/Assets/Model/Train/TrainFrameTop.glb.import index 5c98ae2..f5019db 100644 --- a/Assets/Model/Train/TrainFrameTop.glb.import +++ b/Assets/Model/Train/TrainFrameTop.glb.import @@ -3,7 +3,7 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://db7atd4d3px2c" +uid="uid://50qugnp8dmhk" path="res://.godot/imported/TrainFrameTop.glb-85b93764254982d03cdc6280d6fa2df8.scn" [deps] @@ -33,5 +33,17 @@ _subresources={ "use_external/enabled": true, "use_external/path": "res://Assets/Textures/Wood/M_Wood.tres" } +}, +"meshes": { +"TrainFrameTop_Cube009": { +"generate/lightmap_uv": 1, +"generate/lods": 0, +"generate/shadow_meshes": 0, +"lods/normal_merge_angle": 60.0, +"lods/normal_split_angle": 25.0, +"save_to_file/enabled": false, +"save_to_file/make_streamable": "", +"save_to_file/path": "" +} } } diff --git a/Assets/Model/Train/TrainFrameTopBottom.glb.import b/Assets/Model/Train/TrainFrameTopBottom.glb.import index 7647891..f4693cd 100644 --- a/Assets/Model/Train/TrainFrameTopBottom.glb.import +++ b/Assets/Model/Train/TrainFrameTopBottom.glb.import @@ -3,7 +3,7 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://cugtbjho4lj44" +uid="uid://b7lntc0mh3g7q" path="res://.godot/imported/TrainFrameTopBottom.glb-248277fb627afa53cb8a0dcc98857754.scn" [deps] @@ -33,5 +33,17 @@ _subresources={ "use_external/enabled": true, "use_external/path": "res://Assets/Textures/CopperOxidated/M_Copper.tres" } +}, +"meshes": { +"TrainFrameTopBottom_Cube009": { +"generate/lightmap_uv": 1, +"generate/lods": 0, +"generate/shadow_meshes": 0, +"lods/normal_merge_angle": 60.0, +"lods/normal_split_angle": 25.0, +"save_to_file/enabled": false, +"save_to_file/make_streamable": "", +"save_to_file/path": "" +} } } diff --git a/Assets/Model/Train/TrainFrameTopBottomLarge.glb.import b/Assets/Model/Train/TrainFrameTopBottomLarge.glb.import index 176cf1b..ec9e5e4 100644 --- a/Assets/Model/Train/TrainFrameTopBottomLarge.glb.import +++ b/Assets/Model/Train/TrainFrameTopBottomLarge.glb.import @@ -3,7 +3,7 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://b6dmdhc2m5gb5" +uid="uid://csf8sx2sjoblu" path="res://.godot/imported/TrainFrameTopBottomLarge.glb-4e4e9f4a72532a8b1458e0183cb83453.scn" [deps] @@ -27,4 +27,17 @@ animation/import=true animation/fps=30 animation/trimming=false import_script/path="" -_subresources={} +_subresources={ +"meshes": { +"TrainFrameTopBottomLarge_Cube003": { +"generate/lightmap_uv": 1, +"generate/lods": 0, +"generate/shadow_meshes": 0, +"lods/normal_merge_angle": 60.0, +"lods/normal_split_angle": 25.0, +"save_to_file/enabled": false, +"save_to_file/make_streamable": "", +"save_to_file/path": "" +} +} +} diff --git a/Assets/Model/Train/TrainPillar.glb.import b/Assets/Model/Train/TrainPillar.glb.import index 6068943..04f4e66 100644 --- a/Assets/Model/Train/TrainPillar.glb.import +++ b/Assets/Model/Train/TrainPillar.glb.import @@ -3,7 +3,7 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://dlsypa31ymd0s" +uid="uid://b5ge5gx71a3ts" path="res://.godot/imported/TrainPillar.glb-632c3dc906cb68f02d7a7a4c5f8d50d2.scn" [deps] @@ -33,5 +33,17 @@ _subresources={ "use_external/enabled": true, "use_external/path": "res://Assets/Textures/CopperOxidated/M_Copper.tres" } +}, +"meshes": { +"TrainPillar_Cube011": { +"generate/lightmap_uv": 1, +"generate/lods": 0, +"generate/shadow_meshes": 0, +"lods/normal_merge_angle": 60.0, +"lods/normal_split_angle": 25.0, +"save_to_file/enabled": false, +"save_to_file/make_streamable": "", +"save_to_file/path": "" +} } } diff --git a/Nodes/Train_P1.tscn b/Nodes/Train_P1.tscn index 2544b3c..1c81cc4 100644 --- a/Nodes/Train_P1.tscn +++ b/Nodes/Train_P1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=23 format=3 uid="uid://md2ofbviios3"] +[gd_scene load_steps=27 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"] @@ -65,6 +65,18 @@ animations = [{ "speed": 2.0 }] +[sub_resource type="BoxShape3D" id="BoxShape3D_lji1n"] +size = Vector3(1, 3.77669, 24) + +[sub_resource type="BoxShape3D" id="BoxShape3D_hx6x8"] +size = Vector3(12, 1, 24) + +[sub_resource type="BoxShape3D" id="BoxShape3D_d230q"] +size = Vector3(12, 4, 1) + +[sub_resource type="BoxShape3D" id="BoxShape3D_04j56"] +size = Vector3(1, 6, 9.05915) + [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") @@ -128,4 +140,31 @@ icon = ExtResource("19_5df2b") audioClip = ExtResource("17_ajifv") [node name="train" parent="." instance=ExtResource("3_jmv6b")] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0) +transform = Transform3D(-6.55671e-08, 0, 1.5, 0, 1.5, 0, -1.5, 0, -6.55671e-08, 3, 0, 9) + +[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) + +[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) +shape = SubResource("BoxShape3D_lji1n") + +[node name="CollisionShape3D3" type="CollisionShape3D" parent="train/StaticBody3D2"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.5, 2, 3.55271e-15) +shape = SubResource("BoxShape3D_lji1n") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="train/StaticBody3D2"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, -3.55271e-15) +shape = SubResource("BoxShape3D_hx6x8") + +[node name="CollisionShape3D4" type="CollisionShape3D" parent="train/StaticBody3D2"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 2, -12) +shape = SubResource("BoxShape3D_d230q") + +[node name="CollisionShape3D5" type="CollisionShape3D" parent="train/StaticBody3D2"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 2, 12) +shape = SubResource("BoxShape3D_d230q") + +[node name="CollisionShape3D6" type="CollisionShape3D" parent="train/StaticBody3D2"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 3, -1.52864) +shape = SubResource("BoxShape3D_04j56") diff --git a/Nodes/game.tscn b/Nodes/game.tscn index e1cb460..02e9cb1 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=10 format=3 uid="uid://b8u4bo4mklj55"] +[gd_scene load_steps=11 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" 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://bw3yluhr72n2t" path="res://Nodes/InfiniteScroller.tscn" id="5_3jhcw"] [ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="5_wi6pu"] [ext_resource type="PackedScene" uid="uid://cys06pnxfjl2m" path="res://Nodes/UI.tscn" id="6_eicse"] [ext_resource type="AudioStream" uid="uid://c5jhukuk8r3mf" path="res://Assets/Sounds/_MUSIC_/GameJamGameLoop.wav" id="7_wagg2"] @@ -27,9 +28,15 @@ near = 0.041 [node name="Train1" parent="." instance=ExtResource("4_gg4ea")] transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, -10, 0, 0) +[node name="InfiniteScroller" parent="Train1" instance=ExtResource("5_3jhcw")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -5, -104) + [node name="Train2" parent="." instance=ExtResource("5_wi6pu")] transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 9.90113, -0.0549407, -0.085681) +[node name="InfiniteScroller" parent="Train2" instance=ExtResource("5_3jhcw")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -4, -99) + [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(0.875944, -0.294781, 0.381872, -0.106805, 0.65344, 0.749406, -0.470441, -0.697224, 0.540892, 0, 8.25958, 0) visible = false diff --git a/Nodes/train.tscn b/Nodes/train.tscn index d20b599..2f0eb2c 100644 --- a/Nodes/train.tscn +++ b/Nodes/train.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=16 format=3 uid="uid://c1mymb38wqdg6"] -[ext_resource type="PackedScene" uid="uid://by5dkvik2ti0a" path="res://Assets/Model/Train/TrainFloorTile4x4.glb" id="1_ruoy4"] +[ext_resource type="PackedScene" uid="uid://vpvpxwfpiao4" path="res://Assets/Model/Train/TrainFloorTile4x4.glb" id="1_ruoy4"] [ext_resource type="PackedScene" uid="uid://bbt38m8mno0d2" path="res://Assets/Model/Train/TrainWall.glb" id="2_ph0y0"] [ext_resource type="PackedScene" uid="uid://de8860yknve3i" path="res://Assets/Model/Train/TrainPillarFloorAdapter.glb" id="4_ub5ul"] [ext_resource type="PackedScene" uid="uid://dmraqtehsfo45" path="res://Assets/Model/Train/TrainWallArc.glb" id="5_lb36h"] -[ext_resource type="PackedScene" uid="uid://cugtbjho4lj44" path="res://Assets/Model/Train/TrainFrameTopBottom.glb" id="6_0bbr0"] -[ext_resource type="PackedScene" uid="uid://db7atd4d3px2c" path="res://Assets/Model/Train/TrainFrameTop.glb" id="7_2ua2q"] +[ext_resource type="PackedScene" uid="uid://b7lntc0mh3g7q" path="res://Assets/Model/Train/TrainFrameTopBottom.glb" id="6_0bbr0"] +[ext_resource type="PackedScene" uid="uid://50qugnp8dmhk" path="res://Assets/Model/Train/TrainFrameTop.glb" id="7_2ua2q"] [ext_resource type="PackedScene" uid="uid://gihk416gd7tx" path="res://Assets/Model/Train/TrainPillarArcExtention.glb" id="7_87n8g"] [ext_resource type="PackedScene" uid="uid://dfljj7kor8v2j" path="res://Assets/Model/Train/TrainPillarWood.glb" id="7_hd70v"] [ext_resource type="PackedScene" uid="uid://08f17h0im640" path="res://Assets/Model/Train/TrainWallInterior.glb" id="9_yvbc7"] @@ -314,7 +314,6 @@ light_energy = 3.0 light_indirect_energy = 0.0 light_volumetric_fog_energy = 0.0 light_size = 0.041 -shadow_enabled = true [node name="Lamp3" parent="Lights" instance=ExtResource("11_rhd60")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.98784, 1.73746, -5.81179) @@ -326,7 +325,6 @@ light_energy = 3.0 light_indirect_energy = 0.0 light_volumetric_fog_energy = 0.0 light_size = 0.041 -shadow_enabled = true [node name="Lamp4" parent="Lights" instance=ExtResource("11_rhd60")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.98783, 1.73746, -5.81179) @@ -338,7 +336,6 @@ light_energy = 3.0 light_indirect_energy = 0.0 light_volumetric_fog_energy = 0.0 light_size = 0.041 -shadow_enabled = true [node name="Lamp5" parent="Lights" instance=ExtResource("11_rhd60")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.98783, 1.73746, -5.81179) @@ -350,7 +347,6 @@ light_energy = 3.0 light_indirect_energy = 0.0 light_volumetric_fog_energy = 0.0 light_size = 0.041 -shadow_enabled = true [node name="Lamp2" parent="Lights" instance=ExtResource("11_rhd60")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.0164, 2.0195, -1.84234) @@ -362,4 +358,3 @@ light_energy = 3.0 light_indirect_energy = 0.0 light_volumetric_fog_energy = 0.0 light_size = 0.041 -shadow_enabled = true