0.2.5e4

Fixed bug where rerunning code didn't reconnect.
griffinteller · May 5, 2020 · 83a5a79 · 83a5a79
1 parent 5b8ee61
commit 83a5a79
Show file tree

Hide file tree

Showing 52 changed files with 124 additions and 7,290 deletions.
diff --git a/Assets/Materials/Industrial/Standard/BasicCube.mat b/Assets/Materials/Industrial/Standard/BasicCube.mat
@@ -61,9 +61,9 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _GlossMapScale: 1
-    - _Glossiness: 0.5
+    - _Glossiness: 0.484
     - _GlossyReflections: 1
-    - _Metallic: 0.182
+    - _Metallic: 0.172
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02

diff --git a/Assets/Scenes/New Material.mat b/Assets/Scenes/New Material.mat
@@ -0,0 +1,82 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: New Material
+  m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 1
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.599
+    - _GlossyReflections: 1
+    - _Metallic: 0.365
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.9150943, g: 0.78784794, b: 0.366901, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
diff --git a/Assets/Scenes/New Material.mat.meta b/Assets/Scenes/New Material.mat.meta
diff --git a/Assets/Scripts/Main/RobotStateSender.cs b/Assets/Scripts/Main/RobotStateSender.cs
@@ -27,26 +27,43 @@ public class RobotStateSender : MonoBehaviour
 
         private static readonly Action<object> ConnectUpdateAndWritePosix = rss =>
         {
-
-            var rssCast = (RobotStateSender) rss;
 
-            var robotDescriptionBytes = GetRobotDescriptionBytes(rssCast._robotStateDescription); // json
+            var rssCast = (RobotStateSender) rss;
 
-            while (true)
+            try
             {
-                try
-                {
-                    rssCast._clientStream = new FileStream("/tmp/" + PipeName, FileMode.Open, FileAccess.Write);
-                    break;
-                }
-                catch (IOException)
+
+                var robotDescriptionBytes = GetRobotDescriptionBytes(rssCast._robotStateDescription); // json
+
+                while (true)
                 {
-                    continue;
+                    try
+                    {
+                        rssCast._clientStream = new FileStream("/tmp/" + PipeName, FileMode.Open, FileAccess.Write);
+                        break;
+                    }
+                    catch (IOException)
+                    {
+                        continue;
+                    }
                 }
+
+                rssCast._clientStream.Write(robotDescriptionBytes, 0, robotDescriptionBytes.Length);
+                rssCast._clientStream.Close();
+
+            }
+            catch (Exception e)
+            {
+
+                Debug.LogError(e);
+
+            }
+            finally
+            {
+
+                rssCast._clientStream.Close();
+
             }
-
-            rssCast._clientStream.Write(robotDescriptionBytes, 0, robotDescriptionBytes.Length);
-            rssCast._clientStream.Close();
 
         };
 

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -119,7 +119,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.2.5e3
+  bundleVersion: 0.2.5e4
   preloadedAssets:
   - {fileID: 0}
   - {fileID: 0}
@@ -148,7 +148,6 @@ PlayerSettings:
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}
-  - {fileID: 0}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1

diff --git a/...TempFile-570e2479349504d4991d6b9b09489ee1 → ...TempFile-0213b274548f941d8846f915e9bed795 b/...TempFile-570e2479349504d4991d6b9b09489ee1 → ...TempFile-0213b274548f941d8846f915e9bed795
diff --git a/...TempFile-14ce652cbe29a4019ba0c603a404fac9 → ...TempFile-0529b489fa8c44b658a9c814f354db21 b/...TempFile-14ce652cbe29a4019ba0c603a404fac9 → ...TempFile-0529b489fa8c44b658a9c814f354db21
diff --git a/...TempFile-8c74d0e2518f84471abd4e2cd45b2abc → ...TempFile-0ba9273b7439d48cabd7c31db652719d b/...TempFile-8c74d0e2518f84471abd4e2cd45b2abc → ...TempFile-0ba9273b7439d48cabd7c31db652719d
diff --git a/...TempFile-460ccf6cdaac04096bd5e065996cd397 → ...TempFile-14ef522cdfea946c9839b8e7b9de513b b/...TempFile-460ccf6cdaac04096bd5e065996cd397 → ...TempFile-14ef522cdfea946c9839b8e7b9de513b
diff --git a/...TempFile-52e083db647e3492fb33a0c82a42d9f1 → ...TempFile-1694777857bf24074a663f9a6526aee0 b/...TempFile-52e083db647e3492fb33a0c82a42d9f1 → ...TempFile-1694777857bf24074a663f9a6526aee0