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

SerializableEntityEditor displays color values as 0 - 255 instead of 0.0f - 1.0f

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-01-09 14:28:34 +02:00
parent 85d76989c9
commit c2e3f60641
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Serialization/SerializableEntityEditor.cs
+11 -11
View File
@@ -378,18 +378,18 @@ namespace Barotrauma
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
new GUITextBlock(new Rectangle(140 + i * 70, yPos, 100, 18), colorComponentLabels[i], "", Alignment.TopLeft, Alignment.CenterLeft, parent, false, GUI.SmallFont); new GUITextBlock(new Rectangle(140 + i * 70, yPos, 100, 18), colorComponentLabels[i], "", Alignment.TopLeft, Alignment.CenterLeft, parent, false, GUI.SmallFont);
GUINumberInput numberInput = new GUINumberInput(new Rectangle(160 + i * 70, yPos, 45, 18), "", GUINumberInput.NumberType.Float, Alignment.Left, parent); GUINumberInput numberInput = new GUINumberInput(new Rectangle(160 + i * 70, yPos, 45, 18), "", GUINumberInput.NumberType.Int, Alignment.Left, parent);
numberInput.MinValueFloat = 0.0f; numberInput.MinValueInt = 0;
numberInput.MaxValueFloat = 1.0f; numberInput.MaxValueInt = 255;
if (i == 0) if (i == 0)
numberInput.FloatValue = value.R / 255.0f; numberInput.IntValue = value.R;
else if (i == 1) else if (i == 1)
numberInput.FloatValue = value.G / 255.0f; numberInput.IntValue = value.G;
else if (i == 2) else if (i == 2)
numberInput.FloatValue = value.B / 255.0f; numberInput.IntValue = value.B;
else else
numberInput.FloatValue = value.A / 255.0f; numberInput.IntValue = value.A;
numberInput.Font = GUI.SmallFont; numberInput.Font = GUI.SmallFont;
@@ -398,13 +398,13 @@ namespace Barotrauma
{ {
Color newVal = (Color)property.GetValue(); Color newVal = (Color)property.GetValue();
if (comp == 0) if (comp == 0)
newVal.R = (byte)(numInput.FloatValue * 255); newVal.R = (byte)(numInput.IntValue);
else if (comp == 1) else if (comp == 1)
newVal.G = (byte)(numInput.FloatValue * 255); newVal.G = (byte)(numInput.IntValue);
else if (comp == 2) else if (comp == 2)
newVal.B = (byte)(numInput.FloatValue * 255); newVal.B = (byte)(numInput.IntValue);
else else
newVal.A = (byte)(numInput.FloatValue * 255); newVal.A = (byte)(numInput.IntValue);
if (property.TrySetValue(newVal)) if (property.TrySetValue(newVal))
{ {