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

add uv offset/scale support

Browse source
This commit is contained in:
lightling 2022-03-27 16:44:28 -04:00
parent 224766bcaf
commit 32f0916f97
Signed by: lightling
GPG key ID: 016F11E0AA296B67
4 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Game.cpp
View file

@ -246,6 +246,8 @@ void Game::Update(float deltaTime, float totalTime)
{ {
entities[i]->GetTransform()->SetRotation(sin(totalTime / 720) * 360, 0, 0); entities[i]->GetTransform()->SetRotation(sin(totalTime / 720) * 360, 0, 0);
entities[i]->GetMaterial()->SetRoughness(sin(totalTime) * 0.5f + 0.49f); entities[i]->GetMaterial()->SetRoughness(sin(totalTime) * 0.5f + 0.49f);
entities[i]->GetMaterial()->SetUVOffset(DirectX::XMFLOAT2(cos(totalTime * 4) * 0.5f + 0.49f, cos(totalTime * 4) * 0.5f + 0.49f));
entities[i]->GetMaterial()->SetUVScale(DirectX::XMFLOAT2(sin(totalTime) * 0.5f + 0.49f, sin(totalTime) * 0.5f + 0.49f));
} }
} }

24
Material.cpp
View file

@ -10,6 +10,8 @@ Material::Material(
roughness = _roughness; roughness = _roughness;
vertexShader = _vertexShader; vertexShader = _vertexShader;
pixelShader = _pixelShader; pixelShader = _pixelShader;
uvOffset = DirectX::XMFLOAT2(0, 0);
uvScale = DirectX::XMFLOAT2(1, 1);
} }
Material::~Material() Material::~Material()
@ -27,6 +29,8 @@ void Material::Activate(Transform* _transform, std::shared_ptr<Camera> _camera,
pixelShader->SetFloat3("cameraPosition", _camera->GetTransform()->GetPosition()); pixelShader->SetFloat3("cameraPosition", _camera->GetTransform()->GetPosition());
pixelShader->SetFloat("roughness", GetRoughness()); pixelShader->SetFloat("roughness", GetRoughness());
pixelShader->SetFloat2("scale", GetUVScale());
pixelShader->SetFloat2("offset", GetUVOffset());
pixelShader->SetFloat3("tint", GetTint()); pixelShader->SetFloat3("tint", GetTint());
pixelShader->SetFloat3("ambient", _ambient); pixelShader->SetFloat3("ambient", _ambient);
pixelShader->SetData("lights", &_lights[0], sizeof(Light) * (int)_lights.size()); pixelShader->SetData("lights", &_lights[0], sizeof(Light) * (int)_lights.size());
@ -48,6 +52,16 @@ DirectX::XMFLOAT3 Material::GetTint()
return tint; return tint;
} }
DirectX::XMFLOAT2 Material::GetUVScale()
{
return uvScale;
}
DirectX::XMFLOAT2 Material::GetUVOffset()
{
return uvOffset;
}
float Material::GetRoughness() float Material::GetRoughness()
{ {
return roughness; return roughness;
@ -68,6 +82,16 @@ void Material::SetTint(DirectX::XMFLOAT3 _tint)
tint = _tint; tint = _tint;
} }
void Material::SetUVScale(DirectX::XMFLOAT2 _scale)
{
uvScale = _scale;
}
void Material::SetUVOffset(DirectX::XMFLOAT2 _offset)
{
uvOffset = _offset;
}
void Material::SetRoughness(float _roughness) void Material::SetRoughness(float _roughness)
{ {
if (_roughness > 1) if (_roughness > 1)

6
Material.h
View file

@ -24,11 +24,15 @@ public:
std::vector<Light> _lights); std::vector<Light> _lights);
DirectX::XMFLOAT3 GetTint(); DirectX::XMFLOAT3 GetTint();
DirectX::XMFLOAT2 GetUVScale();
DirectX::XMFLOAT2 GetUVOffset();
float GetRoughness(); float GetRoughness();
std::shared_ptr<SimpleVertexShader> GetVertexShader(); std::shared_ptr<SimpleVertexShader> GetVertexShader();
std::shared_ptr<SimplePixelShader> GetPixelShader(); std::shared_ptr<SimplePixelShader> GetPixelShader();
void SetTint(DirectX::XMFLOAT3 _tint); void SetTint(DirectX::XMFLOAT3 _tint);
void SetUVScale(DirectX::XMFLOAT2 _scale);
void SetUVOffset(DirectX::XMFLOAT2 _offset);
void SetRoughness(float _roughness); void SetRoughness(float _roughness);
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);
@ -39,6 +43,8 @@ public:
private: private:
DirectX::XMFLOAT3 tint; DirectX::XMFLOAT3 tint;
float roughness; float roughness;
DirectX::XMFLOAT2 uvScale;
DirectX::XMFLOAT2 uvOffset;
std::shared_ptr<SimpleVertexShader> vertexShader; std::shared_ptr<SimpleVertexShader> vertexShader;
std::shared_ptr<SimplePixelShader> pixelShader; std::shared_ptr<SimplePixelShader> pixelShader;

3
SimplePixelShader.hlsl
View file

@ -9,6 +9,8 @@ cbuffer ExternalData : register(b0)
{ {
float3 cameraPosition; float3 cameraPosition;
float roughness; float roughness;
float2 offset;
float2 scale;
float3 ambient; float3 ambient;
float3 tint; float3 tint;
Light lights[LIGHT_COUNT]; Light lights[LIGHT_COUNT];
@ -54,6 +56,7 @@ float4 main(VertexToPixel input) : SV_TARGET
{ {
// ensure input normals are normalized // ensure input normals are normalized
input.normal = normalize(input.normal); input.normal = normalize(input.normal);
input.uv = input.uv * scale + offset;
// view only needs calculated once, so pre-calculate here and pass it to lights // view only needs calculated once, so pre-calculate here and pass it to lights
float3 view = getView(cameraPosition, input.worldPosition); float3 view = getView(cameraPosition, input.worldPosition);