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

1.0.11

Browse source 
+ Windows now have a default icon

~ Changed CVector.Set(params float[]) to CVector.SetRaw(params float[])
~ I hope, the text rendering is now fixed.
~ Mouse2D.InWorld(Camera) now uses Camera.CalculatedWorldScale.
This commit is contained in:
Michel Fedde 2021-04-22 17:49:42 +02:00
parent a921eb827e
commit 51f8dfd522
14 changed files with 78 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
SMCode/SM.Base/Drawing/Text/TextDrawingBasis.cs
View file

@ -109,7 +109,6 @@ namespace SM.Base.Drawing.Text
float x = 0;
float y = 0;
var _last = new CharParameter();
for (var i = 0; i < _text.Length; i++)
{
@ -144,18 +143,16 @@ namespace SM.Base.Drawing.Text
}
var matrix = Matrix4.CreateScale(parameter.Width, Font.Height, 1) *
Matrix4.CreateTranslation(x, -y, 0);
Matrix4.CreateTranslation(x + parameter.Width / 2, -y, 0);
_instances[i] = new Instance
{
ModelMatrix = matrix,
TextureMatrix = parameter.TextureMatrix
};
x += Math.Max(parameter.Advance, 6);
_last = parameter;
Width = Math.Max(Width, x);
x += parameter.Advance;
}
Width = Math.Max(Width, x);
Height = y + Font.Height;
}
}