Skip to content

Commit

Permalink
Complete reorganization and making it CI friendly
Browse files Browse the repository at this point in the history
  • Loading branch information
microdee committed Apr 26, 2018
1 parent 4489a8c commit f5e2769
Show file tree
Hide file tree
Showing 364 changed files with 62,878 additions and 29,394 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ build/
bld/
[Bb]in/
[Oo]bj/
[Ii]ntermediate/

# Visual Studio 2015 cache/options directory
.vs/
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "dlls/vvvvlib"]
path = dlls/vvvvlib
url = https://github.com/vvvvpm/vvvvlib.git
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,26 @@
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(ProjectDir)\libs\NV_ShadowLib3\include;$(IncludePath)</IncludePath>
<LibraryPath>$(ProjectDir)\libs\NV_ShadowLib3\lib\$(Platform);$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)\deploy\nodes\plugins</OutDir>
<IntDir>$(SolutionDir)\intermediate\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)\deploy\nodes\plugins</OutDir>
<IntDir>$(SolutionDir)\intermediate\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)\deploy\nodes\plugins</OutDir>
<IntDir>$(SolutionDir)\intermediate\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(ProjectDir)\libs\NV_ShadowLib3\include;$(IncludePath)</IncludePath>
<LibraryPath>$(ProjectDir)\libs\NV_ShadowLib3\lib\$(Platform);$(LibraryPath)</LibraryPath>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<OutDir>$(SolutionDir)\deploy\nodes\plugins</OutDir>
<IntDir>$(SolutionDir)\intermediate\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
Expand Down Expand Up @@ -136,22 +144,45 @@
</ItemDefinitionGroup>
<ItemGroup>
<Reference Include="FeralTic">
<HintPath>..\dependencies\x64\FeralTic.dll</HintPath>
<HintPath>..\dlls\FeralTic.dll</HintPath>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
</Reference>
<Reference Include="SharpDX">
<HintPath>..\dependencies\x64\SharpDX.dll</HintPath>
<HintPath>..\dlls\SharpDX.dll</HintPath>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
</Reference>
<Reference Include="SharpDX.Direct3D11">
<HintPath>..\dependencies\x64\SharpDX.Direct3D11.dll</HintPath>
<HintPath>..\dlls\SharpDX.Direct3D11.dll</HintPath>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
</Reference>
<Reference Include="SharpDX.DXGI">
<HintPath>..\dependencies\x64\SharpDX.DXGI.dll</HintPath>
<HintPath>..\dlls\SharpDX.DXGI.dll</HintPath>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="VVVV.DX11.Core">
<HintPath>..\dlls\VVVV.DX11.Core.dll</HintPath>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
</Reference>
<Reference Include="VVVV.Utils">
<HintPath>..\packages\VVVV.Utils.35.12.0-develop-3280\lib\net46\VVVV.Utils.dll</HintPath>
<HintPath>..\dlls\vvvvlib\VVVV.Utils.dll</HintPath>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
</Reference>
<Reference Include="VVVV.Utils3rdParty">
<HintPath>..\dlls\vvvvlib\VVVV.Utils3rdParty.dll</HintPath>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
</Reference>
<Reference Include="VVVV.UtilsIL">
<HintPath>..\dlls\vvvvlib\VVVV.UtilsIL.dll</HintPath>
<Private>false</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
</Reference>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
64 changes: 64 additions & 0 deletions DX11Utils/About.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
using System;
using System.Collections.Generic;
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 mp.dx.Nodes
{
[Startable]
public class VersionWriter : IStartable
{
public static string VersionPath { get; private set; }
public static string VvvvDir { get; private set; }

public void Start()
{
var ver = typeof(VersionWriter).Assembly.GetName().Version.ToString();
VvvvDir = Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName);
if (VvvvDir != null)
{
VersionPath = Path.Combine(VvvvDir, "packs", "mp.dx", "version.info");
File.WriteAllText(VersionPath, ver);
}
else
{
VersionPath = "null";
}
}

public void Shutdown() { Start(); }
}

[PluginInfo(
Name = "About",
Category = "Mp.Dx",
Author = "microdee"
)]
public class AboutNode : IPluginEvaluate, IPartImportsSatisfiedNotification
{
[Output("mp.dx Version")] public ISpread<string> FVer;
[Output("md.stdl Version")] public ISpread<string> FMdStdlVer;
[Output("mp.pddn Version")] public ISpread<string> FMpPddnVer;

[Output("Version File Path")] public ISpread<string> FVerPath;
[Output("VVVV Dir")] public ISpread<string> FVDir;

public void Evaluate(int SpreadMax) { }
public void OnImportsSatisfied()
{
FVer[0] = typeof(AboutNode).Assembly.GetName().Version.ToString();
FMdStdlVer[0] = typeof(IMainlooping).Assembly.GetName().Version.ToString();
FMpPddnVer[0] = typeof(SpreadWrapper).Assembly.GetName().Version.ToString();

FVDir[0] = VersionWriter.VvvvDir;
FVerPath[0] = VersionWriter.VersionPath;
}
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using FeralTic.DX11.Resources;
using VVVV.DX11;
using VVVV.Packs.Messaging;

namespace mp.dx.dx11
{
class DX11Types : TypeProfile
{
public TypeRecord<DX11Resource<IDX11ReadableResource>> ReadableResource = new TypeRecord<DX11Resource<IDX11ReadableResource>>("ReadableResource", CloneBehaviour.Null, () => null);
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using FeralTic.DX11.Resources;
using VVVV.DX11;
using VVVV.Packs.Messaging;

namespace mp.dx.dx11
{
class DX11Types : TypeProfile
{
public TypeRecord<DX11Resource<IDX11ReadableResource>> ReadableResource = new TypeRecord<DX11Resource<IDX11ReadableResource>>("ReadableResource", CloneBehaviour.Null, () => null);
}
}
Loading

0 comments on commit f5e2769

Please sign in to comment.