Changes to CVPR demo version

ssridhar · May 19, 2017 · 5c0bee6 · 5c0bee6
1 parent 15a4a66
commit 5c0bee6
Show file tree

Hide file tree

Showing 137 changed files with 2,108 additions and 1,054 deletions.
diff --git a/WoodenMan.exe b/WoodenMan.exe
diff --git a/WoodenMan/.vs/WoodenMan/v14/.suo b/WoodenMan/.vs/WoodenMan/v14/.suo
diff --git a/WoodenMan/Assets/Mannequin_Doll/Models/Unity5_3/Mannequin_5_3_Optimized-fixed.fbm.meta b/WoodenMan/Assets/Mannequin_Doll/Models/Unity5_3/Mannequin_5_3_Optimized-fixed.fbm.meta
diff --git a/WoodenMan/Assets/Plugins/Android/gvr-permissionsupport-release.aar.meta b/WoodenMan/Assets/Plugins/Android/gvr-permissionsupport-release.aar.meta
diff --git a/WoodenMan/Assets/Plugins/Android/gvr_android_common.aar.meta b/WoodenMan/Assets/Plugins/Android/gvr_android_common.aar.meta
diff --git a/WoodenMan/Assets/Plugins/Android/gvr_audio.jar.meta b/WoodenMan/Assets/Plugins/Android/gvr_audio.jar.meta
diff --git a/WoodenMan/Assets/Plugins/Android/libs/armeabi-v7a/libaudioplugingvrunity.so.meta b/WoodenMan/Assets/Plugins/Android/libs/armeabi-v7a/libaudioplugingvrunity.so.meta
diff --git a/WoodenMan/Assets/Plugins/Android/libs/armeabi-v7a/libgvrunity.so.meta b/WoodenMan/Assets/Plugins/Android/libs/armeabi-v7a/libgvrunity.so.meta
diff --git a/WoodenMan/Assets/Plugins/Android/libs/x86/libaudioplugingvrunity.so.meta b/WoodenMan/Assets/Plugins/Android/libs/x86/libaudioplugingvrunity.so.meta
diff --git a/WoodenMan/Assets/Plugins/Android/libs/x86/libgvrunity.so.meta b/WoodenMan/Assets/Plugins/Android/libs/x86/libgvrunity.so.meta
diff --git a/WoodenMan/Assets/Plugins/Android/unitygvractivity.aar.meta b/WoodenMan/Assets/Plugins/Android/unitygvractivity.aar.meta
diff --git a/WoodenMan/Assets/Plugins/iOS/CardboardSDK.bundle.meta b/WoodenMan/Assets/Plugins/iOS/CardboardSDK.bundle.meta
diff --git a/WoodenMan/Assets/Plugins/iOS/GoogleKitCore.bundle.meta b/WoodenMan/Assets/Plugins/iOS/GoogleKitCore.bundle.meta
diff --git a/WoodenMan/Assets/Plugins/iOS/GoogleKitDialogs.bundle.meta b/WoodenMan/Assets/Plugins/iOS/GoogleKitDialogs.bundle.meta
diff --git a/WoodenMan/Assets/Plugins/iOS/GoogleKitHUD.bundle.meta b/WoodenMan/Assets/Plugins/iOS/GoogleKitHUD.bundle.meta
diff --git a/WoodenMan/Assets/Plugins/iOS/MaterialRobotoFontLoader.bundle.meta b/WoodenMan/Assets/Plugins/iOS/MaterialRobotoFontLoader.bundle.meta
diff --git a/WoodenMan/Assets/Plugins/iOS/libgvrunity.a.meta b/WoodenMan/Assets/Plugins/iOS/libgvrunity.a.meta
diff --git a/WoodenMan/Assets/Scripts/WebSocketClient.cs b/WoodenMan/Assets/Scripts/WebSocketClient.cs
@@ -64,7 +64,7 @@ public void Start()
         //Screen.SetResolution(1920, 1080, true);
         Application.runInBackground = true;
 
-        m_isKFWMode = true;
+        m_isKFWMode = false;
         ConnectWS();
 
         if (m_isKFWMode)

diff --git a/WoodenMan/Assets/Scripts/runLiveVNect.cs b/WoodenMan/Assets/Scripts/runLiveVNect.cs
@@ -99,8 +99,6 @@ override public void Start()
 
     override public void Update(string Line)
     {
-
-
         //Debug.Log(Line);
 
         if (Line.Length == 0)
@@ -117,8 +115,8 @@ override public void Update(string Line)
         for (int i = 0; i < m_JointSpheres.Length; ++i)
         {
             int Idx = m_ValidJointIdx[i];
-            Joints[i].x = float.Parse(Tokens[3 * Idx + 0 + ParseOffset]) * 0.001f; // Prevent mirroring
-            Joints[i].y = float.Parse(Tokens[3 * Idx + 1 + ParseOffset]) * 0.001f;
+            Joints[i].x = -float.Parse(Tokens[3 * Idx + 0 + ParseOffset]) * 0.001f; // Prevent mirroring
+            Joints[i].y = -float.Parse(Tokens[3 * Idx + 1 + ParseOffset]) * 0.001f;
             Joints[i].z = -float.Parse(Tokens[3 * Idx + 2 + ParseOffset]) * 0.001f; // Flip for Google VR
 
             if (Joints[i].y < LowestY)

diff --git a/WoodenMan/Library/CurrentLayout.dwlt b/WoodenMan/Library/CurrentLayout.dwlt
diff --git a/WoodenMan/Library/EditorUserBuildSettings.asset b/WoodenMan/Library/EditorUserBuildSettings.asset
diff --git a/WoodenMan/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/WoodenMan/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
diff --git a/WoodenMan/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb b/WoodenMan/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
diff --git a/WoodenMan/Library/ScriptAssemblies/Assembly-CSharp.dll b/WoodenMan/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/WoodenMan/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/WoodenMan/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/WoodenMan/Library/UnityAssemblies/UnityEditor.Advertisements.dll b/WoodenMan/Library/UnityAssemblies/UnityEditor.Advertisements.dll
diff --git a/WoodenMan/Library/UnityAssemblies/UnityEditor.Android.Extensions.dll b/WoodenMan/Library/UnityAssemblies/UnityEditor.Android.Extensions.dll
diff --git a/WoodenMan/Library/UnityAssemblies/UnityEditor.EditorTestsRunner.dll b/WoodenMan/Library/UnityAssemblies/UnityEditor.EditorTestsRunner.dll
diff --git a/WoodenMan/Library/UnityAssemblies/UnityEditor.Graphs.dll b/WoodenMan/Library/UnityAssemblies/UnityEditor.Graphs.dll
diff --git a/WoodenMan/Library/UnityAssemblies/UnityEditor.Networking.dll b/WoodenMan/Library/UnityAssemblies/UnityEditor.Networking.dll
diff --git a/WoodenMan/Library/UnityAssemblies/UnityEditor.TreeEditor.dll b/WoodenMan/Library/UnityAssemblies/UnityEditor.TreeEditor.dll
diff --git a/WoodenMan/Library/UnityAssemblies/UnityEditor.UI.dll b/WoodenMan/Library/UnityAssemblies/UnityEditor.UI.dll
diff --git a/WoodenMan/Library/UnityAssemblies/UnityEditor.WindowsStandalone.Extensions.dll b/WoodenMan/Library/UnityAssemblies/UnityEditor.WindowsStandalone.Extensions.dll
diff --git a/WoodenMan/Library/UnityAssemblies/version.txt b/WoodenMan/Library/UnityAssemblies/version.txt
@@ -1,5 +1,5 @@
 5.5.0f3:2.3.0.0
-Android
+StandaloneWindows
 C:/Program Files/Unity/Editor/Data/Managed/UnityEngine.dll
 C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll
 C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll

diff --git a/WoodenMan/Library/assetDatabase3 b/WoodenMan/Library/assetDatabase3
diff --git a/WoodenMan/Library/expandedItems b/WoodenMan/Library/expandedItems
diff --git a/WoodenMan/Library/metadata/00/00000000000000002000000000000000 b/WoodenMan/Library/metadata/00/00000000000000002000000000000000
diff --git a/WoodenMan/Library/metadata/00/00000000000000003000000000000000 b/WoodenMan/Library/metadata/00/00000000000000003000000000000000
diff --git a/WoodenMan/Library/metadata/00/00000000000000004000000000000000 b/WoodenMan/Library/metadata/00/00000000000000004000000000000000
diff --git a/WoodenMan/Library/metadata/00/00000000000000004100000000000000 b/WoodenMan/Library/metadata/00/00000000000000004100000000000000
diff --git a/WoodenMan/Library/metadata/00/00000000000000005000000000000000 b/WoodenMan/Library/metadata/00/00000000000000005000000000000000
diff --git a/WoodenMan/Library/metadata/00/00000000000000005100000000000000 b/WoodenMan/Library/metadata/00/00000000000000005100000000000000
diff --git a/WoodenMan/Library/metadata/00/00000000000000006000000000000000 b/WoodenMan/Library/metadata/00/00000000000000006000000000000000
diff --git a/WoodenMan/Library/metadata/00/00000000000000006100000000000000 b/WoodenMan/Library/metadata/00/00000000000000006100000000000000
diff --git a/WoodenMan/Library/metadata/00/00000000000000007000000000000000 b/WoodenMan/Library/metadata/00/00000000000000007000000000000000
diff --git a/WoodenMan/Library/metadata/00/00000000000000007100000000000000 b/WoodenMan/Library/metadata/00/00000000000000007100000000000000
diff --git a/WoodenMan/Library/metadata/00/00000000000000008000000000000000 b/WoodenMan/Library/metadata/00/00000000000000008000000000000000
diff --git a/WoodenMan/Library/metadata/00/00000000000000009000000000000000 b/WoodenMan/Library/metadata/00/00000000000000009000000000000000
diff --git a/WoodenMan/Library/metadata/00/0000000000000000a000000000000000 b/WoodenMan/Library/metadata/00/0000000000000000a000000000000000
diff --git a/WoodenMan/Library/metadata/00/0000000000000000a100000000000000 b/WoodenMan/Library/metadata/00/0000000000000000a100000000000000
diff --git a/WoodenMan/Library/metadata/00/0000000000000000b000000000000000 b/WoodenMan/Library/metadata/00/0000000000000000b000000000000000
diff --git a/WoodenMan/Library/metadata/00/0000000000000000c000000000000000 b/WoodenMan/Library/metadata/00/0000000000000000c000000000000000
diff --git a/WoodenMan/Library/metadata/02/02bfa6dacfed42e48a6fcff1a79cd9ee b/WoodenMan/Library/metadata/02/02bfa6dacfed42e48a6fcff1a79cd9ee
diff --git a/WoodenMan/Library/metadata/09/09514aff0bf87ea4c9cfba85b433f0a7 b/WoodenMan/Library/metadata/09/09514aff0bf87ea4c9cfba85b433f0a7
diff --git a/WoodenMan/Library/metadata/0a/0a1c15617420adb44ba9a5ffb9d33418 b/WoodenMan/Library/metadata/0a/0a1c15617420adb44ba9a5ffb9d33418
diff --git a/WoodenMan/Library/metadata/0b/0becd8c3a9ca3ab46af22dfca56198c0 b/WoodenMan/Library/metadata/0b/0becd8c3a9ca3ab46af22dfca56198c0
diff --git a/WoodenMan/Library/metadata/0c/0c553b8624a6ee2459f43d0862e97b72 b/WoodenMan/Library/metadata/0c/0c553b8624a6ee2459f43d0862e97b72
diff --git a/WoodenMan/Library/metadata/0c/0ce7a3c0840bb3844823de555c141f97 b/WoodenMan/Library/metadata/0c/0ce7a3c0840bb3844823de555c141f97
diff --git a/WoodenMan/Library/metadata/0d/0d97258235eba3343b6e41867b6015e4 b/WoodenMan/Library/metadata/0d/0d97258235eba3343b6e41867b6015e4
diff --git a/WoodenMan/Library/metadata/14/14055ce313ac36d45bc67f9bf83a9032 b/WoodenMan/Library/metadata/14/14055ce313ac36d45bc67f9bf83a9032
diff --git a/WoodenMan/Library/metadata/17/170d1020abb840b4e975275d910857d7 b/WoodenMan/Library/metadata/17/170d1020abb840b4e975275d910857d7
diff --git a/WoodenMan/Library/metadata/1d/1dd162d0275d0bb45a14a5995dc5de1d b/WoodenMan/Library/metadata/1d/1dd162d0275d0bb45a14a5995dc5de1d
diff --git a/WoodenMan/Library/metadata/1e/1e1c5c41ec2359e4e920fae164c3b9f1.info b/WoodenMan/Library/metadata/1e/1e1c5c41ec2359e4e920fae164c3b9f1.info
diff --git a/WoodenMan/Library/metadata/1f/1fd0a2b0af32e044cbe9ad2227b17699 b/WoodenMan/Library/metadata/1f/1fd0a2b0af32e044cbe9ad2227b17699
diff --git a/WoodenMan/Library/metadata/21/215845e76aa61e443b651af9681a1ba5 b/WoodenMan/Library/metadata/21/215845e76aa61e443b651af9681a1ba5
diff --git a/WoodenMan/Library/metadata/22/22b5db1b34ea91448b83bf101fb29aa6 b/WoodenMan/Library/metadata/22/22b5db1b34ea91448b83bf101fb29aa6
diff --git a/WoodenMan/Library/metadata/27/27c7d416d8f983340a0e51be83284e04 b/WoodenMan/Library/metadata/27/27c7d416d8f983340a0e51be83284e04
diff --git a/WoodenMan/Library/metadata/2e/2ec72979199d2984783fa0f9d83461b7 b/WoodenMan/Library/metadata/2e/2ec72979199d2984783fa0f9d83461b7
diff --git a/WoodenMan/Library/metadata/31/31ce6c3bbead55747a142da1200e06e2 b/WoodenMan/Library/metadata/31/31ce6c3bbead55747a142da1200e06e2
diff --git a/WoodenMan/Library/metadata/32/327ee17f0861f0047ad5230f3a1f6595 b/WoodenMan/Library/metadata/32/327ee17f0861f0047ad5230f3a1f6595
diff --git a/WoodenMan/Library/metadata/33/33f50dbc0f19bd642889930352c894b2 b/WoodenMan/Library/metadata/33/33f50dbc0f19bd642889930352c894b2
diff --git a/WoodenMan/Library/metadata/38/38ef460afd1330e4aa8b68b733207d19.info b/WoodenMan/Library/metadata/38/38ef460afd1330e4aa8b68b733207d19.info
diff --git a/WoodenMan/Library/metadata/3c/3cef0fe9989fde6408198a3f1ac10314 b/WoodenMan/Library/metadata/3c/3cef0fe9989fde6408198a3f1ac10314
diff --git a/WoodenMan/Library/metadata/42/42c0d3323ea13604dbcb22b4cbe28395 b/WoodenMan/Library/metadata/42/42c0d3323ea13604dbcb22b4cbe28395
diff --git a/WoodenMan/Library/metadata/46/46e0fc5f01e4ce34080a690d0f21a402.info b/WoodenMan/Library/metadata/46/46e0fc5f01e4ce34080a690d0f21a402.info
diff --git a/WoodenMan/Library/metadata/62/6256f370e4e4cd6479875a047624fdc9 b/WoodenMan/Library/metadata/62/6256f370e4e4cd6479875a047624fdc9
diff --git a/WoodenMan/Library/metadata/63/63610f27affd98648993c8d9a80a8cb4 b/WoodenMan/Library/metadata/63/63610f27affd98648993c8d9a80a8cb4
diff --git a/WoodenMan/Library/metadata/64/64222a07f5bc47b44a427e0b0db66ac6.info b/WoodenMan/Library/metadata/64/64222a07f5bc47b44a427e0b0db66ac6.info
diff --git a/WoodenMan/Library/metadata/68/68bd2d9e0ebabc640af4813609afb89e b/WoodenMan/Library/metadata/68/68bd2d9e0ebabc640af4813609afb89e
diff --git a/WoodenMan/Library/metadata/69/6962740ec6729bb42ac8b1eee586307d b/WoodenMan/Library/metadata/69/6962740ec6729bb42ac8b1eee586307d
diff --git a/WoodenMan/Library/metadata/6a/6aac9fce7697b274985f4a3d5d42c59b b/WoodenMan/Library/metadata/6a/6aac9fce7697b274985f4a3d5d42c59b
diff --git a/WoodenMan/Library/metadata/6c/6c4e638cc5b014942acfb3c451196dc4 b/WoodenMan/Library/metadata/6c/6c4e638cc5b014942acfb3c451196dc4
diff --git a/WoodenMan/Library/metadata/70/7087e7f2a8aaec74c9e9c797e38f4db4 b/WoodenMan/Library/metadata/70/7087e7f2a8aaec74c9e9c797e38f4db4
diff --git a/WoodenMan/Library/metadata/71/710f883d665a50c47899766103fc9c13.info b/WoodenMan/Library/metadata/71/710f883d665a50c47899766103fc9c13.info
diff --git a/WoodenMan/Library/metadata/72/727345d4f764cf745b100fd387252c0e b/WoodenMan/Library/metadata/72/727345d4f764cf745b100fd387252c0e
diff --git a/WoodenMan/Library/metadata/78/78cf6ad2cfdf5d94c8a46100f37d74b6 b/WoodenMan/Library/metadata/78/78cf6ad2cfdf5d94c8a46100f37d74b6
diff --git a/WoodenMan/Library/metadata/7a/7a508b24693f1da4397770e593df6c16 b/WoodenMan/Library/metadata/7a/7a508b24693f1da4397770e593df6c16
diff --git a/WoodenMan/Library/metadata/7c/7cf19bcedac81b44fb03179640ab3c65.info b/WoodenMan/Library/metadata/7c/7cf19bcedac81b44fb03179640ab3c65.info
diff --git a/WoodenMan/Library/metadata/83/83a46bd16b64c9c4386ae0f1b3812dbf b/WoodenMan/Library/metadata/83/83a46bd16b64c9c4386ae0f1b3812dbf
diff --git a/WoodenMan/Library/metadata/86/86f20f5a835a27544a122ac834c28252 b/WoodenMan/Library/metadata/86/86f20f5a835a27544a122ac834c28252
diff --git a/WoodenMan/Library/metadata/89/89b9705988254ab49870ccaccb6f0fad b/WoodenMan/Library/metadata/89/89b9705988254ab49870ccaccb6f0fad
diff --git a/WoodenMan/Library/metadata/8a/8a2713822b042a44ea8b325b6ab503e1.info b/WoodenMan/Library/metadata/8a/8a2713822b042a44ea8b325b6ab503e1.info
diff --git a/WoodenMan/Library/metadata/8b/8b1a321b6e11f9e46b5ace2815bd99f5 b/WoodenMan/Library/metadata/8b/8b1a321b6e11f9e46b5ace2815bd99f5
diff --git a/WoodenMan/Library/metadata/8c/8cea330b11a21064caa1fe10fdb3617c b/WoodenMan/Library/metadata/8c/8cea330b11a21064caa1fe10fdb3617c
diff --git a/WoodenMan/Library/metadata/8d/8d78bb7a282240049a6a9e99fefafb00 b/WoodenMan/Library/metadata/8d/8d78bb7a282240049a6a9e99fefafb00
diff --git a/WoodenMan/Library/metadata/94/94c4187ffb5bc034dbc3326a61ed4b16 b/WoodenMan/Library/metadata/94/94c4187ffb5bc034dbc3326a61ed4b16
diff --git a/WoodenMan/Library/metadata/96/962bd38e76e20e646ae6c318d47bc30d b/WoodenMan/Library/metadata/96/962bd38e76e20e646ae6c318d47bc30d
diff --git a/WoodenMan/Library/metadata/96/96fef49e114057a4e8804cd90914edaf b/WoodenMan/Library/metadata/96/96fef49e114057a4e8804cd90914edaf
diff --git a/WoodenMan/Library/metadata/99/990737175b86c0347be612799cb957ef b/WoodenMan/Library/metadata/99/990737175b86c0347be612799cb957ef
diff --git a/WoodenMan/Library/metadata/9b/9be48156a47064f428f28967190d8494 b/WoodenMan/Library/metadata/9b/9be48156a47064f428f28967190d8494
diff --git a/WoodenMan/Library/metadata/9c/9c37016021dbf8d42936c6c35df87989 b/WoodenMan/Library/metadata/9c/9c37016021dbf8d42936c6c35df87989
diff --git a/WoodenMan/Library/metadata/9e/9e4714d4c4a4e3448a673fcef6534704 b/WoodenMan/Library/metadata/9e/9e4714d4c4a4e3448a673fcef6534704
diff --git a/WoodenMan/Library/metadata/9f/9fafe9f02c7593e47850068ea5c6616f b/WoodenMan/Library/metadata/9f/9fafe9f02c7593e47850068ea5c6616f
diff --git a/WoodenMan/Library/metadata/a5/a59bd0732c1883f4d922d390b82887b3 b/WoodenMan/Library/metadata/a5/a59bd0732c1883f4d922d390b82887b3
diff --git a/WoodenMan/Library/metadata/a7/a743b18104f47f84dae36ae68d4c5e4d b/WoodenMan/Library/metadata/a7/a743b18104f47f84dae36ae68d4c5e4d
diff --git a/WoodenMan/Library/metadata/ae/ae0df40a034b8ef4ca46a0f385578190 b/WoodenMan/Library/metadata/ae/ae0df40a034b8ef4ca46a0f385578190
diff --git a/WoodenMan/Library/metadata/b1/b189c5d7d88bc2e448498602d2c3470c b/WoodenMan/Library/metadata/b1/b189c5d7d88bc2e448498602d2c3470c
diff --git a/WoodenMan/Library/metadata/b2/b249dd9a53aaf844bba9f1346bdd4fd8 b/WoodenMan/Library/metadata/b2/b249dd9a53aaf844bba9f1346bdd4fd8
diff --git a/WoodenMan/Library/metadata/b7/b7d3e8e2fcb32e24a91499176d3dd014 b/WoodenMan/Library/metadata/b7/b7d3e8e2fcb32e24a91499176d3dd014
diff --git a/WoodenMan/Library/metadata/ba/bafa44809c814f8448deac15d8446582 b/WoodenMan/Library/metadata/ba/bafa44809c814f8448deac15d8446582
diff --git a/WoodenMan/Library/metadata/bd/bd2ce84155ed35846845d17bfed563a4 b/WoodenMan/Library/metadata/bd/bd2ce84155ed35846845d17bfed563a4
diff --git a/WoodenMan/Library/metadata/ca/cade0e3b1bcbd7e4fb7131ee9c6686dd b/WoodenMan/Library/metadata/ca/cade0e3b1bcbd7e4fb7131ee9c6686dd
diff --git a/WoodenMan/Library/metadata/cb/cb10b04c12f77964f84b815f0cdf384b b/WoodenMan/Library/metadata/cb/cb10b04c12f77964f84b815f0cdf384b
diff --git a/WoodenMan/Library/metadata/da/da006417ff81af84cb24243cee969f55 b/WoodenMan/Library/metadata/da/da006417ff81af84cb24243cee969f55
diff --git a/WoodenMan/Library/metadata/db/db05b9122e8e36145b32469096fb6524 b/WoodenMan/Library/metadata/db/db05b9122e8e36145b32469096fb6524
diff --git a/WoodenMan/Library/metadata/ed/ed6bb1da4ca28a748b68d5c2fd257c89 b/WoodenMan/Library/metadata/ed/ed6bb1da4ca28a748b68d5c2fd257c89
diff --git a/WoodenMan/Library/metadata/fb/fbc0e1d3ed72a8547996b980a118733d b/WoodenMan/Library/metadata/fb/fbc0e1d3ed72a8547996b980a118733d
diff --git a/WoodenMan/Library/metadata/fd/fd4bce2e16aaaf043a866330580415b5 b/WoodenMan/Library/metadata/fd/fd4bce2e16aaaf043a866330580415b5