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

2f107db...5202af9

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-03-18 21:42:26 +02:00
parent 58c92888b7
commit 044fd3344b
395 changed files with 27417 additions and 19754 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Sprite/DeformAnimations/NoiseDeformation.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace Barotrauma.SpriteDeformations
{
[Serialize(0.0f, true), Editable(MinValueFloat = 0.0f, MaxValueFloat = 100.0f,
ToolTip = "The frequency of the noise.")]
public float Frequency { get; set; }
public override float Frequency { get; set; }
[Serialize(1.0f, true), Editable(MinValueFloat = 0.0f, MaxValueFloat = 10.0f,
ToolTip = "How much the noise distorts the sprite.")]
Barotrauma/BarotraumaClient/Source/Sprite/DeformableSprite.cs
+1 -1
View File
@@ -247,7 +247,7 @@ namespace Barotrauma
SetupVertexBuffers();
}
#if LINUX
#if (LINUX || OSX)
effect.Parameters["TextureSampler+xTexture"].SetValue(sprite.Texture);
#else
effect.Parameters["xTexture"].SetValue(sprite.Texture);
Barotrauma/BarotraumaClient/Source/Sprite/Sprite.cs
+5 -7
View File
@@ -39,7 +39,7 @@ namespace Barotrauma
partial void LoadTexture(ref Vector4 sourceVector, ref bool shouldReturn, bool preMultiplyAlpha)
{
preMultipliedAlpha = preMultiplyAlpha;
texture = LoadTexture(this.file, preMultiplyAlpha);
texture = LoadTexture(this.FilePath, preMultiplyAlpha);
if (texture == null)
{
@@ -57,7 +57,7 @@ namespace Barotrauma
texture.Dispose();
texture = null;
texture = TextureLoader.FromFile(file, preMultipliedAlpha);
texture = TextureLoader.FromFile(FilePath, preMultipliedAlpha);
foreach (Sprite sprite in sprites)
{
sprite.texture = texture;
@@ -76,8 +76,7 @@ namespace Barotrauma
file = Path.GetFullPath(file);
foreach (Sprite s in list)
{
if (string.IsNullOrEmpty(s.FilePath)) continue;
if (Path.GetFullPath(s.file) == file) return s.texture;
if (s.FullPath == file) return s.texture;
}
if (File.Exists(file))
@@ -278,13 +277,12 @@ namespace Barotrauma
partial void DisposeTexture()
{
//check if another sprite is using the same texture
if (!string.IsNullOrEmpty(file)) //file can be empty if the sprite is created directly from a Texture2D instance
if (!string.IsNullOrEmpty(FilePath)) //file can be empty if the sprite is created directly from a Texture2D instance
{
string normalizedFilePath = Path.GetFullPath(file);
foreach (Sprite s in list)
{
if (string.IsNullOrEmpty(s.file)) continue;
if (Path.GetFullPath(s.file) == normalizedFilePath) return;
if (s.FullPath == FullPath) return;
}
}