Version on desktop. Next commit will be merged with Mo code

ssridhar · Jan 18, 2017 · b83cd74 · b83cd74
1 parent 1e8f880
commit b83cd74
Show file tree

Hide file tree

Showing 19 changed files with 196 additions and 6 deletions.
diff --git a/WoodenMan/.vs/WoodenMan/v14/.suo b/WoodenMan/.vs/WoodenMan/v14/.suo
diff --git a/WoodenMan/Assets/Scripts/loadKFWSkeleton.cs b/WoodenMan/Assets/Scripts/loadKFWSkeleton.cs
@@ -30,12 +30,12 @@ void Start()
         //Screen.SetResolution(1920, 1080, true);
         Application.runInBackground = true;
 
-        m_isVRMode = true;
-        m_isMoveFloor = false;
-        m_isVNECTMode = false;
+        m_isVRMode = false;
+        m_isMoveFloor = true;
+        m_isVNECTMode = true;
 
         if (m_isVNECTMode)
-            m_SequenceName = "DCorridor_VNECT";
+            m_SequenceName = "Football_2";
         else
             m_SequenceName = "DCorridor_KFW";
         FileStream fs = new FileStream(UnityEngine.Application.streamingAssetsPath + "/" + m_SequenceName + ".txt", FileMode.Open, FileAccess.Read, FileShare.Read);
@@ -183,6 +183,7 @@ void Start()
     void Update()
     {
         string Line = m_3DPoseFileStream.ReadLine();
+        Debug.Log(Line);
         m_isValid = false;
 
         if (Line.Length == 0)

diff --git a/WoodenMan/Assets/StreamingAssets/Football_2.txt b/WoodenMan/Assets/StreamingAssets/Football_2.txt
diff --git a/WoodenMan/Library/CurrentLayout.dwlt b/WoodenMan/Library/CurrentLayout.dwlt
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/assetDatabase3 b/WoodenMan/Library/assetDatabase3
diff --git a/WoodenMan/Library/metadata/83/83a46bd16b64c9c4386ae0f1b3812dbf b/WoodenMan/Library/metadata/83/83a46bd16b64c9c4386ae0f1b3812dbf
diff --git a/WoodenMan/Library/shadercompiler-UnityShaderCompiler.exe0.log b/WoodenMan/Library/shadercompiler-UnityShaderCompiler.exe0.log
@@ -1,4 +1,2 @@
 Base path: C:/Program Files/Unity/Editor/Data
 Cmd: getPlatforms
-
-Quitting shader compiler process
diff --git a/WoodenMan/WoodenMan.CSharp.Editor.csproj b/WoodenMan/WoodenMan.CSharp.Editor.csproj
@@ -169,6 +169,7 @@
     <None Include="Assets\StreamingAssets\DCorridor_KFW.txt" />
     <None Include="Assets\StreamingAssets\DCorridor_VNECT.txt" />
     <None Include="Assets\StreamingAssets\DRotunda.txt" />
+    <None Include="Assets\StreamingAssets\Football_2.txt" />
     <None Include="Assets\StreamingAssets\KFWFormat.txt" />
     <None Include="Assets\StreamingAssets\VNECTFormat.txt" />
     <None Include="Assets\websocket-sharp for Unity\Plugins\websocket-sharp.xml" />

diff --git a/WoodenMan/WoodenMan.CSharp.csproj b/WoodenMan/WoodenMan.CSharp.csproj
@@ -200,6 +200,7 @@
     <None Include="Assets\StreamingAssets\DCorridor_KFW.txt" />
     <None Include="Assets\StreamingAssets\DCorridor_VNECT.txt" />
     <None Include="Assets\StreamingAssets\DRotunda.txt" />
+    <None Include="Assets\StreamingAssets\Football_2.txt" />
     <None Include="Assets\StreamingAssets\KFWFormat.txt" />
     <None Include="Assets\StreamingAssets\VNECTFormat.txt" />
     <None Include="Assets\websocket-sharp for Unity\Plugins\websocket-sharp.xml" />