Add new methods to input handler, add RectangleShape2d, modify test game.

This commit is contained in:
2023-09-25 17:31:33 +02:00
parent 0b018e081e
commit ddf62f1834
12 changed files with 318 additions and 77 deletions

View File

@@ -12,7 +12,7 @@ namespace DaggerFramework.SceneGraph
renderer.DrawCircle(_radius, _color);
}
private float _radius;
private Color _color;
private float _radius = 16;
private Color _color = Color.White;
}
}

View File

@@ -0,0 +1,14 @@
using System.Numerics;
using DaggerFramework.Rendering;
namespace DaggerFramework.SceneGraph;
public class RectangleShape2d : Drawable2d
{
public Vector2 Size { get; set; } = Vector2.One * 32;
public Color Color { get; set; } = Color.White;
public override void OnDraw(Renderer renderer)
{
renderer.DrawRectangle(Size, Color);
}
}

View File

@@ -5,17 +5,41 @@ namespace DaggerFramework.SceneGraph
{
public class Text2d : Drawable2d
{
public string Contents { get => _contents; set => _contents = value; }
public string Text { get => _text; set => _text = value; }
public int FontSize { get => _fontSize; set => _fontSize = value; }
public Color FontColor { get => _fontColor; set => _fontColor = value; }
public Font Font
{
get => _font; set
{
_isDirty = true;
_font = value;
}
}
public override void OnDraw(Renderer renderer)
{
renderer.DrawDebugText(_contents, _fontSize, _fontColor);
if (_isDirty)
{
_fontHandle = renderer.LoadFont(_font);
_isDirty = false;
}
if (_font == null)
{
renderer.DrawDebugText(_text, _fontSize, _fontColor);
}
else
{
renderer.DrawText(_fontHandle, _text, _fontSize, _fontColor);
}
}
private string _contents = string.Empty;
private string _text = string.Empty;
private int _fontSize = 16;
private Color _fontColor = Color.White;
private Font _font;
private int _fontHandle;
private bool _isDirty;
}
}

View File

@@ -1,3 +1,4 @@
using DaggerFramework.Resources;
using DaggerFramework.Rendering;
namespace DaggerFramework.SceneGraph
@@ -6,6 +7,7 @@ namespace DaggerFramework.SceneGraph
{
public Scene Scene { get; set; }
public InputHandler Input { get; set; }
public ResourceManager ResourceManager => Scene.ResourceManager;
public void Draw(Renderer renderer) => OnDraw(renderer);

View File

@@ -1,7 +1,7 @@
using System.Drawing;
using System.Numerics;
using DaggerFramework.Audio;
using DaggerFramework.Rendering;
using DaggerFramework.Resources;
namespace DaggerFramework.SceneGraph
@@ -11,14 +11,17 @@ namespace DaggerFramework.SceneGraph
public Renderer Renderer { get => _renderer; set => _renderer = value; }
public InputHandler Input { get => _input; set => _input = value; }
public AudioBackend Audio => _audioBackend;
public ResourceManager ResourceManager => _resourceManager;
public double DeltaTime => Renderer.GetFrameTime();
public Scene(Renderer renderer, InputHandler input, AudioBackend audioBackend)
public Scene(Renderer renderer, InputHandler input, AudioBackend audioBackend, ResourceManager resourceManager)
{
_renderer = renderer;
_input = input;
_audioBackend = audioBackend;
_resourceManager = resourceManager;
_layers = new Dictionary<string, Layer>();
}
@@ -43,6 +46,7 @@ namespace DaggerFramework.SceneGraph
{
layer.Value.Update(DeltaTime);
}
Draw();
}
@@ -58,10 +62,12 @@ namespace DaggerFramework.SceneGraph
{
Renderer.BeginFrame();
Renderer.ClearBackground(Color.Black);
foreach (var layer in _layers.Values)
{
layer.Draw(_renderer);
}
Renderer.EndFrame();
Audio.Update();
@@ -78,5 +84,8 @@ namespace DaggerFramework.SceneGraph
private Renderer _renderer;
private AudioBackend _audioBackend;
private InputHandler _input;
private ResourceManager _resourceManager;
private bool _inputDirty;
}
}