From 07675e07ff3463db30ffda3734741009df2f4369 Mon Sep 17 00:00:00 2001
From: jaschutte <34577095+jaschutte@users.noreply.github.com>
Date: Sun, 10 Apr 2022 12:03:33 +0200
Subject: [PATCH] made camera spawn at player position

---
 actors/camera_area/camera_area.gd   | 32 ++++++++++++++---------------
 scenes/tutorial_1/tutorial_1_4.tscn |  1 -
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/actors/camera_area/camera_area.gd b/actors/camera_area/camera_area.gd
index c0dac95e5..ac6db5677 100644
--- a/actors/camera_area/camera_area.gd
+++ b/actors/camera_area/camera_area.gd
@@ -11,25 +11,25 @@ onready var collision = $StaticBody2D/CollisionPolygon2D
 onready var body = $KinematicBody2D
 onready var body_collision: CollisionPolygon2D = $KinematicBody2D/CollisionPolygon2D
 
-export var spawn_position: Vector2 setget force_draw
+#export var spawn_position: Vector2 setget force_draw
 
 var window_prev_length: float
 var shrink_number = 0
 
-func force_draw(val):
-	spawn_position = val
-	update()
-
-func _draw():
-	if Engine.editor_hint:
-		draw_rect(Rect2(
-			spawn_position - Vector2(Singleton.DEFAULT_SIZE.x * 2, Singleton.DEFAULT_SIZE.y) / 2,
-			Vector2(Singleton.DEFAULT_SIZE.x * 2, Singleton.DEFAULT_SIZE.y)
-		), Color(1, 0, 1, 0.5))
-		draw_rect(Rect2(
-			spawn_position - Vector2(Singleton.DEFAULT_SIZE.x, Singleton.DEFAULT_SIZE.y) / 2,
-			Vector2(Singleton.DEFAULT_SIZE.x, Singleton.DEFAULT_SIZE.y)
-		), Color(0, 0, 1, 0.5))
+#func force_draw(val):
+#	spawn_position = val
+#	update()
+#
+#func _draw():
+#	if Engine.editor_hint:
+#		draw_rect(Rect2(
+#			spawn_position - Vector2(Singleton.DEFAULT_SIZE.x * 2, Singleton.DEFAULT_SIZE.y) / 2,
+#			Vector2(Singleton.DEFAULT_SIZE.x * 2, Singleton.DEFAULT_SIZE.y)
+#		), Color(1, 0, 1, 0.5))
+#		draw_rect(Rect2(
+#			spawn_position - Vector2(Singleton.DEFAULT_SIZE.x, Singleton.DEFAULT_SIZE.y) / 2,
+#			Vector2(Singleton.DEFAULT_SIZE.x, Singleton.DEFAULT_SIZE.y)
+#		), Color(0, 0, 1, 0.5))
 
 func get_rect(poly, margin = 0):
 	var min_v = Vector2.INF
@@ -138,7 +138,7 @@ func _ready():
 	set_hitbox_extends(OS.window_size)
 	shrink_number = 0
 	
-	body.position = spawn_position
+	body.position = player.position # spawn_position
 	#make it invisible
 	color = Color(0, 0, 0, 0)
 	
diff --git a/scenes/tutorial_1/tutorial_1_4.tscn b/scenes/tutorial_1/tutorial_1_4.tscn
index b1ab84815..cbac76b28 100644
--- a/scenes/tutorial_1/tutorial_1_4.tscn
+++ b/scenes/tutorial_1/tutorial_1_4.tscn
@@ -68,7 +68,6 @@ shader_param/color5 = Color( 0.713726, 0.278431, 0.156863, 1 )
 
 [node name="CameraArea" parent="." instance=ExtResource( 36 )]
 polygon = PoolVector2Array( -389, -160, -1008, -160, -1008, -848, 1168, -848, 1168, -400, 816, -400, 747.278, -319.208, 752, 288, -320, 288, -322, -92 )
-spawn_position = Vector2( 600, 0 )
 
 [node name="Player" parent="." instance=ExtResource( 18 )]
 position = Vector2( -81, 193 )