Skip to content

Commit 0654673

Browse files
Remove camera dependecy and add camera references
1 parent 0b4aba7 commit 0654673

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

fps/fps_controller_3d.gd

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ class_name FPSController3D
7171
## [HeadMovement3D] reference, where the rotation of the camera sight is calculated
7272
@onready var head: HeadMovement3D = get_node(NodePath("Head"))
7373

74-
## Camera3D reference
75-
@onready var camera: Camera3D = get_node(NodePath("Head/Camera"))
74+
## First Person Camera3D reference
75+
@onready var first_person_camera_reference : Marker3D = get_node(NodePath("Head/FirstPersonCameraReference"))
76+
77+
## Third Person Camera3D reference
78+
@onready var third_person_camera_reference : Marker3D = get_node(NodePath("Head/ThirdPersonCameraReference"))
7679

7780
## HeadBob reference
7881
@onready var head_bob: HeadBob = get_node(NodePath("Head/Head Bob"))
7982

80-
## Stores normal fov from camera fov
81-
@onready var normal_fov: float = camera.fov
82-
8383

8484
## Configure mouse sensitivity, rotation limit angle and head bob
8585
## After call the base class setup [CharacterController3D].
@@ -112,8 +112,9 @@ func move(_delta: float, input_axis := Vector2.ZERO, input_jump := false, input_
112112
else:
113113
_direction_base_node = self
114114
super.move(_delta, input_axis, input_jump, input_crouch, input_sprint, input_swim_down, input_swim_up)
115-
if not is_fly_mode() and not swim_ability.is_floating() and not swim_ability.is_submerged():
116-
camera.set_fov(lerp(camera.fov, normal_fov, _delta * fov_change_speed))
115+
# TODO Make in exemple this
116+
# if not is_fly_mode() and not swim_ability.is_floating() and not swim_ability.is_submerged()
117+
# camera.set_fov(lerp(camera.fov, normal_fov, _delta * fov_change_speed))
117118
_check_head_bob(_delta, input_axis)
118119

119120

fps/fps_controller_3d.tscn

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@ angle_limit_for_rotation = 0.1
2525
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.64, 0)
2626
script = ExtResource("3_pqlf6")
2727

28-
[node name="Camera" type="Camera3D" parent="Head" index="0"]
29-
current = true
30-
31-
[node name="Head Bob" type="Node" parent="Head" index="1"]
28+
[node name="Head Bob" type="Node" parent="Head" index="0"]
3229
script = ExtResource("4_6ym6a")
33-
head_path = NodePath("../Camera")
30+
head_path = NodePath("../FirstPersonCameraReference")
3431
bob_curve = ExtResource("5_cv58a")
32+
33+
[node name="FirstPersonCameraReference" type="Marker3D" parent="Head" index="1"]
34+
35+
[node name="ThirdPersonCameraReference" type="Marker3D" parent="Head" index="2"]
36+
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 4)

0 commit comments

Comments
 (0)