Merge branch

mrvux · Nov 22, 2016 · b9898f1 · b9898f1
2 parents e91cc14 + b494891
commit b9898f1
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 8 deletions.
diff --git a/FeralTic b/FeralTic
diff --git a/Nodes/VVVV.DX11.Nodes.Experimental/DX11RenderFullScreenForm.cs b/Nodes/VVVV.DX11.Nodes.Experimental/DX11RenderFullScreenForm.cs
@@ -68,7 +68,7 @@ private void CreateSwapChain()
                 this.form.Top = 0;
                 this.form.Width = 1920;
                 this.form.Height = 1080;
-                this.swapChain = new DX11SwapChain(this.RenderContext, this.form.Handle, SlimDX.DXGI.Format.R8G8B8A8_UNorm, new SlimDX.DXGI.SampleDescription(1, 0), 60, 2);
+                this.swapChain = new DX11SwapChain(this.RenderContext, this.form.Handle, SlimDX.DXGI.Format.R8G8B8A8_UNorm, new SlimDX.DXGI.SampleDescription(1, 0), 60, 2, false);
                 this.RenderContext.Factory.SetWindowAssociation(this.form.Handle, SlimDX.DXGI.WindowAssociationFlags.IgnoreAll);
             }
         }

diff --git a/Nodes/VVVV.DX11.Nodes.Experimental/DX11RenderFullScreenTest.cs b/Nodes/VVVV.DX11.Nodes.Experimental/DX11RenderFullScreenTest.cs
@@ -58,7 +58,7 @@ private void CreateSwapChain()
         {
             if (this.swapChain == null && this.RenderContext != null)
             {
-                this.swapChain = new DX11SwapChain(this.RenderContext, this.node.Window.Handle, SlimDX.DXGI.Format.R8G8B8A8_UNorm, new SlimDX.DXGI.SampleDescription(1, 0), 60, 2);
+                this.swapChain = new DX11SwapChain(this.RenderContext, this.node.Window.Handle, SlimDX.DXGI.Format.R8G8B8A8_UNorm, new SlimDX.DXGI.SampleDescription(1, 0), 60, 2, false);
                 this.RenderContext.Factory.SetWindowAssociation(this.node.Window.Handle, SlimDX.DXGI.WindowAssociationFlags.IgnoreAll);
             }
         }

diff --git a/Nodes/VVVV.DX11.Nodes/Nodes/Geometry/Primitives/DX11TetrahedronNode.cs b/Nodes/VVVV.DX11.Nodes/Nodes/Geometry/Primitives/DX11TetrahedronNode.cs
@@ -32,7 +32,7 @@ protected override DX11IndexedGeometry GetGeom(DX11RenderContext context, int sl
 
         protected override bool Invalidate()
         {
-            return false;// this.FSize.IsChanged;
+            return this.FSize.IsChanged;
         }
     }
 }
diff --git a/Nodes/VVVV.DX11.Nodes/Nodes/Renderers/DX11PreviewNode.cs b/Nodes/VVVV.DX11.Nodes/Nodes/Renderers/DX11PreviewNode.cs
@@ -96,8 +96,7 @@ public void Render(DX11RenderContext context)
 
              if (!this.swapchain.Contains(context))
              {
-                 this.swapchain[context] = new DX11SwapChain(context, this.Handle, 
-                     SlimDX.DXGI.Format.R8G8B8A8_UNorm, new SampleDescription(1, 0),60,1, false);
+                 this.swapchain[context] = new DX11SwapChain(context, this.Handle, SlimDX.DXGI.Format.R8G8B8A8_UNorm, new SampleDescription(1, 0),60,1,false);
              }
 
              if (this.resized)

diff --git a/Nodes/VVVV.DX11.Nodes/Nodes/Renderers/Graphics/DX11RendererNode.cs b/Nodes/VVVV.DX11.Nodes/Nodes/Renderers/Graphics/DX11RendererNode.cs
@@ -526,6 +526,8 @@ public void Update(DX11RenderContext context)
                 this.FOutBackBuffer[0][context] = new DX11SwapChain(context, this.Handle, Format.R8G8B8A8_UNorm, sd, this.FInRefreshRate[0],
                     this.FInBufferCount[0], this.FInFlipSequential[0]);
 
+                this.FInvalidateSwapChain = false;
+
                 #if DEBUG
                 this.FOutBackBuffer[0][context].Resource.DebugName = "BackBuffer";
                 #endif

diff --git a/appveyor.yml b/appveyor.yml
@@ -3,6 +3,7 @@ branches:
   # whitelist
   only:
     - master
+    - io
 
 image: Visual Studio 2015
 
@@ -11,11 +12,11 @@ platform: x64
 configuration: Release
 
 build:
-  project: vvvv-dx11.sln
+  project: ci.targets
 
 artifacts:
   # pushing a single file
-  - path: vvvv-dx11-x64-build-alpha.zip
+  - path: Zip/vvvv-packs-dx11-x64.zip
 
 environment:
   priv_key:

diff --git a/ci.targets b/ci.targets
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project
+    xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
+    ToolsVersion="4.0"
+    DefaultTargets="Build">
+
+  <ItemGroup>
+    <DeployFolder Include="Deploy\**\*.*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <GirlPower Include="girlpower\girlpower\**\*.*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <NuiDatabase Include="$(KINECTSDK20_DIR)Redist\Face\x64\NuiDatabase\**\*.*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <vgbtechs Include="$(KINECTSDK20_DIR)Redist\VGB\x64\vgbtechs\**\*.*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <GirlPowerNodes Include="girlpower\nodes\**\*.*" />
+  </ItemGroup>
+
+  <Target Name="Clean-Deploy">
+    <Delete Files="@(DeployFolder)" />
+  </Target>
+
+  <Target Name="Build-x64">
+    <MSBuild Projects="vvvv-dx11.sln" Properties="Configuration=Release;Platform=x64;DebugSymbols=false;DebugType=None" />
+  </Target>
+
+  <Target Name="Build">
+    <Delete Files="Deploy\**\*.*" />
+    <CallTarget Targets="Build-x64" />
+    <Copy SourceFiles="@(GirlPowerNodes)" DestinationFolder="Deploy\Release\x64\packs\dx11\nodes\%(GirlPowerNodes.RecursiveDir)" />
+    <Copy SourceFiles="@(GirlPower)" DestinationFolder="Deploy\Release\x64\packs\dx11\girlpower\%(GirlPower.RecursiveDir)" />
+    <Exec WorkingDirectory="Deploy\Release\x64\" Command="..\..\..\Tools\7zA.exe a -tzip ..\..\..\Zip\vvvv-packs-dx11-x64.zip packs" LogStandardErrorAsError="true" />
+  </Target>
+</Project>
+0 −1		Core/DX11/Geometry/Primitives/DX11Primitive_IcoGrid.cs
+1 −1		Core/DX11/Shaders/DX11Shader.cs