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

~ Changed Pipelines

Browse source 
(Default2DPipeline: Has Lights, Post-ProcessingEffects, etc.)
(Basic2DPipeline: Simple Color and Texture stuff, thats it)
This commit is contained in:
Michel Fedde 2020-12-19 18:31:44 +01:00
parent 1ed03fec3f
commit 5d4b360b05
23 changed files with 243 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

3
SMCode/SM.OGL/Shaders/Uniform.cs
View file

@ -458,7 +458,7 @@ namespace SM.OGL.Shaders
/// <param name="texture"></param>
public void SetTexture(TextureBase texture)
{
if (Parent != null) SetTexture(texture, Parent.NextTexture++);
if (Parent != null) SetTexture(texture, Parent.NextTexture);
}
/// <summary>
@ -468,6 +468,7 @@ namespace SM.OGL.Shaders
/// <param name="texturePos"></param>
public void SetTexture(TextureBase texture, int texturePos)
{
Parent.NextTexture = texturePos + 1;
GL.ActiveTexture(TextureUnit.Texture0 + texturePos);
GL.BindTexture(TextureTarget.Texture2D, texture);
SetUniform1(texturePos);