26.09.2020

+ Added BoundingBoxes to Meshes
+ SM.Base.Objects.Mesh
+ Vertex Colors
+ ShowItem Collections + 2D Equlivant
+ Default Class to store Default Values
+ SM.OGL.GLSystem to store OpenGL specific system information

+ SM2D.DrawColor // not working yet
+ SM2D.DrawComplex to allow access to all features.
+ SM2D.DrawPolygon
+ Polygon system // for 2D only yet

~ Renamed SM.OGL.Mesh to SM.OGL.GenericMesh

SMCode/SM2D/Drawing/DrawBackground.cs

@@ -2,8 +2,8 @@
 using OpenTK;
 using OpenTK.Graphics;
 using SM.Base.Contexts;
+using SM.Base.Objects.Static;
 using SM.Base.Scene;
-using SM.Base.StaticObjects;
 using SM.Base.Textures;
 using SM.OGL.Texture;
 using SM2D.Types;

SMCode/SM2D/Drawing/DrawColor.cs

@@ -0,0 +1,35 @@
+using OpenTK.Graphics;
+using SM.Base.Contexts;
+using SM.Base.Scene;
+using SM2D.Scene;
+using SM2D.Types;
+
+namespace SM2D.Drawing
+{
+    public class DrawColor : DrawingBasis<Transformation>, I2DShowItem
+    {
+        public Color4 Tint
+        {
+            get => _material.Tint;
+            set => _material.Tint = value;
+        }
+
+        public int ZIndex { get; set; }
+
+        public DrawColor() {}
+
+        public DrawColor(Color4 color)
+        {
+            _material.Tint = color;
+        }
+
+        public override void Draw(DrawContext context)
+        {
+            base.Draw(context);
+            ApplyContext(ref context);
+            context.Instances[0].ModelMatrix = Transform.GetMatrix();
+
+            _material.Shader.Draw(context);
+        }
+    }
+}

SMCode/SM2D/Drawing/DrawComplex.cs

@@ -0,0 +1,35 @@
+using SM.Base.Contexts;
+using SM.Base.Scene;
+using SM.OGL.Mesh;
+using SM2D.Scene;
+using SM2D.Types;
+
+namespace SM2D.Drawing
+{
+    public class DrawComplex: DrawingBasis<Transformation>, I2DShowItem
+    {
+        public int ZIndex { get; set; }
+
+        public Material Material
+        {
+            get => _material;
+            set => _material = value;
+        }
+
+        public GenericMesh Mesh
+        {
+            get => _mesh;
+            set => _mesh = value;
+        }
+
+        public override void Draw(DrawContext context)
+        {
+            base.Draw(context);
+            ApplyContext(ref context);
+
+            context.Instances[0].ModelMatrix = Transform.GetMatrix();
+
+            _material.Shader.Draw(context);
+        }
+    }
+}

SMCode/SM2D/Drawing/DrawPolygon.cs

@@ -0,0 +1,38 @@
+using System.Drawing;
+using OpenTK.Graphics;
+using SM.Base.Textures;
+using SM.OGL.Texture;
+using SM2D.Object;
+
+namespace SM2D.Drawing
+{
+    public class DrawPolygon : DrawColor
+    {
+        public Polygon Polygon
+        {
+            get => (Polygon)_mesh;
+            set => _mesh = value;
+        }
+
+        public Texture Texture
+        {
+            get => (Texture)_material.Texture;
+            set => _material.Texture = value;
+        }
+
+        public DrawPolygon(Polygon polygon) {}
+
+        public DrawPolygon(Polygon polygon, Bitmap map) : this(polygon, map, Color4.White) {}
+
+        public DrawPolygon(Polygon polygon, Color4 color) : base(color)
+        {
+            _mesh = polygon;
+        }
+        public DrawPolygon(Polygon polygon, Bitmap map, Color4 tint) : base(tint)
+        {
+            _mesh = polygon;
+
+            _material.Texture = new Texture(map);
+        }
+    }
+}

SMCode/SM2D/Drawing/DrawText.cs

@@ -1,14 +1,17 @@
 using SM.Base.Contexts;
 using SM.Base.Text;
+using SM.Base.Types;
+using SM2D.Scene;
 using SM2D.Types;
 
 namespace SM2D.Drawing
 {
-    public class DrawText : TextDrawingBasis<Transformation>
+    public class DrawText : TextDrawingBasis<Transformation>, I2DShowItem
     {
         public DrawText(Font font, string text) : base(font)
         {
             _text = text;
+            Transform.Size = new Vector2(1);
         }
 
         public override void Draw(DrawContext context)
@@ -21,5 +24,7 @@ namespace SM2D.Drawing
 
             _material.Shader.Draw(context);
         }
+
+        public int ZIndex { get; set; }
     }
 }

SMCode/SM2D/Drawing/DrawTexture.cs

@@ -5,48 +5,40 @@ using SM.Base.Contexts;
 using SM.Base.Scene;
 using SM.Base.Textures;
 using SM.Base.Types;
+using SM2D.Scene;
 using SM2D.Types;
 using Vector2 = SM.Base.Types.Vector2;
 
 namespace SM2D.Drawing
 {
-    public class DrawTexture : DrawingBasis<Transformation>
+    public class DrawTexture : DrawColor
     {
         public static float MasterScale = .25f;
 
+        public float Scale = 1;
         public Texture Texture
         {
             get => (Texture) _material.Texture;
             set => _material.Texture = value;
         }
 
-        public Color4 Tint
-        {
-            get => _material.Tint;
-            set => _material.Tint = value;
-        }
-
-        public float Scale = 1;
+        public DrawTexture() {}
 
+        protected DrawTexture(Color4 color) : base(color) { }
 
         public DrawTexture(Bitmap map) : this(map, Color4.White)
         { }
 
-        public DrawTexture(Bitmap map, Color4 tint)
+        public DrawTexture(Bitmap map, Color4 color)
         {
             _material.Texture = new Texture(map);
-            _material.Tint = tint;
+            _material.Tint = color;
         }
 
         public override void Draw(DrawContext context)
         {
+            Transform.Size = new Vector2(Texture.Map.Width * MasterScale * Scale, Texture.Map.Height * MasterScale * Scale);
             base.Draw(context);
-            ApplyContext(ref context);
-
-            Transform.Size = new Vector2(Texture.Map.Width * MasterScale * Scale, Texture.Map.Height  * MasterScale * Scale);
-            context.Instances[0].ModelMatrix = Transform.GetMatrix();
-
-            _material.Shader.Draw(context);
         }
     }
 }

SMCode/SM2D/GLWindow2D.cs

@@ -6,7 +6,7 @@ using SM2D.Scene;
 
 namespace SM2D
 {
-    public class GLWindow2D : GenericWindow<Scene.Scene, Camera>
+    public class GLWindow2D : GenericWindow<Scene.Scene, I2DShowItem, Camera>
     {
 
 

SMCode/SM2D/Object/Polygon.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using OpenTK;
+using OpenTK.Graphics;
+using OpenTK.Graphics.OpenGL4;
+using SM.Base.Objects;
+using SM.OGL.Mesh;
+
+namespace SM2D.Object
+{
+    public class Polygon : Mesh
+    {
+        public override VBO Vertex { get; } = new VBO();
+        public override VBO UVs { get; } = new VBO(pointerSize:2);
+        public override VBO Color { get; } = new VBO(pointerSize: 4);
+
+        public override PrimitiveType PrimitiveType { get; } = PrimitiveType.TriangleFan;
+
+
+
+        public Polygon(ICollection<Vector2> vertices)
+        {
+            foreach (Vector2 vertex in vertices)
+            {
+                Color.Add(Color4.White);
+                AddVertex(vertex);
+            }
+
+            foreach (Vector2 vertex in vertices)
+            {
+                AddUV(vertex);
+            }
+        }
+
+        public Polygon(ICollection<PolygonVertex> vertices)
+        {
+            foreach (PolygonVertex polygonVertex in vertices)
+            {
+                Color.Add(polygonVertex.Color);
+                AddVertex(polygonVertex.Vertex);
+            }
+
+            foreach (PolygonVertex vertex in vertices)
+            {
+                AddUV(vertex.Vertex);
+            }
+        }
+
+        private void AddVertex(Vector2 vertex)
+        {
+            BoundingBox.Update(vertex);
+            Vertex.Add(vertex, 0);
+        }
+
+        private void AddUV(Vector2 vertex)
+        {
+            Vector2 uv = Vector2.Divide(vertex, BoundingBox.Max.Xy) + BoundingBox.Min.Xy;
+            UVs.Add(uv);
+        }
+    }
+}

SMCode/SM2D/Object/PolygonVertex.cs

@@ -0,0 +1,17 @@
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace SM2D.Object
+{
+    public struct PolygonVertex
+    {
+        public Vector2 Vertex;
+        public Color4 Color;
+
+        public PolygonVertex(Vector2 vertex = default, Color4 color = default)
+        {
+            Vertex = vertex;
+            Color = color;
+        }
+    }
+}

SMCode/SM2D/SM2D.csproj

@@ -46,11 +46,18 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Drawing\DrawBackground.cs" />
+    <Compile Include="Drawing\DrawColor.cs" />
+    <Compile Include="Drawing\DrawComplex.cs" />
+    <Compile Include="Drawing\DrawPolygon.cs" />
     <Compile Include="Drawing\DrawText.cs" />
     <Compile Include="Drawing\DrawTexture.cs" />
     <Compile Include="GLWindow2D.cs" />
+    <Compile Include="Object\Polygon.cs" />
+    <Compile Include="Object\PolygonVertex.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Scene\Camera.cs" />
+    <Compile Include="Scene\I2DShowItem.cs" />
+    <Compile Include="Scene\ItemCollection.cs" />
     <Compile Include="Scene\Scene.cs" />
     <Compile Include="Types\Transformation.cs" />
   </ItemGroup>

SMCode/SM2D/Scene/Camera.cs

@@ -12,12 +12,12 @@ namespace SM2D.Scene
 
         protected override Matrix4 ViewCalculation()
         {
-            return Matrix4.LookAt(Position.X, Position.Y, -1, Position.X, Position.Y, 0, 0, 1, 0);
+            return Matrix4.LookAt(Position.X, Position.Y, 2, Position.X, Position.Y, 0, 0, 1, 0);
         }
 
         public override void RecalculateWorld(OpenTK.Vector2 world, float aspect)
         {
-            OrthographicWorld = Matrix4.CreateOrthographicOffCenter(world.X / 2, -world.X / 2, world.Y / 2, -world.Y / 2, 0.1f, 100);
+            OrthographicWorld = Matrix4.CreateOrthographicOffCenter(-world.X / 2, world.X / 2, world.Y / 2, -world.Y / 2, 0.1f, 4f);
         }
     }
 }

SMCode/SM2D/Scene/I2DShowItem.cs

@@ -0,0 +1,10 @@
+using SM.Base.Scene;
+
+namespace SM2D.Scene
+{
+    public interface I2DShowItem : IShowItem
+    {
+        int ZIndex { get; set; }
+
+    }
+}

SMCode/SM2D/Scene/ItemCollection.cs

@@ -0,0 +1,24 @@
+using SM.Base.Contexts;
+using SM.Base.Scene;
+using SM.Base.Types;
+using SM2D.Types;
+
+namespace SM2D.Scene
+{
+    public class ItemCollection : GenericItemCollection<I2DShowItem, Transformation>, I2DShowItem
+    {
+        public ItemCollection()
+        {
+            Transform.Size = new Vector2(1);
+        }
+
+        public override void Draw(DrawContext context)
+        {
+            Objects.Sort((x, y) => x.ZIndex - y.ZIndex);
+
+            base.Draw(context);
+        }
+
+        public int ZIndex { get; set; }
+    }
+}

SMCode/SM2D/Scene/Scene.cs

@@ -1,10 +1,11 @@
 using OpenTK.Graphics;
+using SM.Base.Contexts;
 using SM.Base.Scene;
 using SM2D.Drawing;
 
 namespace SM2D.Scene
 {
-    public class Scene : GenericScene<Camera>
+    public class Scene : GenericScene<Camera, I2DShowItem>
     {
         public DrawBackground Background => (DrawBackground)_background;
 
@@ -12,5 +13,11 @@ namespace SM2D.Scene
         {
             _background = new DrawBackground(Color4.Black);
         }
+
+        public override void Draw(DrawContext context)
+        {
+            Objects.Sort((x,y) => x.ZIndex - y.ZIndex);
+            base.Draw(context);
+        }
     }
 }

SMCode/SM2D/Types/Transformation.cs

@@ -9,12 +9,13 @@ namespace SM2D.Types
         public Vector2 Position = new Vector2(0);
         public Vector2 Size = new Vector2(50);
         public float Rotation;
+        public int ZIndex = 0;
 
         public override Matrix4 GetMatrix()
         {
             return Matrix4.CreateScale(Size.X, Size.Y, 1) *
                    Matrix4.CreateRotationZ(MathHelper.DegreesToRadians(Rotation)) *
-                   Matrix4.CreateTranslation(Position.X, Position.Y, 1);
+                   Matrix4.CreateTranslation(Position.X, Position.Y, ZIndex);
         }
     }
 }