neintonine/smrendererv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

04.10.2020

Browse source 
+ render pipeline system for more control about the renderering.
+ Log system
+ Framebuffer system

~ Default shader was moved to pipelines.
This commit is contained in:
Michel Fedde 2020-10-04 16:31:48 +02:00
parent 97e638d9d9
commit 820d6ce700
34 changed files with 660 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SMCode/SM2D/Drawing/DrawBackground.cs
View file

@ -50,13 +50,11 @@ namespace SM2D.Drawing
public void Draw(DrawContext context)
{
if (_material.Shader == null) _material.Shader = Defaults.DefaultShader;
context.Material = _material;
context.Mesh = Plate.Object;
context.Instances[0].ModelMatrix = Matrix4.CreateScale(context.WorldScale.X, context.WorldScale.Y, 1);
_material.Shader.Draw(context);
context.Shader.Draw(context);
}
}
}

6
SMCode/SM2D/Drawing/DrawColor.cs
View file

@ -24,13 +24,11 @@ namespace SM2D.Drawing
_material.Tint = color;
}
public override void Draw(DrawContext context)
protected override void DrawContext(ref DrawContext context)
{
base.Draw(context);
ApplyContext(ref context);
context.Instances[0].ModelMatrix = Transform.GetMatrix();
_material.Shader.Draw(context);
context.Shader.Draw(context);
}
}
}

7
SMCode/SM2D/Drawing/DrawComplex.cs
View file

@ -22,14 +22,11 @@ namespace SM2D.Drawing
set => _mesh = value;
}
public override void Draw(DrawContext context)
protected override void DrawContext(ref DrawContext context)
{
base.Draw(context);
ApplyContext(ref context);
context.Instances[0].ModelMatrix = Transform.GetMatrix();
_material.Shader.Draw(context);
context.Shader.Draw(context);
}
}
}

10
SMCode/SM2D/Drawing/DrawText.cs
View file

@ -1,4 +1,5 @@
using SM.Base.Contexts;
using SM.Base;
using SM.Base.Contexts;
using SM.Base.Text;
using SM.Base.Types;
using SM2D.Scene;
@ -14,15 +15,14 @@ namespace SM2D.Drawing
Transform.Size = new CVector2(1);
}
public override void Draw(DrawContext context)
protected override void DrawContext(ref DrawContext context)
{
base.Draw(context);
base.DrawContext(ref context);
context.Instances = _instances;
ApplyContext(ref context);
context.View = Transform.GetMatrix() * context.View;
_material.Shader.Draw(context);
context.Shader.Draw(context);
}
public int ZIndex { get; set; }

14
SMCode/SM2D/Drawing/DrawTexture.cs
View file

@ -15,6 +15,7 @@ namespace SM2D.Drawing
public static float MasterScale = .25f;
public float Scale = 1;
public bool ManualSize = false;
public Texture Texture
{
get => (Texture) _material.Texture;
@ -28,16 +29,19 @@ namespace SM2D.Drawing
public DrawTexture(Bitmap map) : this(map, Color4.White)
{ }
public DrawTexture(Bitmap map, Color4 color)
public DrawTexture(Bitmap map, Color4 color) : this((Texture)map, color)
{ }
public DrawTexture(Texture texture, Color4 color)
{
_material.Texture = new Texture(map);
_material.Texture = texture;
_material.Tint = color;
}
public override void Draw(DrawContext context)
protected override void DrawContext(ref DrawContext context)
{
Transform.Size = new CVector2(Texture.Map.Width * MasterScale * Scale, Texture.Map.Height * MasterScale * Scale);
base.Draw(context);
if (!ManualSize) Transform.Size = new CVector2(Texture.Map.Width * MasterScale * Scale, Texture.Map.Height * MasterScale * Scale);
base.DrawContext(ref context);
}
}
}