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

(f9949667c) Modified: Default video resolutio multiplied by 1.5, default text width for video set to 450

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-03-27 20:50:35 +02:00
parent ff20f7f374
commit 91e87e8b74
8 changed files with 241 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/GUI/GUI.cs
-14
View File
@@ -663,20 +663,6 @@ namespace Barotrauma
msg.Timer -= deltaTime;
msg.Pos += msg.Velocity * deltaTime;
}
foreach (GUIMessage msg in messages)
{
if (!msg.WorldSpace) continue;
msg.Timer -= deltaTime;
msg.Pos += msg.Velocity * deltaTime;
}
foreach (GUIMessage msg in messages)
{
if (!msg.WorldSpace) continue;
msg.Timer -= deltaTime;
msg.Pos += msg.Velocity * deltaTime;
}
}
messages.RemoveAll(m => m.Timer <= 0.0f);
Barotrauma/BarotraumaClient/Source/GUI/VideoPlayer.cs
+9 -14
View File
@@ -29,7 +29,7 @@ namespace Barotrauma
return isPlaying;
}
private readonly Point defaultResolution = new Point(520, 300);
private readonly Point defaultResolution = new Point(780, 450);
private readonly int borderSize = 20;
private readonly Point buttonSize = new Point(160, 50);
private readonly int titleHeight = 30;
@@ -44,7 +44,7 @@ namespace Barotrauma
public TextSettings(XElement element)
{
Text = TextManager.GetFormatted(element.GetAttributeString("text", string.Empty), true);
Width = element.GetAttributeInt("width", 300);
Width = element.GetAttributeInt("width", 450);
}
}
@@ -57,8 +57,8 @@ namespace Barotrauma
public VideoSettings(XElement element)
{
File = element.GetAttributeString("file", string.Empty);
Width = element.GetAttributeInt("width", 0);
Height = element.GetAttributeInt("height", 0);
Width = 0;
Height = 0;
}
}
@@ -150,20 +150,15 @@ namespace Barotrauma
currentVideo = null;
}
resolution = new Point(0, 0);
resolution = new Point(videoSettings.Width, videoSettings.Height);
if (currentVideo == null) // No preloaded video found
if (resolution.X == 0 || resolution.Y == 0)
{
resolution = new Point(videoSettings.Width, videoSettings.Height);
if (resolution.X == 0 || resolution.Y == 0)
{
resolution = defaultResolution;
}
currentVideo = CreateVideo();
resolution = defaultResolution;
}
currentVideo = CreateVideo();
objectiveTitle.Visible = objectiveText.Visible = true;
videoFrame.RectTransform.NonScaledSize += resolution + new Point(borderSize, borderSize);