diff --git a/Assets/Textures/WithNormals/cobblestone.png b/Assets/Textures/WithNormals/cobblestone.png
new file mode 100644
index 0000000..14f72ab
Binary files /dev/null and b/Assets/Textures/WithNormals/cobblestone.png differ
diff --git a/Assets/Textures/WithNormals/cobblestone_normals.png b/Assets/Textures/WithNormals/cobblestone_normals.png
new file mode 100644
index 0000000..e58bde8
Binary files /dev/null and b/Assets/Textures/WithNormals/cobblestone_normals.png differ
diff --git a/Assets/Textures/WithNormals/cobblestone_specular.png b/Assets/Textures/WithNormals/cobblestone_specular.png
new file mode 100644
index 0000000..9d46404
Binary files /dev/null and b/Assets/Textures/WithNormals/cobblestone_specular.png differ
diff --git a/Assets/Textures/WithNormals/cushion.png b/Assets/Textures/WithNormals/cushion.png
new file mode 100644
index 0000000..8a789b1
Binary files /dev/null and b/Assets/Textures/WithNormals/cushion.png differ
diff --git a/Assets/Textures/WithNormals/cushion_normals.png b/Assets/Textures/WithNormals/cushion_normals.png
new file mode 100644
index 0000000..d8ca474
Binary files /dev/null and b/Assets/Textures/WithNormals/cushion_normals.png differ
diff --git a/Assets/Textures/WithNormals/cushion_specular.png b/Assets/Textures/WithNormals/cushion_specular.png
new file mode 100644
index 0000000..394d361
Binary files /dev/null and b/Assets/Textures/WithNormals/cushion_specular.png differ
diff --git a/Assets/Textures/WithNormals/rock.png b/Assets/Textures/WithNormals/rock.png
new file mode 100644
index 0000000..e8858a3
Binary files /dev/null and b/Assets/Textures/WithNormals/rock.png differ
diff --git a/Assets/Textures/WithNormals/rock_normals.png b/Assets/Textures/WithNormals/rock_normals.png
new file mode 100644
index 0000000..ee5a435
Binary files /dev/null and b/Assets/Textures/WithNormals/rock_normals.png differ
diff --git a/Assets/Textures/WithNormals/rock_specular.png b/Assets/Textures/WithNormals/rock_specular.png
new file mode 100644
index 0000000..f427907
Binary files /dev/null and b/Assets/Textures/WithNormals/rock_specular.png differ
diff --git a/DX11Starter.vcxproj b/DX11Starter.vcxproj
index 5d29ec5..44720e9 100644
--- a/DX11Starter.vcxproj
+++ b/DX11Starter.vcxproj
@@ -685,6 +685,134 @@
$(OutDir)/Assets/Textures/HQGame
+
+
+ false
+ true
+ false
+ true
+ false
+ true
+ false
+ true
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+
+
+ false
+ true
+ false
+ true
+ false
+ true
+ false
+ true
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+
+
+ false
+ true
+ false
+ true
+ false
+ true
+ false
+ true
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+
+
+ false
+ true
+ false
+ true
+ false
+ true
+ false
+ true
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+
+
+ false
+ true
+ false
+ true
+ false
+ true
+ false
+ true
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+
+
+ false
+ true
+ false
+ true
+ false
+ true
+ false
+ true
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+
+
+ false
+ true
+ false
+ true
+ false
+ true
+ false
+ true
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+
+
+ false
+ true
+ false
+ true
+ false
+ true
+ false
+ true
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+
+
+ false
+ true
+ false
+ true
+ false
+ true
+ false
+ true
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+ $(OutDir)/Assets/Textures/WithNormals
+
+
diff --git a/DX11Starter.vcxproj.filters b/DX11Starter.vcxproj.filters
index ba641ac..eb8cf4f 100644
--- a/DX11Starter.vcxproj.filters
+++ b/DX11Starter.vcxproj.filters
@@ -28,6 +28,9 @@
{347d5c70-73d2-4716-b28c-06526433d151}
+
+ {7476640e-6b46-49e4-a478-c3ce10b2ddca}
+
@@ -210,6 +213,33 @@
Assets\Textures\HQGame
+
+ Assets\Textures\WithNormals
+
+
+ Assets\Textures\WithNormals
+
+
+ Assets\Textures\WithNormals
+
+
+ Assets\Textures\WithNormals
+
+
+ Assets\Textures\WithNormals
+
+
+ Assets\Textures\WithNormals
+
+
+ Assets\Textures\WithNormals
+
+
+ Assets\Textures\WithNormals
+
+
+ Assets\Textures\WithNormals
+
diff --git a/Game.cpp b/Game.cpp
index 1381f94..13cde9d 100644
--- a/Game.cpp
+++ b/Game.cpp
@@ -80,6 +80,8 @@ void Game::LoadShadersAndMaterials()
materials = {
std::make_shared(white, 0, vertexShader, pixelShader),
std::make_shared(white, 0, vertexShader, pixelShader),
+ std::make_shared(white, 0, vertexShader, pixelShader),
+ std::make_shared(white, 0, vertexShader, pixelShader),
};
}
@@ -105,9 +107,19 @@ void Game::LoadTextures()
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]->LoadTexture(L"Assets/Textures/HQGame/structure-endgame-floor_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
- materials[1]->LoadTexture(L"Assets/Textures/HQGame/structure-endgame-floor_specular.png", TEXTYPE_SPECULAR, device.Get(), context.Get());
- materials[1]->LoadTexture(L"Assets/Textures/HQGame/structure-endgame-floor_emissive.png", TEXTYPE_EMISSIVE, device.Get(), context.Get());
+ materials[1]->LoadTexture(L"Assets/Textures/WithNormals/cobblestone.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
+ materials[1]->LoadTexture(L"Assets/Textures/WithNormals/cobblestone_specular.png", TEXTYPE_SPECULAR, device.Get(), context.Get());
+ materials[1]->LoadTexture(L"Assets/Textures/WithNormals/cobblestone_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
+
+ materials[2]->PushSampler("BasicSampler", sampler);
+ materials[2]->LoadTexture(L"Assets/Textures/WithNormals/rock.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
+ materials[2]->LoadTexture(L"Assets/Textures/WithNormals/rock_specular.png", TEXTYPE_SPECULAR, device.Get(), context.Get());
+ materials[2]->LoadTexture(L"Assets/Textures/WithNormals/rock_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
+
+ materials[3]->PushSampler("BasicSampler", sampler);
+ materials[3]->LoadTexture(L"Assets/Textures/WithNormals/cushion.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
+ materials[3]->LoadTexture(L"Assets/Textures/WithNormals/cushion_specular.png", TEXTYPE_SPECULAR, device.Get(), context.Get());
+ materials[3]->LoadTexture(L"Assets/Textures/WithNormals/cushion_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
}
// --------------------------------------------------------
@@ -157,19 +169,21 @@ void Game::CreateBasicGeometry()
};
entities = {
- std::make_shared(materials[0], shapes[0]),
- std::make_shared(materials[0], shapes[1]),
- std::make_shared(materials[0], shapes[2]),
- std::make_shared(materials[0], shapes[3]),
+ std::make_shared(materials[1], shapes[0]),
+ std::make_shared(materials[2], shapes[1]),
+ std::make_shared(materials[3], shapes[2]),
+ std::make_shared(materials[2], shapes[3]),
std::make_shared(materials[1], shapes[4]),
- std::make_shared(materials[1], shapes[5]),
- std::make_shared(materials[1], shapes[6]),
+ std::make_shared(materials[0], shapes[5]),
+ std::make_shared(materials[0], shapes[6]),
};
+ entities[6]->GetMaterial()->SetEmitAmount(0.75f);
+
for (int i = 0; i < entities.size(); ++i)
{
entities[i]->GetTransform()->SetPosition((-(int)(entities.size() / 2) + i) * 5, 0, 0);
- entities[i]->GetMaterial()->SetEmitAmount((entities.size() - i) * 0.25f);
+ entities[i]->GetMaterial()->SetRoughness(0.70f);
}
}