Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/LibRender2/BaseRenderer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ public void Reset()
{
if (!File.Exists(keys[i].Item1) || File.GetLastWriteTime(keys[i].Item1) != keys[i].Item3)
{
currentHost.StaticObjectCache.Remove(keys[i]);
currentHost.StaticObjectCache.TryRemove(keys[i], out _);
}
}
TextureManager.UnloadAllTextures(true);
Expand Down
32 changes: 22 additions & 10 deletions source/LibRender2/Objects/ObjectLibrary.cs
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,17 @@ public void ShowObject(ObjectState State, ObjectType Type)
TextureOrigin daytimeOrigin = State.Prototype.Mesh.Materials[face.Material].DaytimeTexture.Origin;
if (!TextureManager.textureCache.TryGetValue(daytimeOrigin, out daytimeTexture))
{
Stopwatch sw = Stopwatch.StartNew();
daytimeOrigin.GetTexture(out daytimeTexture);
sw.Stop();
TextureManager.TextureDecodeTime += sw.ElapsedMilliseconds;
TextureManager.textureCache[daytimeOrigin] = daytimeTexture;
lock (BaseRenderer.GdiPlusLock)
{
if (!TextureManager.textureCache.TryGetValue(daytimeOrigin, out daytimeTexture))
{
Stopwatch sw = Stopwatch.StartNew();
daytimeOrigin.GetTexture(out daytimeTexture);
sw.Stop();
TextureManager.TextureDecodeTime += sw.ElapsedMilliseconds;
TextureManager.textureCache.TryAdd(daytimeOrigin, daytimeTexture);
}
}
}

TextureTransparencyType transparencyType = TextureTransparencyType.Opaque;
Expand All @@ -195,11 +201,17 @@ public void ShowObject(ObjectState State, ObjectType Type)
TextureOrigin nighttimeOrigin = State.Prototype.Mesh.Materials[face.Material].NighttimeTexture.Origin;
if (!TextureManager.textureCache.TryGetValue(nighttimeOrigin, out nighttimeTexture))
{
Stopwatch sw = Stopwatch.StartNew();
nighttimeOrigin.GetTexture(out nighttimeTexture);
sw.Stop();
TextureManager.TextureDecodeTime += sw.ElapsedMilliseconds;
TextureManager.textureCache[nighttimeOrigin] = nighttimeTexture;
lock (BaseRenderer.GdiPlusLock)
{
if (!TextureManager.textureCache.TryGetValue(nighttimeOrigin, out nighttimeTexture))
{
Stopwatch sw = Stopwatch.StartNew();
nighttimeOrigin.GetTexture(out nighttimeTexture);
sw.Stop();
TextureManager.TextureDecodeTime += sw.ElapsedMilliseconds;
TextureManager.textureCache.TryAdd(nighttimeOrigin, nighttimeTexture);
}
}
}
TextureTransparencyType transparencyType = TextureTransparencyType.Opaque;
if (nighttimeTexture != null)
Expand Down
Loading
Loading