From a8bdc15c718001569956dfd96c948bbf80153480 Mon Sep 17 00:00:00 2001
From: Ryan Reed <git@ryanreed.net>
Date: Sun, 3 Sep 2023 09:20:01 -0400
Subject: [PATCH] Cleanup and renaming of the camera script

---
 scenes/{camera_view.gd => camera.gd} | 19 +++++++------------
 scenes/conway.gd                     |  7 ++++---
 scenes/conway.tscn                   |  8 +++-----
 3 files changed, 14 insertions(+), 20 deletions(-)
 rename scenes/{camera_view.gd => camera.gd} (70%)

diff --git a/scenes/camera_view.gd b/scenes/camera.gd
similarity index 70%
rename from scenes/camera_view.gd
rename to scenes/camera.gd
index a919435..8951f4b 100644
--- a/scenes/camera_view.gd
+++ b/scenes/camera.gd
@@ -1,9 +1,8 @@
-extends Node2D
+extends Camera2D
 
-@export var zoom_increment: Vector2 = Vector2(0.1, 0.1)
-@export var move_speed: int = 250
 
-@onready var camera: Camera2D = $Camera2D
+@export var move_speed: int = 250
+@export var zoom_increment: Vector2 = Vector2(0.1, 0.1)
 
 
 func _process(delta: float) -> void:
@@ -14,13 +13,9 @@ func _process(delta: float) -> void:
 	position += Vector2(velocity_x, velocity_y)
 
 func _unhandled_input(event: InputEvent) -> void:
+	if event.is_action_pressed("Reset Zoom"):
+		zoom = Vector2.ONE
 	if event.is_action_pressed("Zoom In"):
-		camera.zoom += zoom_increment
+		zoom += zoom_increment
 	if event.is_action_pressed("Zoom Out"):
-		camera.zoom -= zoom_increment
-	if event.is_action_pressed("Reset Zoom"):
-		camera.zoom = Vector2.ONE
-
-
-func update_position(pos: Vector2) -> void:
-	camera.position = pos
+		zoom -= zoom_increment
diff --git a/scenes/conway.gd b/scenes/conway.gd
index 07e42e7..525beea 100644
--- a/scenes/conway.gd
+++ b/scenes/conway.gd
@@ -29,7 +29,7 @@ enum CellStates {
 @onready var messages_label: Label = $UI/Messages/Label
 
 ## Other
-@onready var camera: Node2D = $CameraView
+@onready var camera: Camera2D = $Camera
 @onready var generation_timer: Timer = $GenerationTimer
 
 @export var world_seed: int ## The seed utilized for generation of the world
@@ -106,10 +106,11 @@ func start_conway() -> void:
 	debug_living_cells_counter.text = "Living Cells: %s" % total_living
 
 	# Center the camera on the world
-	camera.update_position(Vector2(
+	camera.position = Vector2(
 		world_size.x * cell_size.x / 2,
 		world_size.y * cell_size.y / 2
-	))
+	)
+	camera.zoom = Vector2.ONE
 
 	if not is_paused: generation_timer.start()
 
diff --git a/scenes/conway.tscn b/scenes/conway.tscn
index 888bea4..1847efa 100644
--- a/scenes/conway.tscn
+++ b/scenes/conway.tscn
@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" path="res://scenes/conway.gd" id="1_1gvb0"]
 [ext_resource type="Texture2D" uid="uid://c2vm5pfsamed4" path="res://assets/icon.svg" id="2_l6fa6"]
-[ext_resource type="Script" path="res://scenes/camera_view.gd" id="3_avkud"]
+[ext_resource type="Script" path="res://scenes/camera.gd" id="3_e0v0d"]
 [ext_resource type="Texture2D" uid="uid://b8gggrriib8n" path="res://assets/refresh.png" id="4_hmfh6"]
 
 [node name="World" type="Node2D"]
@@ -10,11 +10,9 @@ position = Vector2(-152, 0)
 script = ExtResource("1_1gvb0")
 cell_texture = ExtResource("2_l6fa6")
 
-[node name="CameraView" type="Node2D" parent="."]
-script = ExtResource("3_avkud")
-
-[node name="Camera2D" type="Camera2D" parent="CameraView"]
+[node name="Camera" type="Camera2D" parent="."]
 position = Vector2(464, 200)
+script = ExtResource("3_e0v0d")
 
 [node name="GenerationTimer" type="Timer" parent="."]
 wait_time = 0.05