From 64cdf78b1048790bbea1873a05472e2832098ab4 Mon Sep 17 00:00:00 2001 From: You-Key Date: Sat, 29 Oct 2016 18:32:34 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=E5=A4=89=E6=95=B0=E5=90=8D=E3=81=AE?= =?UTF-8?q?=E8=A1=9D=E7=AA=81=E3=81=AB=E3=82=88=E3=82=8AUnity=205=E3=81=A7?= =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C?= =?UTF-8?q?=E5=87=BA=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/Image Effects/CameraMotionBlurEditor.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/Editor/Image Effects/CameraMotionBlurEditor.js b/Assets/Editor/Image Effects/CameraMotionBlurEditor.js index 3b0d356..8de93b0 100644 --- a/Assets/Editor/Image Effects/CameraMotionBlurEditor.js +++ b/Assets/Editor/Image Effects/CameraMotionBlurEditor.js @@ -7,7 +7,7 @@ class CameraMotionBlurEditor extends Editor var serObj : SerializedObject; var filterType : SerializedProperty; - var preview : SerializedProperty; + var preview_ : SerializedProperty; var previewScale : SerializedProperty; var movementScale : SerializedProperty; var jitter : SerializedProperty; @@ -28,7 +28,7 @@ class CameraMotionBlurEditor extends Editor filterType = serObj.FindProperty ("filterType"); - preview = serObj.FindProperty ("preview"); + preview_ = serObj.FindProperty ("preview"); previewScale = serObj.FindProperty ("previewScale"); movementScale = serObj.FindProperty ("movementScale"); @@ -89,8 +89,8 @@ class CameraMotionBlurEditor extends Editor EditorGUILayout.Separator (); - EditorGUILayout.PropertyField (preview, new GUIContent("Preview")); - if (preview.boolValue) + EditorGUILayout.PropertyField (preview_, new GUIContent("Preview")); + if (preview_.boolValue) EditorGUILayout.PropertyField (previewScale, new GUIContent("")); serObj.ApplyModifiedProperties(); From 989bc3011bea202a28ce5f490bbc54778a92f66d Mon Sep 17 00:00:00 2001 From: You-Key Date: Sun, 6 Nov 2016 16:46:06 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=E3=82=B9=E3=83=88=E3=83=AA=E3=83=BC?= =?UTF-8?q?=E3=83=A0=E3=83=90=E3=83=83=E3=83=95=E3=82=A1=E3=82=92=E3=82=AF?= =?UTF-8?q?=E3=83=AA=E3=82=A2=E3=81=9B=E3=81=9A=E3=81=AB=E5=8F=97=E3=81=91?= =?UTF-8?q?=E5=8F=96=E3=82=8B=E5=BA=A6=E3=81=AB=E3=83=90=E3=83=83=E3=83=95?= =?UTF-8?q?=E3=82=A1=E5=85=A8=E4=BD=93=E3=82=92=E8=A7=A3=E6=9E=90=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=E3=81=9F=E3=82=81=E3=80=81=E5=90=8C?= =?UTF-8?q?=E4=B8=80=E7=B5=90=E6=9E=9C=E3=81=8C=E9=80=A3=E7=B6=9A=E3=81=97?= =?UTF-8?q?=E3=81=A6=E6=A4=9C=E5=87=BA=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=81=9F=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/julius/Script/Julius_Client.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/julius/Script/Julius_Client.cs b/Assets/julius/Script/Julius_Client.cs index 7a426e4..72f01a2 100644 --- a/Assets/julius/Script/Julius_Client.cs +++ b/Assets/julius/Script/Julius_Client.cs @@ -146,9 +146,11 @@ private void get_stream(){//**マルチスレッド関数** //マルチスレッドの速度？ Thread.Sleep(0); //ストリームの受信 - net.Read(data, 0, data.Length); - stream = System.Text.Encoding.Default.GetString(data); - //Debug.Log (stream); + //受け取ったバイト数だけを文字列として解析する + //streamは前の状態が残っているため、受け取ったバイト数が前回より少ないときに同じ文字列が認識されてしまう + int charCount = net.Read(data, 0, data.Length); + stream = System.Text.Encoding.Default.GetString(data, 0, charCount); + Debug.Log (stream); //Debug.Log ("tmp_s : "+words) tmp = string.Empty; From df66f26b10c6024b4d68b6725d918435c31d83db Mon Sep 17 00:00:00 2001 From: You-Key Date: Sun, 6 Nov 2016 17:23:32 +0900 Subject: [PATCH 3/7] =?UTF-8?q?julius=5Fserver.exe=E3=81=AE=E3=83=97?= =?UTF-8?q?=E3=83=AD=E3=82=BB=E3=82=B9=E8=B5=B7=E5=8B=95=E3=81=AB=E5=A4=B1?= =?UTF-8?q?=E6=95=97=E3=81=97=E3=81=9F=E9=9A=9B=E3=81=AB=E3=82=A8=E3=83=A9?= =?UTF-8?q?=E3=83=BC=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=AB?= =?UTF-8?q?=E3=83=91=E3=82=B9=E3=82=92=E5=90=AB=E3=82=81=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/julius/Script/Julius_Client.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/julius/Script/Julius_Client.cs b/Assets/julius/Script/Julius_Client.cs index 72f01a2..6c5bf46 100644 --- a/Assets/julius/Script/Julius_Client.cs +++ b/Assets/julius/Script/Julius_Client.cs @@ -72,7 +72,8 @@ private bool open_julius_server(){ try{ julius_process = System.Diagnostics.Process.Start(info); }catch(System.ComponentModel.Win32Exception w){ - Debug.Log("Not Found." + w); + Debug.Log("Process Not Found. " + w); + Debug.Log("Path: " + info.WorkingDirectory + info.FileName); message = "Not Found."; return_num = 0; return false; From 8bc2939ef7c89146ea41468463b800cafcc9fc06 Mon Sep 17 00:00:00 2001 From: You-Key Date: Sun, 6 Nov 2016 17:34:04 +0900 Subject: [PATCH 4/7] =?UTF-8?q?TcpClient=E9=96=A2=E6=95=B0=E3=81=8C?= =?UTF-8?q?=E4=BE=8B=E5=A4=96=E3=82=92=E9=80=81=E5=87=BA=E3=81=97=E3=81=9F?= =?UTF-8?q?=E9=9A=9B=E3=81=AB=E6=AD=A3=E3=81=97=E3=81=8F=E3=82=A8=E3=83=A9?= =?UTF-8?q?=E3=83=BC=E5=87=A6=E7=90=86=E3=81=A7=E3=81=8D=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/julius/Script/Julius_Client.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Assets/julius/Script/Julius_Client.cs b/Assets/julius/Script/Julius_Client.cs index 6c5bf46..b24169e 100644 --- a/Assets/julius/Script/Julius_Client.cs +++ b/Assets/julius/Script/Julius_Client.cs @@ -99,7 +99,15 @@ private void kill_julius_server(){ /*juliusサーバーへ接続する*/ private bool initialize_julius_client(){ //TCP/IPの初期化＆juliusサーバーへ接続 - tcpip = new TcpClient(IPAddress,port); + //TcpClientは例外を返す場合がある + try + { + tcpip = new TcpClient(IPAddress, port); + } + catch + { + tcpip = null; + } //クライアントが取得出来たかどうか if (tcpip == null) { Debug.Log("Connect Fall."); From b2ca8aae3239227aad89da44d47f06f1d5637ad2 Mon Sep 17 00:00:00 2001 From: You-Key Date: Sun, 6 Nov 2016 17:37:59 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=81=8C=E8=B5=B7=E5=8B=95=E3=81=99=E3=82=8B=E5=89=8D=E3=81=AB?= =?UTF-8?q?=E8=B5=B7=E5=8B=95=E5=87=A6=E7=90=86=E3=81=AB=E5=88=B0=E9=81=94?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86=E3=81=A8=E3=80=81?= =?UTF-8?q?=E4=BB=A5=E9=99=8D=E6=AD=A3=E3=81=97=E3=81=8F=E6=8E=A5=E7=B6=9A?= =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=A6?= =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=86=E3=81=9F=E3=82=81=E3=80=81=E3=83=AA?= =?UTF-8?q?=E3=83=88=E3=83=A9=E3=82=A4=E5=87=A6=E7=90=86=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/julius/Script/Julius_Client.cs | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Assets/julius/Script/Julius_Client.cs b/Assets/julius/Script/Julius_Client.cs index b24169e..b3c312b 100644 --- a/Assets/julius/Script/Julius_Client.cs +++ b/Assets/julius/Script/Julius_Client.cs @@ -137,14 +137,18 @@ private void close_julius(){ /*サーバーが起動するまで時間があるので少し待つ*/ private IEnumerator start_julius_server(){ - Debug.Log ("Julius Initialize..."); - message = "Julius Initialize..."; - return_num = 1; - yield return new WaitForSeconds(wait_time); - Debug.Log ("Connect start"); - message = "Connect start"; - return_num = 1; - connect = initialize_julius_client(); + while (!connect) + { + Debug.Log("Julius Initialize..."); + message = "Julius Initialize..."; + return_num = 1; + yield return new WaitForSeconds(wait_time); + Debug.Log("Connect start"); + message = "Connect start"; + return_num = 1; + + connect = initialize_julius_client(); + } } //-------------------------------------------------------------------- From e6fcb43abca6bb522dd1810abd85f436ac39e9b4 Mon Sep 17 00:00:00 2001 From: You-Key Date: Sun, 6 Nov 2016 17:40:02 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=90=E5=A4=89?= =?UTF-8?q?=E6=95=B0=E3=81=A8=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=AB=E5=A4=89?= =?UTF-8?q?=E6=95=B0=E3=81=A7=E5=90=8C=E3=81=98=E5=90=8D=E5=89=8D=E3=81=AE?= =?UTF-8?q?=E5=A4=89=E6=95=B0=E3=81=8C=E3=81=82=E3=81=A3=E3=81=9F=E3=81=AE?= =?UTF-8?q?=E3=81=A7=E5=8C=BA=E5=88=A5=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/julius/Script/Julius_Client.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/julius/Script/Julius_Client.cs b/Assets/julius/Script/Julius_Client.cs index b3c312b..9143718 100644 --- a/Assets/julius/Script/Julius_Client.cs +++ b/Assets/julius/Script/Julius_Client.cs @@ -184,7 +184,7 @@ private void send_stream(string msg){ /*ストリーム情報から正規表現を利用して文字列を抽出する*/ private string XML_search(string stream){ - string tmp = string.Empty; + string tmp_l = string.Empty; //正規表現 xml_data = new Regex(regular); @@ -193,13 +193,13 @@ private string XML_search(string stream){ while(sampling.Success){//最後まで抽出 //結合処理 for(int i = 1;i Date: Sun, 6 Nov 2016 17:51:10 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=E3=82=AA=E3=83=96=E3=82=B8=E3=82=A7?= =?UTF-8?q?=E3=82=AF=E3=83=88=E3=81=8C=E7=A0=B4=E6=A3=84=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=A6=E3=82=82=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC=E3=81=8C?= =?UTF-8?q?=E6=AE=8B=E3=82=8A=E3=80=81=E3=82=B7=E3=83=BC=E3=83=B3=E3=83=AA?= =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=83=89=E3=81=A7=E5=A4=9A=E9=87=8D=E8=B5=B7?= =?UTF-8?q?=E5=8B=95=E3=81=AB=E3=81=AA=E3=82=8B=E3=81=AE=E3=82=92=E9=98=B2?= =?UTF-8?q?=E3=81=90=E3=81=9F=E3=82=81=E3=80=81=E3=82=B5=E3=83=BC=E3=83=90?= =?UTF-8?q?=E3=83=BC=E5=88=87=E6=96=AD=E3=82=92=E3=82=AA=E3=83=96=E3=82=B8?= =?UTF-8?q?=E3=82=A7=E3=82=AF=E3=83=88=E7=A0=B4=E6=A3=84=E6=99=82=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/julius/Script/Julius_Client.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/julius/Script/Julius_Client.cs b/Assets/julius/Script/Julius_Client.cs index 9143718..555f149 100644 --- a/Assets/julius/Script/Julius_Client.cs +++ b/Assets/julius/Script/Julius_Client.cs @@ -263,7 +263,8 @@ void Update () { } //終了処理と同時に実行される - void OnApplicationQuit() { + void OnDestroy() + { if (connect) { //juliusサーバーを切断 close_julius();