save

DirectXTK/.github/workflows/codeql.yml

@@ -44,7 +44,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
     - if: matrix.language == 'c-cpp'
       name: 'Install Ninja'
@@ -53,7 +53,7 @@ jobs:
     - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+      uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
       with:
         languages: ${{ matrix.language }}
         build-mode: manual
@@ -74,6 +74,6 @@ jobs:
       run: msbuild MakeSpriteFont.csproj /p:Configuration=Debug /p:Platform=AnyCPU
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+      uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
       with:
         category: "/language:${{ matrix.language }}"

DirectXTK/.github/workflows/main.yml

@@ -74,7 +74,7 @@ jobs:
             arch: amd64_arm64
 
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
     - name: 'Install Ninja'
       run: choco install ninja

DirectXTK/.github/workflows/msbuild.yml

@@ -32,7 +32,7 @@ jobs:
         platform: [x86, x64, ARM64]
 
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
     - name: Add MSBuild to PATH
       uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0

DirectXTK/.github/workflows/msvc.yml

@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
         with:
@@ -64,6 +64,6 @@ jobs:
 
       # Upload SARIF file to GitHub Code Scanning Alerts
       - name: Upload SARIF to GitHub
-        uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+        uses: github/codeql-action/upload-sarif@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
         with:
           sarif_file: ${{ steps.run-analysis.outputs.sarif }}

DirectXTK/.github/workflows/test.yml

@@ -75,10 +75,10 @@ jobs:
             arch: amd64_arm64
 
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
     - name: Clone test repository
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       with:
         repository: walbourn/directxtktest
         path: Tests

DirectXTK/.github/workflows/vcpkg.yml

@@ -41,7 +41,7 @@ jobs:
             arch: amd64_arm64
 
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
     - name: 'Install Ninja'
       run: choco install ninja

DirectXTK/CMakeLists.txt

@@ -86,6 +86,7 @@ set(LIBRARY_SOURCES
     Src/BasicEffect.cpp
     Src/BasicPostProcess.cpp
     Src/BufferHelpers.cpp
+    Src/CMO.h
     Src/CommonStates.cpp
     Src/DDSTextureLoader.cpp
     Src/DebugEffect.cpp
@@ -367,6 +368,7 @@ if(BUILD_TOOLS AND WIN32)
     xwbtool/xwbtool.cpp
     xwbtool/xwbtool.rc
     xwbtool/settings.manifest
+    xwbtool/CmdLineHelpers.h
     Audio/WAVFileReader.cpp
     Audio/WAVFileReader.h)
   target_compile_features(xwbtool PRIVATE cxx_std_17)
@@ -381,6 +383,10 @@ if(directxmath_FOUND)
     endforeach()
 endif()
 
+if(TOOL_EXES)
+  message(STATUS "Building tools: ${TOOL_EXES}")
+endif()
+
 # Model uses dynamic_cast, so we need /GR (Enable RTTI)
 if(MSVC)
     foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
@@ -428,6 +434,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
     set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 14)
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
     if(ENABLE_CODE_ANALYSIS)
+      message(STATUS "Building with Code Analysis (PREFIX)")
       foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
         target_compile_options(${t} PRIVATE /analyze /WX)
       endforeach()

DirectXTK/CMakePresets.json

@@ -294,7 +294,9 @@
     { "name": "x64-Debug-ICX"    , "description": "Intel oneAPI Compiler (Debug) for Windows 8", "inherits": [ "base", "x64", "Debug", "IntelLLVM" ] },
     { "name": "x64-Release-ICX"  , "description": "Intel oneAPI Compiler (Release) for Windows 8", "inherits": [ "base", "x64", "Release", "IntelLLVM" ] },
 
-    { "name": "x64-Fuzzing"  , "description": "MSVC for x64 (Release) with ASan", "inherits": [ "base", "x64", "Release", "MSVC", "Win10", "Fuzzing" ] }
+    { "name": "x64-Fuzzing"       , "description": "MSVC for x64 (Release) with ASan", "inherits": [ "base", "x64", "Release", "MSVC", "Win10", "Fuzzing" ] },
+    { "name": "x64-Analyze"       , "description": "MSVC for x64 (Debug) for Windows 8 using /analyze", "inherits": [ "base", "x64", "Debug", "MSVC" ], "cacheVariables": { "ENABLE_CODE_ANALYSIS": true } },
+    { "name": "x64-Analyze-Win10" , "description": "MSVC for x64 (Debug) for Windows 10 using /analyze", "inherits": [ "base", "x64", "Debug", "MSVC", "Win10" ], "cacheVariables": { "ENABLE_CODE_ANALYSIS": true } }
   ],
   "testPresets": [
     { "name": "x64-Debug"      , "configurePreset": "x64-Debug" },

DirectXTK/DirectXTK_Desktop_2019.vcxproj

@@ -42,6 +42,7 @@
     <ClInclude Include="Src\AlignedNew.h" />
     <ClInclude Include="Src\Bezier.h" />
     <ClInclude Include="Src\BinaryReader.h" />
+    <ClInclude Include="Src\CMO.h" />
     <ClInclude Include="Src\DemandCreate.h" />
     <ClInclude Include="Src\EffectCommon.h" />
     <ClInclude Include="Src\Geometry.h" />

DirectXTK/DirectXTK_Desktop_2019.vcxproj.filters

@@ -120,6 +120,9 @@
     <ClInclude Include="Inc\BufferHelpers.h">
       <Filter>Inc</Filter>
     </ClInclude>
+    <ClInclude Include="Src\CMO.h">
+      <Filter>Src\Shared</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Src\CommonStates.cpp">

DirectXTK/DirectXTK_Desktop_2019_Win10.vcxproj

@@ -54,6 +54,7 @@
     <ClInclude Include="Src\AlignedNew.h" />
     <ClInclude Include="Src\Bezier.h" />
     <ClInclude Include="Src\BinaryReader.h" />
+    <ClInclude Include="Src\CMO.h" />
     <ClInclude Include="Src\DemandCreate.h" />
     <ClInclude Include="Src\EffectCommon.h" />
     <ClInclude Include="Src\Geometry.h" />

DirectXTK/DirectXTK_Desktop_2019_Win10.vcxproj.filters

@@ -135,6 +135,9 @@
     <ClInclude Include="Inc\BufferHelpers.h">
       <Filter>Inc</Filter>
     </ClInclude>
+    <ClInclude Include="Src\CMO.h">
+      <Filter>Src\Shared</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Src\CommonStates.cpp">

DirectXTK/DirectXTK_Desktop_2022.vcxproj

@@ -42,6 +42,7 @@
     <ClInclude Include="Src\AlignedNew.h" />
     <ClInclude Include="Src\Bezier.h" />
     <ClInclude Include="Src\BinaryReader.h" />
+    <ClInclude Include="Src\CMO.h" />
     <ClInclude Include="Src\DemandCreate.h" />
     <ClInclude Include="Src\EffectCommon.h" />
     <ClInclude Include="Src\Geometry.h" />

DirectXTK/DirectXTK_Desktop_2022.vcxproj.filters

@@ -120,6 +120,9 @@
     <ClInclude Include="Inc\BufferHelpers.h">
       <Filter>Inc</Filter>
     </ClInclude>
+    <ClInclude Include="Src\CMO.h">
+      <Filter>Src\Shared</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Src\CommonStates.cpp">

DirectXTK/DirectXTK_Desktop_2022_Win10.vcxproj

@@ -54,6 +54,7 @@
     <ClInclude Include="Src\AlignedNew.h" />
     <ClInclude Include="Src\Bezier.h" />
     <ClInclude Include="Src\BinaryReader.h" />
+    <ClInclude Include="Src\CMO.h" />
     <ClInclude Include="Src\DemandCreate.h" />
     <ClInclude Include="Src\EffectCommon.h" />
     <ClInclude Include="Src\Geometry.h" />

DirectXTK/DirectXTK_Desktop_2022_Win10.vcxproj.filters

@@ -135,6 +135,9 @@
     <ClInclude Include="Inc\BufferHelpers.h">
       <Filter>Inc</Filter>
     </ClInclude>
+    <ClInclude Include="Src\CMO.h">
+      <Filter>Src\Shared</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Src\CommonStates.cpp">

DirectXTK/DirectXTK_GDK_2019.vcxproj

@@ -199,6 +199,7 @@
     <ClInclude Include="Src\AlignedNew.h" />
     <ClInclude Include="Src\Bezier.h" />
     <ClInclude Include="Src\BinaryReader.h" />
+    <ClInclude Include="Src\CMO.h" />
     <ClInclude Include="Src\DemandCreate.h" />
     <ClInclude Include="Src\EffectCommon.h" />
     <ClInclude Include="Src\Geometry.h" />
@@ -321,4 +322,4 @@
     <Delete Files="@(_ATGShaderHeaders)" />
     <Delete Files="@(_ATGShaderSymbols)" />
   </Target>
-</Project>
+</Project>

DirectXTK/DirectXTK_GDK_2019.vcxproj.filters

@@ -137,6 +137,9 @@
     <ClInclude Include="Inc\BufferHelpers.h">
       <Filter>Inc</Filter>
     </ClInclude>
+    <ClInclude Include="Src\CMO.h">
+      <Filter>Src\Shared</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Src\CommonStates.cpp">
@@ -280,6 +283,9 @@
     <ClCompile Include="Src\DirectXHelpers.cpp">
       <Filter>Src</Filter>
     </ClCompile>
+    <ClCompile Include="Audio\SoundStreamInstance.cpp">
+      <Filter>Audio</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="Src\Shaders\CompileShaders.cmd">

DirectXTK/DirectXTK_GDK_2022.vcxproj

@@ -199,6 +199,7 @@
     <ClInclude Include="Src\AlignedNew.h" />
     <ClInclude Include="Src\Bezier.h" />
     <ClInclude Include="Src\BinaryReader.h" />
+    <ClInclude Include="Src\CMO.h" />
     <ClInclude Include="Src\DemandCreate.h" />
     <ClInclude Include="Src\EffectCommon.h" />
     <ClInclude Include="Src\Geometry.h" />

DirectXTK/DirectXTK_GDK_2022.vcxproj.filters

@@ -137,6 +137,9 @@
     <ClInclude Include="Inc\BufferHelpers.h">
       <Filter>Inc</Filter>
     </ClInclude>
+    <ClInclude Include="Src\CMO.h">
+      <Filter>Src\Shared</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Src\CommonStates.cpp">
@@ -281,7 +284,7 @@
       <Filter>Src</Filter>
     </ClCompile>
     <ClCompile Include="Audio\SoundStreamInstance.cpp">
-      <Filter>Src</Filter>
+      <Filter>Audio</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>

DirectXTK/DirectXTK_Windows10_2022.vcxproj

@@ -53,6 +53,7 @@
     <ClInclude Include="Src\AlignedNew.h" />
     <ClInclude Include="Src\Bezier.h" />
     <ClInclude Include="Src\BinaryReader.h" />
+    <ClInclude Include="Src\CMO.h" />
     <ClInclude Include="Src\DDS.h" />
     <ClInclude Include="Src\DemandCreate.h" />
     <ClInclude Include="Src\EffectCommon.h" />

DirectXTK/DirectXTK_Windows10_2022.vcxproj.filters

@@ -132,6 +132,9 @@
     <ClInclude Include="Inc\BufferHelpers.h">
       <Filter>Inc</Filter>
     </ClInclude>
+    <ClInclude Include="Src\CMO.h">
+      <Filter>Src\Shared</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="Src\Shaders\CompileShaders.cmd">

DirectXTK/Inc/Effects.h

@@ -929,7 +929,7 @@ namespace DirectX
 
             void __cdecl SetDirectory(_In_opt_z_ const wchar_t* path) noexcept;
 
-            // Property.
+            // Properties.
             ID3D11Device* GetDevice() const noexcept;
 
         private:
@@ -967,7 +967,7 @@ namespace DirectX
 
             void __cdecl SetDirectory(_In_opt_z_ const wchar_t* path) noexcept;
 
-            // Property.
+            // Properties.
             ID3D11Device* GetDevice() const noexcept;
 
         private:
@@ -1025,7 +1025,7 @@ namespace DirectX
 
             void __cdecl SetDirectory(_In_opt_z_ const wchar_t* path) noexcept;
 
-            // Property.
+            // Properties.
             ID3D11Device* GetDevice() const noexcept;
 
         private:

DirectXTK/Inc/PostProcess.h

@@ -81,7 +81,7 @@ namespace DirectX
             // Shader control
             void __cdecl SetEffect(Effect fx);
 
-            // Property
+            // Properties
             void __cdecl SetSourceTexture(_In_opt_ ID3D11ShaderResourceView* value);
 
             // Sets multiplier for GaussianBlur_5x5
@@ -130,7 +130,7 @@ namespace DirectX
             // Shader control
             void __cdecl SetEffect(Effect fx);
 
-            // Property
+            // Properties
             void __cdecl SetSourceTexture(_In_opt_ ID3D11ShaderResourceView* value);
             void __cdecl SetSourceTexture2(_In_opt_ ID3D11ShaderResourceView* value);
 
@@ -204,7 +204,7 @@ namespace DirectX
             void __cdecl SetMRTOutput(bool value = true);
         #endif
 
-            // Property
+            // Properties
             void __cdecl SetHDRSourceTexture(_In_opt_ ID3D11ShaderResourceView* value);
 
             // Sets the Color Rotation Transform for HDR10 signal output

DirectXTK/Inc/SimpleMath.h

@@ -527,7 +527,7 @@ namespace DirectX
             Matrix operator+ () const noexcept { return *this; }
             Matrix operator- () const noexcept;
 
-            // Property
+            // Properties
             Vector3 Up() const noexcept { return Vector3(_21, _22, _23); }
             void Up(const Vector3& v) noexcept { _21 = v.x; _22 = v.y; _23 = v.z; }
 
@@ -656,7 +656,7 @@ namespace DirectX
             // Assignment operators
             Plane& operator= (const XMVECTORF32& F) noexcept { x = F.f[0]; y = F.f[1]; z = F.f[2]; w = F.f[3]; return *this; }
 
-            // Property
+            // Properties
             Vector3 Normal() const noexcept { return Vector3(x, y, z); }
             void Normal(const Vector3& normal) noexcept { x = normal.x; y = normal.y; z = normal.z; }
 
@@ -824,7 +824,7 @@ namespace DirectX
             Color operator+ () const noexcept { return *this; }
             Color operator- () const noexcept;
 
-            // Property
+            // Properties
             float R() const noexcept { return x; }
             void R(float r) noexcept { x = r; }
 

DirectXTK/Src/BasicPostProcess.cpp

@@ -526,7 +526,7 @@ void BasicPostProcess::SetEffect(Effect fx)
 }
 
 
-// Property
+// Properties
 void BasicPostProcess::SetSourceTexture(_In_opt_ ID3D11ShaderResourceView* value)
 {
     pImpl->texture = value;