Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move and Rename reading of SColorF

Browse Source
This commit is contained in:
Flamefire committed 2014-10-09 23:27:32 +02:00
1 parent a2720c2108
commit 4efd670747
5 files changed
+20 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Base/Fonts/CFonts.cs
+1 -1
View File
@@ -338,7 +338,7 @@ namespace Vocaluxe.Base.Fonts
ok &= xmlReader.GetValue("//root/Fonts/Font" + i + "/FileBold", out sf.FileBold); ok &= xmlReader.GetValue("//root/Fonts/Font" + i + "/FileBold", out sf.FileBold);
ok &= xmlReader.GetValue("//root/Fonts/Font" + i + "/FileBoldItalic", out sf.FileBoldItalic); ok &= xmlReader.GetValue("//root/Fonts/Font" + i + "/FileBoldItalic", out sf.FileBoldItalic);
ok &= xmlReader.TryGetNormalizedFloatValue("//root/Fonts/Font" + i + "/Outline", ref sf.Outline); ok &= xmlReader.TryGetNormalizedFloatValue("//root/Fonts/Font" + i + "/Outline", ref sf.Outline);
ok &= xmlReader.TryGetColorFromRGBA("//root/Fonts/Font" + i + "/OutlineColor", out sf.OutlineColor); ok &= xmlReader.Read("//root/Fonts/Font" + i + "/OutlineColor", out sf.OutlineColor);
if (ok) if (ok)
{ {
Vocaluxe/Base/ThemeSystem/CSkin.cs
+2 -2
View File
@@ -140,7 +140,7 @@ namespace Vocaluxe.Base.ThemeSystem
for (int i = 0; i < CSettings.MaxNumPlayer; i++) for (int i = 0; i < CSettings.MaxNumPlayer; i++)
{ {
SColorF color; SColorF color;
if (!xmlReader.TryGetColorFromRGBA("//root/Colors/Player" + (i + 1), out color)) if (!xmlReader.Read("//root/Colors/Player" + (i + 1), out color))
return false; return false;
_PlayerColors[i] = color; _PlayerColors[i] = color;
} }
@@ -150,7 +150,7 @@ namespace Vocaluxe.Base.ThemeSystem
foreach (string str in names) foreach (string str in names)
{ {
SColorF color; SColorF color;
if (!xmlReader.TryGetColorFromRGBA("//root/ColorSchemes/" + str, out color)) if (!xmlReader.Read("//root/ColorSchemes/" + str, out color))
return false; return false;
_ColorSchemes.Add(str, color); _ColorSchemes.Add(str, color);
} }
Vocaluxe/Base/ThemeSystem/CTheme.cs
+1 -1
View File
@@ -151,7 +151,7 @@ namespace Vocaluxe.Base.ThemeSystem
ok &= xmlReader.TryGetFloatValue("//root/Cursor/H", ref CursorTheme.H); ok &= xmlReader.TryGetFloatValue("//root/Cursor/H", ref CursorTheme.H);
if (!xmlReader.GetValue("//root/Cursor/Color/Name", out CursorTheme.Color.Name)) if (!xmlReader.GetValue("//root/Cursor/Color/Name", out CursorTheme.Color.Name))
ok &= xmlReader.TryGetColorFromRGBA("//root/Cursor/Color/Color", out CursorTheme.Color.Color); ok &= xmlReader.Read("//root/Cursor/Color/Color", out CursorTheme.Color.Color);
return ok; return ok;
} }
VocaluxeLib/Xml/CXMLReader.cs
-11
View File
@@ -57,17 +57,6 @@ namespace VocaluxeLib.Xml
} }
} }
public bool TryGetColorFromRGBA(string xPath, out SColorF value)
{
value = new SColorF();
bool result = true;
result &= TryGetNormalizedFloatValue(xPath + "/R", ref value.R);
result &= TryGetNormalizedFloatValue(xPath + "/G", ref value.G);
result &= TryGetNormalizedFloatValue(xPath + "/B", ref value.B);
result &= TryGetNormalizedFloatValue(xPath + "/A", ref value.A);
return result;
}
public override bool GetValue(string xPath, out string value, string defaultValue = "") public override bool GetValue(string xPath, out string value, string defaultValue = "")
{ {
int resultCt = 0; int resultCt = 0;
VocaluxeLib/Xml/CXmlDeserializer.cs
+16 -5
View File
@@ -5,7 +5,7 @@ namespace VocaluxeLib.Xml
public abstract class CXmlDeserializer : CXmlReaderBase public abstract class CXmlDeserializer : CXmlReaderBase
{ {
public abstract string FilePath { get; } public abstract string FilePath { get; }
public bool Read(string xPath, out SThemeFont el) public bool Read(string xPath, out SThemeFont el)
{ {
el = new SThemeFont(); el = new SThemeFont();
@@ -69,17 +69,28 @@ namespace VocaluxeLib.Xml
public bool Read(string xPath, out SInfo el) public bool Read(string xPath, out SInfo el)
{ {
el=new SInfo(); el = new SInfo();
bool ok = GetValue(xPath+"/Name", out el.Name); bool ok = GetValue(xPath + "/Name", out el.Name);
ok &= GetValue(xPath + "/Author", out el.Author); ok &= GetValue(xPath + "/Author", out el.Author);
ok &= TryGetIntValue(xPath + "/VersionMajor", ref el.VersionMajor); ok &= TryGetIntValue(xPath + "/VersionMajor", ref el.VersionMajor);
ok &= TryGetIntValue(xPath + "/VersionMinor", ref el.VersionMinor); ok &= TryGetIntValue(xPath + "/VersionMinor", ref el.VersionMinor);
return ok; return ok;
} }
public bool Read(string xPath, out SColorF value)
{
value = new SColorF();
bool result = true;
result &= TryGetNormalizedFloatValue(xPath + "/R", ref value.R);
result &= TryGetNormalizedFloatValue(xPath + "/G", ref value.G);
result &= TryGetNormalizedFloatValue(xPath + "/B", ref value.B);
result &= TryGetNormalizedFloatValue(xPath + "/A", ref value.A);
return result;
}
public bool CheckVersion(string xPath, int reqVersion) public bool CheckVersion(string xPath, int reqVersion)
{ {
int version=0; int version = 0;
string errorMsg; string errorMsg;
if (!TryGetIntValue(xPath, ref version)) if (!TryGetIntValue(xPath, ref version))
errorMsg = "Version missing"; errorMsg = "Version missing";
@@ -90,7 +101,7 @@ namespace VocaluxeLib.Xml
} }
else else
return true; return true;
CBase.Log.LogError("Cannot load "+FilePath+": "+errorMsg); CBase.Log.LogError("Cannot load " + FilePath + ": " + errorMsg);
return false; return false;
} }
} }