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

move texture loading to material class

Browse source
This commit is contained in:
lightling 2022-03-29 10:20:44 -04:00
parent 8daa82df97
commit 4c911f8348
4 changed files with 29 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
DXCore.h
View file

@ -44,6 +44,13 @@ public:
virtual void Update(float deltaTime, float totalTime) = 0; virtual void Update(float deltaTime, float totalTime) = 0;
virtual void Draw(float deltaTime, float totalTime) = 0; virtual void Draw(float deltaTime, float totalTime) = 0;
// Helpers for determining the actual path to the executable
static std::string GetExePath();
static std::wstring GetExePath_Wide();
static std::string GetFullPathTo(std::string relativeFilePath);
static std::wstring GetFullPathTo_Wide(std::wstring relativeFilePath);
protected: protected:
HINSTANCE hInstance; // The handle to the application HINSTANCE hInstance; // The handle to the application
HWND hWnd; // The handle to the window itself HWND hWnd; // The handle to the window itself
@ -70,13 +77,6 @@ protected:
// Helper function for allocating a console window // Helper function for allocating a console window
void CreateConsoleWindow(int bufferLines, int bufferColumns, int windowLines, int windowColumns); void CreateConsoleWindow(int bufferLines, int bufferColumns, int windowLines, int windowColumns);
// Helpers for determining the actual path to the executable
std::string GetExePath();
std::wstring GetExePath_Wide();
std::string GetFullPathTo(std::string relativeFilePath);
std::wstring GetFullPathTo_Wide(std::wstring relativeFilePath);
private: private:
// Timing related data // Timing related data

31
Game.cpp
View file

@ -105,32 +105,15 @@ void Game::LoadTextures()
sampDesc.MaxLOD = D3D11_FLOAT32_MAX; sampDesc.MaxLOD = D3D11_FLOAT32_MAX;
device->CreateSamplerState(&sampDesc, sampler.GetAddressOf()); device->CreateSamplerState(&sampDesc, sampler.GetAddressOf());
Microsoft::WRL::ComPtr<ID3D11ShaderResourceView>
deepFloorEmissive,
deepFloorSpecular,
deepFloorAlbedo,
floorEmissive,
floorSpecular,
floorAlbedo;
// taking the preprocessor macro from the demo because I don't like typing
#define GetTex(pathToTexture, shaderResourceView) CreateWICTextureFromFile(device.Get(), context.Get(), GetFullPathTo_Wide(pathToTexture).c_str(), 0, shaderResourceView.GetAddressOf());
GetTex(L"Assets/Textures/HQGame/structure-endgame-deepfloor_emissive.png", deepFloorEmissive);
GetTex(L"Assets/Textures/HQGame/structure-endgame-deepfloor_specular.png", deepFloorSpecular);
GetTex(L"Assets/Textures/HQGame/structure-endgame-deepfloor_albedo.png", deepFloorAlbedo);
GetTex(L"Assets/Textures/HQGame/structure-endgame-floor_emissive.png", floorEmissive);
GetTex(L"Assets/Textures/HQGame/structure-endgame-floor_specular.png", floorSpecular);
GetTex(L"Assets/Textures/HQGame/structure-endgame-floor_albedo.png", floorAlbedo);
materials[0]->PushSampler("BasicSampler", sampler); materials[0]->PushSampler("BasicSampler", sampler);
materials[0]->PushTexture("Albedo", deepFloorAlbedo); materials[0]->LoadTexture(L"Assets/Textures/HQGame/structure-endgame-deepfloor_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
materials[0]->PushTexture("Specular", deepFloorSpecular); materials[0]->LoadTexture(L"Assets/Textures/HQGame/structure-endgame-deepfloor_specular.png", TEXTYPE_SPECULAR, device.Get(), context.Get());
materials[0]->PushTexture("Emissive", deepFloorEmissive); materials[0]->LoadTexture(L"Assets/Textures/HQGame/structure-endgame-deepfloor_emissive.png", TEXTYPE_EMISSIVE, device.Get(), context.Get());
materials[1]->PushSampler("BasicSampler", sampler); materials[1]->PushSampler("BasicSampler", sampler);
materials[1]->PushTexture("Albedo", floorAlbedo); materials[1]->LoadTexture(L"Assets/Textures/HQGame/structure-endgame-floor_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
materials[1]->PushTexture("Specular", floorSpecular); materials[1]->LoadTexture(L"Assets/Textures/HQGame/structure-endgame-floor_specular.png", TEXTYPE_SPECULAR, device.Get(), context.Get());
materials[1]->PushTexture("Emissive", floorEmissive); materials[1]->LoadTexture(L"Assets/Textures/HQGame/structure-endgame-floor_emissive.png", TEXTYPE_EMISSIVE, device.Get(), context.Get());
} }
void Game::LoadLighting() void Game::LoadLighting()

7
Material.cpp
View file

@ -129,6 +129,13 @@ void Material::SetPixelShader(std::shared_ptr<SimplePixelShader> _pixelShader)
pixelShader = _pixelShader; pixelShader = _pixelShader;
} }
void Material::LoadTexture(const wchar_t* _path, const char* _type, ID3D11Device* _device, ID3D11DeviceContext* _context)
{
Microsoft::WRL::ComPtr<ID3D11ShaderResourceView> shaderResourceView;
DirectX::CreateWICTextureFromFile(_device, _context, DXCore::GetFullPathTo_Wide(_path).c_str(), 0, shaderResourceView.GetAddressOf());
PushTexture(_type, shaderResourceView);
}
void Material::PushSampler(std::string _name, Microsoft::WRL::ComPtr<ID3D11SamplerState> _sampler) void Material::PushSampler(std::string _name, Microsoft::WRL::ComPtr<ID3D11SamplerState> _sampler)
{ {
samplers.insert({ _name, _sampler }); samplers.insert({ _name, _sampler });

8
Material.h
View file

@ -2,10 +2,17 @@
#include <DirectXMath.h> #include <DirectXMath.h>
#include <memory> #include <memory>
#include "DXCore.h"
#include "SimpleShader.h" #include "SimpleShader.h"
#include "Transform.h" #include "Transform.h"
#include "Camera.h" #include "Camera.h"
#include "Lights.h" #include "Lights.h"
#include "WICTextureLoader.h"
constexpr auto TEXTYPE_ALBEDO = "Albedo";
constexpr auto TEXTYPE_NORMAL = "Normal";
constexpr auto TEXTYPE_EMISSIVE = "Emissive";
constexpr auto TEXTYPE_SPECULAR = "Specular";
class Material class Material
{ {
@ -39,6 +46,7 @@ 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 LoadTexture(const wchar_t* _path, const char* _type, ID3D11Device* _device, ID3D11DeviceContext* _context);
void PushSampler(std::string _name, Microsoft::WRL::ComPtr<ID3D11SamplerState> _sampler); void PushSampler(std::string _name, Microsoft::WRL::ComPtr<ID3D11SamplerState> _sampler);
void PushTexture(std::string _name, Microsoft::WRL::ComPtr<ID3D11ShaderResourceView> _texture); void PushTexture(std::string _name, Microsoft::WRL::ComPtr<ID3D11ShaderResourceView> _texture);