Scenes & Model Loading & PIX Markers & DPI-awareness

.gitignore

@@ -344,4 +344,7 @@ $RECYCLE.BIN/
 # EXCEPTIONS
 !Data/Models/*/*.obj
 !Tools/7z.exe
-!Tools/wget.exe
+!Tools/wget.exe
+!Libs/WinPixEventRuntime/bin
+!Libs/WinPixEventRuntime/bin/x64/
+!Libs/WinPixEventRuntime/bin/x64/*

.gitmodules

@@ -7,3 +7,9 @@
 [submodule "Libs/D3D12MA"]
 	path = Libs/D3D12MA
 	url = https://github.com/vilbeyli/D3D12MemoryAllocator.git
+[submodule "Libs/assimp"]
+	path = Libs/assimp
+	url = https://github.com/assimp/assimp.git
+[submodule "Data/Models"]
+	path = Data/Models
+	url = https://github.com/vilbeyli/VQModels.git

Build/GenerateProjectFiles.bat

@@ -128,7 +128,20 @@ exit /b 0
 ::
 :RunCmake
 
-cmake ..\.. -G "Visual Studio 16 2019" -A x64
+:: assimp importers
+set ASSIMP_IMPORT_FORMATS=-DASSIMP_BUILD_OBJ_IMPORTER=TRUE
+set ASSIMP_IMPORT_FORMATS=!ASSIMP_IMPORT_FORMATS! -DASSIMP_BUILD_GLTF_IMPORTER=TRUE
+:: assimp build options
+set CMAKE_ASSIMP_PARAMETERS=-DASSIMP_BUILD_ASSIMP_TOOLS=OFF
+set CMAKE_ASSIMP_PARAMETERS=!CMAKE_ASSIMP_PARAMETERS! -DASSIMP_NO_EXPORT=ON 
+set CMAKE_ASSIMP_PARAMETERS=!CMAKE_ASSIMP_PARAMETERS! -DASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT=FALSE
+set CMAKE_ASSIMP_PARAMETERS=!CMAKE_ASSIMP_PARAMETERS! -DBUILD_SHARED_LIBS=OFF 
+set CMAKE_ASSIMP_PARAMETERS=!CMAKE_ASSIMP_PARAMETERS! -DASSIMP_BUILD_TESTS=OFF 
+set CMAKE_ASSIMP_PARAMETERS=!CMAKE_ASSIMP_PARAMETERS! -DASSIMP_INSTALL=OFF
+set CMAKE_ASSIMP_PARAMETERS=!CMAKE_ASSIMP_PARAMETERS! !ASSIMP_IMPORT_FORMATS!
+
+
+cmake ..\.. -G "Visual Studio 16 2019" -A x64 !CMAKE_ASSIMP_PARAMETERS!
 
 if !errorlevel! EQU 0 (
     echo [VQBuild] Success!
@@ -140,7 +153,7 @@ if !errorlevel! EQU 0 (
     echo [VQBuild] cmake VS2019 failed, retrying with VS 2017...
     echo [VQBuild] removing %~dp0SolutionFiles ...
     rmdir /S /Q  %~dp0SolutionFiles
-    cmake ..\.. -G "Visual Studio 15 2017" -A x64
+    cmake ..\.. -G "Visual Studio 15 2017" -A x64 !CMAKE_ASSIMP_PARAMETERS!
     if !errorlevel! NEQ 0 (
         echo [VQBuild] cmake VS2017 failed, retrying without specifying VS version...
         echo [VQBuild] removing %~dp0SolutionFiles ...

Build/PackageEngine.bat

@@ -85,7 +85,7 @@ for %%i IN (%*) DO (
 ::echo SkipMSBuildFind=!MSBUILD_FIND!
 if !MSBUILD_FIND! equ 1 (
     call :FindMSBuild
-    if %ERRORLEVEL% neq 0 (
+    if !ERRORLEVEL! neq 0 (
         echo [VQPackage] Error: Couldn't find MSBuild
         exit /b -1
     )
@@ -124,7 +124,7 @@ if !NO_BUILD! equ 0 (
     :: Package the engine
     call :ExecBuildTask_Build
 
-    if %ERRORLEVEL% neq 0  exit /b %ERRORLEVEL%
+    if !ERRORLEVEL! neq 0  exit /b !ERRORLEVEL!
 )
 
 :: move build artifacts into destination folder
@@ -191,7 +191,7 @@ if not exist !SOLUTION_FILE_PATH! (
     echo **********************************************************************
     echo.
     call %~dp0GenerateProjectFiles.bat -noVS
-    if %ERRORLEVEL% neq 0 (
+    if !ERRORLEVEL! neq 0 (
         echo [VQPackage] Error: Couldn't generate project files.
         exit /b -1
     )
@@ -218,20 +218,25 @@ exit /b 0
 :ExecBuildTask_Build
 ::echo [VQPackage] ENGINE_BUILD_COMMAND = !ENGINE_BUILD_COMMAND!
 :: ---------------------- Build Release ----------------------
-call :PrintBuildStage Release
-call !ENGINE_BUILD_COMMAND! /p:Configuration=Release
-set /A ERR_REL=!ERRORLEVEL!
-set /A BUILD_NUM_CURR_TASK=!BUILD_NUM_CURR_TASK!+1
+if !BUILD_CONFIG_RELEASE! neq 0 (
+    call :PrintBuildStage Release
+    call !ENGINE_BUILD_COMMAND! /p:Configuration=Release
+    if !ERRORLEVEL! neq 0 (
+        echo ERROR: BUILD ERROR
+        exit /b -1
+    )
+    set /A BUILD_NUM_CURR_TASK=!BUILD_NUM_CURR_TASK!+1
+)
 :: ---------------------- Build Release ----------------------
 :: ---------------------- Build Debug   ----------------------
 if !BUILD_CONFIG_DEBUG! neq 0 (
     call :PrintBuildStage Debug
     call !ENGINE_BUILD_COMMAND! /p:Configuration=Debug
-    set /A BUILD_NUM_CURR_TASK=!BUILD_NUM_CURR_TASK!+1
-    if %ERRORLEVEL% neq 0 (
+    if !ERRORLEVEL! neq 0 (
         echo ERROR: BUILD ERROR
         exit /b -1
     )
+    set /A BUILD_NUM_CURR_TASK=!BUILD_NUM_CURR_TASK!+1
 )
 :: ---------------------- Build Debug   ----------------------
 :: ---------------------- Build RelWithDebInfo----------------

CMakeLists.txt

@@ -43,6 +43,7 @@ set (Shaders
     "Shaders/FullscreenTriangle.hlsl"
     "Shaders/Tonemapper.hlsl"
     "Shaders/Skydome.hlsl"
+    "Shaders/Object.hlsl"
 )
 
 set (HeaderVQE 
@@ -54,6 +55,7 @@ set (HeaderVQE
     "Source/Application/VQEngine.h"
     "Source/Application/Events.h"
     "Source/Application/Mesh.h"
+    "Source/Application/Material.h"
     "Source/Application/Model.h"
     "Source/Application/Geometry.h"
     "Source/Application/Transform.h"
@@ -65,6 +67,7 @@ set (HeaderVQE
     "Source/Application/Light.h"
     "Source/Application/GameObject.h"
     "Source/Application/Memory.h"
+    "Source/Application/GPUMarker.h"
 )
 
 set (SourceVQE 
@@ -79,6 +82,7 @@ set (SourceVQE
     "Source/Application/FileParser.cpp"
     "Source/Application/Events.cpp"
     "Source/Application/Mesh.cpp"
+    "Source/Application/Material.cpp"
     "Source/Application/Model.cpp"
     "Source/Application/Geometry.cpp"
     "Source/Application/Transform.cpp"
@@ -91,6 +95,11 @@ set (SourceVQE
     "Source/Application/Light.cpp"
     "Source/Application/GameObject.cpp"
     "Source/Application/Memory.cpp"
+    "Source/Application/GPUMarker.cpp"
+)
+
+set (PIXIncl 
+    "Libs/WinPixEventRuntime/Include"
 )
 
 # ouput exe to bin directory
@@ -101,10 +110,20 @@ endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
 
 add_link_options(/SUBSYSTEM:WINDOWS)
 
+# add submodules
 add_subdirectory(Libs/VQUtils)
 add_subdirectory(Libs/D3D12MA)
 add_subdirectory(Source/Renderer)
 
+#add_definitions(
+#    -DASSIMP_BUILD_ASSIMP_TOOLS=OFF 
+#    -DASSIMP_NO_EXPORT=ON 
+#    -DBUILD_SHARED_LIBS=OFF 
+#    -DASSIMP_BUILD_TESTS=OFF 
+#    -DASSIMP_INSTALL=OFF
+#)
+add_subdirectory(Libs/assimp)
+
 source_group("Config"   FILES ${Config})
 source_group("Resource" FILES ${Resource})
 source_group("Icons"    FILES ${Icons})
@@ -118,12 +137,14 @@ set_source_files_properties(Data/Resources/VQE.rc PROPERTIES VS_TOOL_OVERRIDE "R
 set_source_files_properties(Data/Icons/VQE32.ico  PROPERTIES VS_TOOL_OVERRIDE "Image")
 
 link_directories(${CMAKE_CURRENT_SOURCE_DIR}/Libs/VQUtils/Bin/)
+link_directories(${CMAKE_CURRENT_SOURCE_DIR}/Libs/WinPixEventRuntime/bin/x64)
 
 # Create a library with the project name that is build with the Headers and Source files
 add_executable( ${PROJECT_NAME} ${HeaderVQE} ${SourceVQE} ${Config} ${Scenes} ${Resource} ${Shaders} )
 
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY} )
 
+
 # set target executable name for debug/releasewithdebug builds, release is VQE.exe
 foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
     string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
@@ -135,9 +156,27 @@ foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
 endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
 
 set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 17)
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+set_target_properties(assimp PROPERTIES FOLDER Libs/assimp)
+set_target_properties(IrrXML PROPERTIES FOLDER Libs/assimp)
+set_target_properties(uninstall PROPERTIES FOLDER Libs/assimp)
+set_target_properties(UpdateAssimpLibsDebugSymbolsAndDLLs PROPERTIES FOLDER Libs/assimp)
+set_target_properties(zlibstatic PROPERTIES FOLDER Libs/assimp)
+
+#set_target_properties(VQRenderer PROPERTIES FOLDER Libs)
+#set_target_properties(VQUtils PROPERTIES FOLDER Libs)
+set_target_properties(D3D12MA PROPERTIES FOLDER Libs)
 
 # Make sure the compiler can find include files for the libraries
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${Includes})
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${PIXIncl})
 
+target_link_libraries(${PROJECT_NAME} PRIVATE VQUtils VQRenderer assimp WinPixEventRuntime)
 
-target_link_libraries(${PROJECT_NAME} PRIVATE VQUtils VQRenderer )
+
+add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    "${CMAKE_CURRENT_SOURCE_DIR}/Libs/WinPixEventRuntime/bin/x64/WinPixEventRuntime.dll"
+    $<TARGET_FILE_DIR:${PROJECT_NAME}>
+)

Data/EngineSettings.ini

@@ -13,7 +13,7 @@ Width=768
 Height=432
 DisplayMode=Windowed
 PreferredDisplay=0
-Scene=Sponza
+Scene=StressTest
 
 DebugWindow=false
 DebugWindowWidth=450

Data/Levels/Default.xml

@@ -13,6 +13,7 @@
         <Preset>Stadium01</Preset>
     </EnvironmentMap>
 
+    <!-- CAMERAS -->
     <Camera>
         <Position> 0.0 3.0 -5 </Position>
         <Pitch> 15 </Pitch>
@@ -29,39 +30,46 @@
             <Drag>9.5</Drag>
         </FirstPerson>
     </Camera>
-
-    <GameObject>
-        <Transform>
-            <Position>0 0 4</Position>
-            <Quaternion>0 0 0 1</Quaternion>
-            <Scale>3 3 3</Scale>
-        </Transform>
-        <Model>
-            <Mesh>Cube</Mesh>
-            <Material>
-                <Diffuse></Diffuse>
-            </Material>
-        </Model>
-    </GameObject>
-
-
     <Camera>
         <Position> 6.0 3.0 -5 </Position>
         <Pitch> 65 </Pitch>
         <Yaw> 6 </Yaw>
-        
-        <Projection>Orthographic</Projection>
+
+        <Projection>Perspective</Projection>
         <FoV>90.0</FoV>
         <Near>0.01</Near>
-        <Far>1000</Far>
+        <Far>5000</Far>
 
         <FirstPerson>
             <TranslationSpeed>1000</TranslationSpeed>
             <AngularSpeed>0.05</AngularSpeed>
             <Drag>9.5</Drag>
         </FirstPerson>
     </Camera>
+
+    <!-- MATERIALS -->
+    <Material>
+        <Name>Checkerboard</Name>
+        <DiffuseMap>Procedural/Checkerboard</DiffuseMap>
+    </Material>
+    <Material>
+        <Name>Checkerboard_Grayscale</Name>
+        <DiffuseMap>Procedural/Checkerboard_Grayscale</DiffuseMap>
+    </Material>
 
+    <!-- OBJECTS -->
+    <GameObject>
+        <Transform>
+            <Position>0 0 4</Position>
+            <Quaternion>0 0 0 1</Quaternion>
+            <Scale>3 3 3</Scale>
+        </Transform>
+        <Model>
+            <Mesh>Cube</Mesh>
+            <MaterialName>Checkerboard</MaterialName>
+        </Model>
+    </GameObject>
+
     <GameObject>
         <Transform>
             <Position> 0.0 3.0 -14 </Position>
@@ -70,11 +78,7 @@
         </Transform>
         <Model>
             <Mesh>Cube</Mesh>
-            <Material>
-                <Diffuse></Diffuse>
-            </Material>
+            <MaterialName>Checkerboard_Grayscale</MaterialName>
         </Model>
     </GameObject>
-
-
 </Scene>

Data/Levels/GeometryUnitTest.xml

@@ -30,6 +30,30 @@
         <Preset>Stadium01</Preset>
     </EnvironmentMap>
     -->
+
+    <!-- 
+    MATERIALS
+    -->
+    <Material>
+        <Name>GreenMat</Name>
+        <Diffuse>0 0.5 0</Diffuse>
+        <Alpha> 0.5 </Alpha>
+        <DiffuseMap>Data/Textures/PBR/cgbookcase/black-herringbone-tiles-01/Black_herringbone_tiles_01_2K_Base_Color.png</DiffuseMap>
+    </Material>
+    <Material>
+        <Name>RedMat</Name>
+        <Diffuse>0.8 0.0 0</Diffuse>
+        <Alpha> 1 </Alpha>
+    </Material>
+    <Material>
+        <Name>Checkerboard</Name>
+        <DiffuseMap>Procedural/Checkerboard</DiffuseMap>
+    </Material>
+    <Material>
+        <Name>Checkerboard_Grayscale</Name>
+        <DiffuseMap>Procedural/Checkerboard_Grayscale</DiffuseMap>
+    </Material>
+
     <Camera>
         <Position> 0.0 3.0 -5 </Position>
         <Pitch> 15 </Pitch>
@@ -55,9 +79,7 @@
         </Transform>
         <Model>
             <Mesh>Cube</Mesh>
-            <Material>
-                <Diffuse></Diffuse>
-            </Material>
+            <MaterialName>GreenMat</MaterialName>
         </Model>
     </GameObject>
 
@@ -69,13 +91,23 @@
         </Transform>
         <Model>
             <Mesh>Triangle</Mesh>
-            <Material>
-                <Diffuse></Diffuse>
-            </Material>
+            <MaterialName>Checkerboard</MaterialName>
         </Model>
     </GameObject>
 
 
+    <GameObject>
+        <Transform>
+            <Position>-5 0 0</Position>
+            <Quaternion>0 0 0 1</Quaternion>
+            <Scale>1 1 1</Scale>
+        </Transform>
+        <Model>
+            <Mesh>Triangle</Mesh>
+            <MaterialName>Checkerboard_Grayscale</MaterialName>
+        </Model>
+    </GameObject>
+
     <PostProcess>
     <!-- TBA -->
     </PostProcess>