change ShaderCollection::Set to ShaderCollection::ApplyToContext for clarity, remove Models-Refactored

Floyd Huizinga · Floyd Huizinga · commit ea73a8e7da2d · 2023-02-04T13:50:47.000+01:00
diff --git a/src/Cpp/1-getting-started/1-3-3-SettingUp3DRendering/ShaderCollection.cpp b/src/Cpp/1-getting-started/1-3-3-SettingUp3DRendering/ShaderCollection.cpp
@@ -182,7 +182,7 @@ bool ShaderCollection::CompileShader(const std::wstring& filePath, const std::st
 }
 
 
-void ShaderCollection::Set(ID3D11DeviceContext* context)
+void ShaderCollection::ApplyToContext(ID3D11DeviceContext* context)
 {
     context->IASetInputLayout(_inputLayout.Get());
     context->VSSetShader(_vertexShader.Get(), nullptr, 0);
diff --git a/src/Cpp/1-getting-started/1-3-3-SettingUp3DRendering/ShaderCollection.hpp b/src/Cpp/1-getting-started/1-3-3-SettingUp3DRendering/ShaderCollection.hpp
@@ -23,7 +23,7 @@ class ShaderCollection
 
     static size_t GetLayoutByteSize(VertexType vertexType);
 
-    void Set(ID3D11DeviceContext* context);
+    void ApplyToContext(ID3D11DeviceContext* context);
     void Destroy();
 
 private:
@@ -52,7 +52,7 @@ class ShaderCollection
     WRL::ComPtr<ID3D11VertexShader> _vertexShader = nullptr;
     WRL::ComPtr<ID3D11PixelShader> _pixelShader = nullptr;
     WRL::ComPtr<ID3D11InputLayout> _inputLayout = nullptr;
-    D3D11_PRIMITIVE_TOPOLOGY _primitiveTopology = {};
+    D3D11_PRIMITIVE_TOPOLOGY _primitiveTopology = {};*
     uint32_t _vertexSize = 0;
     static std::unordered_map<VertexType, std::vector<D3D11_INPUT_ELEMENT_DESC>> _layoutMap;
 };
diff --git a/src/Cpp/1-getting-started/1-3-4-3DRendering/ShaderCollection.cpp b/src/Cpp/1-getting-started/1-3-4-3DRendering/ShaderCollection.cpp
@@ -182,7 +182,7 @@ bool ShaderCollection::CompileShader(const std::wstring& filePath, const std::st
 }
 
 
-void ShaderCollection::Set(ID3D11DeviceContext* context)
+void ShaderCollection::ApplyToContext(ID3D11DeviceContext* context)
 {
     context->IASetInputLayout(_inputLayout.Get());
     context->VSSetShader(_vertexShader.Get(), nullptr, 0);
diff --git a/src/Cpp/1-getting-started/1-3-4-3DRendering/ShaderCollection.hpp b/src/Cpp/1-getting-started/1-3-4-3DRendering/ShaderCollection.hpp
@@ -22,7 +22,7 @@ class ShaderCollection
         const ShaderCollectionDescriptor& settings, ID3D11Device* device);
     static size_t GetLayoutByteSize(VertexType vertexType);
 
-    void Set(ID3D11DeviceContext* context);
+    void ApplyToContext(ID3D11DeviceContext* context);
     void Destroy();
 
 private:
diff --git a/src/LearnD3D11.sln b/src/LearnD3D11.sln
@@ -66,11 +66,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "1-1-3-HelloTriangle-Refacto
 		{A3B1AE74-436A-44B7-AD17-A0D19168773C} = {A3B1AE74-436A-44B7-AD17-A0D19168773C}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "1-3-5-Models-Refactored", "Cpp\1-getting-started\1-3-5-Models-Refactored\1-3-5-Models-Refactored.vcxproj", "{1B3547F4-344F-41FC-8AB0-312AF6E01A96}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A3B1AE74-436A-44B7-AD17-A0D19168773C} = {A3B1AE74-436A-44B7-AD17-A0D19168773C}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "1-3-7-DearImGui", "Cpp\1-getting-started\1-3-7-DearImGui\1-3-7-DearImGui.vcxproj", "{0989B526-EC66-4C1C-8121-4B9AC53E2C83}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A3B1AE74-436A-44B7-AD17-A0D19168773C} = {A3B1AE74-436A-44B7-AD17-A0D19168773C}
@@ -141,10 +136,6 @@ Global
 		{A1F990E5-58A1-4345-AF2B-599F785519A7}.Debug|x64.Build.0 = Debug|x64
 		{A1F990E5-58A1-4345-AF2B-599F785519A7}.Release|x64.ActiveCfg = Release|x64
 		{A1F990E5-58A1-4345-AF2B-599F785519A7}.Release|x64.Build.0 = Release|x64
-		{1B3547F4-344F-41FC-8AB0-312AF6E01A96}.Debug|x64.ActiveCfg = Debug|x64
-		{1B3547F4-344F-41FC-8AB0-312AF6E01A96}.Debug|x64.Build.0 = Debug|x64
-		{1B3547F4-344F-41FC-8AB0-312AF6E01A96}.Release|x64.ActiveCfg = Release|x64
-		{1B3547F4-344F-41FC-8AB0-312AF6E01A96}.Release|x64.Build.0 = Release|x64
 		{0989B526-EC66-4C1C-8121-4B9AC53E2C83}.Debug|x64.ActiveCfg = Debug|x64
 		{0989B526-EC66-4C1C-8121-4B9AC53E2C83}.Debug|x64.Build.0 = Debug|x64
 		{0989B526-EC66-4C1C-8121-4B9AC53E2C83}.Release|x64.ActiveCfg = Release|x64
@@ -188,7 +179,6 @@ Global
 		{FAFF4FF7-7CB0-475D-AC8E-59156B3BC8B4} = {125F76A8-AE74-44AE-B471-BE7C09EB5EB4}
 		{C1C659F7-25F7-463E-BC25-83DCD748044E} = {125F76A8-AE74-44AE-B471-BE7C09EB5EB4}
 		{A1F990E5-58A1-4345-AF2B-599F785519A7} = {69E36221-7B54-4891-AB39-B9F2C5025815}
-		{1B3547F4-344F-41FC-8AB0-312AF6E01A96} = {125F76A8-AE74-44AE-B471-BE7C09EB5EB4}
 		{0989B526-EC66-4C1C-8121-4B9AC53E2C83} = {125F76A8-AE74-44AE-B471-BE7C09EB5EB4}
 		{1B35D552-7FE9-43AD-B0BC-7375D96034A5} = {125F76A8-AE74-44AE-B471-BE7C09EB5EB4}
 		{B88367A4-CB5C-4FB1-9FF9-ADDA3D9D0AB2} = {69E36221-7B54-4891-AB39-B9F2C5025815}

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ bool ShaderCollection::CompileShader(const std::wstring& filePath, const std::st`
`182`	`182`	`}`
`183`	`183`
`184`	`184`
`185`		`-void ShaderCollection::Set(ID3D11DeviceContext* context)`
	`185`	`+void ShaderCollection::ApplyToContext(ID3D11DeviceContext* context)`
`186`	`186`	`{`
`187`	`187`	`context->IASetInputLayout(_inputLayout.Get());`
`188`	`188`	`context->VSSetShader(_vertexShader.Get(), nullptr, 0);`