From f36522f1a89f0578414adf07f75a342ca7208296 Mon Sep 17 00:00:00 2001 From: Tanner van Teeffelen Date: Thu, 1 Jan 2026 14:45:08 -0500 Subject: [PATCH] Moved player camera back into Player scene, added top_level property to allow it to follow properly. --- Scenes/main.tscn | 8 +------- Scenes/player.tscn | 8 +++++++- Scripts/player_camera.gd | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Scenes/main.tscn b/Scenes/main.tscn index aeb2f1e..407143b 100644 --- a/Scenes/main.tscn +++ b/Scenes/main.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=7 format=4 uid="uid://c741imf2la5yt"] +[gd_scene load_steps=6 format=4 uid="uid://c741imf2la5yt"] [ext_resource type="Script" uid="uid://b228yv3gle864" path="res://Scripts/Levels/main.gd" id="1_8gbba"] [ext_resource type="Texture2D" uid="uid://btqnhg54e1p66" path="res://Sprites/png/spritesheet.png" id="1_jjgbg"] [ext_resource type="PackedScene" uid="uid://syx6ov00a585" path="res://Scenes/player.tscn" id="2_bo1nx"] -[ext_resource type="Script" uid="uid://de1fdvk35epdt" path="res://Scripts/player_camera.gd" id="4_jjvhh"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_bo1nx"] texture = ExtResource("1_jjgbg") @@ -30,8 +29,3 @@ tile_set = SubResource("TileSet_8gbba") [node name="Player" parent="." instance=ExtResource("2_bo1nx")] position = Vector2(40, 328) - -[node name="Camera" type="Camera2D" parent="."] -position = Vector2(35, 329) -zoom = Vector2(2, 2) -script = ExtResource("4_jjvhh") diff --git a/Scenes/player.tscn b/Scenes/player.tscn index df1febd..58f8982 100644 --- a/Scenes/player.tscn +++ b/Scenes/player.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=5 format=3 uid="uid://syx6ov00a585"] +[gd_scene load_steps=6 format=3 uid="uid://syx6ov00a585"] [ext_resource type="Script" uid="uid://ohb2t6o7wr1u" path="res://Scripts/player.gd" id="1_cvnsp"] [ext_resource type="Texture2D" uid="uid://btqnhg54e1p66" path="res://Sprites/png/spritesheet.png" id="2_6t5aa"] [ext_resource type="Material" uid="uid://ck13qte606w1j" path="res://Materials/Particles/down_particles.tres" id="2_vgqql"] +[ext_resource type="Script" uid="uid://de1fdvk35epdt" path="res://Scripts/player_camera.gd" id="4_vgqql"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_jjgbg"] size = Vector2(16, 16) @@ -27,4 +28,9 @@ shape = SubResource("RectangleShape2D_jjgbg") [node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."] rect = Rect2(-8, -8, 16, 16) +[node name="Camera" type="Camera2D" parent="."] +top_level = true +zoom = Vector2(2.5, 2.5) +script = ExtResource("4_vgqql") + [connection signal="screen_exited" from="VisibleOnScreenNotifier2D" to="." method="_on_visible_on_screen_notifier_2d_screen_exited"] diff --git a/Scripts/player_camera.gd b/Scripts/player_camera.gd index 8c4369d..5fbc8c4 100644 --- a/Scripts/player_camera.gd +++ b/Scripts/player_camera.gd @@ -1,6 +1,6 @@ extends Camera2D -@onready var player : CharacterBody2D = $"../Player" +@onready var player : CharacterBody2D = $".." @export var camera_speed : float = 6.0