diff --git a/VRCFaceTracking.sln b/VRCFaceTracking.sln index 81fbb0ec..cad2a3e4 100644 --- a/VRCFaceTracking.sln +++ b/VRCFaceTracking.sln @@ -1,5 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.32126.315 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRCFaceTracking", "VRCFaceTracking\VRCFaceTracking.csproj", "{0767C09E-D536-464B-B0A1-46D5BFA19E98}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRCFT Module Example", "VRCFT Module Example\VRCFT Module Example.csproj", "{296110E5-3AE7-4D9F-BE09-890194CDD76E}" @@ -10,13 +13,19 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {296110E5-3AE7-4D9F-BE09-890194CDD76E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {296110E5-3AE7-4D9F-BE09-890194CDD76E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {296110E5-3AE7-4D9F-BE09-890194CDD76E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {296110E5-3AE7-4D9F-BE09-890194CDD76E}.Release|Any CPU.Build.0 = Release|Any CPU {0767C09E-D536-464B-B0A1-46D5BFA19E98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0767C09E-D536-464B-B0A1-46D5BFA19E98}.Debug|Any CPU.Build.0 = Debug|Any CPU {0767C09E-D536-464B-B0A1-46D5BFA19E98}.Release|Any CPU.ActiveCfg = Release|Any CPU {0767C09E-D536-464B-B0A1-46D5BFA19E98}.Release|Any CPU.Build.0 = Release|Any CPU + {296110E5-3AE7-4D9F-BE09-890194CDD76E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {296110E5-3AE7-4D9F-BE09-890194CDD76E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {296110E5-3AE7-4D9F-BE09-890194CDD76E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {296110E5-3AE7-4D9F-BE09-890194CDD76E}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {7160120F-762F-4906-B9F5-F0B1AB71E928} EndGlobalSection EndGlobal diff --git a/VRCFaceTracking/App.xaml b/VRCFaceTracking/App.xaml new file mode 100644 index 00000000..88423482 --- /dev/null +++ b/VRCFaceTracking/App.xaml @@ -0,0 +1,10 @@ + + + + + + diff --git a/VRCFaceTracking/App.xaml.cs b/VRCFaceTracking/App.xaml.cs new file mode 100644 index 00000000..8dfef6c5 --- /dev/null +++ b/VRCFaceTracking/App.xaml.cs @@ -0,0 +1,14 @@ +using System.Threading; + +namespace VRCFaceTracking +{ + public partial class App + { + private readonly Thread _oscThread = new Thread(MainStandalone.Initialize); + + public App() + { + _oscThread.Start(); + } + } +} \ No newline at end of file diff --git a/VRCFaceTracking/InputManager.cs b/VRCFaceTracking/InputManager.cs index 12978349..765569d2 100644 --- a/VRCFaceTracking/InputManager.cs +++ b/VRCFaceTracking/InputManager.cs @@ -5,12 +5,14 @@ namespace VRCFaceTracking { public class InputManager { + // Move to the WPF window as a button public bool ShouldPause; public InputManager() => new Thread(Listen).Start(); private void Listen() { + return; while (true) { var key = Console.ReadKey(true); diff --git a/VRCFaceTracking/MainStandalone.cs b/VRCFaceTracking/MainStandalone.cs index 0832b9f2..0836e970 100644 --- a/VRCFaceTracking/MainStandalone.cs +++ b/VRCFaceTracking/MainStandalone.cs @@ -6,6 +6,7 @@ using System.Runtime.InteropServices; using System.Text.RegularExpressions; using System.Threading; +using System.Windows; using VRCFaceTracking.OSC; [assembly: AssemblyTitle("VRCFaceTracking")] @@ -17,6 +18,10 @@ [assembly: AssemblyVersion("3.0.1")] [assembly: AssemblyFileVersion("3.0.1")] [assembly: NeutralResourcesLanguage("en")] +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, + ResourceDictionaryLocation.SourceAssembly +)] namespace VRCFaceTracking { @@ -34,10 +39,10 @@ private static IEnumerable ConstructMessages(IEnumerable + + + + Welcome to + VRCFaceTracking + + + + + diff --git a/VRCFaceTracking/MainWindow.xaml.cs b/VRCFaceTracking/MainWindow.xaml.cs new file mode 100644 index 00000000..9d9a7e81 --- /dev/null +++ b/VRCFaceTracking/MainWindow.xaml.cs @@ -0,0 +1,14 @@ +using System.Windows; + +namespace VRCFaceTracking +{ + public partial class MainWindow + { + public MainWindow() + { + InitializeComponent(); + + //VRCFTLogo.Source = new + } + } +} \ No newline at end of file diff --git a/VRCFaceTracking/VRCFTLogo.png b/VRCFaceTracking/VRCFTLogo.png new file mode 100644 index 00000000..8299b616 Binary files /dev/null and b/VRCFaceTracking/VRCFTLogo.png differ diff --git a/VRCFaceTracking/VRCFaceTracking.csproj b/VRCFaceTracking/VRCFaceTracking.csproj index 3efbbd31..d3ec87e0 100644 --- a/VRCFaceTracking/VRCFaceTracking.csproj +++ b/VRCFaceTracking/VRCFaceTracking.csproj @@ -5,16 +5,16 @@ Debug AnyCPU {0767C09E-D536-464B-B0A1-46D5BFA19E98} - Exe + WinExe Properties VRCFaceTracking VRCFaceTracking v4.7.2 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 512 x64 - Exe true full false @@ -28,7 +28,6 @@ pdbonly true - Exe TRACE prompt 4 @@ -41,6 +40,14 @@ VRCFT.ico + + App.xaml + Code + + + MainWindow.xaml + Code + @@ -84,18 +91,21 @@ - ..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0-preview.1.22076.8\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll True + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll True + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll True @@ -125,9 +135,25 @@ ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll True + + + + + + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer +