20.09.2020

+ Instance Drawing
+ Text and Font

~ Made "DrawBackground" forced Background for 2D

- DrawEmpty

SMCode/SM2D/Drawing/DrawBackground.cs

@@ -3,14 +3,17 @@ using OpenTK;
 using OpenTK.Graphics;
 using SM.Base.Contexts;
 using SM.Base.Scene;
+using SM.Base.StaticObjects;
 using SM.Base.Textures;
 using SM.OGL.Texture;
 using SM2D.Types;
 
 namespace SM2D.Drawing
 {
-    public class DrawBackground : DrawingBasis
+    public class DrawBackground : IBackgroundItem
     {
+        private Material _material = new Material();
+
         public Color4 Color
         {
             get => _material.Tint;
@@ -38,11 +41,17 @@ namespace SM2D.Drawing
             Texture = (Texture) texture;
         }
 
-        public override void Draw(DrawContext context)
+        public void Update(UpdateContext context)
         {
-            ApplyContext(ref context);
+            throw new System.NotImplementedException();
+        }
 
-            context.ModelMatrix = Matrix4.CreateScale(context.WorldScale.X, context.WorldScale.Y, 1);
+        public void Draw(DrawContext context)
+        {
+            context.Material = _material;
+            context.Mesh = Plate.Object;
+
+            context.Instances[0].ModelMatrix = Matrix4.CreateScale(context.WorldScale.X, context.WorldScale.Y, 1);
             _material.Shader.Draw(context);
         }
     }

SMCode/SM2D/Drawing/DrawEmpty.cs

@@ -1,24 +0,0 @@
-using OpenTK;
-using SM.Base.Contexts;
-using SM.Base.Scene;
-using SM.Base.Shader;
-using SM.Base.StaticObjects;
-using SM.OGL.Mesh;
-
-namespace SM2D.Drawing
-{
-    public class DrawEmpty : IShowItem
-    {
-        public void Update(UpdateContext context)
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public void Draw(DrawContext context)
-        {
-            context.ModelMatrix = Matrix4.CreateScale(100, 100, 1);
-
-            Shaders.Default.Draw(context);
-        }
-    }
-}

SMCode/SM2D/Drawing/DrawText.cs

@@ -0,0 +1,25 @@
+using SM.Base.Contexts;
+using SM.Base.Text;
+using SM2D.Types;
+
+namespace SM2D.Drawing
+{
+    public class DrawText : TextDrawingBasis<Transformation>
+    {
+        public DrawText(Font font, string text) : base(font)
+        {
+            _text = text;
+        }
+
+        public override void Draw(DrawContext context)
+        {
+            base.Draw(context);
+            context.Instances = _modelMatrixs;
+            ApplyContext(ref context);
+
+            context.View = Transform.GetMatrix() * context.View;
+
+            _material.Shader.Draw(context);
+        }
+    }
+}

SMCode/SM2D/Drawing/DrawTexture.cs

@@ -44,7 +44,7 @@ namespace SM2D.Drawing
             ApplyContext(ref context);
 
             Transform.Size = new Vector2(Texture.Map.Width * MasterScale * Scale, Texture.Map.Height  * MasterScale * Scale);
-            context.ModelMatrix = Transform.GetMatrix();
+            context.Instances[0].ModelMatrix = Transform.GetMatrix();
 
             _material.Shader.Draw(context);
         }