Revize c6ecc85a

Re #9003 - Client configuration

deltarobot-vr/Assets/DeltaRobotVr/Client.cs

@@ -18 +18 @@
         public static readonly Client Instance = new Client();
 
         // default server
-        private const string DefaultServer = "127.0.0.1";
+        private const string DefaultHost = "127.0.0.1";
         private const int DefaultPort = 4242;
 
         // protocol constants
@@ -277 +277 @@
             {
                 try
                 {
-                    using var client = new TcpClient(DefaultServer, DefaultPort);
+                    var host = ConfigurationProvider.Instance.Host;
+                    var port = ConfigurationProvider.Instance.Port;
+
+                    if (port < 0 || host.Length == 0)
+                    {
+                        // Obviously invalid values
+                        host = DefaultHost;
+                        port = DefaultPort;
+                    }
+
+                    using var client = new TcpClient(host, port);
                     using var stream = client.GetStream();
                     BinaryReader reader = new BinaryReader(stream);
                     BinaryWriter writer = new BinaryWriter(stream);

deltarobot-vr/Assets/DeltaRobotVr/Components/Actuator.cs

@@ -19 +19 @@
             {
                 var actPosition = Client.Instance.ActuatorPosition;
                 var newPosition = Single3Utils.ToVector3(actPosition.X, actPosition.Y, actPosition.Z);
-                _transform.position = Vector3.Lerp(_transform.position, newPosition, LerpParam);
+                _transform.localPosition = Vector3.Lerp(_transform.localPosition, newPosition, LerpParam);
             }
         }
     }

deltarobot-vr/Assets/DeltaRobotVr/ConfigurationProvider.cs

@@ +1 @@
+using System.Xml.Serialization;
+using System;
+using System.IO;
+
+namespace DeltaRobotVr
+{
+    /// <summary>
+    /// Singleton class responsible for providing configuration.
+    /// </summary>
+    [Serializable]
+    public class ConfigurationProvider
+    {
+        private static readonly string Default_Config_File = "config.xml";
+        public static readonly ConfigurationProvider Instance = new ConfigurationProvider();
+
+        public float VisualizationTranslateX = 0.0f;
+        public float VisualizationTranslateY = 0.0f;
+        public float VisualizationTranslateZ = 0.0f;
+
+        public float VisualizationScaleX = 1.0f;
+        public float VisualizationScaleY = 1.0f;
+        public float VisualizationScaleZ = 1.0f;
+
+        public int Port = 4242;
+
+        public string Host = "127.0.0.1";
+
+        public string SceneName = "BasicRoomScene";
+
+
+        static ConfigurationProvider()
+        {
+            Instance = loadConfiguration(Default_Config_File);
+        }
+
+        private ConfigurationProvider()
+        {
+        }
+
+        /// <summary>
+        /// Load ConfigurationProvider instance from file.
+        /// </summary>
+        /// <param name="fileName">File to load configuration from</param>
+        /// <returns></returns>
+        private static ConfigurationProvider loadConfiguration(String fileName)
+        {
+            XmlSerializer serializer = new XmlSerializer(typeof(ConfigurationProvider));
+
+            ConfigurationProvider cp;
+
+            using (Stream reader = new FileStream(fileName, FileMode.Open))
+            {
+                cp = (ConfigurationProvider)serializer.Deserialize(reader);
+            }
+
+            return cp;
+        }
+
+        /// <summary>
+        /// Save ConfigurationProvider instance to file.
+        /// </summary>
+        /// <param name="cp">ConfigurationProvider instance to save</param>
+        /// <param name="fileName">File to save configuration to</param>
+        private static void saveConfiguration(ConfigurationProvider cp, String fileName)
+        {
+            XmlSerializer serializer = new XmlSerializer(typeof(ConfigurationProvider));
+
+            using (Stream writer = new FileStream(fileName, FileMode.Create))
+            {
+                serializer.Serialize(writer, cp);
+            }
+        }
+
+    }
+}

deltarobot-vr/Assets/DeltaRobotVr/ConfigurationProvider.cs.meta

@@ +1 @@
+fileFormatVersion: 2
+guid: 99b81634dd1a93e4396ba2b51655392f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

deltarobot-vr/Assets/DeltaRobotVr/MainScript.cs

@@ -9 +9 @@
     /// </summary>
     public class MainScript : MonoBehaviour
     {
+        private static readonly string DefaultScene = "BasicRoomScene";
         private void Start()
         {
-            SceneManager.LoadScene("BasicRoomScene", LoadSceneMode.Additive);
+            var sceneName = ConfigurationProvider.Instance.SceneName;
+            SceneManager.LoadScene(sceneName, LoadSceneMode.Additive);
             Client.Instance.Start();
         }
 

deltarobot-vr/Assets/DeltaRobotVr/SetVisualizationTransform.cs

@@ +1 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using DeltaRobotVr;
+
+/// <summary>
+/// Applies the transform from ConfigurationProvider.Instance
+/// to this GameObejct's transform.
+/// </summary>
+public class SetVisualizationTransform : MonoBehaviour
+{
+    void Start()
+    {
+        var x = ConfigurationProvider.Instance.VisualizationTranslateX;
+        var y = ConfigurationProvider.Instance.VisualizationTranslateY;
+        var z = ConfigurationProvider.Instance.VisualizationTranslateZ;
+
+        var sx = ConfigurationProvider.Instance.VisualizationScaleX;
+        var sy = ConfigurationProvider.Instance.VisualizationScaleY;
+        var sz = ConfigurationProvider.Instance.VisualizationScaleZ;
+
+        transform.position = new Vector3(x, y, z);
+        transform.localScale = new Vector3(sx, sy, sz);
+    }
+}

deltarobot-vr/Assets/DeltaRobotVr/SetVisualizationTransform.cs.meta

@@ +1 @@
+fileFormatVersion: 2
+guid: 4102e3362fef6284db0f47a38afc06b3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

deltarobot-vr/Assets/Scenes/MainScene.unity

@@ -38 +38 @@
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 705507994}
-  m_IndirectSpecularColor: {r: 0.59937465, g: 0.5997504, b: 0.599488, a: 1}
+  m_IndirectSpecularColor: {r: 0.59937525, g: 0.5997512, b: 0.59948856, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -259 +259 @@
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 67930113}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -4.5}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_Father: {fileID: 696353308}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &86918157
 GameObject:
@@ -703 +703 @@
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &696353306
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 696353308}
+  - component: {fileID: 696353307}
+  m_Layer: 0
+  m_Name: Visualization
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &696353307
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 696353306}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4102e3362fef6284db0f47a38afc06b3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &696353308
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 696353306}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 2021860140}
+  - {fileID: 67930116}
+  m_Father: {fileID: 0}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &705507993
 GameObject:
   m_ObjectHideFlags: 0
@@ -981 +1026 @@
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1045848415
 GameObject:
@@ -1368 +1413 @@
   m_Children:
   - {fileID: 1430580983}
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1575 +1620 @@
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2021860136}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1177787072}
   - {fileID: 1535691006}
   - {fileID: 86918158}
-  m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_Father: {fileID: 696353308}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2021860141
 MonoBehaviour:

deltarobot-vr/config.xml

@@ +1 @@
+<?xml version="1.0"?>
+<ConfigurationProvider xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <VisualizationTranslateX>0</VisualizationTranslateX>
+  <VisualizationTranslateY>0</VisualizationTranslateY>
+  <VisualizationTranslateZ>0</VisualizationTranslateZ>
+  <VisualizationScaleX>1</VisualizationScaleX>
+  <VisualizationScaleY>1</VisualizationScaleY>
+  <VisualizationScaleZ>1</VisualizationScaleZ>
+  <Port>4242</Port>
+  <Host>127.0.0.1</Host>
+  <SceneName>BasicRoomScene</SceneName>
+</ConfigurationProvider>