Skip to content

Commit a6c390d

Browse files
stanardstanard
committed
Updated Raytracing samples and especially the MiniEngine sample
1 parent 7299e9b commit a6c390d

File tree

303 files changed

+2066770
-2327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

303 files changed

+2066770
-2327
lines changed

‎Samples/Desktop/D3D12Raytracing/src/D3D12Raytracing.sln‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12RaytracingSimpleLighti
1414
EndProject
1515
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MiniEngine", "MiniEngine", "{0B851798-A730-4A11-A717-668D40A26088}"
1616
EndProject
17-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "..\..\..\..\MiniEngine\Core\Core_VS16.vcxproj", "{86A58508-0D6A-4786-A32F-01A301FDC6F3}"
17+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "..\..\..\..\MiniEngine\Core\Core.vcxproj", "{86A58508-0D6A-4786-A32F-01A301FDC6F3}"
1818
EndProject
19-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Model", "..\..\..\..\MiniEngine\Model\Model_VS16.vcxproj", "{5D3AEEFB-8789-48E5-9BD9-09C667052D09}"
19+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Model", "..\..\..\..\MiniEngine\Model\Model.vcxproj", "{5D3AEEFB-8789-48E5-9BD9-09C667052D09}"
2020
EndProject
2121
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12RaytracingMiniEngineSample", "D3D12RaytracingMiniEngineSample\ModelViewer_VS16.vcxproj", "{315A1E1B-3732-41FE-9B4A-6A1E103BA2F5}"
2222
EndProject
@@ -49,18 +49,18 @@ Global
4949
{A0848C98-F5AA-431C-9E76-7F1E7EFA368C}.Profile|x64.Build.0 = Release|x64
5050
{A0848C98-F5AA-431C-9E76-7F1E7EFA368C}.Release|x64.ActiveCfg = Release|x64
5151
{A0848C98-F5AA-431C-9E76-7F1E7EFA368C}.Release|x64.Build.0 = Release|x64
52-
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Debug|x64.ActiveCfg = Debug|x64
53-
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Debug|x64.Build.0 = Debug|x64
54-
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Profile|x64.ActiveCfg = Profile|x64
55-
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Profile|x64.Build.0 = Profile|x64
56-
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Release|x64.ActiveCfg = Release|x64
57-
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Release|x64.Build.0 = Release|x64
58-
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Debug|x64.ActiveCfg = Debug|x64
59-
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Debug|x64.Build.0 = Debug|x64
60-
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Profile|x64.ActiveCfg = Profile|x64
61-
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Profile|x64.Build.0 = Profile|x64
62-
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Release|x64.ActiveCfg = Release|x64
63-
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Release|x64.Build.0 = Release|x64
52+
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Debug|x64.ActiveCfg = Debug|Gaming.Desktop.x64
53+
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Debug|x64.Build.0 = Debug|Gaming.Desktop.x64
54+
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Profile|x64.ActiveCfg = Profile|Gaming.Desktop.x64
55+
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Profile|x64.Build.0 = Profile|Gaming.Desktop.x64
56+
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Release|x64.ActiveCfg = Release|Gaming.Desktop.x64
57+
{86A58508-0D6A-4786-A32F-01A301FDC6F3}.Release|x64.Build.0 = Release|Gaming.Desktop.x64
58+
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Debug|x64.ActiveCfg = Debug|Gaming.Desktop.x64
59+
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Debug|x64.Build.0 = Debug|Gaming.Desktop.x64
60+
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Profile|x64.ActiveCfg = Profile|Gaming.Desktop.x64
61+
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Profile|x64.Build.0 = Profile|Gaming.Desktop.x64
62+
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Release|x64.ActiveCfg = Release|Gaming.Desktop.x64
63+
{5D3AEEFB-8789-48E5-9BD9-09C667052D09}.Release|x64.Build.0 = Release|Gaming.Desktop.x64
6464
{315A1E1B-3732-41FE-9B4A-6A1E103BA2F5}.Debug|x64.ActiveCfg = Debug|x64
6565
{315A1E1B-3732-41FE-9B4A-6A1E103BA2F5}.Debug|x64.Build.0 = Debug|x64
6666
{315A1E1B-3732-41FE-9B4A-6A1E103BA2F5}.Profile|x64.ActiveCfg = Profile|x64

‎Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<Optimization>Disabled</Optimization>
7272
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7373
<SDLCheck>true</SDLCheck>
74-
<AdditionalIncludeDirectories>..\..\..\..\..\Libraries\D3DX12\;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
74+
<AdditionalIncludeDirectories>..\;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7575
<CompileAsWinRT>false</CompileAsWinRT>
7676
<DisableSpecificWarnings>
7777
</DisableSpecificWarnings>
@@ -125,7 +125,7 @@
125125
<IntrinsicFunctions>true</IntrinsicFunctions>
126126
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
127127
<SDLCheck>true</SDLCheck>
128-
<AdditionalIncludeDirectories>..\..\..\..\..\Libraries\D3DX12\;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
128+
<AdditionalIncludeDirectories>..\;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
129129
<CompileAsWinRT>false</CompileAsWinRT>
130130
</ClCompile>
131131
<Link>
@@ -147,18 +147,6 @@
147147
<FxCompile>
148148
<EntryPointName />
149149
</FxCompile>
150-
<PostBuildEvent>
151-
<Command>
152-
</Command>
153-
<Message>
154-
</Message>
155-
</PostBuildEvent>
156-
<PreBuildEvent>
157-
<Command>
158-
</Command>
159-
<Message>
160-
</Message>
161-
</PreBuildEvent>
162150
</ItemDefinitionGroup>
163151
<ItemGroup>
164152
<ClInclude Include="DeviceResources.h" />

‎Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingLibrarySubobjects/D3D12RaytracingLibrarySubobjects.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<Optimization>Disabled</Optimization>
7373
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7474
<SDLCheck>true</SDLCheck>
75-
<AdditionalIncludeDirectories>..\..\..\..\..\Libraries\D3DX12\;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
75+
<AdditionalIncludeDirectories>..\;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7676
<CompileAsWinRT>false</CompileAsWinRT>
7777
<DisableSpecificWarnings>
7878
</DisableSpecificWarnings>
@@ -126,7 +126,7 @@
126126
<IntrinsicFunctions>true</IntrinsicFunctions>
127127
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128128
<SDLCheck>true</SDLCheck>
129-
<AdditionalIncludeDirectories>..\..\..\..\..\Libraries\D3DX12\;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
129+
<AdditionalIncludeDirectories>..\;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
130130
<CompileAsWinRT>false</CompileAsWinRT>
131131
</ClCompile>
132132
<Link>

‎Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/Build.props‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ImportGroup Label="PropertySheets" />
4+
<PropertyGroup Label="UserMacros" />
5+
<PropertyGroup>
6+
<LinkIncremental>false</LinkIncremental>
7+
<WholeProgramOptimization Condition="'$(Configuration)'=='Release'">true</WholeProgramOptimization>
8+
<OutDir>$(SolutionDir)..\Build\$(Platform)\$(Configuration)\Output\$(ProjectName)\</OutDir>
9+
<IntDir>$(SolutionDir)..\Build\$(Platform)\$(Configuration)\Intermediate\$(ProjectName)\</IntDir>
10+
<IncludePath>$(SolutionDir)..\Build\$(Platform)\$(Configuration)\Output\$(ProjectName);$(IncludePath)</IncludePath>
11+
</PropertyGroup>
12+
<ItemDefinitionGroup>
13+
<ClCompile>
14+
<AdditionalIncludeDirectories>..\Core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
15+
<WarningLevel>Level4</WarningLevel>
16+
<IntrinsicFunctions>true</IntrinsicFunctions>
17+
<FloatingPointModel>Fast</FloatingPointModel>
18+
</ClCompile>
19+
<ClCompile Condition="'$(Configuration)'=='Debug'">
20+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
21+
<MinimalRebuild>false</MinimalRebuild>
22+
<Optimization>Disabled</Optimization>
23+
<BufferSecurityCheck>true</BufferSecurityCheck>
24+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
25+
<FunctionLevelLinking>false</FunctionLevelLinking>
26+
</ClCompile>
27+
<ClCompile Condition="'$(Configuration)'=='Profile'">
28+
<PreprocessorDefinitions>NDEBUG;PROFILE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
29+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
30+
<Optimization>MaxSpeed</Optimization>
31+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
32+
<FunctionLevelLinking>true</FunctionLevelLinking>
33+
</ClCompile>
34+
<ClCompile Condition="'$(Configuration)'=='Release'">
35+
<PreprocessorDefinitions>NDEBUG;RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
36+
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
37+
<Optimization>MaxSpeed</Optimization>
38+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
39+
<FunctionLevelLinking>true</FunctionLevelLinking>
40+
</ClCompile>
41+
<Link>
42+
<SubSystem>Windows</SubSystem>
43+
<GenerateDebugInformation>true</GenerateDebugInformation>
44+
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
45+
</Link>
46+
<Link Condition="'$(Configuration)'=='Debug'">
47+
</Link>
48+
<Link Condition="'$(Configuration)'=='Profile'">
49+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
50+
<OptimizeReferences>true</OptimizeReferences>
51+
</Link>
52+
<Link Condition="'$(Configuration)'=='Release'">
53+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
54+
<OptimizeReferences>true</OptimizeReferences>
55+
</Link>
56+
<Lib>
57+
<AdditionalOptions>/IGNORE:4221 %(AdditionalOptions)</AdditionalOptions>
58+
</Lib>
59+
<FxCompile>
60+
<ShaderType>Compute</ShaderType>
61+
<VariableName>g_p%(Filename)</VariableName>
62+
<HeaderFileOutput>$(SolutionDir)..\Build\$(Platform)\$(Configuration)\Output\$(ProjectName)\CompiledShaders\%(Filename).h</HeaderFileOutput>
63+
<DisableOptimizations>false</DisableOptimizations>
64+
<ObjectFileOutput />
65+
<EnableDebuggingInformation Condition="'$(Configuration)'=='Debug'">true</EnableDebuggingInformation>
66+
<AdditionalOptions Condition="'$(Configuration)'=='Debug'">-Qembed_debug %(AdditionalOptions)</AdditionalOptions>
67+
</FxCompile>
68+
</ItemDefinitionGroup>
69+
</Project>

‎Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingMiniEngineSample/Desktop.props‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ImportGroup Label="PropertySheets" />
4+
<PropertyGroup Label="UserMacros" />
5+
<PropertyGroup>
6+
<LibraryPath>$(Console_SdkLibPath);$(LibraryPath)</LibraryPath>
7+
<IncludePath>$(Console_SdkIncludeRoot);$(IncludePath)</IncludePath>
8+
</PropertyGroup>
9+
<ItemDefinitionGroup>
10+
<Link>
11+
<AdditionalDependencies>$(Console_Libs);%(AdditionalDependencies)</AdditionalDependencies>
12+
</Link>
13+
<ClCompile>
14+
<PreprocessorDefinitions>__WRL_NO_DEFAULT_LIB__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
15+
</ClCompile>
16+
<FxCompile>
17+
<PreprocessorDefinitions>_GAMING_DESKTOP=1</PreprocessorDefinitions>
18+
<ShaderModel>6.2</ShaderModel>
19+
</FxCompile>
20+
</ItemDefinitionGroup>
21+
<ItemGroup />
22+
</Project>

0 commit comments

Comments
 (0)