feat(render): Finish Renderer

Author: Alexis Huvier

Demos/SE_BasicGame/MyScene.cs

@@ -20,12 +20,18 @@ public MyScene()
         e1.AddComponent(new PhysicsComponent(fixedRotation: true, ignoreGravity: true)).AddRectangleCollision(new Vec2(50), restitution: 0f);
         e1.AddComponent(new ControlComponent(ControlType.FourDirection, speed: 300));
         AddEntity(e1);
-        
-        var e2 = new Entity();
-        e2.AddComponent(new TransformComponent(new Vec2(100, 300)));
-        e2.AddComponent(new RectComponent(Color.Red, new Vec2(50)));
-        e2.AddComponent(new PhysicsComponent(BodyType.Static, ignoreGravity: true, fixedRotation: true)).AddRectangleCollision(new Vec2(50), restitution: 0f);
-        AddEntity(e2);
+
+        for (var x = 0; x < 20; x++)
+        {
+            for (var y = 0; y < 20; y++)
+            {
+                var e2 = new Entity();
+                e2.AddComponent(new TransformComponent(new Vec2(240 + 120*x, 80 + 120*y)));
+                e2.AddComponent(new RectComponent(Color.Red, new Vec2(50)));
+                e2.AddComponent(new PhysicsComponent(BodyType.Static, ignoreGravity: true, fixedRotation: true)).AddRectangleCollision(new Vec2(50), restitution: 0f);
+                AddEntity(e2);
+            }
+        }
 
         AddWidget(new Selector(new Vec2(500), new List<string> { "Un", "Deux", "SUPPPPERRR TROIS !" }, "basic")).ValueChanged += 
             (_, args) => Console.WriteLine(args.OldValue + " => " + args.NewValue);
@@ -38,4 +44,19 @@ public MyScene()
         }, "idle", flipX: true));
         AddEntity(e3);
     }
+
+    public override void OpenScene()
+    {
+        base.OpenScene();
+        Window!.CameraManager.FollowEntity = Entities[0];
+    }
+
+    public override void Update(float delta)
+    {
+        base.Update(delta);
+
+        if (InputManager.IsKeyPressed(Key.A))
+            Window!.CameraManager.Mode =
+                Window!.CameraManager.Mode == CameraMode.Follow ? CameraMode.Basic : CameraMode.Follow;
+    }
 }

SharpEngine/Component/RectComponent.cs

@@ -1,6 +1,7 @@
 using System.Numerics;
 using Raylib_cs;
 using SharpEngine.Math;
+using SharpEngine.Renderer;
 using Color = SharpEngine.Utils.Color;
 
 namespace SharpEngine.Component;
@@ -29,6 +30,11 @@ public class RectComponent: Component
     /// Offset of Rectangle
     /// </summary>
     public Vec2 Offset { get; set; }
+    
+    /// <summary>
+    /// Offset of ZLayer of Rectangle
+    /// </summary>
+    public int ZLayerOffset { get; set; }
 
     private TransformComponent? _transform;
 
@@ -39,12 +45,14 @@ public class RectComponent: Component
     /// <param name="size">Rectangle Size</param>
     /// <param name="displayed">If displayed</param>
     /// <param name="offset">Rectangle Offset</param>
-    public RectComponent(Color color, Vec2 size, bool displayed = true, Vec2? offset = null)
+    /// <param name="zLayerOffset">Offset of zLayer</param>
+    public RectComponent(Color color, Vec2 size, bool displayed = true, Vec2? offset = null, int zLayerOffset = 0)
     {
         Color = color;
         Size = size;
         Displayed = displayed;
         Offset = offset ?? Vec2.Zero;
+        ZLayerOffset = zLayerOffset;
     }
 
     /// <inheritdoc />
@@ -64,7 +72,7 @@ public override void Draw()
         var size = Size * _transform.Scale;
         var position = _transform.GetTransformedPosition(Offset);
 
-        Raylib.DrawRectanglePro(new Rectangle(position.X, position.Y, size.X, size.Y), new Vector2(size.X / 2, size.Y / 2),
-            _transform.Rotation, Color);
+        DMRender.DrawRectangle(new Rect(position.X, position.Y, size.X, size.Y), size / 2, _transform.Rotation, Color,
+            InstructionSource.Entity, _transform.ZLayer + ZLayerOffset);
     }
 }

SharpEngine/Component/SpriteComponent.cs

@@ -1,6 +1,7 @@
 using System.Numerics;
 using Raylib_cs;
 using SharpEngine.Math;
+using SharpEngine.Renderer;
 using Color = SharpEngine.Utils.Color;
 
 namespace SharpEngine.Component;
@@ -34,6 +35,11 @@ public class SpriteComponent: Component
     /// If Sprite is Flip Vertically
     /// </summary>
     public bool FlipY { get; set; }
+    
+    /// <summary>
+    /// Offset of ZLayer of Sprite
+    /// </summary>
+    public int ZLayerOffset { get; set; }
 
     private TransformComponent? _transformComponent;
 
@@ -45,13 +51,16 @@ public class SpriteComponent: Component
     /// <param name="offset">Offset (Vec2(0))</param>
     /// <param name="flipX">If Sprite is Flip Horizontally</param>
     /// <param name="flipY">If Sprite is Flip Vertically</param>
-    public SpriteComponent(string texture, bool displayed = true, Vec2? offset = null, bool flipX = false, bool flipY = false)
+    /// <param name="zLayerOffset">Offset of zLayer</param>
+    public SpriteComponent(string texture, bool displayed = true, Vec2? offset = null, bool flipX = false,
+        bool flipY = false, int zLayerOffset = 0)
     {
         Texture = texture;
         Displayed = displayed;
         Offset = offset ?? Vec2.Zero;
         FlipX = flipX;
         FlipY = flipY;
+        ZLayerOffset = zLayerOffset;
     }
 
     /// <inheritdoc />
@@ -73,13 +82,14 @@ public override void Draw()
 
         var texture = window.TextureManager.GetTexture(Texture);
         var position = _transformComponent.GetTransformedPosition(Offset);
-        Raylib.DrawTexturePro(
+        DMRender.DrawTexture(
             texture,
-            new Rectangle(0, 0, FlipX ? -texture.width : texture.width, FlipY ? -texture.height : texture.height),
-            new Rectangle(position.X, position.Y, texture.width * _transformComponent.Scale.X,
+            new Rect(0, 0, FlipX ? -texture.width : texture.width, FlipY ? -texture.height : texture.height),
+            new Rect(position.X, position.Y, texture.width * _transformComponent.Scale.X,
                 texture.height * _transformComponent.Scale.Y),
-            new Vector2(texture.width / 2f * _transformComponent.Scale.X,
+            new Vec2(texture.width / 2f * _transformComponent.Scale.X,
                 texture.height / 2f * _transformComponent.Scale.Y),
-            _transformComponent.Rotation, Color.White);
+            _transformComponent.Rotation, Color.White, InstructionSource.Entity,
+            _transformComponent.ZLayer + ZLayerOffset);
     }
 }

SharpEngine/Component/SpriteSheetComponent.cs

@@ -2,6 +2,7 @@
 using System.Numerics;
 using Raylib_cs;
 using SharpEngine.Math;
+using SharpEngine.Renderer;
 using SharpEngine.Utils;
 using Color = SharpEngine.Utils.Color;
 
@@ -46,6 +47,11 @@ public class SpriteSheetComponent: Component
     /// If Sprite is Flip Vertically
     /// </summary>
     public bool FlipY { get; set; }
+    
+    /// <summary>
+    /// Offset of ZLayer of Sprite Sheet
+    /// </summary>
+    public int ZLayerOffset { get; set; }
 
     /// <summary>
     /// Current animation
@@ -78,8 +84,9 @@ public string Anim
     /// <param name="offset">Offset</param>
     /// <param name="flipX">If Sprite is Flip Horizontally</param>
     /// <param name="flipY">If Sprite is Flip Vertically</param>
+    /// <param name="zLayerOffset">Offset of zLayer</param>
     public SpriteSheetComponent(string texture, Vec2 spriteSize, List<Animation> animations, string currentAnim = "",
-        bool displayed = true, Vec2? offset = null, bool flipX = false, bool flipY = false)
+        bool displayed = true, Vec2? offset = null, bool flipX = false, bool flipY = false, int zLayerOffset = 0)
     {
         Texture = texture;
         SpriteSize = spriteSize;
@@ -89,6 +96,7 @@ public SpriteSheetComponent(string texture, Vec2 spriteSize, List<Animation> ani
         Offset = offset ?? Vec2.Zero;
         FlipX = flipX;
         FlipY = flipY;
+        ZLayerOffset = zLayerOffset;
     }
 
     /// <summary>
@@ -147,14 +155,14 @@ public override void Draw()
 
         var texture = window.TextureManager.GetTexture(Texture);
         var position = _transform.GetTransformedPosition(Offset);
-        Raylib.DrawTexturePro(
+        DMRender.DrawTexture(
             texture,
-            new Rectangle(
-                SpriteSize.X * (anim.Value.Indices[_currentImage] % (texture.width / SpriteSize.X)), 
-                SpriteSize.Y * (int)(anim.Value.Indices[_currentImage] / (int)(texture.width / SpriteSize.X)), 
+            new Rect(
+                SpriteSize.X * (anim.Value.Indices[_currentImage] % (texture.width / SpriteSize.X)),
+                SpriteSize.Y * (int)(anim.Value.Indices[_currentImage] / (int)(texture.width / SpriteSize.X)),
                 FlipX ? -SpriteSize.X : SpriteSize.X, FlipY ? -SpriteSize.Y : SpriteSize.Y),
-            new Rectangle(position.X, position.Y, SpriteSize.X * _transform.Scale.X,SpriteSize.Y * _transform.Scale.Y),
-            new Vector2(SpriteSize.X / 2f * _transform.Scale.X, SpriteSize.Y / 2f * _transform.Scale.Y),
-            _transform.Rotation, Color.White);
+            new Rect(position.X, position.Y, SpriteSize.X * _transform.Scale.X, SpriteSize.Y * _transform.Scale.Y),
+            new Vec2(SpriteSize.X / 2f * _transform.Scale.X, SpriteSize.Y / 2f * _transform.Scale.Y),
+            _transform.Rotation, Color.White, InstructionSource.Entity, _transform.ZLayer + ZLayerOffset);
     }
 }

SharpEngine/Component/TextComponent.cs

@@ -1,5 +1,6 @@
 using Raylib_cs;
 using SharpEngine.Math;
+using SharpEngine.Renderer;
 using Color = SharpEngine.Utils.Color;
 
 namespace SharpEngine.Component;
@@ -39,6 +40,11 @@ public class TextComponent: Component
     /// </summary>
     public int? FontSize;
 
+    /// <summary>
+    /// Offset of ZLayer of Text
+    /// </summary>
+    public int ZLayerOffset { get; set; }
+    
     private TransformComponent? _transformComponent;
 
     /// <summary>
@@ -50,15 +56,17 @@ public class TextComponent: Component
     /// <param name="displayed">If Text is Displayed (true)</param>
     /// <param name="fontSize">Font Size (null)</param>
     /// <param name="offset">Offset (Vec2(0))</param>
+    /// <param name="zLayerOffset">Offset of zLayer</param>
     public TextComponent(string text, string font = "RAYLIB_DEFAULT", Color? color = null, bool displayed = true,
-        int? fontSize = null, Vec2? offset = null)
+        int? fontSize = null, Vec2? offset = null, int zLayerOffset = 0)
     {
         Text = text;
         Font = font;
         Color = color ?? Color.Black;
         Displayed = displayed;
         Offset = offset ?? Vec2.Zero;
         FontSize = fontSize;
+        ZLayerOffset = zLayerOffset;
     }
 
     /// <inheritdoc />
@@ -82,7 +90,8 @@ public override void Draw()
         var fontSize = FontSize ?? font.baseSize;
         var position = _transformComponent.GetTransformedPosition(Offset);
         var textSize = Raylib.MeasureTextEx(font, Text, fontSize, 2);
-        
-        Raylib.DrawTextPro(font, Text, position, textSize / 2, _transformComponent.Rotation, fontSize, 2, Color);
+
+        DMRender.DrawText(font, Text, position, textSize / 2, _transformComponent.Rotation, fontSize, 2, Color,
+            InstructionSource.Entity, _transformComponent.ZLayer + ZLayerOffset);
     }
 }

SharpEngine/Component/TransformComponent.cs

@@ -21,18 +21,25 @@ public class TransformComponent: Component
     /// Rotation of Component
     /// </summary>
     public float Rotation { get; set; }
+    
+    /// <summary>
+    /// ZLayer of Component
+    /// </summary>
+    public int ZLayer { get; set; }
 
     /// <summary>
     /// Create TransformComponent
     /// </summary>
     /// <param name="position">Position (Vec2(0))</param>
     /// <param name="scale">Scale (Vec2(1))</param>
     /// <param name="rotation">Rotation (0)</param>
-    public TransformComponent(Vec2? position = null, Vec2? scale = null, float rotation = 0)
+    /// <param name="zLayer">ZLayer (0)</param>
+    public TransformComponent(Vec2? position = null, Vec2? scale = null, float rotation = 0, int zLayer = 0)
     {
         Position = position ?? Vec2.Zero;
         Scale = scale ?? Vec2.One;
         Rotation = rotation;
+        ZLayer = zLayer;
     }
 
     /// <summary>