Fix MathUtils.LerpVector2, add cameras.

This commit is contained in:
2023-09-25 18:32:36 +02:00
parent 34c65be667
commit 6b5678cdb8
12 changed files with 139 additions and 7 deletions

View File

@@ -0,0 +1,25 @@
using System.Numerics;
namespace DaggerFramework.SceneGraph;
public class Camera2d : Entity2d
{
public Vector2 Offset { get; set; }
public float Zoom { get; set; } = 1f;
public bool Current
{
get => _current; set
{
_current = value;
Layer?.UpdateCurrentCamera();
}
}
protected override void OnStart()
{
base.OnStart();
Offset = Renderer.WindowSize / 2;
}
private bool _current;
}

View File

@@ -1,4 +1,5 @@
using DaggerFramework.Audio;
using DaggerFramework.Rendering;
namespace DaggerFramework.SceneGraph
{
@@ -7,6 +8,7 @@ namespace DaggerFramework.SceneGraph
public EntityLayer Layer { get; set; }
public InputHandler Input => Layer.Scene.Input;
public AudioBackend Audio => Layer.Scene.Audio;
public Renderer Renderer => Layer.Scene.Renderer;
public int Id { get; set; }
public void Start() => OnStart();

View File

@@ -1,10 +1,13 @@
using DaggerFramework.Rendering;
using DaggerFramework.Utils;
namespace DaggerFramework.SceneGraph
{
public class EntityLayer : Layer
{
public List<Entity> Entities { get => _entities; }
public Camera2d CurrentCamera { get; set; }
public EntityLayer(List<Entity> entities)
{
_entities = entities;
@@ -15,11 +18,36 @@ namespace DaggerFramework.SceneGraph
_entities = new List<Entity>();
}
public void UpdateCurrentCamera()
{
if (_cameraEntities.Count == 1)
{
CurrentCamera = _cameraEntities[0];
return;
}
else
{
foreach (var camera in _cameraEntities)
{
if (camera.Current) CurrentCamera = camera;
}
}
}
public bool AddEntity(Entity entity)
{
entity.Id = Entities.Count;
entity.Layer = this;
if (entity is Camera2d camera2d)
{
_cameraEntities.Add(camera2d);
UpdateCurrentCamera();
}
Entities.Add(entity);
return true;
}
@@ -30,8 +58,9 @@ namespace DaggerFramework.SceneGraph
protected override void OnStart()
{
foreach (var entity in _entities)
for (int i = 0; i < _entities.Count; i++)
{
var entity = _entities[i];
entity.Layer = this;
entity.Start();
}
@@ -45,14 +74,38 @@ namespace DaggerFramework.SceneGraph
}
}
protected override void OnBeginDraw(Renderer renderer)
{
var hasCamera = CurrentCamera != null;
if (hasCamera)
{
renderer.BeginCamera2d(CurrentCamera.Offset, CurrentCamera.Position, 0f, CurrentCamera.Zoom);
}
}
protected override void OnEndDraw(Renderer renderer)
{
var hasCamera = CurrentCamera != null;
if (hasCamera)
{
renderer.EndCamera2d();
}
}
protected override void OnDraw(Renderer renderer)
{
foreach (IDrawable drawable in _entities)
// TODO: can be done more efficiently, needs rendering redesign.
foreach (var entity in _entities)
{
drawable.Draw(renderer);
if (entity is IDrawable drawable)
{
drawable.Draw(renderer);
}
}
}
private List<Entity> _entities;
private List<Camera2d> _cameraEntities = new();
}
}

View File

@@ -9,7 +9,9 @@ namespace DaggerFramework.SceneGraph
public InputHandler Input { get; set; }
public ResourceManager ResourceManager => Scene.ResourceManager;
public void BeginDraw(Renderer renderer) => OnBeginDraw(renderer);
public void Draw(Renderer renderer) => OnDraw(renderer);
public void EndDraw(Renderer renderer) => OnEndDraw(renderer);
public void Start() => OnStart();
public void Update(double dt) => OnUpdate(dt);
@@ -18,6 +20,8 @@ namespace DaggerFramework.SceneGraph
protected virtual void OnStart() { }
protected virtual void OnUpdate(double dt) { }
protected virtual void OnInput(InputHandler input) { }
protected abstract void OnBeginDraw(Renderer renderer);
protected abstract void OnDraw(Renderer renderer);
protected abstract void OnEndDraw(Renderer renderer);
}
}

View File

@@ -65,7 +65,9 @@ namespace DaggerFramework.SceneGraph
foreach (var layer in _layers.Values)
{
layer.BeginDraw(_renderer);
layer.Draw(_renderer);
layer.EndDraw(_renderer);
}
Renderer.EndFrame();
@@ -85,7 +87,5 @@ namespace DaggerFramework.SceneGraph
private AudioBackend _audioBackend;
private InputHandler _input;
private ResourceManager _resourceManager;
private bool _inputDirty;
}
}