Flex 1.2.0 release

1 files changed, 72 insertions, 14 deletions

diff --git a/demo/compiler/vc12win32/flexDemoD3D.vcxproj b/demo/compiler/vc12win32/flexDemoD3D.vcxproj
index 264f9d9..bb24f2d 100644
--- a/demo/compiler/vc12win32/flexDemoD3D.vcxproj
+++ b/demo/compiler/vc12win32/flexDemoD3D.vcxproj
@@ -55,7 +55,8 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
-			<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexDebugD3D_x86.lib;./../../../lib/win32/NvFlexExtDebugD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
+			<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;delayimp.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexDebugD3D_x86.lib;./../../../lib/win32/NvFlexExtDebugD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexDemoDebugD3D_x86.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoDebugD3D_x86.exe.pdb</ProgramDatabaseFile>
@@ -94,7 +95,8 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
-			<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexReleaseD3D_x86.lib;./../../../lib/win32/NvFlexExtReleaseD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
+			<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;delayimp.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexReleaseD3D_x86.lib;./../../../lib/win32/NvFlexExtReleaseD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexDemoReleaseD3D_x86.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoReleaseD3D_x86.exe.pdb</ProgramDatabaseFile>
@@ -181,8 +183,6 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\pasta.h">
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticbody.h">
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\potpourri.h">
@@ -191,8 +191,6 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\restitution.h">
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\ridigbody.h">
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\rigidfluidcoupling.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\rigidpile.h">
@@ -231,8 +229,12 @@
 		</ClCompile>
 		<ClCompile Include="..\..\main.cpp">
 		</ClCompile>
+		<ClCompile Include="..\..\shadersDemoContext.cpp">
+		</ClCompile>
 		<ClInclude Include="..\..\benchmark.h">
 		</ClInclude>
+		<ClInclude Include="..\..\demoContext.h">
+		</ClInclude>
 		<ClInclude Include="..\..\helpers.h">
 		</ClInclude>
 		<ClInclude Include="..\..\imgui.h">
@@ -241,6 +243,8 @@
 		</ClInclude>
 		<ClInclude Include="..\..\shaders.h">
 		</ClInclude>
+		<ClInclude Include="..\..\shadersDemoContext.h">
+		</ClInclude>
 		<ClInclude Include="..\..\stb_truetype.h">
 		</ClInclude>
 	</ItemGroup>
@@ -269,6 +273,8 @@
 		</ClCompile>
 		<ClCompile Include="..\..\..\core\platform.cpp">
 		</ClCompile>
+		<ClCompile Include="..\..\..\core\png.cpp">
+		</ClCompile>
 		<ClCompile Include="..\..\..\core\sdf.cpp">
 		</ClCompile>
 		<ClCompile Include="..\..\..\core\tga.cpp">
@@ -303,14 +309,14 @@
 		</ClInclude>
 		<ClInclude Include="..\..\..\core\platform.h">
 		</ClInclude>
+		<ClInclude Include="..\..\..\core\png.h">
+		</ClInclude>
 		<ClInclude Include="..\..\..\core\point3.h">
 		</ClInclude>
 		<ClInclude Include="..\..\..\core\quat.h">
 		</ClInclude>
 		<ClInclude Include="..\..\..\core\sdf.h">
 		</ClInclude>
-		<ClInclude Include="..\..\..\core\skylight.h">
-		</ClInclude>
 		<ClInclude Include="..\..\..\core\tga.h">
 		</ClInclude>
 		<ClInclude Include="..\..\..\core\types.h">
@@ -339,6 +345,8 @@
 		</ClInclude>
 		<ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h">
 		</ClInclude>
+		<ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h">
+		</ClInclude>
 		<ClInclude Include="..\..\d3d12\imguiGraphD3D12.h">
 		</ClInclude>
 		<ClInclude Include="..\..\d3d12\lineRenderPipelineD3D12.h">
@@ -395,6 +403,8 @@
 		</ClCompile>
 		<ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp">
 		</ClCompile>
+		<ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp">
+		</ClCompile>
 		<ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp">
 		</ClCompile>
 		<ClCompile Include="..\..\d3d12\imguiInteropD3D12.cpp">
@@ -483,8 +493,6 @@
 	<ItemGroup>
 		<ClInclude Include="..\..\d3d\appGraphCtx.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d\demoContext.h">
-		</ClInclude>
 		<ClInclude Include="..\..\d3d\imguiGraph.h">
 		</ClInclude>
 		<ClInclude Include="..\..\d3d\loader.h">
@@ -495,8 +503,6 @@
 		</ClInclude>
 		<ClInclude Include="..\..\d3d\shaderCommonD3D.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d\shadersDemoContext.h">
-		</ClInclude>
 		<ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp">
 		</ClCompile>
 		<ClCompile Include="..\..\d3d\imguiGraph.cpp">
@@ -507,8 +513,6 @@
 		</ClCompile>
 		<ClCompile Include="..\..\d3d\renderParamsD3D.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d\shadersDemoContext.cpp">
-		</ClCompile>
 	</ItemGroup>
 	<ItemGroup>
 		<FxCompile Include="./../../d3d/shaders/debugLineVS.hlsl">
@@ -889,6 +893,60 @@
 			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/pointThicknessVS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/pointThicknessGS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Geometry</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessGS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Geometry</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessGS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/pointThicknessPS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="./../../../extensions/compiler/vc12win32/flexExtD3D.vcxproj">