Skip to content

Commit

Permalink
Automatic merge of T1.4-84-g4dced6b1d and 10 pull requests
Browse files Browse the repository at this point in the history
- Pull request #525 at b5ac1d2: Add SignalTypeName and DrawStateName to SignalFeatures
- Pull request #527 at 27f05a1: Brake cuts power refactor and new parameters
- Pull request #531 at b2affac: Bug fix for https://bugs.launchpad.net/or/+bug/1950578 Dyn Brake setup state not disappearing in cab
- Pull request #533 at 62a1c27: fix for shapes hidden by animations( 0 )
- Pull request #537 at e753905: C# signal script extensions
- Pull request #538 at c457f11: Delete binary paths if the ascii version or the tdb was modified. Blueprint: https://blueprints.launchpad.net/or/+spec/binary-timetable-paths
- Pull request #542 at 83320ed: adds new webpage, moves Testing out of Download/Programs
- Pull request #543 at 5b0121c: adds Discover > Roadmap webpage
- Pull request #544 at 8117250: Blueprint https://blueprints.launchpad.net/or/+spec/cabview-controls-for-generic-items
- Pull request #545 at 265b635: Fix VRAM usage
  • Loading branch information
openrails-bot committed Dec 10, 2021
12 parents 4dc5034 + 4dced6b + b5ac1d2 + 27f05a1 + b2affac + 62a1c27 + e753905 + c457f11 + 83320ed + 5b0121c + 8117250 + 265b635 commit c4a4363
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
3 changes: 3 additions & 0 deletions Source/RunActivity/Viewer3D/Materials.cs
Expand Up @@ -212,7 +212,10 @@ public void Mark(Texture2D texture)
public void Sweep()
{
foreach (var path in TextureMarks.Where(kvp => !kvp.Value).Select(kvp => kvp.Key))
{
Textures[path].Dispose();
Textures.Remove(path);
}
}

[CallOnThread("Updater")]
Expand Down
14 changes: 10 additions & 4 deletions Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
Expand Up @@ -354,8 +354,10 @@ internal override void Mark()
foreach (var pdl in ParticleDrawers.Values)
foreach (var pd in pdl)
pd.Mark();
if (_CabRenderer != null)
_CabRenderer.Mark();

_CabRenderer?.Mark();
ThreeDimentionCabViewer?.Mark();

base.Mark();
}

Expand Down Expand Up @@ -2927,9 +2929,13 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)

internal override void Mark()
{
// TODO: This is likely wrong; we should mark textures, shapes and other graphical resources here.
TrainCarShape?.Mark();
foreach (ThreeDimCabDigit threeDimCabDigit in DigitParts3D.Values)
{
threeDimCabDigit.Mark();
}
}
} // Class ThreeDimentionCabViewer
}

public class ThreeDimCabDigit
{
Expand Down

0 comments on commit c4a4363

Please sign in to comment.