From ea4d1986f5a4ba6af7f67b5205a666a6729f2130 Mon Sep 17 00:00:00 2001 From: David Morasz Date: Wed, 26 Sep 2018 00:44:09 +0200 Subject: [PATCH] still eliminating memory issues --- Vanadium.Core/Core/BoundObject.cs | 4 +-- Vanadium.Core/Core/ClrV8ValueSerializer.cs | 6 +---- Vanadium.Core/Core/CoreStartable.cs | 12 ++------- Vanadium.Core/Core/DefaultFunctionBindings.cs | 6 +---- Vanadium.Core/Core/Globals.cs | 9 ++----- Vanadium.Core/Core/HtmlTextureWrapper.cs | 26 ++++++------------- Vanadium.Core/Core/ObjectBuilder.cs | 8 ++---- Vanadium.Core/Core/Operations.cs | 6 +---- Vanadium.Core/Core/RemoteTasks.cs | 6 +---- Vanadium.Core/Core/RenderProcess.cs | 9 ++----- Vanadium.Core/Core/WrapperSettings.cs | 6 +---- Vanadium.Core/Nodes/About.cs | 10 ++----- .../Nodes/AbstractHtmlTextureInputsNode.cs | 8 ++---- Vanadium.Core/Nodes/AbstractOperationNode.cs | 8 ++---- Vanadium.Core/Nodes/DummyResizeOpNode.cs | 12 +++------ Vanadium.Core/Nodes/EventsTunnelingNode.cs | 13 +++------- Vanadium.Core/Nodes/HtmlTextureGetNodes.cs | 11 +++----- Vanadium.Core/Nodes/HtmlTextureNodes.cs | 13 ++-------- .../Nodes/JavascriptOperationNodes.cs | 12 +++------ .../Nodes/NavigationOperationNodes.cs | 11 +++----- Vanadium.Core/Nodes/ObjectBindingNodes.cs | 12 ++------- Vanadium.Core/Nodes/ObjectBuilderNodes.cs | 10 +++---- Vanadium.Core/Nodes/ScrollOperationNode.cs | 11 +++----- Vanadium.Core/Nodes/Startables.cs | 14 +++------- Vanadium.Core/Nodes/TouchOperationNode.cs | 6 ++--- Vanadium.Core/Properties/AssemblyInfo.cs | 1 - Vanadium.Core/Vanadium.Core.csproj | 18 +++---------- 27 files changed, 62 insertions(+), 206 deletions(-) diff --git a/Vanadium.Core/Core/BoundObject.cs b/Vanadium.Core/Core/BoundObject.cs index aa8822e..69d92c6 100644 --- a/Vanadium.Core/Core/BoundObject.cs +++ b/Vanadium.Core/Core/BoundObject.cs @@ -1,14 +1,12 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; using Chromium.Remote; using Chromium.Remote.Event; using md.stdl.Coding; using md.stdl.Interfaces; -namespace Vanadium.Core +namespace VVVV.Vanadium.Core { public delegate void JsFunctionEventHandler(JsBindingFunction func, HtmlTextureWrapper wrapper); diff --git a/Vanadium.Core/Core/ClrV8ValueSerializer.cs b/Vanadium.Core/Core/ClrV8ValueSerializer.cs index f727094..4fac88e 100644 --- a/Vanadium.Core/Core/ClrV8ValueSerializer.cs +++ b/Vanadium.Core/Core/ClrV8ValueSerializer.cs @@ -3,16 +3,12 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Runtime.Remoting.Messaging; -using System.Text; -using System.Threading.Tasks; -using System.Xml.Linq; using Chromium; using Chromium.Remote; using SlimDX; using VVVV.Utils.VColor; -namespace Vanadium.Core +namespace VVVV.Vanadium.Core { public static class ClrV8ValueSerializer { diff --git a/Vanadium.Core/Core/CoreStartable.cs b/Vanadium.Core/Core/CoreStartable.cs index d9b0b90..2851526 100644 --- a/Vanadium.Core/Core/CoreStartable.cs +++ b/Vanadium.Core/Core/CoreStartable.cs @@ -1,15 +1,7 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; +using System.IO; using Chromium; -using VVVV.DX11.Nodes; -using VVVV.PluginInterfaces.V2; -namespace Vanadium.Core +namespace VVVV.Vanadium.Core { public static class HtmlTextureStartable { diff --git a/Vanadium.Core/Core/DefaultFunctionBindings.cs b/Vanadium.Core/Core/DefaultFunctionBindings.cs index ac89561..685a0b3 100644 --- a/Vanadium.Core/Core/DefaultFunctionBindings.cs +++ b/Vanadium.Core/Core/DefaultFunctionBindings.cs @@ -1,13 +1,9 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Chromium.Remote; using Chromium.Remote.Event; using md.stdl.Interfaces; -namespace Vanadium.Core +namespace VVVV.Vanadium.Core { public partial class HtmlTextureWrapper : IMainlooping, IDisposable { diff --git a/Vanadium.Core/Core/Globals.cs b/Vanadium.Core/Core/Globals.cs index c429f2b..15e26ae 100644 --- a/Vanadium.Core/Core/Globals.cs +++ b/Vanadium.Core/Core/Globals.cs @@ -1,12 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Collections.Specialized; +using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Vanadium.Core +namespace VVVV.Vanadium.Core { public static class Globals { diff --git a/Vanadium.Core/Core/HtmlTextureWrapper.cs b/Vanadium.Core/Core/HtmlTextureWrapper.cs index 161ccb8..0b76a68 100644 --- a/Vanadium.Core/Core/HtmlTextureWrapper.cs +++ b/Vanadium.Core/Core/HtmlTextureWrapper.cs @@ -1,35 +1,25 @@ -// Decompiled with JetBrains decompiler -// Type: Vanadium.Core.HtmlTextureWrapper -// Assembly: Vanadium.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null -// MVID: 57C678C6-0611-48DA-B8C5-441FD4527177 -// Assembly location: D:\local\vvvv-gp\packs\Vanadium\nodes\plugins\Vanadium.Core.exe - -using Chromium; -using Chromium.Event; -using Chromium.Remote; -using Chromium.Remote.Event; -using FeralTic.DX11; -using FeralTic.DX11.Resources; -using md.stdl.Interaction; -using md.stdl.Interfaces; using System; using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; -using System.Reactive.Concurrency; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Windows.Forms; using System.Xml.Linq; +using Chromium; +using Chromium.Event; +using Chromium.Remote; +using FeralTic.DX11; +using FeralTic.DX11.Resources; using md.stdl.Coding; +using md.stdl.Interaction; +using md.stdl.Interfaces; using VVVV.Core.Logging; using VVVV.DX11; -using VVVV.DX11.Lib.Effects.Pins.RenderSemantics; using VVVV.Utils.IO; using VVVV.Utils.VMath; -namespace Vanadium.Core +namespace VVVV.Vanadium.Core { public partial class HtmlTextureWrapper : IMainlooping, IDisposable { diff --git a/Vanadium.Core/Core/ObjectBuilder.cs b/Vanadium.Core/Core/ObjectBuilder.cs index 77f1312..6afee7f 100644 --- a/Vanadium.Core/Core/ObjectBuilder.cs +++ b/Vanadium.Core/Core/ObjectBuilder.cs @@ -1,14 +1,10 @@ -using System; -using System.Collections; +using System.Collections; using System.Collections.Generic; using System.Linq; -using System.Runtime.Remoting; -using System.Text; -using System.Threading.Tasks; using Chromium; using Chromium.Remote; -namespace Vanadium.Core +namespace VVVV.Vanadium.Core { public enum TokenType { diff --git a/Vanadium.Core/Core/Operations.cs b/Vanadium.Core/Core/Operations.cs index 8c512f9..f3dd679 100644 --- a/Vanadium.Core/Core/Operations.cs +++ b/Vanadium.Core/Core/Operations.cs @@ -1,17 +1,13 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; using Chromium; using md.stdl.Coding; using md.stdl.Interaction; using VVVV.PluginInterfaces.V2; -using VVVV.PluginInterfaces.V2.NonGeneric; -using VVVV.Utils.IO; using VVVV.Utils.VMath; -namespace Vanadium.Core +namespace VVVV.Vanadium.Core { public delegate void OperationExecutedEventHandler(HtmlTextureOperation ops, HtmlTextureWrapper wrapper); diff --git a/Vanadium.Core/Core/RemoteTasks.cs b/Vanadium.Core/Core/RemoteTasks.cs index 523bea9..bf9e4bd 100644 --- a/Vanadium.Core/Core/RemoteTasks.cs +++ b/Vanadium.Core/Core/RemoteTasks.cs @@ -1,13 +1,9 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Chromium; using Chromium.Remote; using md.stdl.Interfaces; -namespace Vanadium.Core +namespace VVVV.Vanadium.Core { public partial class HtmlTextureWrapper : IMainlooping, IDisposable { diff --git a/Vanadium.Core/Core/RenderProcess.cs b/Vanadium.Core/Core/RenderProcess.cs index ee6a852..38b0874 100644 --- a/Vanadium.Core/Core/RenderProcess.cs +++ b/Vanadium.Core/Core/RenderProcess.cs @@ -1,14 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using Chromium; using Chromium.Remote; using Chromium.Remote.Event; -using VVVV.DX11.Nodes; -namespace Vanadium.Core +namespace VVVV.Vanadium.Core { class App diff --git a/Vanadium.Core/Core/WrapperSettings.cs b/Vanadium.Core/Core/WrapperSettings.cs index dd758fb..df2bc2c 100644 --- a/Vanadium.Core/Core/WrapperSettings.cs +++ b/Vanadium.Core/Core/WrapperSettings.cs @@ -1,11 +1,7 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using md.stdl.Interfaces; -namespace Vanadium.Core +namespace VVVV.Vanadium.Core { public partial class HtmlTextureWrapper : IMainlooping, IDisposable { diff --git a/Vanadium.Core/Nodes/About.cs b/Vanadium.Core/Nodes/About.cs index 12e5e40..2456573 100644 --- a/Vanadium.Core/Nodes/About.cs +++ b/Vanadium.Core/Nodes/About.cs @@ -1,16 +1,10 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.Composition; +using System.ComponentModel.Composition; using System.IO; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; using md.stdl.Interfaces; using mp.pddn; using VVVV.PluginInterfaces.V2; -namespace Vanadium.Nodes +namespace VVVV.Vanadium.Nodes { [Startable] public class VersionWriter : IStartable diff --git a/Vanadium.Core/Nodes/AbstractHtmlTextureInputsNode.cs b/Vanadium.Core/Nodes/AbstractHtmlTextureInputsNode.cs index a3abe3b..9350868 100644 --- a/Vanadium.Core/Nodes/AbstractHtmlTextureInputsNode.cs +++ b/Vanadium.Core/Nodes/AbstractHtmlTextureInputsNode.cs @@ -1,19 +1,15 @@ using System; -using System.Collections.Generic; using System.ComponentModel.Composition; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using FeralTic.DX11; using FeralTic.DX11.Resources; using VVVV.Core.Logging; using VVVV.DX11; -using Vanadium.Core; using VVVV.PluginInterfaces.V2; using VVVV.Utils.IO; using VVVV.Utils.VMath; +using VVVV.Vanadium.Core; -namespace Vanadium.Nodes +namespace VVVV.Vanadium.Nodes { public abstract class AbstractHtmlTextureInputsNode { diff --git a/Vanadium.Core/Nodes/AbstractOperationNode.cs b/Vanadium.Core/Nodes/AbstractOperationNode.cs index 911defc..6e3e0a1 100644 --- a/Vanadium.Core/Nodes/AbstractOperationNode.cs +++ b/Vanadium.Core/Nodes/AbstractOperationNode.cs @@ -1,13 +1,9 @@ using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Vanadium.Core; using VVVV.PluginInterfaces.V2; -using VVVV.Utils.VMath; +using VVVV.Vanadium.Core; -namespace Vanadium.Nodes +namespace VVVV.Vanadium.Nodes { public class AbstractOperationNode where T : HtmlTextureOperation { diff --git a/Vanadium.Core/Nodes/DummyResizeOpNode.cs b/Vanadium.Core/Nodes/DummyResizeOpNode.cs index 02b7dd7..3fb6fc1 100644 --- a/Vanadium.Core/Nodes/DummyResizeOpNode.cs +++ b/Vanadium.Core/Nodes/DummyResizeOpNode.cs @@ -1,13 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Vanadium.Nodes; -using Vanadium.Core; -using VVVV.PluginInterfaces.V2; +using VVVV.PluginInterfaces.V2; +using VVVV.Vanadium.Core; -namespace Vanadium.Nodes +namespace VVVV.Vanadium.Nodes { [PluginInfo( Name = "SendResizeEvent", diff --git a/Vanadium.Core/Nodes/EventsTunnelingNode.cs b/Vanadium.Core/Nodes/EventsTunnelingNode.cs index 95895ee..18d517b 100644 --- a/Vanadium.Core/Nodes/EventsTunnelingNode.cs +++ b/Vanadium.Core/Nodes/EventsTunnelingNode.cs @@ -1,14 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Chromium.Event; -using Vanadium.Nodes; -using Vanadium.Core; -using VVVV.PluginInterfaces.V2; +using VVVV.PluginInterfaces.V2; +using VVVV.Vanadium.Core; -namespace Vanadium.Nodes +namespace VVVV.Vanadium.Nodes { [PluginInfo( Name = "EventTunneler", diff --git a/Vanadium.Core/Nodes/HtmlTextureGetNodes.cs b/Vanadium.Core/Nodes/HtmlTextureGetNodes.cs index ad2dfe5..98efe61 100644 --- a/Vanadium.Core/Nodes/HtmlTextureGetNodes.cs +++ b/Vanadium.Core/Nodes/HtmlTextureGetNodes.cs @@ -1,15 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Collections.Specialized; +using System.Collections.Specialized; using System.ComponentModel.Composition; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using mp.pddn; -using Vanadium.Core; using VVVV.PluginInterfaces.V2; +using VVVV.Vanadium.Core; -namespace Vanadium.Nodes +namespace VVVV.Vanadium.Nodes { [PluginInfo( Name = "DOM", diff --git a/Vanadium.Core/Nodes/HtmlTextureNodes.cs b/Vanadium.Core/Nodes/HtmlTextureNodes.cs index 362aea5..efab763 100644 --- a/Vanadium.Core/Nodes/HtmlTextureNodes.cs +++ b/Vanadium.Core/Nodes/HtmlTextureNodes.cs @@ -1,21 +1,12 @@ using System; -using System.Collections.Generic; using System.Collections.Specialized; using System.ComponentModel.Composition; using System.Linq; -using System.Text; -using System.Threading.Tasks; -using FeralTic.DX11; -using FeralTic.DX11.Resources; using mp.pddn; -using VVVV.Core.Logging; -using VVVV.DX11; -using Vanadium.Core; using VVVV.PluginInterfaces.V2; -using VVVV.Utils.IO; -using VVVV.Utils.VMath; +using VVVV.Vanadium.Core; -namespace Vanadium.Nodes +namespace VVVV.Vanadium.Nodes { public abstract class MesoHtmlTextureNode : HtmlTextureInputOutputNode, IPluginEvaluate { diff --git a/Vanadium.Core/Nodes/JavascriptOperationNodes.cs b/Vanadium.Core/Nodes/JavascriptOperationNodes.cs index 87041ee..badd971 100644 --- a/Vanadium.Core/Nodes/JavascriptOperationNodes.cs +++ b/Vanadium.Core/Nodes/JavascriptOperationNodes.cs @@ -1,14 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using mp.pddn; -using Vanadium.Core; +using mp.pddn; using VVVV.PluginInterfaces.V2; -using VVVV.Utils.VMath; +using VVVV.Vanadium.Core; -namespace Vanadium.Nodes +namespace VVVV.Vanadium.Nodes { public class JsOperationNode : PersistentOperationNode where T : HtmlTextureOperation, IJsOperation, new() { diff --git a/Vanadium.Core/Nodes/NavigationOperationNodes.cs b/Vanadium.Core/Nodes/NavigationOperationNodes.cs index 1718589..b69dc49 100644 --- a/Vanadium.Core/Nodes/NavigationOperationNodes.cs +++ b/Vanadium.Core/Nodes/NavigationOperationNodes.cs @@ -1,12 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Vanadium.Core; -using VVVV.PluginInterfaces.V2; +using VVVV.PluginInterfaces.V2; +using VVVV.Vanadium.Core; -namespace Vanadium.Nodes +namespace VVVV.Vanadium.Nodes { [PluginInfo( Name = "Navigate", diff --git a/Vanadium.Core/Nodes/ObjectBindingNodes.cs b/Vanadium.Core/Nodes/ObjectBindingNodes.cs index 3fda60c..05da9bb 100644 --- a/Vanadium.Core/Nodes/ObjectBindingNodes.cs +++ b/Vanadium.Core/Nodes/ObjectBindingNodes.cs @@ -1,19 +1,11 @@ using System; -using System.Collections.Generic; -using System.Collections.Specialized; using System.ComponentModel.Composition; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; -using Chromium.Remote; using mp.pddn; -using SlimDX.D3DCompiler; -using Vanadium.Core; using VVVV.PluginInterfaces.V2; using VVVV.Utils.VMath; +using VVVV.Vanadium.Core; -namespace Vanadium.Nodes +namespace VVVV.Vanadium.Nodes { [PluginInfo( Name = "BindObject", diff --git a/Vanadium.Core/Nodes/ObjectBuilderNodes.cs b/Vanadium.Core/Nodes/ObjectBuilderNodes.cs index bb0d50d..d05e51e 100644 --- a/Vanadium.Core/Nodes/ObjectBuilderNodes.cs +++ b/Vanadium.Core/Nodes/ObjectBuilderNodes.cs @@ -1,16 +1,12 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.Composition; +using System.ComponentModel.Composition; using System.Linq; -using System.Text; -using System.Threading.Tasks; using md.stdl.Coding; using mp.pddn; -using Vanadium.Core; using VVVV.PluginInterfaces.V2; using VVVV.Utils.VMath; +using VVVV.Vanadium.Core; -namespace Vanadium.Nodes +namespace VVVV.Vanadium.Nodes { public abstract class ObjectBuilderNode : IPluginEvaluate, IPartImportsSatisfiedNotification { diff --git a/Vanadium.Core/Nodes/ScrollOperationNode.cs b/Vanadium.Core/Nodes/ScrollOperationNode.cs index 3472af1..c783b24 100644 --- a/Vanadium.Core/Nodes/ScrollOperationNode.cs +++ b/Vanadium.Core/Nodes/ScrollOperationNode.cs @@ -1,13 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Vanadium.Core; -using VVVV.PluginInterfaces.V2; +using VVVV.PluginInterfaces.V2; using VVVV.Utils.VMath; +using VVVV.Vanadium.Core; -namespace Vanadium.Nodes +namespace VVVV.Vanadium.Nodes { [PluginInfo( Name = "Scroll", diff --git a/Vanadium.Core/Nodes/Startables.cs b/Vanadium.Core/Nodes/Startables.cs index a1fd493..54cf293 100644 --- a/Vanadium.Core/Nodes/Startables.cs +++ b/Vanadium.Core/Nodes/Startables.cs @@ -1,21 +1,15 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; -using Vanadium.Core; +using System.Windows.Forms; using VVVV.PluginInterfaces.V2; -using VVVV.Utils.VColor; +using VVVV.Vanadium.Core; -namespace Vanadium.Nodes +namespace VVVV.Vanadium.Nodes { [Startable(Lazy = false)] public class HtmlPluginStartable : IStartable { public void Start() { - //MessageBox.Show("test startable"); + MessageBox.Show("test startable"); HtmlTextureStartable.Start(); } diff --git a/Vanadium.Core/Nodes/TouchOperationNode.cs b/Vanadium.Core/Nodes/TouchOperationNode.cs index 43ff350..b5ebe1c 100644 --- a/Vanadium.Core/Nodes/TouchOperationNode.cs +++ b/Vanadium.Core/Nodes/TouchOperationNode.cs @@ -2,18 +2,16 @@ using System.Collections.Generic; using System.ComponentModel.Composition; using System.Linq; -using System.Text; -using System.Threading.Tasks; using md.stdl.Coding; using md.stdl.Interaction; using md.stdl.Mathematics; using VVVV.DX11.Nodes.Renderers.Graphics.Touch; -using Vanadium.Core; using VVVV.PluginInterfaces.V2; using VVVV.Utils.SlimDX; using VVVV.Utils.VMath; +using VVVV.Vanadium.Core; -namespace Vanadium.Nodes +namespace VVVV.Vanadium.Nodes { public abstract class TouchOperationNode : PersistentOperationNode { diff --git a/Vanadium.Core/Properties/AssemblyInfo.cs b/Vanadium.Core/Properties/AssemblyInfo.cs index 74e6b34..bae2472 100644 --- a/Vanadium.Core/Properties/AssemblyInfo.cs +++ b/Vanadium.Core/Properties/AssemblyInfo.cs @@ -1,6 +1,5 @@ #region Using directives -using System; using System.Reflection; using System.Runtime.InteropServices; diff --git a/Vanadium.Core/Vanadium.Core.csproj b/Vanadium.Core/Vanadium.Core.csproj index cdba00e..0a0098d 100644 --- a/Vanadium.Core/Vanadium.Core.csproj +++ b/Vanadium.Core/Vanadium.Core.csproj @@ -5,8 +5,8 @@ Debug x86 WinExe - Vanadium - Vanadium.Core + VVVV.Vanadium + Vanadium v4.7 bin\$(Platform)\$(Configuration)\ True @@ -54,7 +54,7 @@ x64 - Vanadium.Core.App + VVVV.Vanadium.Core.App true @@ -700,9 +700,6 @@ Always - - Always - Always @@ -982,15 +979,9 @@ Always - - Always - Always - - Always - Always @@ -1027,9 +1018,6 @@ Always - - Always -