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

18.09.2020

Browse source 
+ Textures
~ Changed 2D coordnate system to lower right as XY+
This commit is contained in:
Michel Fedde 2020-09-19 15:04:04 +02:00
parent 589d131246
commit a603ecc417
26 changed files with 267 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
SMCode/SM.Base/Shader/Files/default.frag
View file

@ -1,8 +1,12 @@
#version 330
in vec2 vTexture;
uniform vec4 Tint;
uniform sampler2D Texture;
layout(location = 0) out vec4 color;
void main() {
color = vec4(1,1,1,1) + Tint;
color = Tint * texture(Texture, vTexture);
}

5
SMCode/SM.Base/Shader/Files/default.vert
View file

@ -1,9 +1,14 @@
#version 330
layout(location = 0) in vec3 aPos;
layout(location = 1) in vec2 aTex;
uniform mat4 MVP;
uniform mat4 ModelMatrix;
out vec2 vTexture;
void main() {
vTexture = aTex;
gl_Position = MVP * ModelMatrix * vec4(aPos, 1);
}

12
SMCode/SM.Base/Shader/InstanceShader.cs
View file

@ -1,20 +1,21 @@
using System;
using System.Collections.Generic;
using OpenTK;
using OpenTK.Graphics.OpenGL4;
using SM.Base.Contexts;
using SM.Base.Scene;
using SM.Base.StaticObjects;
using SM.OGL.Shaders;
namespace SM.Base.Shader
{
public class InstanceShader : GenericShader
public class InstanceShader : GenericShader, IShader
{
protected override bool AutoCompile { get; } = true;
public Action<UniformCollection, DrawContext> SetUniform;
public InstanceShader(string vertex, string fragment, Action<UniformCollection, DrawContext> setUniform) : base(
new ShaderFileCollection(vertex, fragment))
public InstanceShader(string vertex, string fragment, Action<UniformCollection, DrawContext> setUniform) : base(new ShaderFileCollection(vertex, fragment))
{
SetUniform = setUniform;
}
@ -28,5 +29,10 @@ namespace SM.Base.Shader
GL.UseProgram(0);
}
public void DrawInstanced(DrawContext context, ICollection<Matrix4> instanceCollection)
{
throw new NotImplementedException();
}
}
}

3
SMCode/SM.Base/Shader/Shaders.cs
View file

@ -12,7 +12,8 @@ namespace SM.Base.Shader
{
u["MVP"].SetMatrix4(context.View * context.World);
u["ModelMatrix"].SetMatrix4(context.ModelMatrix);
u["Tint"].SetUniform4(1,1,1,1);
u["Tint"].SetUniform4(context.Material.Tint);
u["Texture"].SetTexture(context.Material.Texture, 0);
}));
}
}