Moved camera vector stuff into CameraHandler

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

diff --git a/player/player.tscn b/player/player.tscn
index 4d86286d93133f4442f4a0383ce61c5e70b091a4..7edfe65e65bd3e3e1c81749820f595e1b05b6bae 100644 (file)
--- a/player/player.tscn
+++ b/player/player.tscn
@@ -1,9 +1,10 @@
-[gd_scene load_steps=6 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://dcv34jq0jett0" path="res://player/player.gd" id="1_onrkg"]

-[ext_resource type="Script" uid="uid://bspr3vafk6wi2" path="res://player/InputHandler.gd" id="3_g1dw6"]
-[ext_resource type="Script" uid="uid://c5mn28v6ujngk" path="res://player/CameraHandler.gd" id="3_yw30f"]
+[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/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"]
 


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

-[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+[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="Input" type="Node" parent="."]
+script = ExtResource("3_g1dw6")
+
+[node name="Model" parent="." instance=ExtResource("5_qjkh3")]
+
+[node name="Visual" parent="." instance=ExtResource("1_4flbx")]

 
 

-[node name="CameraPivot" type="Node3D" parent="."]
-unique_name_in_owner = true
+[node name="CameraHandler" type="Node3D" parent="."]

 script = ExtResource("3_yw30f")
 
 script = ExtResource("3_yw30f")
 

-[node name="spring" type="SpringArm3D" parent="CameraPivot"]
-unique_name_in_owner = true
+[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
 
 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="CameraPivot/spring"]
-unique_name_in_owner = true
-
-[node name="Input" type="Node" parent="."]
-unique_name_in_owner = true
-script = ExtResource("3_g1dw6")
+[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)