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

+ AxisHelper

Browse source 
~ Transformation can now set to be ignored. (Sending a Identity, when requested)
~ Changed how Meshes store Attributes
This commit is contained in:
Michel Fedde 2020-12-13 13:03:57 +01:00
parent 0895c600cf
commit 2e7051d800
14 changed files with 146 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
SMCode/SM2D/Shader/Default2DShader.cs
View file

@ -26,8 +26,8 @@ namespace SM2D.Shader
// Vertex Uniforms
Uniforms["MVP"].SetMatrix4(context.ModelMaster * context.View * context.World);
Uniforms["HasVColor"]
.SetUniform1(context.Mesh.AttribDataIndex.ContainsKey(3) && context.Mesh.AttribDataIndex[3] != null);
.SetUniform1(context.Mesh.Attributes["color"] != null);
/*
Uniforms.GetArray("Instances").Set((i, uniforms) =>
{
if (i >= context.Instances.Count) return false;
@ -38,7 +38,7 @@ namespace SM2D.Shader
uniforms["TextureScale"].SetUniform2(instance.TextureScale);
return true;
});
});*/
// Fragment Uniforms
Uniforms["Tint"].SetUniform4(context.Material.Tint);

4
SMCode/SM2D/Shader/ShaderFiles/default.glsl
View file

@ -24,6 +24,6 @@ uniform sampler2D Texture;
layout(location = 0) out vec4 color;
void fmain() {
color = vColor * Tint;
if (UseTexture) color *= texture(Texture, vTexture);
color = vColor;
//if (UseTexture) color *= texture(Texture, vTexture);
}