MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-19 06:43:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleanup code

Browse Source
This commit is contained in:
pypy
2020-11-01 22:23:03 +09:00
parent 5938f877f8
commit 2cc00465ad
5 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Browser.cs
View File

@@ -27,14 +27,7 @@ namespace VRCX
Size = new Size(texture.Description.Width, texture.Description.Height); Size = new Size(texture.Description.Width, texture.Description.Height);
RenderHandler.Dispose(); RenderHandler.Dispose();
RenderHandler = new RenderHandler(this, m_Lock); RenderHandler = new RenderHandler(this, m_Lock);
var options = new BindingOptions() Util.RegisterBindings(JavascriptObjectRepository);
{
CamelCaseJavascriptNames = false
};
JavascriptObjectRepository.Register("VRCX", VRCX.Instance, true, options);
JavascriptObjectRepository.Register("SharedVariable", SharedVariable.Instance, false, options);
JavascriptObjectRepository.Register("VRCXStorage", VRCXStorage.Instance, false, options);
JavascriptObjectRepository.Register("SQLite", SQLite.Instance, false, options);
} }
public new void Dispose() public new void Dispose()

11
MainForm.cs
View File

@@ -47,16 +47,7 @@ namespace VRCX
}, },
Dock = DockStyle.Fill, Dock = DockStyle.Fill,
}; };
var options = new BindingOptions() Util.RegisterBindings(Browser.JavascriptObjectRepository);
{
CamelCaseJavascriptNames = false
};
Browser.JavascriptObjectRepository.Register("VRCX", VRCX.Instance, true, options);
Browser.JavascriptObjectRepository.Register("SharedVariable", SharedVariable.Instance, false, options);
Browser.JavascriptObjectRepository.Register("VRCXStorage", VRCXStorage.Instance, false, options);
Browser.JavascriptObjectRepository.Register("SQLite", SQLite.Instance, false, options);
Browser.JavascriptObjectRepository.Register("LogWatcher", LogWatcher.Instance, true, options);
Browser.JavascriptObjectRepository.Register("Discord", Discord.Instance, true, options);
Browser.IsBrowserInitializedChanged += (A, B) => Browser.IsBrowserInitializedChanged += (A, B) =>
{ {
// Browser.ShowDevTools(); // Browser.ShowDevTools();

21
Util.cs Normal file
View File

@@ -0,0 +1,21 @@
using CefSharp;
namespace VRCX
{
public static class Util
{
public static void RegisterBindings(IJavascriptObjectRepository repository)
{
var options = new BindingOptions()
{
CamelCaseJavascriptNames = false
};
repository.Register("VRCX", VRCX.Instance, true, options);
repository.Register("SharedVariable", SharedVariable.Instance, false, options);
repository.Register("VRCXStorage", VRCXStorage.Instance, false, options);
repository.Register("SQLite", SQLite.Instance, false, options);
repository.Register("LogWatcher", LogWatcher.Instance, true, options);
repository.Register("Discord", Discord.Instance, true, options);
}
}
}

1
VRCX.csproj
View File

@@ -133,6 +133,7 @@
<Compile Include="RenderHandler.cs" /> <Compile Include="RenderHandler.cs" />
<Compile Include="SQLite.cs" /> <Compile Include="SQLite.cs" />
<Compile Include="SharedVariable.cs" /> <Compile Include="SharedVariable.cs" />
<Compile Include="Util.cs" />
<Compile Include="VRForm.cs"> <Compile Include="VRForm.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>

18
VRForm.cs
View File

@@ -46,22 +46,8 @@ namespace VRCX
{ {
CamelCaseJavascriptNames = false CamelCaseJavascriptNames = false
}; };
Browser1.JavascriptObjectRepository.Register("VRCX", VRCX.Instance, true, options); Util.RegisterBindings(Browser1.JavascriptObjectRepository);
Browser1.JavascriptObjectRepository.Register("SharedVariable", SharedVariable.Instance, false, options); Util.RegisterBindings(Browser2.JavascriptObjectRepository);
Browser1.JavascriptObjectRepository.Register("VRCXStorage", VRCXStorage.Instance, false, options);
Browser1.JavascriptObjectRepository.Register("SQLite", SQLite.Instance, false, options);
Browser2.JavascriptObjectRepository.Register("VRCX", VRCX.Instance, true, options);
Browser2.JavascriptObjectRepository.Register("SharedVariable", SharedVariable.Instance, false, options);
Browser2.JavascriptObjectRepository.Register("VRCXStorage", VRCXStorage.Instance, false, options);
Browser2.JavascriptObjectRepository.Register("SQLite", SQLite.Instance, false, options);
Browser1.IsBrowserInitializedChanged += (A, B) =>
{
// Browser1.ShowDevTools();
};
Browser2.IsBrowserInitializedChanged += (A, B) =>
{
// Browser2.ShowDevTools();
};
panel1.Controls.Add(Browser1); panel1.Controls.Add(Browser1);
panel2.Controls.Add(Browser2); panel2.Controls.Add(Browser2);
} }