diff --git a/Backround.gd b/Backround.gd deleted file mode 100644 index 32b6855..0000000 --- a/Backround.gd +++ /dev/null @@ -1,26 +0,0 @@ -extends Node - - -const pre_background_straight = preload("res://background_straight.tscn") -const pre_background_left = preload("res://Backround.gd") -const pre_background_right = preload("res://Backround.gd") - -var background_straight -var background_left -var background_right - -var level - - -func _ready(): - level = get_node("game") - background_straight = pre_background_straight.instance() - background_left = pre_background_left.instance() - background_right = pre_background_right.instance() - add_straight() - - - -func add_straight(): - var single_straight = background_straight.get_child("straight").dublicate() - level.add_child(single_straight) diff --git a/Nodes/Backgroundspawner.gd b/Nodes/Backgroundspawner.gd deleted file mode 100644 index 79ef0f9..0000000 --- a/Nodes/Backgroundspawner.gd +++ /dev/null @@ -1,17 +0,0 @@ -extends Node3D - -var background -# Called when the node enters the scene tree for the first time. -func _ready(): -<<<<<<< HEAD - var background = preload("res://background_straight.tscn").instantiate() -======= - background = preload("res://background_straight.tscn").instantiate() ->>>>>>> 5f02f31566a22964a395c71a583c58c36f414be1 - add_child(background) - print(background.get_position()) - - -# Called every frame. 'delta' is the elapsed time since the previous frame. -func _process(delta): - print(background.get_position()) diff --git a/Nodes/game.tscn b/Nodes/game.tscn index 6fe4506..f8a0e42 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=10 format=3 uid="uid://cp2itfdd21cg2"] +[gd_scene load_steps=9 format=3 uid="uid://n7w0ff7u25yc"] [ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_iox18"] [ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="2_61aog"] [ext_resource type="PackedScene" uid="uid://byo1m0n20yl45" path="res://Nodes/cannon.tscn" id="2_vrf6k"] [ext_resource type="Script" path="res://scripts/Train.gd" id="2_xl0he"] [ext_resource type="PackedScene" uid="uid://vwjd5od63jgh" path="res://Nodes/Player.tscn" id="4_1ipcp"] -[ext_resource type="PackedScene" uid="uid://cjcjlxjnw8h3c" path="res://backgroundspawner.tscn" id="6_eu07k"] [sub_resource type="BoxMesh" id="BoxMesh_ognqx"] size = Vector3(13, 1, 25) @@ -23,6 +22,7 @@ script = ExtResource("1_iox18") [node name="Camera3D" type="Camera3D" parent="."] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 20, 0) +current = true [node name="Player1" type="Node3D" parent="."] transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, -12, 0, 0) @@ -43,15 +43,12 @@ transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 0, 0, 0) [node name="Cannon2" parent="Player1" instance=ExtResource("2_vrf6k")] -[node name="Backgroundspawner" parent="Player1" instance=ExtResource("6_eu07k")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) - [node name="Player2" type="Node3D" parent="."] -transform = Transform3D(-0.0154456, -6.75145e-10, -0.999879, -5.21344e-12, 1, -6.75146e-10, 0.999879, -5.2134e-12, -0.0154456, 12, 0, 0) +transform = Transform3D(0.999998, 0, 0, 0, 1, 0, 0, 0, 0.999998, 12, 0, 0) script = ExtResource("2_xl0he") [node name="MeshInstance3D" type="MeshInstance3D" parent="Player2"] -transform = Transform3D(-0.0154456, -5.21524e-12, 0.999881, -6.75146e-10, 1, -5.21521e-12, -0.999881, -6.75146e-10, -0.0154456, 0, 0, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) mesh = SubResource("BoxMesh_ognqx") [node name="StaticBody3D" type="StaticBody3D" parent="Player2/MeshInstance3D"] @@ -63,9 +60,6 @@ shape = SubResource("ConcavePolygonShape3D_l76gd") [node name="CharacterBody3D" parent="Player2" instance=ExtResource("4_1ipcp")] transform = Transform3D(-0.0154457, -5.21527e-12, 0.999882, -6.75147e-10, 1, -5.21524e-12, -0.999882, -6.75146e-10, -0.0154457, 0, 0, 0) -[node name="Backgroundspawner" parent="Player2" instance=ExtResource("6_eu07k")] -transform = Transform3D(1, 0, -9.31323e-10, 0, 1, 5.90213e-18, 9.31323e-10, -2.23142e-17, 1, 0, 0, 0) - [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, 0, 0, 0) diff --git a/Nodes/gameTest.tscn b/Nodes/gameTest.tscn new file mode 100644 index 0000000..d8bbe6f --- /dev/null +++ b/Nodes/gameTest.tscn @@ -0,0 +1,70 @@ +[gd_scene load_steps=10 format=3 uid="uid://c34te0t8st48p"] + +[ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_fcsyg"] +[ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="2_ocs5b"] +[ext_resource type="Script" path="res://scripts/Train.gd" id="3_7p0po"] +[ext_resource type="PackedScene" uid="uid://byo1m0n20yl45" path="res://Nodes/cannon.tscn" id="4_3aj1d"] +[ext_resource type="PackedScene" uid="uid://vwjd5od63jgh" path="res://Nodes/Player.tscn" id="5_efv53"] +[ext_resource type="PackedScene" uid="uid://cjcjlxjnw8h3c" path="res://backgroundspawner.tscn" id="6_lg36d"] + +[sub_resource type="BoxMesh" id="BoxMesh_ognqx"] +size = Vector3(13, 1, 25) + +[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_p3d4e"] +data = PackedVector3Array(-6.5, 0.5, 12.5, 6.5, 0.5, 12.5, -6.5, -0.5, 12.5, 6.5, 0.5, 12.5, 6.5, -0.5, 12.5, -6.5, -0.5, 12.5, 6.5, 0.5, -12.5, -6.5, 0.5, -12.5, 6.5, -0.5, -12.5, -6.5, 0.5, -12.5, -6.5, -0.5, -12.5, 6.5, -0.5, -12.5, 6.5, 0.5, 12.5, 6.5, 0.5, -12.5, 6.5, -0.5, 12.5, 6.5, 0.5, -12.5, 6.5, -0.5, -12.5, 6.5, -0.5, 12.5, -6.5, 0.5, -12.5, -6.5, 0.5, 12.5, -6.5, -0.5, -12.5, -6.5, 0.5, 12.5, -6.5, -0.5, 12.5, -6.5, -0.5, -12.5, 6.5, 0.5, 12.5, -6.5, 0.5, 12.5, 6.5, 0.5, -12.5, -6.5, 0.5, 12.5, -6.5, 0.5, -12.5, 6.5, 0.5, -12.5, -6.5, -0.5, 12.5, 6.5, -0.5, 12.5, -6.5, -0.5, -12.5, 6.5, -0.5, 12.5, 6.5, -0.5, -12.5, -6.5, -0.5, -12.5) + +[sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_l76gd"] +data = PackedVector3Array(-6.5, 0.5, 12.5, 6.5, 0.5, 12.5, -6.5, -0.5, 12.5, 6.5, 0.5, 12.5, 6.5, -0.5, 12.5, -6.5, -0.5, 12.5, 6.5, 0.5, -12.5, -6.5, 0.5, -12.5, 6.5, -0.5, -12.5, -6.5, 0.5, -12.5, -6.5, -0.5, -12.5, 6.5, -0.5, -12.5, 6.5, 0.5, 12.5, 6.5, 0.5, -12.5, 6.5, -0.5, 12.5, 6.5, 0.5, -12.5, 6.5, -0.5, -12.5, 6.5, -0.5, 12.5, -6.5, 0.5, -12.5, -6.5, 0.5, 12.5, -6.5, -0.5, -12.5, -6.5, 0.5, 12.5, -6.5, -0.5, 12.5, -6.5, -0.5, -12.5, 6.5, 0.5, 12.5, -6.5, 0.5, 12.5, 6.5, 0.5, -12.5, -6.5, 0.5, 12.5, -6.5, 0.5, -12.5, 6.5, 0.5, -12.5, -6.5, -0.5, 12.5, 6.5, -0.5, 12.5, -6.5, -0.5, -12.5, 6.5, -0.5, 12.5, 6.5, -0.5, -12.5, -6.5, -0.5, -12.5) + +[node name="Game" type="Node"] +script = ExtResource("1_fcsyg") + +[node name="StartNode" parent="." instance=ExtResource("2_ocs5b")] + +[node name="Camera3D" type="Camera3D" parent="."] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 20, 0) + +[node name="Player1" type="Node3D" parent="."] +transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, -8, 0, 8) +script = ExtResource("3_7p0po") + +[node name="Cannon" parent="Player1" instance=ExtResource("4_3aj1d")] + +[node name="MeshInstance3D2" type="MeshInstance3D" parent="Player1"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0, -8) +mesh = SubResource("BoxMesh_ognqx") + +[node name="StaticBody3D" type="StaticBody3D" parent="Player1/MeshInstance3D2"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Player1/MeshInstance3D2/StaticBody3D"] +shape = SubResource("ConcavePolygonShape3D_p3d4e") + +[node name="CharacterBody3D" parent="Player1" instance=ExtResource("5_efv53")] +transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, -1.18815, 1, -11.064) + +[node name="Cannon2" parent="Player1" instance=ExtResource("4_3aj1d")] + +[node name="Backgroundspawner" parent="Player1" instance=ExtResource("6_lg36d")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -43.4414) + +[node name="Player2" type="Node3D" parent="."] +transform = Transform3D(-0.0154456, -6.75145e-10, -0.999879, -5.21344e-12, 1, -6.75146e-10, 0.999879, -5.2134e-12, -0.0154456, -8, 0, -32) +script = ExtResource("3_7p0po") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Player2"] +transform = Transform3D(-0.0154456, -5.21524e-12, 0.999881, -6.75146e-10, 1, -5.21521e-12, -0.999881, -6.75146e-10, -0.0154456, 31.7182, -1.23195e-08, -18.4921) +mesh = SubResource("BoxMesh_ognqx") + +[node name="StaticBody3D" type="StaticBody3D" parent="Player2/MeshInstance3D"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Player2/MeshInstance3D/StaticBody3D"] +transform = Transform3D(1, 8.23952e-25, 0, -1.6479e-25, 1, 0, 0, -1.65436e-24, 1, 0, 0, 0) +shape = SubResource("ConcavePolygonShape3D_l76gd") + +[node name="CharacterBody3D" parent="Player2" instance=ExtResource("5_efv53")] +transform = Transform3D(-0.0154457, -5.21527e-12, 0.999882, -6.75147e-10, 1, -5.21524e-12, -0.999882, -6.75146e-10, -0.0154457, 31.3762, 1.5, -17.7157) + +[node name="Backgroundspawner" parent="Player2" instance=ExtResource("6_lg36d")] + +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, 0, 0, 0) diff --git a/background_straight.gd b/background_straight.gd deleted file mode 100644 index 9aa611b..0000000 --- a/background_straight.gd +++ /dev/null @@ -1,11 +0,0 @@ -extends Node3D - - -# Called when the node enters the scene tree for the first time. -func _ready(): - var tween = create_tween() - tween.tween_property(self,"position",Vector3(-8,0,40),5) - -# Called every frame. 'delta' is the elapsed time since the previous frame. -func _process(delta): - pass diff --git a/background_straight.tscn b/background_straight.tscn deleted file mode 100644 index 7cee316..0000000 --- a/background_straight.tscn +++ /dev/null @@ -1,18 +0,0 @@ -[gd_scene load_steps=5 format=3 uid="uid://r5ulnwvlrya6"] - -[ext_resource type="Texture2D" uid="uid://cy6x8d3xe8lux" path="res://icon.svg" id="1_52lw3"] -[ext_resource type="Script" path="res://background_straight.gd" id="1_obhgk"] - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_aoi7r"] -albedo_texture = ExtResource("1_52lw3") - -[sub_resource type="PlaneMesh" id="PlaneMesh_xipx2"] -material = SubResource("StandardMaterial3D_aoi7r") -size = Vector2(5, 5) - -[node name="Node3D" type="Node3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0) -script = ExtResource("1_obhgk") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="."] -mesh = SubResource("PlaneMesh_xipx2") diff --git a/backgroundspawner.tscn b/backgroundspawner.tscn deleted file mode 100644 index 7a7e1b0..0000000 --- a/backgroundspawner.tscn +++ /dev/null @@ -1,7 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://cjcjlxjnw8h3c"] - -[ext_resource type="Script" path="res://Nodes/Backgroundspawner.gd" id="1_01tg0"] - -[node name="Backgroundspawner" type="Node3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -24) -script = ExtResource("1_01tg0")