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

Fixed Shader Instancing (with that particles and Text, aswell)

Browse source
This commit is contained in:
Michel Fedde 2020-12-13 14:21:06 +01:00
parent 57fb71d01b
commit fd53c73fa7
8 changed files with 60 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

12
SMCode/SM.OGL/Shaders/UniformCollection.cs
View file

@ -82,20 +82,16 @@ namespace SM.OGL.Shaders
{
Location = loc,
Name = keySplits[0],
Parent = ParentShader,
Struct = keySplits.Length > 2
Parent = this,
ParentShader = ParentShader
};
arrayFilled = true;
lastArrayKey = keySplits[0];
}
var curIndex = int.Parse(keySplits[1]);
if (array.Size < curIndex) array.Size = curIndex;
if (array.Struct)
if (!array.Offsets.ContainsKey(keySplits[2].Trim('.')))
array.Offsets.Add(keySplits[2].Trim('.'), loc - array.Location);
if (keySplits[1] == "0")
array.uniformNames.Add(keySplits[2].Substring(1));
}
else
{