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

cleanup, relocate material/entity draw prep code

Browse source
This commit is contained in:
lightling 2022-03-27 14:18:14 -04:00
parent 434726dffd
commit fefdf69b9a
Signed by: lightling
GPG key ID: 016F11E0AA296B67
5 changed files with 43 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Entity.cpp
View file

@ -6,6 +6,12 @@ Entity::Entity(std::shared_ptr<Material> _material, std::shared_ptr<Mesh> _mesh)
mesh = _mesh;
}
void Entity::Draw(std::shared_ptr<Camera> _camera, DirectX::XMFLOAT3 _ambient, std::vector<Light> _lights)
{
material->Activate(&transform, _camera, _ambient, _lights);
mesh->Draw();
}
Transform* Entity::GetTransform()
{
return &transform;

2
Entity.h
View file

@ -12,6 +12,8 @@ public:
std::shared_ptr<Material> _material,
std::shared_ptr<Mesh> _mesh);
void Draw(std::shared_ptr<Camera> _camera, DirectX::XMFLOAT3 _ambient, std::vector<Light> _lights);
Transform* GetTransform();
std::shared_ptr<Mesh> GetMesh();
std::shared_ptr<Material> GetMaterial();

31
Game.cpp
View file

@ -80,11 +80,8 @@ void Game::Init()
void Game::LoadShaders()
{
vertexShader = std::make_shared<SimpleVertexShader>(device, context, GetFullPathTo_Wide(L"VertexShader.cso").c_str());
pixelShader = //std::make_shared<SimplePixelShader>(device, context, GetFullPathTo_Wide(L"PixelShader.cso").c_str());
//std::make_shared<SimplePixelShader>(device, context, GetFullPathTo_Wide(L"RandomPixelShader.cso").c_str());
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());
// thanks to https://harry7557558.github.io/tools/colorpicker.html for having the only 0f-1f picker i could find
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);
@ -99,33 +96,39 @@ void Game::LoadShaders()
void Game::LoadLighting()
{
ambient = XMFLOAT3(0.05f, 0.05f, 0.20f);
Light directionalLight0 = {};
directionalLight0.Type = LIGHT_TYPE_DIRECTIONAL;
directionalLight0.Direction = XMFLOAT3(1, 0, 0);
directionalLight0.Color = XMFLOAT3(1, 0, 0);
directionalLight0.Intensity = 1;
Light directionalLight1 = {};
directionalLight1.Type = LIGHT_TYPE_DIRECTIONAL;
directionalLight1.Direction = XMFLOAT3(0, -1, 0);
directionalLight1.Color = XMFLOAT3(0, 1, 0);
directionalLight1.Intensity = 1;
Light directionalLight2 = {};
directionalLight2.Type = LIGHT_TYPE_DIRECTIONAL;
directionalLight2.Direction = XMFLOAT3(-1, 1, -0.5f);
directionalLight2.Color = XMFLOAT3(0, 0, 1);
directionalLight2.Intensity = 1;
Light pointLight0 = {};
pointLight0.Type = LIGHT_TYPE_POINT;
pointLight0.Position = XMFLOAT3(-2, -2, 0);
pointLight0.Color = XMFLOAT3(1, 1, 0);
pointLight0.Intensity = 1;
pointLight0.Range = 10;
Light pointLight1 = {};
pointLight1.Type = LIGHT_TYPE_POINT;
pointLight1.Position = XMFLOAT3(2, 2, 0);
pointLight1.Color = XMFLOAT3(0, 1, 1);
pointLight1.Intensity = 1;
pointLight1.Range = 10;
lights = {
directionalLight0,
directionalLight1,
@ -140,7 +143,6 @@ void Game::LoadLighting()
// --------------------------------------------------------
void Game::CreateBasicGeometry()
{
shapes = {
std::make_shared<Mesh>(
GetFullPathTo("Assets/Models/cube.obj").c_str(),
@ -233,24 +235,7 @@ void Game::Draw(float deltaTime, float totalTime)
for (auto entity : entities)
{
std::shared_ptr<SimpleVertexShader> vs = entity->GetMaterial()->GetVertexShader();
vs->SetMatrix4x4("world", entity->GetTransform()->GetWorldMatrix());
vs->SetMatrix4x4("worldInvTranspose", entity->GetTransform()->GetWorldMatrixInverseTranspose());
vs->SetMatrix4x4("view", camera->GetViewMatrix());
vs->SetMatrix4x4("projection", camera->GetProjectionMatrix());
vs->CopyAllBufferData();
std::shared_ptr<SimplePixelShader> ps = entity->GetMaterial()->GetPixelShader();
ps->SetFloat3("cameraPosition", camera->GetTransform()->GetPosition());
ps->SetFloat("roughness", entity->GetMaterial()->GetRoughness());
ps->SetFloat3("tint", entity->GetMaterial()->GetTint());
ps->SetFloat3("ambient", ambient);
ps->SetData("lights", &lights[0], sizeof(Light) * (int)lights.size());
ps->CopyAllBufferData();
entity->GetMaterial()->GetVertexShader()->SetShader();
entity->GetMaterial()->GetPixelShader()->SetShader();
entity->GetMesh()->Draw();
entity->Draw(camera, ambient, lights);
}
// Present the back buffer to the user

18
Material.cpp
View file

@ -16,6 +16,24 @@ Material::~Material()
{
}
void Material::Activate(Transform* _transform, std::shared_ptr<Camera> _camera, DirectX::XMFLOAT3 _ambient, std::vector<Light> _lights)
{
vertexShader->SetMatrix4x4("world", _transform->GetWorldMatrix());
vertexShader->SetMatrix4x4("worldInvTranspose", _transform->GetWorldMatrixInverseTranspose());
vertexShader->SetMatrix4x4("view", _camera->GetViewMatrix());
vertexShader->SetMatrix4x4("projection", _camera->GetProjectionMatrix());
vertexShader->CopyAllBufferData();
vertexShader->SetShader();
pixelShader->SetFloat3("cameraPosition", _camera->GetTransform()->GetPosition());
pixelShader->SetFloat("roughness", GetRoughness());
pixelShader->SetFloat3("tint", GetTint());
pixelShader->SetFloat3("ambient", _ambient);
pixelShader->SetData("lights", &_lights[0], sizeof(Light) * (int)_lights.size());
pixelShader->CopyAllBufferData();
pixelShader->SetShader();
}
DirectX::XMFLOAT3 Material::GetTint()
{
return tint;

9
Material.h
View file

@ -3,6 +3,9 @@
#include <DirectXMath.h>
#include <memory>
#include "SimpleShader.h"
#include "Transform.h"
#include "Camera.h"
#include "Lights.h"
class Material
{
@ -14,6 +17,12 @@ public:
std::shared_ptr<SimplePixelShader> _pixelShader);
~Material();
void Activate(
Transform* _transform,
std::shared_ptr<Camera> _camera,
DirectX::XMFLOAT3 _ambient,
std::vector<Light> _lights);
DirectX::XMFLOAT3 GetTint();
float GetRoughness();
std::shared_ptr<SimpleVertexShader> GetVertexShader();