Camera Fix

This commit is contained in:
Dustin 2025-04-18 21:14:59 -07:00
parent bde9492c63
commit 0ea4a45b06
4 changed files with 59 additions and 39 deletions

View File

@ -1,5 +1,7 @@
[gd_scene load_steps=6 format=2] [gd_scene load_steps=9 format=2]
[ext_resource path="res://src/classes/camera_guide.gd" type="Script" id=1]
[ext_resource path="res://src/Camera2D.gd" type="Script" id=2]
[ext_resource path="res://src/ui/scene_transition.tscn" type="PackedScene" id=4] [ext_resource path="res://src/ui/scene_transition.tscn" type="PackedScene" id=4]
[ext_resource path="res://src/Main.gd" type="Script" id=7] [ext_resource path="res://src/Main.gd" type="Script" id=7]
[ext_resource path="res://src/ui/lobby.tscn" type="PackedScene" id=9] [ext_resource path="res://src/ui/lobby.tscn" type="PackedScene" id=9]
@ -17,6 +19,9 @@ void vertex() {
shader = SubResource( 2 ) shader = SubResource( 2 )
shader_param/cam_offset = Vector2( 0, 0 ) shader_param/cam_offset = Vector2( 0, 0 )
[sub_resource type="RectangleShape2D" id=4]
extents = Vector2( 160, 90 )
[node name="Main" type="Node2D"] [node name="Main" type="Node2D"]
script = ExtResource( 7 ) script = ExtResource( 7 )
@ -37,3 +42,22 @@ render_target_update_mode = 3
[node name="Lobby" parent="ViewportContainer/Viewport" instance=ExtResource( 9 )] [node name="Lobby" parent="ViewportContainer/Viewport" instance=ExtResource( 9 )]
[node name="SceneTransition" parent="ViewportContainer/Viewport" instance=ExtResource( 4 )] [node name="SceneTransition" parent="ViewportContainer/Viewport" instance=ExtResource( 4 )]
[node name="Camera2D" type="Camera2D" parent="ViewportContainer/Viewport"]
unique_name_in_owner = true
position = Vector2( 160, 90 )
current = true
script = ExtResource( 2 )
tracking_node_path = NodePath("../CameraGuide")
[node name="CameraGuide" type="KinematicBody2D" parent="ViewportContainer/Viewport"]
unique_name_in_owner = true
position = Vector2( 160, 90 )
collision_layer = 0
collision_mask = 256
script = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="ViewportContainer/Viewport/CameraGuide"]
visible = false
shape = SubResource( 4 )
one_way_collision = true

View File

@ -32,6 +32,5 @@ collision_mask = 256
script = ExtResource( 1 ) script = ExtResource( 1 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="CameraGuide"] [node name="CollisionShape2D" type="CollisionShape2D" parent="CameraGuide"]
visible = false
shape = SubResource( 1 ) shape = SubResource( 1 )
one_way_collision = true one_way_collision = true

View File

@ -37,7 +37,6 @@
[sub_resource type="Resource" id=3] [sub_resource type="Resource" id=3]
resource_local_to_scene = true resource_local_to_scene = true
resource_name = "hurt"
script = ExtResource( 18 ) script = ExtResource( 18 )
debug_state = false debug_state = false
timeout_seconds = 2.0 timeout_seconds = 2.0
@ -50,7 +49,6 @@ jerk_factor = 0.0
animation_sequence = [ "hurt" ] animation_sequence = [ "hurt" ]
[sub_resource type="Resource" id=4] [sub_resource type="Resource" id=4]
resource_name = "move_0"
script = ExtResource( 24 ) script = ExtResource( 24 )
state_name = "move" state_name = "move"
frame_number = 0 frame_number = 0
@ -58,7 +56,6 @@ sound_effect_type = 0
sound = ExtResource( 25 ) sound = ExtResource( 25 )
[sub_resource type="Resource" id=5] [sub_resource type="Resource" id=5]
resource_name = "move_4"
script = ExtResource( 24 ) script = ExtResource( 24 )
state_name = "move" state_name = "move"
frame_number = 4 frame_number = 4
@ -66,7 +63,6 @@ sound_effect_type = 0
sound = ExtResource( 25 ) sound = ExtResource( 25 )
[sub_resource type="Resource" id=6] [sub_resource type="Resource" id=6]
resource_name = "land_0"
script = ExtResource( 24 ) script = ExtResource( 24 )
state_name = "land" state_name = "land"
frame_number = 0 frame_number = 0

View File

@ -29,6 +29,7 @@ func _physics_process(delta):
#pos = lerp(pos, PlayerInfo.player_position, delta ) #pos = lerp(pos, PlayerInfo.player_position, delta )
var dir_to = Vector2(0,0) var dir_to = Vector2(0,0)
if (PlayerInfo.get_player_data(0)):
var player_position = PlayerInfo.get_player_data(0).player_position var player_position = PlayerInfo.get_player_data(0).player_position
# Calculate how far the player is from object # Calculate how far the player is from object