例外検出&シャットダウンを追加、範囲チェックを追加、誤ってソースをダウンロードする人向けの注意追加

gpsnmeajp · Feb 21, 2020 · 503bc5b · 503bc5b
1 parent ca050c9
commit 503bc5b
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 24 deletions.
diff --git a/EVMC4U/CameraReceiver.cs b/EVMC4U/CameraReceiver.cs
@@ -124,7 +124,19 @@ public void MessageDaisyChain(ref uOSC.Message message, int callCount)
 
             StatusMessage = "OK";
 
-            ProcessMessage(ref message);
+            //異常を検出して動作停止
+            try
+            {
+                ProcessMessage(ref message);
+            }
+            catch (Exception e)
+            {
+                StatusMessage = "Error: Exception";
+                Debug.LogError(" --- Communication Error ---");
+                Debug.LogError(e.ToString());
+                shutdown = true;
+                return;
+            }
 
             if (!externalReceiverManager.SendNextReceivers(message, callCount))
             {

diff --git a/EVMC4U/CommunicationValidator.cs b/EVMC4U/CommunicationValidator.cs
@@ -124,7 +124,19 @@ public void MessageDaisyChain(ref uOSC.Message message, int callCount)
             CallCountMonitor = callCount;
             StatusMessage = "OK";
 
-            ProcessMessage(ref message);
+            //異常を検出して動作停止
+            try
+            {
+                ProcessMessage(ref message);
+            }
+            catch (Exception e)
+            {
+                StatusMessage = "Error: Exception";
+                Debug.LogError(" --- Communication Error ---");
+                Debug.LogError(e.ToString());
+                shutdown = true;
+                return;
+            }
 
             if (!externalReceiverManager.SendNextReceivers(message, callCount))
             {
@@ -154,11 +166,14 @@ private void ProcessMessage(ref uOSC.Message message)
                     StatusMessage = "OK";
                 }
 
-                //V2.5 キャリブレーション状態
-                if ((message.values[1] is int) && (message.values[2] is int))
+                //V2.5 キャリブレーション状態(長さ3以上)
+                if (message.values.Length >= 3)
                 {
-                    calibrationState = (CalibrationState)message.values[1];
-                    calibrationMode = (CalibrationMode)message.values[2];
+                    if ((message.values[1] is int) && (message.values[2] is int))
+                    {
+                        calibrationState = (CalibrationState)message.values[1];
+                        calibrationMode = (CalibrationMode)message.values[2];
+                    }
                 }
             }
             //データ送信時刻

diff --git a/EVMC4U/DeviceReceiver.cs b/EVMC4U/DeviceReceiver.cs
@@ -111,7 +111,19 @@ public void MessageDaisyChain(ref uOSC.Message message, int callCount)
 
             StatusMessage = "OK";
 
-            ProcessMessage(ref message);
+            //異常を検出して動作停止
+            try
+            {
+                ProcessMessage(ref message);
+            }
+            catch (Exception e)
+            {
+                StatusMessage = "Error: Exception";
+                Debug.LogError(" --- Communication Error ---");
+                Debug.LogError(e.ToString());
+                shutdown = true;
+                return;
+            }
 
             if (!externalReceiverManager.SendNextReceivers(message, callCount))
             {

diff --git a/EVMC4U/DirectionalLightReceiver.cs b/EVMC4U/DirectionalLightReceiver.cs
@@ -83,7 +83,19 @@ public void MessageDaisyChain(ref uOSC.Message message, int callCount)
 
             StatusMessage = "OK";
 
-            ProcessMessage(ref message);
+            //異常を検出して動作停止
+            try
+            {
+                ProcessMessage(ref message);
+            }
+            catch (Exception e)
+            {
+                StatusMessage = "Error: Exception";
+                Debug.LogError(" --- Communication Error ---");
+                Debug.LogError(e.ToString());
+                shutdown = true;
+                return;
+            }
 
             if (!externalReceiverManager.SendNextReceivers(message, callCount))
             {

diff --git a/EVMC4U/ExternalReceiver.cs b/EVMC4U/ExternalReceiver.cs
@@ -274,7 +274,18 @@ public void MessageDaisyChain(ref uOSC.Message message, int callCount)
 
             //メッセージを処理
             if (!Freeze) {
-                ProcessMessage(ref message);
+                //異常を検出して動作停止
+                try
+                {
+                    ProcessMessage(ref message);
+                }
+                catch (Exception e) {
+                    StatusMessage = "Error: Exception";
+                    Debug.LogError(" --- Communication Error ---");
+                    Debug.LogError(e.ToString());
+                    shutdown = true;
+                    return;
+                }
             }
 
             //次のデイジーチェーンへ伝える
@@ -322,23 +333,26 @@ private void ProcessMessage(ref uOSC.Message message)
                     StatusMessage = "Waiting for [Load VRM]";
                 }
 
-                //V2.5 キャリブレーション状態
-                if ((message.values[1] is int) && (message.values[2] is int))
-                {
-                    int calibrationState = (int)message.values[1];
-                    int calibrationMode = (int)message.values[2];
+                //V2.5 キャリブレーション状態(長さ3以上)
+                if (message.values.Length >= 3) {
+                    if ((message.values[1] is int) && (message.values[2] is int))
+                    {
+                        int calibrationState = (int)message.values[1];
+                        int calibrationMode = (int)message.values[2];
 
-                    //キャリブレーション出来ていないときは隠す
-                    if (HideInUncalibrated && Model != null) {
-                        Model.SetActive(calibrationState == 3);
-                    }
-                    //スケール同期をキャリブレーションと連動させる
-                    if (SyncCalibrationModeWithScaleOffsetSynchronize) {
-                        RootScaleOffsetSynchronize = !(calibrationMode == 0); //通常モードならオフ、MR系ならオン
-                    }
+                        //キャリブレーション出来ていないときは隠す
+                        if (HideInUncalibrated && Model != null)
+                        {
+                            Model.SetActive(calibrationState == 3);
+                        }
+                        //スケール同期をキャリブレーションと連動させる
+                        if (SyncCalibrationModeWithScaleOffsetSynchronize)
+                        {
+                            RootScaleOffsetSynchronize = !(calibrationMode == 0); //通常モードならオフ、MR系ならオン
+                        }
 
+                    }
                 }
-
                 return;
             }
             //データ送信時刻

diff --git a/EVMC4U/InputReceiver.cs b/EVMC4U/InputReceiver.cs
@@ -103,7 +103,19 @@ public void MessageDaisyChain(ref uOSC.Message message, int callCount)
 
             StatusMessage = "OK";
 
-            ProcessMessage(ref message);
+            //異常を検出して動作停止
+            try
+            {
+                ProcessMessage(ref message);
+            }
+            catch (Exception e)
+            {
+                StatusMessage = "Error: Exception";
+                Debug.LogError(" --- Communication Error ---");
+                Debug.LogError(e.ToString());
+                shutdown = true;
+                return;
+            }
 
             if (!externalReceiverManager.SendNextReceivers(message, callCount))
             {

diff --git a/これは開発中のソースコードです.txt b/これは開発中のソースコードです.txt