Refactor server variable to Vrem due to naming conventions.

VIRTUE-DBIS · Jul 21, 2021 · 9f21c35 · 9f21c35
1 parent 8759319
commit 9f21c35
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git 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
     /// <summary>
     /// The Address of the VREM server instance, inclusive port.
     /// </summary>
-    public string VREMAddress;
+    public string VremAddress;
 
     /// <summary>
     /// 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
@@ -45,15 +45,15 @@ private void Awake()
     /// </summary>
     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()
     /// </summary>
     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
@@ -33,7 +33,7 @@ public class Exhibit
     /// <returns>A string with the full path/URL to the image of the exhibit.</returns>
     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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 {
-  "VREMAddress": "http://127.0.0.1:4545",
+  "VremAddress": "http://127.0.0.1:4545",
   "StartInLobby": true,
   "SpotsEnabled": false,
   "LobbyFloorLogoEnabled": true,