From f43307ac675f3f7404c2c4f72ba4f15c47626753 Mon Sep 17 00:00:00 2001 From: PfandBoss <68470553+PfandBoss@users.noreply.github.com> Date: Sat, 10 Dec 2022 04:11:58 +0100 Subject: [PATCH] e --- Nodes/game.tscn | 45 ++++++++++++++++++++++++++++++++----------- scripts/Logic/Game.gd | 8 ++++---- 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/Nodes/game.tscn b/Nodes/game.tscn index 8bf6463..7c530eb 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -19,35 +19,58 @@ _data = { } point_count = 15 -[node name="Game" type="Node"] +[node name="Game" type="Node" node_paths=PackedStringArray("p1", "p2")] script = ExtResource("1_iox18") +p1 = NodePath("HBoxContainer/SubViewportContainer/SubViewport/Player1Path/PathFollow3D") +p2 = NodePath("HBoxContainer/SubViewportContainer2/SubViewport/Player2Path/PathFollow3D") -[node name="Camera3D" type="Camera3D" parent="."] -transform = Transform3D(1, 1.77636e-14, 7.76471e-22, 0, -4.37114e-08, 1, 1.77636e-14, -1, -4.37114e-08, 36.5305, 43.522, 0.295507) +[node name="HBoxContainer" type="HBoxContainer" parent="."] +offset_right = 40.0 +offset_bottom = 40.0 -[node name="Player1Path" type="Path3D" parent="."] +[node name="SubViewportContainer" type="SubViewportContainer" parent="HBoxContainer"] +layout_mode = 2 + +[node name="SubViewport" type="SubViewport" parent="HBoxContainer/SubViewportContainer"] +size = Vector2i(960, 1080) +render_target_update_mode = 4 + +[node name="Player1Path" type="Path3D" parent="HBoxContainer/SubViewportContainer/SubViewport"] curve = SubResource("Curve3D_42kdk") -[node name="PathFollow3D" type="PathFollow3D" parent="Player1Path"] +[node name="PathFollow3D" type="PathFollow3D" parent="HBoxContainer/SubViewportContainer/SubViewport/Player1Path"] transform = Transform3D(-4.37107e-08, 0, 0.999984, 0, 1, 0, -0.999984, 0, -4.37107e-08, 0, 0, -8) -[node name="root" type="Node3D" parent="Player1Path/PathFollow3D"] +[node name="root" type="Node3D" parent="HBoxContainer/SubViewportContainer/SubViewport/Player1Path/PathFollow3D"] -[node name="Zug1" type="MeshInstance3D" parent="Player1Path/PathFollow3D/root"] +[node name="Zug1" type="MeshInstance3D" parent="HBoxContainer/SubViewportContainer/SubViewport/Player1Path/PathFollow3D/root"] transform = Transform3D(1, 0, -7.10543e-15, 0, 1, 0, 7.10543e-15, 0, 1, 0, 0, 0) mesh = SubResource("BoxMesh_3vwcb") skeleton = NodePath("../..") -[node name="Player2Path" type="Path3D" parent="."] +[node name="Camera3D" type="Camera3D" parent="HBoxContainer/SubViewportContainer/SubViewport/Player1Path/PathFollow3D/root"] +transform = Transform3D(1.00002, 4.37121e-08, 4.37128e-08, -4.37121e-08, -4.37121e-08, 1, 4.37121e-08, -1.00002, -4.37128e-08, 0, 20, 0) + +[node name="SubViewportContainer2" type="SubViewportContainer" parent="HBoxContainer"] +layout_mode = 2 + +[node name="SubViewport" type="SubViewport" parent="HBoxContainer/SubViewportContainer2"] +size = Vector2i(960, 1080) +render_target_update_mode = 4 + +[node name="Player2Path" type="Path3D" parent="HBoxContainer/SubViewportContainer2/SubViewport"] curve = SubResource("Curve3D_ycdkn") -[node name="PathFollow3D" type="PathFollow3D" parent="Player2Path"] +[node name="PathFollow3D" type="PathFollow3D" parent="HBoxContainer/SubViewportContainer2/SubViewport/Player2Path"] transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, -16) -[node name="root" type="Node3D" parent="Player2Path/PathFollow3D"] +[node name="root" type="Node3D" parent="HBoxContainer/SubViewportContainer2/SubViewport/Player2Path/PathFollow3D"] transform = Transform3D(-0.0154456, -6.75146e-10, -0.999881, -5.21344e-12, 1, -6.75146e-10, 0.999881, -5.21341e-12, -0.0154456, 0, 0, 0) -[node name="Zug1" type="MeshInstance3D" parent="Player2Path/PathFollow3D/root"] +[node name="Zug1" type="MeshInstance3D" parent="HBoxContainer/SubViewportContainer2/SubViewport/Player2Path/PathFollow3D/root"] transform = Transform3D(1, 0, -7.10543e-15, 0, 1, 0, 7.10543e-15, 0, 1, 0, 0, 0) mesh = SubResource("BoxMesh_3vwcb") skeleton = NodePath("../..") + +[node name="Camera3D2" type="Camera3D" parent="HBoxContainer/SubViewportContainer2/SubViewport/Player2Path/PathFollow3D/root"] +transform = Transform3D(-0.0154455, -0.99988, -4.43872e-08, -4.43872e-08, -4.37069e-08, 1, -0.99988, 0.0154455, -4.37069e-08, 0, 20, 0) diff --git a/scripts/Logic/Game.gd b/scripts/Logic/Game.gd index c5fb60f..24c4ef4 100644 --- a/scripts/Logic/Game.gd +++ b/scripts/Logic/Game.gd @@ -6,8 +6,8 @@ signal shoot var t = 0.0 @onready var tween = create_tween() as Tween -@onready var p1 = $Player1Path/PathFollow3D -@onready var p2 = $Player2Path/PathFollow3D +@export var p1 : PathFollow3D +@export var p2 : PathFollow3D func _ready(): @@ -16,8 +16,8 @@ func _ready(): func start_tween(): tween.set_trans(Tween.TRANS_LINEAR) tween.set_parallel(true) - tween.tween_property(p1, "progress_ratio", 1, 5) - tween.tween_property(p2, "progress_ratio", -1, 5) + tween.tween_property(p1, "progress_ratio", 1, 20) + tween.tween_property(p2, "progress_ratio", -1, 20) func _process(delta): if round(p1.position.distance_to(p2.position)) == 9: