From 155d210e3111290ad0ce0078d56bf3c30f2002ce Mon Sep 17 00:00:00 2001
From: MaddoScientisto <maddo.science@gmail.com>
Date: Fri, 15 Mar 2024 18:48:08 +0100
Subject: [PATCH] 2D Smoothing

---
 Scenes/game.gd     |  8 --------
 Scenes/player.tscn |  4 ++--
 Scenes/test.tscn   | 14 +++++++-------
 project.godot      |  2 +-
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/Scenes/game.gd b/Scenes/game.gd
index 8284c38f..29b7ad7d 100644
--- a/Scenes/game.gd
+++ b/Scenes/game.gd
@@ -1,12 +1,4 @@
 extends Node2D
 
-## Whether to use the debug player camera for testing. Otherwise, use the CameraController with non-pixel-perfect settings (hard-coded zoom).
-@export var use_debug_player_camera: bool = false
-
 func _ready() -> void:
 	var camera_controller: CameraController = get_tree().get_first_node_in_group("camera_controllers")
-	if use_debug_player_camera:
-		var debug_player_camera: Camera2D = get_tree().get_first_node_in_group("debug_player_camera")
-		camera_controller.enabled = false
-		debug_player_camera.zoom = Vector2(1, 1)
-		debug_player_camera.enabled = true
diff --git a/Scenes/player.tscn b/Scenes/player.tscn
index 1f390991..e6383be5 100644
--- a/Scenes/player.tscn
+++ b/Scenes/player.tscn
@@ -132,7 +132,7 @@ animations = [{
 "speed": 5.0
 }]
 
-[node name="Player" type="CharacterBody2D" node_paths=PackedStringArray("Muzzle")]
+[node name="Player" type="CharacterBody2D" node_paths=PackedStringArray("Muzzle") groups=["player"]]
 collision_layer = 2
 collision_mask = 3
 script = ExtResource("1_m27vu")
@@ -164,7 +164,7 @@ frame = 1
 [node name="CameraTarget" type="Node2D" parent="Smoothing2D"]
 script = ExtResource("5_cxvyt")
 
-[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="Smoothing2D"]
+[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="Smoothing2D" groups=["player_sprite"]]
 y_sort_enabled = true
 sprite_frames = SubResource("SpriteFrames_q0rt3")
 animation = &"walk_left"
diff --git a/Scenes/test.tscn b/Scenes/test.tscn
index 7cba4375..ed5108b1 100644
--- a/Scenes/test.tscn
+++ b/Scenes/test.tscn
@@ -6044,7 +6044,7 @@ physics_layer_0/collision_layer = 1
 physics_layer_0/collision_mask = 2
 sources/0 = SubResource("TileSetAtlasSource_kegq5")
 
-[node name="Node2D" type="Node2D"]
+[node name="GameScene" type="Node2D"]
 position = Vector2(38, 39)
 
 [node name="TileMap" type="TileMap" parent="."]
@@ -6065,6 +6065,12 @@ layer_0/y_sort_enabled = true
 layer_0/y_sort_origin = 16
 layer_0/tile_data = PackedInt32Array(-196610, 262144, 1, -131075, 262144, 1, -65539, 262144, 1, -4, 262144, 1, 65532, 262144, 1, -393217, 262144, 1, -524288, 262144, 1, -524286, 262144, 1, -458750, 262144, 1, -393213, 262144, 1, -327677, 262144, 1, -262140, 262144, 1, -196604, 262144, 1, 131068, 262144, 1, 196605, 262144, 1, 262141, 262144, 1, 458751, 262144, 1, 524287, 262144, 1, 524288, 262144, 1, 589824, 262144, 1, -65531, 262144, 1, -131067, 262144, 1, -589823, 262144, 1, -655359, 262144, 1, -589824, 262144, 1, -327681, 262144, 1, -262146, 262144, 1, 524289, 262144, 1, 458753, 262144, 1, 393218, 262144, 1, 327682, 262144, 1, 262147, 262144, 1, 196611, 262144, 1, 131076, 262144, 1, 65540, 262144, 1, 5, 262144, 1, -524287, 786432, 3, -458751, 786432, 3, -3, 983040, 18, -65538, 589824, 19, -131074, 0, 21)
 
+[node name="CameraController" type="Camera2D" parent="."]
+script = ExtResource("6_t8ide")
+
+[node name="Player" parent="." groups=["player"] instance=ExtResource("2_8mh54")]
+position = Vector2(12, 0)
+
 [node name="ReferenceRect" type="ReferenceRect" parent="."]
 visible = false
 offset_left = -38.0
@@ -6082,11 +6088,5 @@ polygon = PackedVector2Array(95, 57, 46, 58, -83, 61, -91, -37, 88, -37, 114, -1
 [node name="Fragola" parent="." instance=ExtResource("4_s7wq6")]
 position = Vector2(62, 10)
 
-[node name="Player" parent="." instance=ExtResource("2_8mh54")]
-position = Vector2(12, 0)
-
 [node name="CharacterBody2D" parent="." instance=ExtResource("3_8k37m")]
 position = Vector2(78, -15)
-
-[node name="CameraController" type="Camera2D" parent="."]
-script = ExtResource("6_t8ide")
diff --git a/project.godot b/project.godot
index 1246fba4..f9985c7f 100644
--- a/project.godot
+++ b/project.godot
@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="Cirno"
-run/main_scene="res://Scenes/test.tscn"
+run/main_scene="res://Scenes/game.tscn"
 config/features=PackedStringArray("4.2", "C#", "GL Compatibility")
 config/icon="res://icon.svg"