Moved camera vector stuff into CameraHandler

[frog-ninja.git] / player / player.tscn

diff --git a/player/player.tscn b/player/player.tscn
index 90a1d186761855160101274d14717b700a56c08f..7edfe65e65bd3e3e1c81749820f595e1b05b6bae 100644 (file)
--- a/player/player.tscn
+++ b/player/player.tscn
@@ -1,18 +1,10 @@
-[gd_scene load_steps=15 format=3 uid="uid://cchu1yltrhuk3"]
+[gd_scene load_steps=7 format=3 uid="uid://cchu1yltrhuk3"]

 
 

-[ext_resource type="PackedScene" uid="uid://dvkx3t15l7mfb" path="res://skin/prototype_skin.tscn" id="1_4flbx"]
+[ext_resource type="PackedScene" uid="uid://dvkx3t15l7mfb" path="res://skin/player/player_skin.tscn" id="1_4flbx"]

 [ext_resource type="Script" uid="uid://dcv34jq0jett0" path="res://player/player.gd" id="1_onrkg"]
 [ext_resource type="Script" uid="uid://bspr3vafk6wi2" path="res://player/input/InputHandler.gd" id="3_g1dw6"]
 [ext_resource type="Script" uid="uid://dcv34jq0jett0" path="res://player/player.gd" id="1_onrkg"]
 [ext_resource type="Script" uid="uid://bspr3vafk6wi2" path="res://player/input/InputHandler.gd" id="3_g1dw6"]

-[ext_resource type="Script" uid="uid://c5mn28v6ujngk" path="res://player/input/CameraHandler.gd" id="3_yw30f"]
-[ext_resource type="Script" uid="uid://bwox6frn7fmgt" path="res://player/model.gd" id="5_qjkh3"]
-[ext_resource type="Script" uid="uid://bv5k167ugxmso" path="res://player/moves/idle.gd" id="6_g6k8r"]
-[ext_resource type="Script" uid="uid://cqurhmxam2nl0" path="res://player/moves/walk.gd" id="7_rgyib"]
-[ext_resource type="Script" uid="uid://bdiks0m7vsn5w" path="res://player/moves/dash.gd" id="8_hg6s5"]
-[ext_resource type="Script" uid="uid://b0oj5iuvr8omo" path="res://player/moves/fall.gd" id="9_hg6s5"]
-[ext_resource type="Script" uid="uid://d28gnkyqsg3t" path="res://player/moves/slash.gd" id="10_8t03j"]
-[ext_resource type="Script" uid="uid://whl70vbdv7gu" path="res://player/fall_to_roll.gd" id="10_ebec5"]
-[ext_resource type="Script" uid="uid://c8c16gqh0fmwv" path="res://player/moves/shoot.gd" id="11_2ieo8"]
-[ext_resource type="Script" uid="uid://cgb5nb8cw7cmn" path="res://player/fall_to_landing.gd" id="11_yllr7"]
+[ext_resource type="Script" uid="uid://c5mn28v6ujngk" path="res://player/input/PlayerCameraHandler.gd" id="3_yw30f"]
+[ext_resource type="PackedScene" uid="uid://bhtypq3nj4tur" path="res://player/model.tscn" id="5_qjkh3"]

 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_sh265"]
 
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_sh265"]
 


@@ -21,63 +13,23 @@ collision_layer = 2
 collision_mask = 5
 script = ExtResource("1_onrkg")
 
 collision_mask = 5
 script = ExtResource("1_onrkg")
 

-[node name="hitbox" type="CollisionShape3D" parent="." groups=["hitbox"]]
+[node name="Collision" type="CollisionShape3D" parent="."]

 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
 shape = SubResource("CapsuleShape3D_sh265")
 
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
 shape = SubResource("CapsuleShape3D_sh265")
 

-[node name="skin" parent="." instance=ExtResource("1_4flbx")]
-unique_name_in_owner = true
-
-[node name="CameraHandler" type="Node3D" parent="."]
-unique_name_in_owner = true
-script = ExtResource("3_yw30f")
-
-[node name="spring" type="SpringArm3D" parent="CameraHandler"]
-unique_name_in_owner = true
-transform = Transform3D(-1, -2.99003e-08, 8.21505e-08, 0, 0.939693, 0.34202, -8.74228e-08, 0.34202, -0.939693, 0, 1.52762, 0)
-spring_length = 3.0
-
-[node name="camera" type="Camera3D" parent="CameraHandler/spring"]
-unique_name_in_owner = true
-

 [node name="Input" type="Node" parent="."]
 [node name="Input" type="Node" parent="."]

-unique_name_in_owner = true

 script = ExtResource("3_g1dw6")
 
 script = ExtResource("3_g1dw6")
 

-[node name="Model" type="Node" parent="."]
-unique_name_in_owner = true
-script = ExtResource("5_qjkh3")
-
-[node name="Idle" type="Node" parent="Model"]
-script = ExtResource("6_g6k8r")
+[node name="Model" parent="." instance=ExtResource("5_qjkh3")]

 
 

-[node name="Walk" type="Node" parent="Model"]
-script = ExtResource("7_rgyib")
+[node name="Visual" parent="." instance=ExtResource("1_4flbx")]

 
 

-[node name="Dash" type="Node" parent="Model"]
-script = ExtResource("8_hg6s5")
-
-[node name="Timer" type="Timer" parent="Model/Dash"]
-wait_time = 0.25
-
-[node name="Fall" type="Node" parent="Model"]
-script = ExtResource("9_hg6s5")
-metadata/_custom_type_script = "uid://c886t1c86q0m6"
-
-[node name="FallToRoll" type="Node" parent="Model"]
-script = ExtResource("10_ebec5")
-metadata/_custom_type_script = "uid://c886t1c86q0m6"
-
-[node name="FallToLanding" type="Node" parent="Model"]
-script = ExtResource("11_yllr7")
-metadata/_custom_type_script = "uid://c886t1c86q0m6"
-
-[node name="Slash" type="Node" parent="Model"]
-script = ExtResource("10_8t03j")
-metadata/_custom_type_script = "uid://c886t1c86q0m6"
+[node name="CameraHandler" type="Node3D" parent="."]
+script = ExtResource("3_yw30f")

 
 

-[node name="Shoot" type="Node" parent="Model"]
-script = ExtResource("11_2ieo8")
-metadata/_custom_type_script = "uid://c886t1c86q0m6"
+[node name="SpringArm3D" type="SpringArm3D" parent="CameraHandler"]
+transform = Transform3D(-1, -2.99003e-08, 8.21505e-08, 0, 0.939693, 0.34202, -8.74228e-08, 0.34202, -0.939693, 0, 1.52762, 0)
+spring_length = 3.0

 
 

-[connection signal="timeout" from="Model/Dash/Timer" to="Model/Dash" method="_on_timer_timeout"]
+[node name="Camera3D" type="Camera3D" parent="CameraHandler/SpringArm3D"]
+transform = Transform3D(1, 4.61853e-14, -9.23706e-14, 0, 1, -2.98023e-08, 0, 0, 1, 0, 0, 0)