jrhodnik
/
VRDash
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Started implementing GUI.

This commit is contained in:
jrhodnik 2019-05-26 01:40:32 -04:00
parent 6f3c6fa75e
commit ac666a5a94
18 changed files with 241 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
VDash/ConfigManager.cs
View File

@ -3,10 +3,29 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VDash.Overlay.Config;
namespace VDash
{
class ConfigManager
public class ConfigManager
{
public string ConfigLocation { get; private set; }
public ConfigManager()
{
ConfigLocation = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments, Environment.SpecialFolderOption.None) + @"\VRDash\DefaultProfile.json";
}
/// <summary>
/// Saves config to ConfigLocation
/// </summary>
public void SaveConfig()
{
}
}
public class Profile
{
public List<IOverlayConfig> OverlayConfigs { get; private set; }
}
}

6
VDash/MainWindow.xaml
View File

@ -25,10 +25,14 @@
<Button x:Name="btnDisable">Disable</Button>
<Button x:Name="btnRemove" Click="btnRemove_Click">Remove</Button>
</ToolBar>
<ListView x:Name="lvOverlays" Grid.Row="1">
<ListView x:Name="lvOverlays" Grid.Row="1" SelectionChanged="lvOverlays_SelectionChanged">
</ListView>
</Grid>
</Border>
<Border x:Name="bdrContent" Grid.Column="1" Margin="0,5,5,5"/>
</Grid>
</Window>

49
VDash/MainWindow.xaml.cs
View File

@ -14,6 +14,8 @@ using System.Windows.Navigation;
using System.Windows.Shapes;
using Valve.VR;
using VDash.Overlay;
using VDash.Overlay.Config;
using VDash.UI;
using VDash.Utilities;
namespace VDash
@ -24,6 +26,13 @@ namespace VDash
public partial class MainWindow : Window
{
public static OverlayManager OverlayManager = new OverlayManager();
public static List<EditorMap> EditorMapping = new List<EditorMap>()
{
new EditorMap(typeof(MonitorOverlay), typeof(UI.MonitorOverlayEditor)),
new EditorMap(typeof(WindowOverlay), typeof(UI.WindowOverlayEditor))
};
List<OverlayEditor> overlayEditors = new List<OverlayEditor>();
public MainWindow()
{
InitializeComponent();
@ -73,7 +82,12 @@ namespace VDash
{
Window w = new Window();
var uc = new UI.CreateNewOverlay();
uc.Created += (x, y) => { w.Close(); };
uc.Created += (snd, overlay) => {
w.Close();
UI.IOverlayEditor editor = (UI.IOverlayEditor)Activator.CreateInstance(EditorMapping.Single(x => x.OverlayType == overlay.GetType()).EditorType, new object[] { overlay.OverlayConfig });
OverlayEditor overlayEditor = new OverlayEditor(new UI.OverlayEditor(editor), overlay);
overlayEditors.Add(overlayEditor);
};
w.Content = uc;
w.Width = 500;
w.Height = 400;
@ -87,6 +101,39 @@ namespace VDash
IOverlay overlay = (IOverlay)lvOverlays.SelectedItem;
overlay.Dispose();
OverlayManager.Overlays.Remove(overlay);
overlayEditors.Remove(overlayEditors.Single(x => x.Overlay == overlay));
}
private void lvOverlays_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
if (lvOverlays.SelectedItem == null) { return; }
IOverlay overlay = (IOverlay)lvOverlays.SelectedItem;
bdrContent.Child = (UserControl)overlayEditors.Single(x => x.Overlay == overlay).Editor;
}
}
public class OverlayEditor
{
public OverlayEditor(IOverlayEditor editor, IOverlay overlay)
{
Editor = editor;
Overlay = overlay;
}
public UI.IOverlayEditor Editor { get; private set; }
public IOverlay Overlay { get; private set; }
}
public class EditorMap
{
public EditorMap(Type overlayType, Type editorType)
{
OverlayType = overlayType;
EditorType = editorType;
}
public Type OverlayType { get; private set; }
public Type EditorType { get; private set; }
}
}

1
VDash/Overlay/Config/IOverlayConfig.cs
View File

@ -10,5 +10,6 @@ namespace VDash.Overlay.Config
{
string Name { get; set; }
string Key { get; set; }
float OverlayWidth { get; set; }
}
}

11
VDash/Overlay/Config/MonitorOverlayConfig.cs
View File

@ -8,8 +8,19 @@ namespace VDash.Overlay.Config
{
public class MonitorOverlayConfig : IOverlayConfig
{
public event EventHandler WidthUpdated;
public string Name { get; set; }
public string Key { get; set; }
public string MonitorName { get; set; }
float m_Width = 2.5f;
public float OverlayWidth
{
get { return m_Width; }
set
{
m_Width = value;
WidthUpdated?.Invoke(this, null);
}
}
}
}

11
VDash/Overlay/Config/WindowOverlayConfig.cs
View File

@ -9,6 +9,7 @@ namespace VDash.Overlay.Config
{
public class WindowOverlayConfig : IOverlayConfig
{
public event EventHandler WidthUpdated;
public WindowOverlayConfig(string name, string key, IWindowSelector selector, bool updateDashboardName, bool destroyOnNoWindowFound)
{
Name = name;
@ -25,5 +26,15 @@ namespace VDash.Overlay.Config
public IWindowSelector Selector {get; set; }
public bool UpdateDashboardName { get; set; } = false;
public bool DestroyOnNoWindowFound { get; set; } = false;
float m_Width = 2.5f;
public float OverlayWidth
{
get { return m_Width; }
set
{
m_Width = value;
WidthUpdated?.Invoke(this, null);
}
}
}
}

5
VDash/Overlay/MonitorOverlay.cs
View File

@ -52,13 +52,14 @@ namespace VDash.Overlay
public List<IOverlayAction> OverlayHiddenActions { get; private set; } = new List<IOverlayAction>();
public IOverlayConfig OverlayConfig { get { return Config; } }
public MonitorOverlayConfig Config { get; set; }
public MonitorOverlayConfig Config { get; }
char[] specialKeys = { '+', '^', '%', '~', '(', ')', '{', '}', '[', ']' };
public MonitorOverlay(MonitorOverlayConfig config)
{
Config = config;
Config.WidthUpdated += (x, y) => { SetOverlayWidth(Config.OverlayWidth); };
}
@ -421,7 +422,7 @@ namespace VDash.Overlay
screenTexture = new Texture2D(device, textureDesc);
stream = new DataStream(4 * width * height, true, true);
overlay.SetOverlayWidthInMeters(m_OverlayHandle, 2.5f);
overlay.SetOverlayWidthInMeters(m_OverlayHandle, Config.OverlayWidth);
HmdVector2_t vecWindowSize = new HmdVector2_t() { v0 = data.Width, v1 = data.Height };
OpenVR.Overlay.SetOverlayMouseScale(m_OverlayHandle, ref vecWindowSize);

21
VDash/Overlay/WindowOverlay.cs
View File

@ -39,7 +39,7 @@ namespace VDash.Overlay
public ulong ThumbnailIcon { get { return m_ThumbnailIcon; } }
public IOverlayConfig OverlayConfig { get { return Config; } }
public WindowOverlayConfig Config { get; set; }
public WindowOverlayConfig Config { get; }
//internal string m_Key;
@ -57,6 +57,7 @@ namespace VDash.Overlay
{
//Selector = selector;
Config = config;
Config.WidthUpdated += (x, y) => { SetOverlayWidth(Config.OverlayWidth); };
}
/// <summary>
@ -102,7 +103,7 @@ namespace VDash.Overlay
private void destroyInternal()
{
if (!m_Created) { throw new Exception("This object is not created."); }
if (!m_Created) { return; }
m_Created = false;
//Signal render thread to exit
@ -202,13 +203,16 @@ namespace VDash.Overlay
#region Thumbnail rendering
using (var icon = User32.GetAppIcon(windowHandle))
{
using (var iconBmp = icon.ToBitmap())
if (icon != null)
{
var data = iconBmp.LockBits(new Rectangle(0, 0, iconBmp.Width, iconBmp.Height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
using (var iconBmp = icon.ToBitmap())
{
var data = iconBmp.LockBits(new Rectangle(0, 0, iconBmp.Width, iconBmp.Height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
overlay.SetOverlayRaw(m_ThumbnailIcon, data.Scan0, (uint)data.Width, (uint)data.Height, 4);
overlay.SetOverlayRaw(m_ThumbnailIcon, data.Scan0, (uint)data.Width, (uint)data.Height, 4);
iconBmp.UnlockBits(data);
iconBmp.UnlockBits(data);
}
}
}
#endregion
@ -497,7 +501,7 @@ namespace VDash.Overlay
screenTexture = new Texture2D(device, textureDesc);
stream = new DataStream(4 * width * height, true, true);
overlay.SetOverlayWidthInMeters(m_OverlayHandle, 2.5f);
overlay.SetOverlayWidthInMeters(m_OverlayHandle, Config.OverlayWidth);
HmdVector2_t vecWindowSize = new HmdVector2_t() { v0 = data.Width, v1 = data.Height };
OpenVR.Overlay.SetOverlayMouseScale(m_OverlayHandle, ref vecWindowSize);
@ -590,7 +594,7 @@ namespace VDash.Overlay
}
//Clean up after we exit while loop.
screenTexture.Dispose();
screenTexture?.Dispose();
device.ImmediateContext.ClearState();
device.ImmediateContext.Flush();
@ -617,7 +621,6 @@ namespace VDash.Overlay
public void SetOverlayName(string newName)
{
OpenVR.Overlay.SetOverlayName(m_OverlayHandle, newName);
//Config.Name = newName;
}
public float GetOverlayWidth()

9
VDash/UI/CreateNewOverlay.xaml.cs
View File

@ -21,11 +21,12 @@ namespace VDash.UI
/// </summary>
public partial class CreateNewOverlay : UserControl
{
public event EventHandler Created;
public delegate void CreatedEventHandler(UserControl sender, IOverlay created);
public event CreatedEventHandler Created;
public OverlayTypeWrapper[] EligibleOverlays { get; private set; } = {
new OverlayTypeWrapper("Window Overlay", typeof(WindowOverlay), new WindowOverlayEditor()),
new OverlayTypeWrapper("Monitor Overlay", typeof(MonitorOverlay), new MonitorOverlayEditor())
new OverlayTypeWrapper("Window Overlay", typeof(WindowOverlay), new OverlayEditor(new WindowOverlayEditor())),
new OverlayTypeWrapper("Monitor Overlay", typeof(MonitorOverlay), new OverlayEditor(new MonitorOverlayEditor()))
};
public CreateNewOverlay()
@ -53,7 +54,7 @@ namespace VDash.UI
MainWindow.OverlayManager.Overlays.Add(overlay);
Created?.Invoke(this, null);
Created?.Invoke(this, overlay);
}
// Generate a random string with a given size

1
VDash/UI/IOverlayEditor.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Controls;
using VDash.Overlay.Config;
namespace VDash.UI

4
VDash/UI/MonitorOverlayEditor.xaml.cs
View File

@ -30,7 +30,9 @@ namespace VDash.UI
InitializeComponent();
OverlayConfig = config;
DataContext = OverlayConfig;
cbMontitor.ItemsSource = GetDisplays();
var displays = GetDisplays();
cbMontitor.ItemsSource = displays;
cbMontitor.SelectedItem = displays.Single(x => x.MonitorInfo.DeviceName == OverlayConfig.MonitorName);
}
public MonitorOverlayEditor()

24
VDash/UI/OverlayEditor.xaml Normal file
View File

@ -0,0 +1,24 @@
<UserControl x:Class="VDash.UI.OverlayEditor"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:VDash.UI"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="25" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="85" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="60" />
</Grid.ColumnDefinitions>
<Border x:Name="bdrContent" Grid.Row="0" Grid.ColumnSpan="3"/>
<TextBlock Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center">Overlay Width:</TextBlock>
<Slider x:Name="slWidth" Maximum="10" Grid.Row="1" Grid.Column="1" Value="{Binding OverlayWidth}" VerticalAlignment="Center" Margin="5,0,5,0"/>
<TextBox x:Name="tbWidth" Grid.Row="1" Grid.Column="2" PreviewTextInput="tbWidth_PreviewTextInput" Text="{Binding OverlayWidth}"/>
</Grid>
</UserControl>

42
VDash/UI/OverlayEditor.xaml.cs Normal file
View File

@ -0,0 +1,42 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using VDash.Overlay.Config;
namespace VDash.UI
{
/// <summary>
/// Interaction logic for OverlayEditor.xaml
/// </summary>
public partial class OverlayEditor : UserControl,IOverlayEditor
{
public IOverlayEditor Editor { get { return (IOverlayEditor)bdrContent.Child; } set { bdrContent.Child = (UserControl)value; } }
public IOverlayConfig Config { get { return Editor.Config; } }
public OverlayEditor(IOverlayEditor editor)
{
InitializeComponent();
Editor = editor;
DataContext = Config;
}
private void tbWidth_PreviewTextInput(object sender, TextCompositionEventArgs e)
{
Regex regex = new Regex(@"^[1-9]\d*(\.\d+)?$");
e.Handled = regex.IsMatch(e.Text);
}
}
}

22
VDash/UI/WindowOverlayEditor.xaml.cs
View File

@ -40,14 +40,8 @@ namespace VDash.UI
InitializeComponent();
DataContext = OverlayConfig;
if (OverlayConfig.Selector != null)
{
SelectorWrapper wrapper = Selectors.Single(x => x.SelectorType == OverlayConfig.Selector.GetType());
IWindowSelector selector = OverlayConfig.Selector;
UserControl editor = (UserControl)Activator.CreateInstance(wrapper.EditorType, OverlayConfig);
wrapper.Editor = editor;
}
cbSelector.ItemsSource = Selectors;
SetupDropDown();
}
public WindowOverlayEditor(ref WindowOverlayConfig config)
@ -56,6 +50,20 @@ namespace VDash.UI
OverlayConfig = config;
DataContext = OverlayConfig;
cbSelector.ItemsSource = Selectors;
SetupDropDown();
}
private void SetupDropDown()
{
if (OverlayConfig.Selector != null)
{
SelectorWrapper wrapper = Selectors.Single(x => x.SelectorType == OverlayConfig.Selector.GetType());
IWindowSelector selector = OverlayConfig.Selector;
UserControl editor = (UserControl)Activator.CreateInstance(wrapper.EditorType, new object[] { selector });
wrapper.Editor = editor;
wrapper.Selector = selector;
cbSelector.SelectedItem = wrapper;
}
}
public class SelectorWrapper

1
VDash/UI/WindowSelectorEditor.xaml.cs
View File

@ -29,6 +29,7 @@ namespace VDash.UI
Selector = selector;
cbSearchType.ItemsSource = Enum.GetValues(typeof(FromWindowTitle.TitleSearchType));
DataContext = selector;
cbSearchType.SelectedItem = selector.SearchType;
}
private void cbSearchType_SelectionChanged(object sender, SelectionChangedEventArgs e)

11
VDash/VDash.csproj
View File

@ -54,6 +54,9 @@
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<HintPath>..\packages\SharpDX.4.2.0\lib\net45\SharpDX.dll</HintPath>
</Reference>
@ -85,6 +88,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="ConfigManager.cs" />
<Compile Include="OverlayManager.cs" />
<Compile Include="Overlay\Actions\BringWindowToFrontAction.cs" />
<Compile Include="Overlay\Actions\IOverlayAction.cs" />
@ -103,6 +107,9 @@
<Compile Include="UI\MonitorOverlayEditor.xaml.cs">
<DependentUpon>MonitorOverlayEditor.xaml</DependentUpon>
</Compile>
<Compile Include="UI\OverlayEditor.xaml.cs">
<DependentUpon>OverlayEditor.xaml</DependentUpon>
</Compile>
<Compile Include="UI\ProcessSelectorEditor.xaml.cs">
<DependentUpon>ProcessSelectorEditor.xaml</DependentUpon>
</Compile>
@ -137,6 +144,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UI\OverlayEditor.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UI\ProcessSelectorEditor.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>

33
VDash/WindowSelectors/FromProcessName.cs
View File

@ -7,7 +7,21 @@ namespace VDash.WindowSelectors
{
public class FromProcessName : IWindowSelector
{
public string ProcessName { get; set; } = "";
internal string m_ProcName = "";
public string ProcessName
{
get
{
return m_ProcName;
}
set
{
m_ProcName = value;
m_Processes = null;
}
}
public FromProcessName(string procName)
{
if (string.IsNullOrWhiteSpace(procName))
@ -23,15 +37,15 @@ namespace VDash.WindowSelectors
}
Process[] processes = null;
Process[] m_Processes = null;
public Process[] GetProcesses()
{
if(processes == null)
if(m_Processes == null)
{
processes = Process.GetProcessesByName(ProcessName);
m_Processes = Process.GetProcessesByName(ProcessName);
}
return processes;
return m_Processes;
}
public Process GetProcess()
@ -61,7 +75,14 @@ namespace VDash.WindowSelectors
public bool WindowExists()
{
return User32.IsWindow(GetWindowHandle());
try
{
return User32.IsWindow(GetWindowHandle());
}
catch
{
return false;
}
}
}
}

1
VDash/packages.config
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net45" />
<package id="SharpDX" version="4.2.0" targetFramework="net45" />
<package id="SharpDX.Direct3D11" version="4.2.0" targetFramework="net45" />
<package id="SharpDX.DXGI" version="4.2.0" targetFramework="net45" />