lightling/DX11Starter
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pass textures to materials

Browse source
This commit is contained in:
lightling 2022-03-27 15:15:39 -04:00
parent 329299a4b6
commit 558a0b0238
Signed by: lightling
GPG key ID: 016F11E0AA296B67
3 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Game.cpp
View file

@ -85,13 +85,10 @@ void Game::LoadShaders()
pixelShader = std::make_shared<SimplePixelShader>(device, context, GetFullPathTo_Wide(L"SimplePixelShader.cso").c_str()); pixelShader = std::make_shared<SimplePixelShader>(device, context, GetFullPathTo_Wide(L"SimplePixelShader.cso").c_str());
XMFLOAT3 white = XMFLOAT3(1.0f, 1.0f, 1.0f); XMFLOAT3 white = XMFLOAT3(1.0f, 1.0f, 1.0f);
XMFLOAT3 deeppink = XMFLOAT3(1.0f, 0.08f, 0.4f);
XMFLOAT3 deepcoral = XMFLOAT3(1.0f, 0.39f, 0.22f);
materials = { materials = {
std::make_shared<Material>(white, 0, vertexShader, pixelShader), std::make_shared<Material>(white, 0, vertexShader, pixelShader),
std::make_shared<Material>(deeppink, 0, vertexShader, pixelShader), std::make_shared<Material>(white, 0, vertexShader, pixelShader),
std::make_shared<Material>(deepcoral, 0, vertexShader, pixelShader),
}; };
} }
@ -117,6 +114,11 @@ void Game::LoadTextures()
GetTex(L"Assets/Textures/HQGame/structure-endgame-deepfloor_albedo.png", deepFloorAlbedo); GetTex(L"Assets/Textures/HQGame/structure-endgame-deepfloor_albedo.png", deepFloorAlbedo);
GetTex(L"Assets/Textures/HQGame/structure-endgame-floor_albedo.png", floorAlbedo); GetTex(L"Assets/Textures/HQGame/structure-endgame-floor_albedo.png", floorAlbedo);
materials[0]->PushSampler("BasicSampler", sampler);
materials[0]->PushTexture("Albedo", deepFloorAlbedo);
materials[1]->PushSampler("BasicSampler", sampler);
materials[1]->PushTexture("Albedo", floorAlbedo);
} }
void Game::LoadLighting() void Game::LoadLighting()

19
Material.cpp
View file

@ -32,6 +32,15 @@ void Material::Activate(Transform* _transform, std::shared_ptr<Camera> _camera,
pixelShader->SetData("lights", &_lights[0], sizeof(Light) * (int)_lights.size()); pixelShader->SetData("lights", &_lights[0], sizeof(Light) * (int)_lights.size());
pixelShader->CopyAllBufferData(); pixelShader->CopyAllBufferData();
pixelShader->SetShader(); pixelShader->SetShader();
for (auto& t : textures)
{
pixelShader->SetShaderResourceView(t.first.c_str(), t.second.Get());
}
for (auto& s : samplers)
{
pixelShader->SetSamplerState(s.first.c_str(), s.second.Get());
}
} }
DirectX::XMFLOAT3 Material::GetTint() DirectX::XMFLOAT3 Material::GetTint()
@ -84,3 +93,13 @@ void Material::SetPixelShader(std::shared_ptr<SimplePixelShader> _pixelShader)
{ {
pixelShader = _pixelShader; pixelShader = _pixelShader;
} }
void Material::PushSampler(std::string _name, Microsoft::WRL::ComPtr<ID3D11SamplerState> _sampler)
{
samplers.insert({ _name, _sampler });
}
void Material::PushTexture(std::string _name, Microsoft::WRL::ComPtr<ID3D11ShaderResourceView> _texture)
{
textures.insert({ _name, _texture });
}

6
Material.h
View file

@ -33,9 +33,15 @@ public:
void SetVertexShader(std::shared_ptr<SimpleVertexShader> _vertexShader); void SetVertexShader(std::shared_ptr<SimpleVertexShader> _vertexShader);
void SetPixelShader(std::shared_ptr<SimplePixelShader> _pixelShader); void SetPixelShader(std::shared_ptr<SimplePixelShader> _pixelShader);
void PushSampler(std::string _name, Microsoft::WRL::ComPtr<ID3D11SamplerState> _sampler);
void PushTexture(std::string _name, Microsoft::WRL::ComPtr<ID3D11ShaderResourceView> _texture);
private: private:
DirectX::XMFLOAT3 tint; DirectX::XMFLOAT3 tint;
float roughness; float roughness;
std::shared_ptr<SimpleVertexShader> vertexShader; std::shared_ptr<SimpleVertexShader> vertexShader;
std::shared_ptr<SimplePixelShader> pixelShader; std::shared_ptr<SimplePixelShader> pixelShader;
std::unordered_map<std::string, Microsoft::WRL::ComPtr<ID3D11SamplerState>> samplers;
std::unordered_map<std::string, Microsoft::WRL::ComPtr<ID3D11ShaderResourceView>> textures;
}; };