diff --git a/Assets/Scripts/Unibas/DBIS/VREP/Core/Settings.cs b/Assets/Scripts/Unibas/DBIS/VREP/Core/Settings.cs index 107a1d3..b103332 100644 --- a/Assets/Scripts/Unibas/DBIS/VREP/Core/Settings.cs +++ b/Assets/Scripts/Unibas/DBIS/VREP/Core/Settings.cs @@ -13,7 +13,7 @@ public class Settings /// /// The Address of the VREM server instance, inclusive port. /// - public string VREMAddress; + public string VremAddress; /// /// Whether the player starts in the lobby. diff --git a/Assets/Scripts/Unibas/DBIS/VREP/Core/VrepController.cs b/Assets/Scripts/Unibas/DBIS/VREP/Core/VrepController.cs index 3b1d432..f9367b1 100644 --- a/Assets/Scripts/Unibas/DBIS/VREP/Core/VrepController.cs +++ b/Assets/Scripts/Unibas/DBIS/VREP/Core/VrepController.cs @@ -45,15 +45,15 @@ private void Awake() /// private void SanitizeHost() { - if (!settings.VREMAddress.EndsWith("/")) + if (!settings.VremAddress.EndsWith("/")) { - settings.VREMAddress += "/"; + settings.VremAddress += "/"; } // TODO TLS support. - if (!settings.VREMAddress.StartsWith("http://")) + if (!settings.VremAddress.StartsWith("http://")) { - settings.VREMAddress = "http://" + settings.VREMAddress; + settings.VremAddress = "http://" + settings.VremAddress; } } @@ -96,7 +96,7 @@ private void Start() /// public void LoadAndCreateExhibition() { - _vremClient.serverUrl = settings.VREMAddress; + _vremClient.serverUrl = settings.VremAddress; _vremClient.RequestExhibition(settings.ExhibitionId, ParseExhibition); Debug.Log("Requested exhibition."); diff --git a/Assets/Scripts/Unibas/DBIS/VREP/VREM/Model/Exhibit.cs b/Assets/Scripts/Unibas/DBIS/VREP/VREM/Model/Exhibit.cs index b2ccb3b..bf50e59 100644 --- a/Assets/Scripts/Unibas/DBIS/VREP/VREM/Model/Exhibit.cs +++ b/Assets/Scripts/Unibas/DBIS/VREP/VREM/Model/Exhibit.cs @@ -33,7 +33,7 @@ public class Exhibit /// A string with the full path/URL to the image of the exhibit. public string GetURLEncodedPath() { - return VrepController.Instance.settings.VREMAddress + "content/get/" + + return VrepController.Instance.settings.VremAddress + "content/get/" + VrepController.Instance.settings.ExhibitionId + "%2F" + path.Substring(0).Replace("/", "%2F").Replace(" ", "%20"); } @@ -47,7 +47,7 @@ public string GetURLEncodedAudioPath() { if (!string.IsNullOrEmpty(audio)) { - return VrepController.Instance.settings.VREMAddress + "content/get/" + + return VrepController.Instance.settings.VremAddress + "content/get/" + VrepController.Instance.settings.ExhibitionId + "%2F" + audio.Substring(0).Replace("/", "%2F").Replace(" ", "%20"); } diff --git a/Assets/Scripts/Unibas/DBIS/VREP/VREM/Model/Room.cs b/Assets/Scripts/Unibas/DBIS/VREP/VREM/Model/Room.cs index 3ac2b56..10ce2f4 100644 --- a/Assets/Scripts/Unibas/DBIS/VREP/VREM/Model/Room.cs +++ b/Assets/Scripts/Unibas/DBIS/VREP/VREM/Model/Room.cs @@ -30,7 +30,7 @@ public string GetURLEncodedAudioPath() { if (!string.IsNullOrEmpty(ambient)) { - return VrepController.Instance.settings.VREMAddress + "/content/get/" + + return VrepController.Instance.settings.VremAddress + "/content/get/" + ambient.Substring(0).Replace("/", "%2F").Replace(" ", "%20"); } diff --git a/Assets/demo-settings.json b/Assets/demo-settings.json index 7788223..74c59ad 100644 --- a/Assets/demo-settings.json +++ b/Assets/demo-settings.json @@ -1,5 +1,5 @@ { - "VREMAddress": "http://127.0.0.1:4568", + "VremAddress": "http://127.0.0.1:4545", "StartInLobby": false, "SpotsEnabled": false, "FloorLogoEnabled": true, diff --git a/Assets/settings.json b/Assets/settings.json index a6c731e..e44e5b0 100644 --- a/Assets/settings.json +++ b/Assets/settings.json @@ -1,5 +1,5 @@ { - "VREMAddress": "http://127.0.0.1:4545", + "VremAddress": "http://127.0.0.1:4545", "StartInLobby": true, "SpotsEnabled": false, "LobbyFloorLogoEnabled": true,