From 9a3873353d4828cfdb6cca813dbb0f27f0e4f325 Mon Sep 17 00:00:00 2001 From: Dmitry Duka Date: Mon, 25 Dec 2017 16:33:19 +0300 Subject: Updating Ansel SDK 1.5, no functional changes. Fixing startSession/stopSession not being exported. --- .../AnselSDKIntegration/AnselSDKIntegration.cpp | 8 +- .../AnselSDKIntegration/AnselSDKIntegration.sln | 56 +-- .../AnselSDKIntegration_2015.vcxproj | 502 ++++++++++----------- .../AnselSDKIntegration_2015.vcxproj.filters | 22 +- samples/AnselSDKIntegration/Shaders.fx | 118 ++--- 5 files changed, 353 insertions(+), 353 deletions(-) (limited to 'samples') diff --git a/samples/AnselSDKIntegration/AnselSDKIntegration.cpp b/samples/AnselSDKIntegration/AnselSDKIntegration.cpp index 4e1ba49..46876e1 100644 --- a/samples/AnselSDKIntegration/AnselSDKIntegration.cpp +++ b/samples/AnselSDKIntegration/AnselSDKIntegration.cpp @@ -596,13 +596,13 @@ void CleanupDevice() if (g_pConstantBuffer) g_pConstantBuffer->Release(); if (g_pVertexBuffer) g_pVertexBuffer->Release(); if (g_pIndexBuffer) g_pIndexBuffer->Release(); - if (g_pHudVertexBuffer) g_pHudVertexBuffer->Release(); - if (g_pHudIndexBuffer) g_pHudIndexBuffer->Release(); + if (g_pHudVertexBuffer) g_pVertexBuffer->Release(); + if (g_pHudIndexBuffer) g_pIndexBuffer->Release(); if (g_pVertexLayout) g_pVertexLayout->Release(); if (g_pVertexShader) g_pVertexShader->Release(); if (g_pPixelShader) g_pPixelShader->Release(); - if (g_pHudVertexShader) g_pHudVertexShader->Release(); - if (g_pHudPixelShader) g_pHudPixelShader->Release(); + if (g_pHudVertexShader) g_pVertexShader->Release(); + if (g_pHudPixelShader) g_pPixelShader->Release(); if (g_pDepthStencil) g_pDepthStencil->Release(); if (g_pDepthStencilView) g_pDepthStencilView->Release(); if (g_pRenderTargetView) g_pRenderTargetView->Release(); diff --git a/samples/AnselSDKIntegration/AnselSDKIntegration.sln b/samples/AnselSDKIntegration/AnselSDKIntegration.sln index 558874c..b8a681b 100644 --- a/samples/AnselSDKIntegration/AnselSDKIntegration.sln +++ b/samples/AnselSDKIntegration/AnselSDKIntegration.sln @@ -1,28 +1,28 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AnselSDKIntegration", "AnselSDKIntegration_2015.vcxproj", "{291B6A55-368E-4420-A0EB-FBE077B9F137}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {291B6A55-368E-4420-A0EB-FBE077B9F137}.Debug|x64.ActiveCfg = Debug|x64 - {291B6A55-368E-4420-A0EB-FBE077B9F137}.Debug|x64.Build.0 = Debug|x64 - {291B6A55-368E-4420-A0EB-FBE077B9F137}.Debug|x86.ActiveCfg = Debug|Win32 - {291B6A55-368E-4420-A0EB-FBE077B9F137}.Debug|x86.Build.0 = Debug|Win32 - {291B6A55-368E-4420-A0EB-FBE077B9F137}.Release|x64.ActiveCfg = Release|x64 - {291B6A55-368E-4420-A0EB-FBE077B9F137}.Release|x64.Build.0 = Release|x64 - {291B6A55-368E-4420-A0EB-FBE077B9F137}.Release|x86.ActiveCfg = Release|Win32 - {291B6A55-368E-4420-A0EB-FBE077B9F137}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AnselSDKIntegration", "AnselSDKIntegration_2015.vcxproj", "{291B6A55-368E-4420-A0EB-FBE077B9F137}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {291B6A55-368E-4420-A0EB-FBE077B9F137}.Debug|x64.ActiveCfg = Debug|x64 + {291B6A55-368E-4420-A0EB-FBE077B9F137}.Debug|x64.Build.0 = Debug|x64 + {291B6A55-368E-4420-A0EB-FBE077B9F137}.Debug|x86.ActiveCfg = Debug|Win32 + {291B6A55-368E-4420-A0EB-FBE077B9F137}.Debug|x86.Build.0 = Debug|Win32 + {291B6A55-368E-4420-A0EB-FBE077B9F137}.Release|x64.ActiveCfg = Release|x64 + {291B6A55-368E-4420-A0EB-FBE077B9F137}.Release|x64.Build.0 = Release|x64 + {291B6A55-368E-4420-A0EB-FBE077B9F137}.Release|x86.ActiveCfg = Release|Win32 + {291B6A55-368E-4420-A0EB-FBE077B9F137}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/samples/AnselSDKIntegration/AnselSDKIntegration_2015.vcxproj b/samples/AnselSDKIntegration/AnselSDKIntegration_2015.vcxproj index ef49b24..28a3ba7 100644 --- a/samples/AnselSDKIntegration/AnselSDKIntegration_2015.vcxproj +++ b/samples/AnselSDKIntegration/AnselSDKIntegration_2015.vcxproj @@ -1,252 +1,252 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - AnselSDKIntegration - {291B6A55-368E-4420-A0EB-FBE077B9F137} - AnselSDKIntegration - Win32Proj - 8.1 - - - - Application - Unicode - v140 - - - Application - Unicode - v140 - - - Application - true - Unicode - v140 - - - Application - true - Unicode - v140 - - - - - - - - - - - - - - - - - - true - true - intermediate\$(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - - - true - true - intermediate\$(Platform)\$(Configuration)\ - - - false - true - intermediate\$(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ - - - false - true - intermediate\$(Platform)\$(Configuration)\ - - - - Level4 - Disabled - MultiThreadedDebugDLL - false - true - Fast - StreamingSIMDExtensions2 - Sync - %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - EditAndContinue - EnableFastChecks - ../../include - - - %(AdditionalOptions) - AnselSDK32.lib;d3d11.lib;d3dcompiler.lib;dxguid.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies) - Windows - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - ../../lib - - - PerMonitorHighDPIAware - - - - - - - xcopy /Y ..\..\redist\AnselSDK32.dll Win32\debug\ - - - - - Level4 - Disabled - MultiThreadedDebugDLL - false - true - Fast - Sync - %(AdditionalOptions) - WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - EnableFastChecks - ../../include - - - %(AdditionalOptions) - AnselSDK64.lib;d3d11.lib;d3dcompiler.lib;dxguid.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies) - Windows - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - ../../lib - - - PerMonitorHighDPIAware - - - - - - - xcopy /Y ..\..\redist\AnselSDK64.dll x64\debug\ - - - - - Level4 - MaxSpeed - MultiThreadedDLL - false - true - true - Fast - StreamingSIMDExtensions2 - Sync - %(AdditionalOptions) - WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - ../../include - - - %(AdditionalOptions) - AnselSDK32.lib;d3d11.lib;d3dcompiler.lib;;dxguid.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies) - true - Windows - true - true - true - true - true - MachineX86 - AsInvoker - %(DelayLoadDLLs) - ../../lib - - - PerMonitorHighDPIAware - - - - - - - xcopy /Y ..\..\redist\AnselSDK32.dll Win32\release\ - - - - - Level4 - MaxSpeed - MultiThreadedDLL - false - true - true - Fast - Sync - %(AdditionalOptions) - WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) - ../../include - - - %(AdditionalOptions) - AnselSDK64.lib;d3d11.lib;d3dcompiler.lib;dxguid.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies) - true - Windows - true - true - true - true - true - MachineX64 - AsInvoker - %(DelayLoadDLLs) - ../../lib - - - PerMonitorHighDPIAware - - - - - - - xcopy /Y ..\..\redist\AnselSDK64.dll x64\release\ - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + AnselSDKIntegration + {291B6A55-368E-4420-A0EB-FBE077B9F137} + AnselSDKIntegration + Win32Proj + 8.1 + + + + Application + Unicode + v140 + + + Application + Unicode + v140 + + + Application + true + Unicode + v140 + + + Application + true + Unicode + v140 + + + + + + + + + + + + + + + + + + true + true + intermediate\$(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + + + true + true + intermediate\$(Platform)\$(Configuration)\ + + + false + true + intermediate\$(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + + + false + true + intermediate\$(Platform)\$(Configuration)\ + + + + Level4 + Disabled + MultiThreadedDebugDLL + false + true + Fast + StreamingSIMDExtensions2 + Sync + %(AdditionalOptions) + WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + EditAndContinue + EnableFastChecks + ../../include + + + %(AdditionalOptions) + AnselSDK32.lib;d3d11.lib;d3dcompiler.lib;dxguid.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies) + Windows + true + true + true + true + MachineX86 + AsInvoker + %(DelayLoadDLLs) + ../../lib + + + PerMonitorHighDPIAware + + + + + + + xcopy /Y ..\..\redist\AnselSDK32.dll Win32\debug\ + + + + + Level4 + Disabled + MultiThreadedDebugDLL + false + true + Fast + Sync + %(AdditionalOptions) + WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + EnableFastChecks + ../../include + + + %(AdditionalOptions) + AnselSDK64.lib;d3d11.lib;d3dcompiler.lib;dxguid.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies) + Windows + true + true + true + true + MachineX64 + AsInvoker + %(DelayLoadDLLs) + ../../lib + + + PerMonitorHighDPIAware + + + + + + + xcopy /Y ..\..\redist\AnselSDK64.dll x64\debug\ + + + + + Level4 + MaxSpeed + MultiThreadedDLL + false + true + true + Fast + StreamingSIMDExtensions2 + Sync + %(AdditionalOptions) + WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + ../../include + + + %(AdditionalOptions) + AnselSDK32.lib;d3d11.lib;d3dcompiler.lib;;dxguid.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies) + true + Windows + true + true + true + true + true + MachineX86 + AsInvoker + %(DelayLoadDLLs) + ../../lib + + + PerMonitorHighDPIAware + + + + + + + xcopy /Y ..\..\redist\AnselSDK32.dll Win32\release\ + + + + + Level4 + MaxSpeed + MultiThreadedDLL + false + true + true + Fast + Sync + %(AdditionalOptions) + WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions) + ../../include + + + %(AdditionalOptions) + AnselSDK64.lib;d3d11.lib;d3dcompiler.lib;dxguid.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies) + true + Windows + true + true + true + true + true + MachineX64 + AsInvoker + %(DelayLoadDLLs) + ../../lib + + + PerMonitorHighDPIAware + + + + + + + xcopy /Y ..\..\redist\AnselSDK64.dll x64\release\ + + + + + + + \ No newline at end of file diff --git a/samples/AnselSDKIntegration/AnselSDKIntegration_2015.vcxproj.filters b/samples/AnselSDKIntegration/AnselSDKIntegration_2015.vcxproj.filters index bcf807f..ac5233b 100644 --- a/samples/AnselSDKIntegration/AnselSDKIntegration_2015.vcxproj.filters +++ b/samples/AnselSDKIntegration/AnselSDKIntegration_2015.vcxproj.filters @@ -1,12 +1,12 @@ - - - - - {8e114980-c1a3-4ada-ad7c-83caadf5daeb} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - + + + + + {8e114980-c1a3-4ada-ad7c-83caadf5daeb} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + \ No newline at end of file diff --git a/samples/AnselSDKIntegration/Shaders.fx b/samples/AnselSDKIntegration/Shaders.fx index abac43c..8c1b4bd 100644 --- a/samples/AnselSDKIntegration/Shaders.fx +++ b/samples/AnselSDKIntegration/Shaders.fx @@ -1,59 +1,59 @@ -cbuffer ConstantBuffer : register( b0 ) -{ - matrix World; - matrix View; - matrix Projection; - float4 vLightDir; - float4 vLightColor; - float4 vOutputColor; - float vTime; -} - -struct VS_INPUT -{ - float4 Pos : POSITION; - float3 Norm : NORMAL; -}; - -struct PS_INPUT -{ - float4 Pos : SV_POSITION; - float3 Norm : TEXCOORD0; -}; - -PS_INPUT VS( VS_INPUT input ) -{ - PS_INPUT output = (PS_INPUT)0; - output.Pos = mul( input.Pos, World ); - output.Pos = mul( output.Pos, View ); - output.Pos = mul( output.Pos, Projection ); - output.Norm = mul( float4( input.Norm, 1 ), World ).xyz; - - return output; -} - -float4 PS(PS_INPUT input) : SV_Target -{ - float4 finalColor = saturate(dot((float3)vLightDir, input.Norm) * vLightColor); - finalColor.a = 1.0f; - return finalColor; -} - -PS_INPUT VS_Hud(VS_INPUT input) -{ - PS_INPUT output = (PS_INPUT)0; - output.Pos = input.Pos; - output.Pos.w = 1.0f; - - if (input.Norm.x > 1.0f) - { - output.Pos.x *= 0.8f * abs(sin(vTime * 0.25f)) + 0.15f; - } - - return output; -} - -float4 PS_Hud(PS_INPUT input) : SV_Target -{ - return float4(0.33f, 0.5f, 0.906f, 1.0f); -} +cbuffer ConstantBuffer : register( b0 ) +{ + matrix World; + matrix View; + matrix Projection; + float4 vLightDir; + float4 vLightColor; + float4 vOutputColor; + float vTime; +} + +struct VS_INPUT +{ + float4 Pos : POSITION; + float3 Norm : NORMAL; +}; + +struct PS_INPUT +{ + float4 Pos : SV_POSITION; + float3 Norm : TEXCOORD0; +}; + +PS_INPUT VS( VS_INPUT input ) +{ + PS_INPUT output = (PS_INPUT)0; + output.Pos = mul( input.Pos, World ); + output.Pos = mul( output.Pos, View ); + output.Pos = mul( output.Pos, Projection ); + output.Norm = mul( float4( input.Norm, 1 ), World ).xyz; + + return output; +} + +float4 PS(PS_INPUT input) : SV_Target +{ + float4 finalColor = saturate(dot((float3)vLightDir, input.Norm) * vLightColor); + finalColor.a = 1.0f; + return finalColor; +} + +PS_INPUT VS_Hud(VS_INPUT input) +{ + PS_INPUT output = (PS_INPUT)0; + output.Pos = input.Pos; + output.Pos.w = 1.0f; + + if (input.Norm.x > 1.0f) + { + output.Pos.x *= 0.8f * abs(sin(vTime * 0.25f)) + 0.15f; + } + + return output; +} + +float4 PS_Hud(PS_INPUT input) : SV_Target +{ + return float4(0.33f, 0.5f, 0.906f, 1.0f); +} -- cgit v1.2.3