Updated for DirectXTK/DirectXTex October 2016 releases

walbourn · Oct 7, 2016 · 636e717 · 636e717
1 parent 11cf0da
commit 636e717
Show file tree

Hide file tree

Showing 144 changed files with 35,770 additions and 7,300 deletions.
diff --git a/DirectXTK/DirectXTK_Desktop_2013.vcxproj b/DirectXTK/DirectXTK_Desktop_2013.vcxproj
diff --git a/DirectXTK/DirectXTK_Desktop_2013.vcxproj.filters b/DirectXTK/DirectXTK_Desktop_2013.vcxproj.filters
diff --git a/DirectXTK/DirectXTK_Desktop_2015.vcxproj b/DirectXTK/DirectXTK_Desktop_2015.vcxproj
diff --git a/DirectXTK/DirectXTK_Desktop_2015.vcxproj.filters b/DirectXTK/DirectXTK_Desktop_2015.vcxproj.filters
diff --git a/DirectXTK/DirectXTK_Desktop_2015_Win10.vcxproj b/DirectXTK/DirectXTK_Desktop_2015_Win10.vcxproj
diff --git a/DirectXTK/DirectXTK_Desktop_2015_Win10.vcxproj.filters b/DirectXTK/DirectXTK_Desktop_2015_Win10.vcxproj.filters
diff --git a/DirectXTK/Inc/Effects.h b/DirectXTK/Inc/Effects.h
@@ -158,6 +158,9 @@ namespace DirectX
         void __cdecl SetTextureEnabled(bool value);
         void __cdecl SetTexture(_In_opt_ ID3D11ShaderResourceView* value);
 
+        // Normal compression settings.
+        void __cdecl SetBiasedVertexNormals(bool value);
+
     private:
         // Private implementation.
         class Impl;
@@ -326,7 +329,10 @@ namespace DirectX
         void __cdecl SetEnvironmentMapAmount(float value);
         void XM_CALLCONV SetEnvironmentMapSpecular(FXMVECTOR value);
         void __cdecl SetFresnelFactor(float value);
-
+
+        // Normal compression settings.
+        void __cdecl SetBiasedVertexNormals(bool value);
+
     private:
         // Private implementation.
         class Impl;
@@ -398,6 +404,9 @@ namespace DirectX
         void __cdecl SetBoneTransforms(_In_reads_(count) XMMATRIX const* value, size_t count) override;
         void __cdecl ResetBoneTransforms() override;
 
+        // Normal compression settings.
+        void __cdecl SetBiasedVertexNormals(bool value);
+
     private:
         // Private implementation.
         class Impl;
@@ -547,7 +556,10 @@ namespace DirectX
         void __cdecl SetTexture(_In_opt_ ID3D11ShaderResourceView* value);
         void __cdecl SetNormalTexture(_In_opt_ ID3D11ShaderResourceView* value);
         void __cdecl SetSpecularTexture(_In_opt_ ID3D11ShaderResourceView* value);
-
+
+        // Normal compression settings.
+        void __cdecl SetBiasedVertexNormalsAndTangents(bool value);
+
     private:
         // Private implementation.
         class Impl;
@@ -573,6 +585,7 @@ namespace DirectX
             bool                enableSkinning;
             bool                enableDualTexture;
             bool                enableNormalMaps;
+            bool                biasedVertexNormals;
             float               specularPower;
             float               alpha;
             DirectX::XMFLOAT3   ambientColor;

diff --git a/DirectXTK/Inc/GeometricPrimitive.h b/DirectXTK/Inc/GeometricPrimitive.h
@@ -63,14 +63,14 @@ namespace DirectX
 
         // Draw the primitive.
         void XM_CALLCONV Draw(FXMMATRIX world, CXMMATRIX view, CXMMATRIX projection, FXMVECTOR color = Colors::White, _In_opt_ ID3D11ShaderResourceView* texture = nullptr, bool wireframe = false,
-                              _In_opt_ std::function<void __cdecl()> setCustomState = nullptr );
+                              _In_opt_ std::function<void __cdecl()> setCustomState = nullptr ) const;
 
         // Draw the primitive using a custom effect.
         void __cdecl Draw( _In_ IEffect* effect, _In_ ID3D11InputLayout* inputLayout, bool alpha = false, bool wireframe = false,
-                           _In_opt_ std::function<void __cdecl()> setCustomState = nullptr );
+                           _In_opt_ std::function<void __cdecl()> setCustomState = nullptr ) const;
 
         // Create input layout for drawing with a custom effect.
-        void __cdecl CreateInputLayout( _In_ IEffect* effect, _Outptr_ ID3D11InputLayout** inputLayout );
+        void __cdecl CreateInputLayout( _In_ IEffect* effect, _Outptr_ ID3D11InputLayout** inputLayout ) const;
 
     private:
         GeometricPrimitive();

diff --git a/DirectXTK/Inc/Model.h b/DirectXTK/Inc/Model.h
@@ -68,7 +68,7 @@ namespace DirectX
                            _In_opt_ std::function<void __cdecl()> setCustomState = nullptr ) const;
 
         // Create input layout for drawing with a custom effect.
-        void __cdecl CreateInputLayout( _In_ ID3D11Device* d3dDevice, _In_ IEffect* ieffect, _Outptr_ ID3D11InputLayout** iinputLayout );
+        void __cdecl CreateInputLayout( _In_ ID3D11Device* d3dDevice, _In_ IEffect* ieffect, _Outptr_ ID3D11InputLayout** iinputLayout ) const;
 
         // Change effect used by part and regenerate input layout (be sure to call Model::Modified as well)
         void __cdecl ModifyEffect( _In_ ID3D11Device* d3dDevice, _In_ std::shared_ptr<IEffect>& ieffect, bool isalpha = false );
@@ -93,7 +93,7 @@ namespace DirectX
         typedef std::vector<std::shared_ptr<ModelMesh>> Collection;
 
         // Setup states for drawing mesh
-        void __cdecl PrepareForRendering( _In_ ID3D11DeviceContext* deviceContext, CommonStates& states, bool alpha = false, bool wireframe = false ) const;
+        void __cdecl PrepareForRendering( _In_ ID3D11DeviceContext* deviceContext, const CommonStates& states, bool alpha = false, bool wireframe = false ) const;
 
         // Draw the mesh
         void XM_CALLCONV Draw( _In_ ID3D11DeviceContext* deviceContext, FXMMATRIX world, CXMMATRIX view, CXMMATRIX projection,
@@ -112,7 +112,7 @@ namespace DirectX
         std::wstring            name;
 
         // Draw all the meshes in the model
-        void XM_CALLCONV Draw( _In_ ID3D11DeviceContext* deviceContext, CommonStates& states, FXMMATRIX world, CXMMATRIX view, CXMMATRIX projection,
+        void XM_CALLCONV Draw( _In_ ID3D11DeviceContext* deviceContext, const CommonStates& states, FXMMATRIX world, CXMMATRIX view, CXMMATRIX projection,
                                bool wireframe = false, _In_opt_ std::function<void __cdecl()> setCustomState = nullptr ) const;
 
         // Notify model that effects, parts list, or mesh list has changed

diff --git a/DirectXTK/Inc/WICTextureLoader.h b/DirectXTK/Inc/WICTextureLoader.h
@@ -38,6 +38,13 @@
 
 namespace DirectX
 {
+    enum WIC_LOADER_FLAGS
+    {
+        WIC_LOADER_DEFAULT      = 0,
+        WIC_LOADER_FORCE_SRGB   = 0x1,
+        WIC_LOADER_IGNORE_SRGB  = 0x2,
+    };
+
     // Standard version
     HRESULT __cdecl CreateWICTextureFromMemory(
         _In_ ID3D11Device* d3dDevice,
@@ -92,7 +99,7 @@ namespace DirectX
         _In_ unsigned int bindFlags,
         _In_ unsigned int cpuAccessFlags,
         _In_ unsigned int miscFlags,
-        _In_ bool forceSRGB,
+        _In_ unsigned int loadFlags,
         _Outptr_opt_ ID3D11Resource** texture,
         _Outptr_opt_ ID3D11ShaderResourceView** textureView);
 
@@ -104,7 +111,7 @@ namespace DirectX
         _In_ unsigned int bindFlags,
         _In_ unsigned int cpuAccessFlags,
         _In_ unsigned int miscFlags,
-        _In_ bool forceSRGB,
+        _In_ unsigned int loadFlags,
         _Outptr_opt_ ID3D11Resource** texture,
         _Outptr_opt_ ID3D11ShaderResourceView** textureView);
 
@@ -124,7 +131,7 @@ namespace DirectX
         _In_ unsigned int bindFlags,
         _In_ unsigned int cpuAccessFlags,
         _In_ unsigned int miscFlags,
-        _In_ bool forceSRGB,
+        _In_ unsigned int loadFlags,
         _Outptr_opt_ ID3D11Resource** texture,
         _Outptr_opt_ ID3D11ShaderResourceView** textureView);
 
@@ -142,7 +149,7 @@ namespace DirectX
         _In_ unsigned int bindFlags,
         _In_ unsigned int cpuAccessFlags,
         _In_ unsigned int miscFlags,
-        _In_ bool forceSRGB,
+        _In_ unsigned int loadFlags,
         _Outptr_opt_ ID3D11Resource** texture,
         _Outptr_opt_ ID3D11ShaderResourceView** textureView);
 }
diff --git a/DirectXTK/MIT.txt b/DirectXTK/MIT.txt
diff --git a/DirectXTK/Readme.txt b/DirectXTK/Readme.txt
@@ -4,7 +4,7 @@ DirectXTK - the DirectX Tool Kit for DirectX 11
 
 Copyright (c) Microsoft Corporation. All rights reserved.
 
-September 15, 2016
+October 6, 2016
 
 This package contains the "DirectX Tool Kit", a collection of helper classes for 
 writing Direct3D 11 C++ code for Universal Windows Platform (UWP) apps for Windows 10,
@@ -79,6 +79,11 @@ https://opensource.microsoft.com/codeofconduct/
 RELEASE HISTORY
 ---------------
 
+October 6, 2016
+    SDKMESH loader and BasicEffects support for compressed vertex normals with biasing
+    WICTextureLoader Ex bool forceSRGB parameter is now a WIC_LOADER flag
+    Minor code cleanup
+
 September 15, 2016
     Minor code cleanup
     xwbtool: added wildcard support for input filename and optional -r switch for recursive search