From 699c9c3158b21771be846425d8ea5415e4d99a97 Mon Sep 17 00:00:00 2001 From: Lennard Beers Date: Thu, 24 Nov 2022 00:26:00 +0100 Subject: [PATCH] fix(rendering): initialize virtual target --- .../Components/Map/MapComponent.cs | 2 -- .../Rendering/CameraMouseFollowComponent.cs | 15 +++++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/WorkingTitle/Assets/WorkingTitle.Unity/Components/Map/MapComponent.cs b/WorkingTitle/Assets/WorkingTitle.Unity/Components/Map/MapComponent.cs index 0be8382..4d210d1 100644 --- a/WorkingTitle/Assets/WorkingTitle.Unity/Components/Map/MapComponent.cs +++ b/WorkingTitle/Assets/WorkingTitle.Unity/Components/Map/MapComponent.cs @@ -73,9 +73,7 @@ void Start() } var centerPosition = new Vector2Int(MapAsset.ChunkSize / 2, MapAsset.ChunkSize / 2); - PlayerEntityComponent.SetPosition(centerPosition); - Camera.transform.position = centerPosition.ToWorld(); UpdateMap(true); UpdateBounds(); diff --git a/WorkingTitle/Assets/WorkingTitle.Unity/Components/Rendering/CameraMouseFollowComponent.cs b/WorkingTitle/Assets/WorkingTitle.Unity/Components/Rendering/CameraMouseFollowComponent.cs index 0bf74de..0557c12 100644 --- a/WorkingTitle/Assets/WorkingTitle.Unity/Components/Rendering/CameraMouseFollowComponent.cs +++ b/WorkingTitle/Assets/WorkingTitle.Unity/Components/Rendering/CameraMouseFollowComponent.cs @@ -5,6 +5,8 @@ using UnityEngine; using UnityEngine.InputSystem; using WorkingTitle.Unity.Assets; +using WorkingTitle.Unity.Components.Map; +using WorkingTitle.Unity.Extensions; namespace WorkingTitle.Unity.Components.Rendering { @@ -15,17 +17,22 @@ public class CameraMouseFollowComponent : SerializedMonoBehaviour GameObject VirtualTargetObject { get; set; } - UnityEngine.Camera Camera { get; set; } + Camera Camera { get; set; } CinemachineVirtualCamera VirtualCamera { get; set; } GameComponent GameComponent { get; set; } - + MapComponent MapComponent { get; set; } void Awake() { Camera = GetComponent(); - GameComponent = GetComponentInParent(); - + GameComponent = FindObjectOfType(); + MapComponent = FindObjectOfType(); + + var centerPosition = new Vector2Int(MapComponent.MapAsset.ChunkSize / 2, MapComponent.MapAsset.ChunkSize / 2); + transform.position = centerPosition.ToWorld(); + InitializeVirtualTarget(); + VirtualTargetObject.transform.position = centerPosition.ToWorld(); } void InitializeVirtualTarget()