Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-25 05:58:35 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Ellpeck:79354c444bc4d97b694c8e2adbf17f8232123eca
Branches Tags
Ellpeck:main
Ellpeck:7.1.1
Ellpeck:7.1.0
Ellpeck:7.0.0
Ellpeck:6.3.1
Ellpeck:6.3.0
..
compare: Ellpeck:ef3fcb2e9cba9a1a4cf055344005ce08656604a2
Branches Tags
Ellpeck:main
Ellpeck:7.1.1
Ellpeck:7.1.0
Ellpeck:7.0.0
Ellpeck:6.3.1
Ellpeck:6.3.0

No commits in common. "79354c444bc4d97b694c8e2adbf17f8232123eca" and "ef3fcb2e9cba9a1a4cf055344005ce08656604a2" have entirely different histories.
79354c444b ... ef3fcb2e9c

3 changed files with 6 additions and 11 deletions
Show stats Expand all files Collapse all files

4
MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj
View file

@ -9,8 +9,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Contentless" Version="3.0.6" /> <PackageReference Include="Contentless" Version="3.0.5" />
<PackageReference Include="MLEM.Startup" Version="5.1.0" /> <PackageReference Include="MLEM.Startup" Version="4.3.0" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" /> <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" /> <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1641" />
</ItemGroup> </ItemGroup>

2
MLEM.Templates/content/MLEM.Templates.Portable/TemplateNamespace.csproj
View file

@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MLEM.Startup" Version="5.1.0" /> <PackageReference Include="MLEM.Startup" Version="4.3.0" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641"> <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1641">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>

11
MLEM.Ui/Elements/Element.cs
View file

@ -888,13 +888,11 @@ namespace MLEM.Ui.Elements {
public virtual void Update(GameTime time) { public virtual void Update(GameTime time) {
this.System.InvokeOnElementUpdated(this, time); this.System.InvokeOnElementUpdated(this, time);
foreach (var child in this.GetRelevantChildren()) { foreach (var child in this.GetRelevantChildren())
if (child.System != null) if (child.System != null)
child.Update(time); child.Update(time);
}
if (this.System != null) this.System.Metrics.Updates++;
this.System.Metrics.Updates++;
} }
/// <summary> /// <summary>
@ -922,12 +920,9 @@ namespace MLEM.Ui.Elements {
batch.Begin(SpriteSortMode.Deferred, blendState, samplerState, depthStencilState, null, effect, mat); batch.Begin(SpriteSortMode.Deferred, blendState, samplerState, depthStencilState, null, effect, mat);
} }
} }
// draw content in custom begin call // draw content in custom begin call
this.Draw(time, batch, alpha, blendState, samplerState, depthStencilState, effect, mat); this.Draw(time, batch, alpha, blendState, samplerState, depthStencilState, effect, mat);
if (this.System != null) this.System.Metrics.Draws++;
this.System.Metrics.Draws++;
if (customDraw) { if (customDraw) {
// end our draw // end our draw
batch.End(); batch.End();