vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(d9829ac) v0.9.4.0

Browse Source
This commit is contained in:
Regalis
2019-10-24 18:05:42 +02:00
parent 9aa12bcac2
commit b39922a074
319 changed files with 12516 additions and 6815 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Utils/TextureLoader.cs
+5 -10
View File
@@ -80,16 +80,7 @@ namespace Barotrauma
{
int width = 0; int height = 0; int channels = 0;
byte[] textureData = null;
Task loadTask = Task.Run(() =>
{
textureData = Texture2D.TextureDataFromStream(fileStream, out width, out height, out channels);
});
bool success = loadTask.Wait(10000);
if (!success)
{
DebugConsole.ThrowError("Failed to load texture data from " + (path ?? "stream") + ": timed out");
return null;
}
textureData = Texture2D.TextureDataFromStream(fileStream, out width, out height, out channels);
if (preMultiplyAlpha)
{
PreMultiplyAlpha(ref textureData);
@@ -104,6 +95,10 @@ namespace Barotrauma
}
catch (Exception e)
{
#if WINDOWS
if (e is SharpDX.SharpDXException) { throw; }
#endif
DebugConsole.ThrowError("Loading texture from stream failed!", e);
return null;
}
Barotrauma/BarotraumaClient/Source/Utils/ToolBox.cs
+14 -3
View File
@@ -89,11 +89,22 @@ namespace Barotrauma
return str;
}
public static Color GradientLerp(float t, params Color[] gradient)
{
if (t <= 0.0f) return gradient[0];
if (t >= 1.0f) return gradient[gradient.Length - 1];
System.Diagnostics.Debug.Assert(gradient.Length > 0, "Empty color array passed to the GradientLerp method");
if (gradient.Length == 0)
{
#if DEBUG
DebugConsole.ThrowError("Empty color array passed to the GradientLerp method.\n" + Environment.StackTrace);
#endif
GameAnalyticsManager.AddErrorEventOnce("ToolBox.GradientLerp:EmptyColorArray", GameAnalyticsSDK.Net.EGAErrorSeverity.Error,
"Empty color array passed to the GradientLerp method.\n" + Environment.StackTrace);
return Color.Black;
}
if (t <= 0.0f) { return gradient[0]; }
if (t >= 1.0f) { return gradient[gradient.Length - 1]; }
float scaledT = t * (gradient.Length - 1);