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

Faction Test v1.0.1.0

Browse Source
This commit is contained in:
Regalis11
2023-02-16 15:01:28 +02:00
parent caa5a2f762
commit 2c5a7923b0
309 changed files with 7502 additions and 4335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/Utils/EffectLoader.cs
+12
View File
@@ -0,0 +1,12 @@
using Microsoft.Xna.Framework.Graphics;
namespace Barotrauma;
static class EffectLoader
{
public static Effect Load(string path)
=> GameMain.Instance.Content.Load<Effect>(path
#if LINUX || OSX
+"_opengl"
#endif
);
}
Barotrauma/BarotraumaClient/ClientSource/Utils/LocalizationCSVtoXML.cs
+10 -4
View File
@@ -368,6 +368,7 @@ namespace Barotrauma
xmlContent.Add($"<Conversations identifier=\"vanillaconversations\" Language=\"{language}\" nowhitespace=\"{nowhitespace}\">");
conversationClosingIndent.Clear();
int conversationStart = 1;
xmlContent.Add(string.Empty);
@@ -419,9 +420,9 @@ namespace Barotrauma
{
string[] nextConversationElement = csvContent[i + 1].Split(separator);
if (nextConversationElement[1] != string.Empty)
if (nextConversationElement[3] != string.Empty)
{
nextDepth = int.Parse(nextConversationElement[2]);
nextDepth = int.Parse(nextConversationElement[3]);
nextIsSubConvo = nextDepth > depthIndex;
}
@@ -441,7 +442,12 @@ namespace Barotrauma
}
else
{
//end of file, close remaining xml tags
xmlContent.Add(element.TrimEnd() + "/>");
for (int j = depthIndex - 1; j >= 0; j--)
{
HandleClosingElements(xmlContent, j);
}
}
}
@@ -453,12 +459,12 @@ namespace Barotrauma
private static void HandleClosingElements(List<string> xmlContent, int targetDepth)
{
if (conversationClosingIndent.Count == 0) return;
if (conversationClosingIndent.Count == 0) { return; }
for (int k = conversationClosingIndent.Count - 1; k >= 0; k--)
{
int currentIndent = conversationClosingIndent[k];
if (currentIndent < targetDepth) break;
if (currentIndent < targetDepth) { break; }
xmlContent.Add($"{GetIndenting(currentIndent)}</Conversation>");
conversationClosingIndent.RemoveAt(k);
}
Barotrauma/BarotraumaClient/ClientSource/Utils/SpriteRecorder.cs
+113 -85
View File
@@ -7,28 +7,30 @@ using System.Text;
namespace Barotrauma
{
class SpriteRecorder : ISpriteBatch, IDisposable
sealed class SpriteRecorder : ISpriteBatch, IDisposable
{
private struct Command
public readonly record struct Command(
Texture2D Texture,
VertexPositionColorTexture VertexBL,
VertexPositionColorTexture VertexBR,
VertexPositionColorTexture VertexTL,
VertexPositionColorTexture VertexTR,
float Depth,
Vector2 Min,
Vector2 Max,
int Index)
{
public readonly Texture2D Texture;
public readonly VertexPositionColorTexture VertexBL;
public readonly VertexPositionColorTexture VertexBR;
public readonly VertexPositionColorTexture VertexTL;
public readonly VertexPositionColorTexture VertexTR;
public readonly float Depth;
public readonly Vector2 Min;
public readonly Vector2 Max;
public readonly int Index;
public bool Overlaps(Command other)
{
return
Min.X <= other.Max.X && Max.X >= other.Min.X &&
Min.Y <= other.Max.Y && Max.Y >= other.Min.Y;
}
public Command(
public static Vector2 GetMinPosition(params VertexPositionColorTexture[] vertices)
=> new Vector2(
MathUtils.Min(vertices.Select(v => v.Position.X).ToArray()),
MathUtils.Min(vertices.Select(v => v.Position.Y).ToArray()));
public static Vector2 GetMaxPosition(params VertexPositionColorTexture[] vertices)
=> new Vector2(
MathUtils.Max(vertices.Select(v => v.Position.X).ToArray()),
MathUtils.Max(vertices.Select(v => v.Position.Y).ToArray()));
public static Command FromTransform(
Texture2D texture,
Vector2 pos,
Rectangle srcRect,
@@ -46,15 +48,11 @@ namespace Barotrauma
int srcRectBottom = srcRect.Bottom;
if (effects.HasFlag(SpriteEffects.FlipHorizontally))
{
var temp = srcRectRight;
srcRectRight = srcRectLeft;
srcRectLeft = temp;
(srcRectRight, srcRectLeft) = (srcRectLeft, srcRectRight);
}
if (effects.HasFlag(SpriteEffects.FlipVertically))
{
var temp = srcRectBottom;
srcRectBottom = srcRectTop;
srcRectTop = temp;
(srcRectBottom, srcRectTop) = (srcRectTop, srcRectBottom);
}
rotation = MathHelper.ToRadians(rotation);
@@ -68,59 +66,63 @@ namespace Barotrauma
pos.X -= origin.X * scale.X * cos - origin.Y * scale.Y * sin;
pos.Y -= origin.Y * scale.Y * cos + origin.X * scale.X * sin;
Texture = texture;
var vertexTl = new VertexPositionColorTexture
{
Color = color,
Position = new Vector3(pos.X, pos.Y, 0f),
TextureCoordinate = new Vector2((float)srcRectLeft / (float)texture.Width, (float)srcRectTop / (float)texture.Height)
};
Depth = depth;
var vertexTr = new VertexPositionColorTexture
{
Color = color,
Position = new Vector3(pos.X + wAdd.X, pos.Y + wAdd.Y, 0f),
TextureCoordinate = new Vector2((float)srcRectRight / (float)texture.Width, (float)srcRectTop / (float)texture.Height)
};
VertexTL.Color = color;
VertexTR.Color = color;
VertexBL.Color = color;
VertexBR.Color = color;
var vertexBl = new VertexPositionColorTexture
{
Color = color,
Position = new Vector3(pos.X + hAdd.X, pos.Y + hAdd.Y, 0f),
TextureCoordinate = new Vector2((float)srcRectLeft / (float)texture.Width, (float)srcRectBottom / (float)texture.Height)
};
VertexTL.Position = new Vector3(pos.X, pos.Y, 0f);
VertexTR.Position = new Vector3(pos.X + wAdd.X, pos.Y + wAdd.Y, 0f);
VertexBL.Position = new Vector3(pos.X + hAdd.X, pos.Y + hAdd.Y, 0f);
VertexBR.Position = new Vector3(pos.X + wAdd.X + hAdd.X, pos.Y + wAdd.Y + hAdd.Y, 0f);
var vertexBr = new VertexPositionColorTexture
{
Color = color,
Position = new Vector3(pos.X + wAdd.X + hAdd.X, pos.Y + wAdd.Y + hAdd.Y, 0f),
TextureCoordinate = new Vector2((float)srcRectRight / (float)texture.Width, (float)srcRectBottom / (float)texture.Height)
};
Min = new Vector2(
MathUtils.Min
(
VertexTL.Position.X,
VertexTR.Position.X,
VertexBL.Position.X,
VertexBR.Position.X
),
MathUtils.Min
(
VertexTL.Position.Y,
VertexTR.Position.Y,
VertexBL.Position.Y,
VertexBR.Position.Y
));
var min = GetMinPosition(
vertexTl,
vertexTr,
vertexBl,
vertexBr);
Max = new Vector2(
MathUtils.Max
(
VertexTL.Position.X,
VertexTR.Position.X,
VertexBL.Position.X,
VertexBR.Position.X
),
MathUtils.Max
(
VertexTL.Position.Y,
VertexTR.Position.Y,
VertexBL.Position.Y,
VertexBR.Position.Y
));
var max = GetMaxPosition(
vertexTl,
vertexTr,
vertexBl,
vertexBr);
VertexTL.TextureCoordinate = new Vector2((float)srcRectLeft / (float)texture.Width, (float)srcRectTop / (float)texture.Height);
VertexTR.TextureCoordinate = new Vector2((float)srcRectRight / (float)texture.Width, (float)srcRectTop / (float)texture.Height);
VertexBL.TextureCoordinate = new Vector2((float)srcRectLeft / (float)texture.Width, (float)srcRectBottom / (float)texture.Height);
VertexBR.TextureCoordinate = new Vector2((float)srcRectRight / (float)texture.Width, (float)srcRectBottom / (float)texture.Height);
Index = index;
return new Command(
texture,
vertexBl,
vertexBr,
vertexTl,
vertexTr,
depth,
min,
max,
index);
}
public bool Overlaps(Command other)
{
return
Min.X <= other.Max.X && Max.X >= other.Min.X &&
Min.Y <= other.Max.Y && Max.Y >= other.Min.Y;
}
}
@@ -151,8 +153,8 @@ namespace Barotrauma
public static BasicEffect BasicEffect = null;
private List<RecordedBuffer> recordedBuffers = new List<RecordedBuffer>();
private List<Command> commandList = new List<Command>();
private readonly List<RecordedBuffer> recordedBuffers = new List<RecordedBuffer>();
private readonly List<Command> commandList = new List<Command>();
private SpriteSortMode currentSortMode;
private IndexBuffer indexBuffer = null;
@@ -170,16 +172,45 @@ namespace Barotrauma
currentSortMode = sortMode;
}
public void Draw(Texture2D texture, Vector2 pos, Rectangle? srcRect, Color color, float rotation, Vector2 origin, Vector2 scale, SpriteEffects effects, float depth)
private void AppendCommand(Command command)
{
if (isDisposed) { return; }
Command command = new Command(texture, pos, srcRect ?? texture.Bounds, color, rotation, origin, scale, effects, depth, commandList?.Count ?? 0);
if (commandList.Count == 0) { Min = command.Min; Max = command.Max; }
Min = new Vector2(Math.Min(command.Min.X, Min.X), Math.Min(command.Min.Y, Min.Y));
Max = new Vector2(Math.Max(command.Max.X, Max.X), Math.Max(command.Max.Y, Max.Y));
commandList?.Add(command);
commandList.Add(command);
}
public void Draw(Texture2D texture, Vector2 pos, Rectangle? srcRect, Color color, float rotation, Vector2 origin, Vector2 scale, SpriteEffects effects, float depth)
{
if (isDisposed) { return; }
var command = Command.FromTransform(texture, pos, srcRect ?? texture.Bounds, color, rotation, origin, scale, effects, depth, commandList.Count);
AppendCommand(command);
}
public void Draw(Texture2D texture, VertexPositionColorTexture[] vertices, float layerDepth, int? count = null)
{
if (isDisposed) { return; }
int iters = count ?? (vertices.Length / 4);
for (int i=0;i<iters;i++)
{
var subset = vertices[((i * 4) + 0)..((i * 4) + 4)];
var command = new Command(
texture,
subset[2],
subset[3],
subset[0],
subset[1],
layerDepth,
Command.GetMinPosition(subset),
Command.GetMaxPosition(subset),
commandList.Count);
AppendCommand(command);
}
}
public void End()
@@ -309,15 +340,12 @@ namespace Barotrauma
public void Dispose()
{
isDisposed = true;
if (recordedBuffers != null)
foreach (var buffer in recordedBuffers)
{
foreach (var buffer in recordedBuffers)
{
buffer.VertexBuffer.Dispose();
}
recordedBuffers.Clear(); recordedBuffers = null;
buffer.VertexBuffer.Dispose();
}
commandList?.Clear(); commandList = null;
recordedBuffers.Clear();
commandList.Clear();
indexBuffer?.Dispose(); indexBuffer = null;
ReadyToRender = false;
}