diff --git a/Assets/JsonDotNet/Documentation.meta b/Assets/JsonDotNet/Documentation.meta
deleted file mode 100644
index cda8075..0000000
--- a/Assets/JsonDotNet/Documentation.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 76f828f47ce26cc43991113c6a39dbbf
-folderAsset: yes
-timeCreated: 1466010535
-licenseType: Store
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/JsonDotNet/Documentation/Json Net for Unity 2.0.1.pdf b/Assets/JsonDotNet/Documentation/Json Net for Unity 2.0.1.pdf
deleted file mode 100644
index 4f7651d..0000000
Binary files a/Assets/JsonDotNet/Documentation/Json Net for Unity 2.0.1.pdf and /dev/null differ
diff --git a/Assets/JsonDotNet/Documentation/Json Net for Unity 2.0.1.pdf.meta b/Assets/JsonDotNet/Documentation/Json Net for Unity 2.0.1.pdf.meta
deleted file mode 100644
index e5d0257..0000000
--- a/Assets/JsonDotNet/Documentation/Json Net for Unity 2.0.1.pdf.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4e7d9a07cc3f02a41a575406e7230846
-timeCreated: 1466788421
-licenseType: Store
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/JsonDotNet/JsonDotNet201Source.zip b/Assets/JsonDotNet/JsonDotNet201Source.zip
deleted file mode 100644
index 23b699a..0000000
Binary files a/Assets/JsonDotNet/JsonDotNet201Source.zip and /dev/null differ
diff --git a/Assets/JsonDotNet/JsonDotNet201Source.zip.meta b/Assets/JsonDotNet/JsonDotNet201Source.zip.meta
deleted file mode 100644
index c846be6..0000000
--- a/Assets/JsonDotNet/JsonDotNet201Source.zip.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9a6f8c7c1ea72ce46831c5e1b6150d0c
-timeCreated: 1466790933
-licenseType: Store
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Resources/Materials/DetailProjektionAlphamap.png b/Assets/Resources/Materials/DetailProjektionAlphamap.png
index 91cef4a..185a4a1 100644
Binary files a/Assets/Resources/Materials/DetailProjektionAlphamap.png and b/Assets/Resources/Materials/DetailProjektionAlphamap.png differ
diff --git a/Assets/Resources/colors.xml b/Assets/Resources/colors.xml
new file mode 100644
index 0000000..ef73453
--- /dev/null
+++ b/Assets/Resources/colors.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/Resources/colors.xml.meta b/Assets/Resources/colors.xml.meta
new file mode 100644
index 0000000..a17a99a
--- /dev/null
+++ b/Assets/Resources/colors.xml.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 39366101fc02f3b47a0df7508aa6ef1a
+timeCreated: 1545484620
+licenseType: Free
+TextScriptImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/localization.xml b/Assets/Resources/localization.xml
new file mode 100644
index 0000000..93ee8cd
--- /dev/null
+++ b/Assets/Resources/localization.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/Resources/localization.xml.meta b/Assets/Resources/localization.xml.meta
new file mode 100644
index 0000000..03d53f9
--- /dev/null
+++ b/Assets/Resources/localization.xml.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 4652cedf37d935e46a26d6f44630a456
+timeCreated: 1545484620
+licenseType: Free
+TextScriptImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/RothenburgAR/Scripts/LanguageManager.cs b/Assets/RothenburgAR/Scripts/LanguageManager.cs
index 2aebcfc..3ef2345 100644
--- a/Assets/RothenburgAR/Scripts/LanguageManager.cs
+++ b/Assets/RothenburgAR/Scripts/LanguageManager.cs
@@ -86,14 +86,14 @@ namespace RothenburgAR
public void LoadLanguagesFromXml()
{
- var xmlFilePath = Path.Combine(PathHelper.DataPath, "localization.xml");
+ var file = Resources.Load("localization");
+ Debug.Log("Loading languages from Resources");
- Debug.Log("Loading languages from '" + xmlFilePath + "'");
- if (!File.Exists(xmlFilePath))
- throw new FileNotFoundException(xmlFilePath);
+ if (file == null)
+ throw new FileNotFoundException("Localization file Assets/Resources/localization.xml not found");
XmlDocument doc = new XmlDocument();
- doc.Load(xmlFilePath);
+ doc.LoadXml(file.text);
var languageNodes = doc.SelectNodes("//language");
foreach (XmlNode languageNode in languageNodes)
diff --git a/Assets/RothenburgAR/Scripts/UI/UIColorSchemeManager.cs b/Assets/RothenburgAR/Scripts/UI/UIColorSchemeManager.cs
index eb263a6..0e93182 100644
--- a/Assets/RothenburgAR/Scripts/UI/UIColorSchemeManager.cs
+++ b/Assets/RothenburgAR/Scripts/UI/UIColorSchemeManager.cs
@@ -95,13 +95,13 @@ namespace RothenburgAR.UI
private void InitializeUIColorSchemes()
{
- var xmlFilePath = Path.Combine(PathHelper.DataPath, "colors.xml");
- Debug.Log("Loading colors from '" + xmlFilePath + "'");
+ var file = Resources.Load("colors");
+ Debug.Log("Loading colors from Resources..");
- if (!File.Exists(xmlFilePath))
+ if (file == null)
{
// Set default colors, if not able to load
- Debug.Log("File " + xmlFilePath + " does not exist - use default colors");
+ Debug.LogWarning("colors.xml does not exist in Resources folder - use default colors");
AvailableUIColorSchemes = new List
{
new UIColorScheme("t_color_name_light_blue", "#03A9F4", "#E1F5FE", "#0277BD", 0.75f),
@@ -112,7 +112,7 @@ namespace RothenburgAR.UI
}
XmlDocument doc = new XmlDocument();
- doc.Load(xmlFilePath);
+ doc.LoadXml(file.text);
var colorNodes = doc.SelectNodes("//color");
if (colorNodes == null) return;