Merge pull request #10 from xLightling/a10_pbr
A10: Gamma Correction & PBR
This commit is contained in:
Lightling
GitHub
commit
b2e003f394
58 changed files with 897 additions and 358 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Assets/Textures/PBR/bronze_albedo.png
Normal file
BIN
Assets/Textures/PBR/bronze_albedo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 967 KiB |
BIN
Assets/Textures/PBR/bronze_metal.png
Normal file
BIN
Assets/Textures/PBR/bronze_metal.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 440 B |
BIN
Assets/Textures/PBR/bronze_normals.png
Normal file
BIN
Assets/Textures/PBR/bronze_normals.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 MiB |
BIN
Assets/Textures/PBR/bronze_roughness.png
Normal file
BIN
Assets/Textures/PBR/bronze_roughness.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 766 KiB |
BIN
Assets/Textures/PBR/cobblestone_albedo.png
Normal file
BIN
Assets/Textures/PBR/cobblestone_albedo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 MiB |
BIN
Assets/Textures/PBR/cobblestone_metal.png
Normal file
BIN
Assets/Textures/PBR/cobblestone_metal.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 177 B |
BIN
Assets/Textures/PBR/cobblestone_normals.png
Normal file
BIN
Assets/Textures/PBR/cobblestone_normals.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.7 MiB |
BIN
Assets/Textures/PBR/cobblestone_roughness.png
Normal file
BIN
Assets/Textures/PBR/cobblestone_roughness.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 784 KiB |
BIN
Assets/Textures/PBR/floor_albedo.png
Normal file
BIN
Assets/Textures/PBR/floor_albedo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 MiB |
BIN
Assets/Textures/PBR/floor_metal.png
Normal file
BIN
Assets/Textures/PBR/floor_metal.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 69 KiB |
BIN
Assets/Textures/PBR/floor_normals.png
Normal file
BIN
Assets/Textures/PBR/floor_normals.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 MiB |
BIN
Assets/Textures/PBR/floor_roughness.png
Normal file
BIN
Assets/Textures/PBR/floor_roughness.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 538 KiB |
BIN
Assets/Textures/PBR/paint_albedo.png
Normal file
BIN
Assets/Textures/PBR/paint_albedo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 MiB |
BIN
Assets/Textures/PBR/paint_metal.png
Normal file
BIN
Assets/Textures/PBR/paint_metal.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 177 B |
BIN
Assets/Textures/PBR/paint_normals.png
Normal file
BIN
Assets/Textures/PBR/paint_normals.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.9 MiB |
BIN
Assets/Textures/PBR/paint_roughness.png
Normal file
BIN
Assets/Textures/PBR/paint_roughness.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 340 KiB |
BIN
Assets/Textures/PBR/rough_albedo.png
Normal file
BIN
Assets/Textures/PBR/rough_albedo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.7 MiB |
BIN
Assets/Textures/PBR/rough_metal.png
Normal file
BIN
Assets/Textures/PBR/rough_metal.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 398 KiB |
BIN
Assets/Textures/PBR/rough_normals.png
Normal file
BIN
Assets/Textures/PBR/rough_normals.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 MiB |
BIN
Assets/Textures/PBR/rough_roughness.png
Normal file
BIN
Assets/Textures/PBR/rough_roughness.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 642 KiB |
BIN
Assets/Textures/PBR/scratched_albedo.png
Normal file
BIN
Assets/Textures/PBR/scratched_albedo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.2 MiB |
BIN
Assets/Textures/PBR/scratched_metal.png
Normal file
BIN
Assets/Textures/PBR/scratched_metal.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 478 KiB |
BIN
Assets/Textures/PBR/scratched_normals.png
Normal file
BIN
Assets/Textures/PBR/scratched_normals.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 460 KiB |
BIN
Assets/Textures/PBR/scratched_roughness.png
Normal file
BIN
Assets/Textures/PBR/scratched_roughness.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 667 KiB |
BIN
Assets/Textures/PBR/wood_albedo.png
Normal file
BIN
Assets/Textures/PBR/wood_albedo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.5 MiB |
BIN
Assets/Textures/PBR/wood_metal.png
Normal file
BIN
Assets/Textures/PBR/wood_metal.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 177 B |
BIN
Assets/Textures/PBR/wood_normals.png
Normal file
BIN
Assets/Textures/PBR/wood_normals.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 MiB |
BIN
Assets/Textures/PBR/wood_roughness.png
Normal file
BIN
Assets/Textures/PBR/wood_roughness.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 481 KiB |
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
using namespace DirectX;
|
using namespace DirectX;
|
||||||
|
|
||||||
Camera::Camera(float _x, float _y, float _z, float _aspect, float _fov, float _near, float _far)
|
Camera::Camera(float _x, float _y, float _z, float _aspect, float _fov, float _near, float _far, float _moveSpeed)
|
||||||
{
|
{
|
||||||
transform.SetPosition(_x, _y, _z);
|
transform.SetPosition(_x, _y, _z);
|
||||||
|
|
||||||
|
|
@ -11,6 +11,7 @@ Camera::Camera(float _x, float _y, float _z, float _aspect, float _fov, float _n
|
||||||
fovYRadians = XMConvertToRadians(_fov);
|
fovYRadians = XMConvertToRadians(_fov);
|
||||||
clipNear = _near;
|
clipNear = _near;
|
||||||
clipFar = _far;
|
clipFar = _far;
|
||||||
|
moveSpeed = _moveSpeed;
|
||||||
|
|
||||||
UpdateViewMatrix();
|
UpdateViewMatrix();
|
||||||
UpdateProjectionMatrix();
|
UpdateProjectionMatrix();
|
||||||
|
|
@ -100,8 +101,8 @@ void Camera::ReadInput(float _dt)
|
||||||
if (input.KeyDown(VK_SHIFT)) modify *= 2.0f;
|
if (input.KeyDown(VK_SHIFT)) modify *= 2.0f;
|
||||||
if (input.KeyDown(VK_CONTROL)) modify /= 2.0f;
|
if (input.KeyDown(VK_CONTROL)) modify /= 2.0f;
|
||||||
|
|
||||||
transform.TranslateRelative(moveLat * _dt * modify, 0, moveLong * _dt * modify);
|
transform.TranslateRelative(moveLat * _dt * modify * moveSpeed, 0, moveLong * _dt * modify * moveSpeed);
|
||||||
transform.TranslateAbsolute(0, moveVert * _dt * modify, 0);
|
transform.TranslateAbsolute(0, moveVert * _dt * modify * moveSpeed, 0);
|
||||||
|
|
||||||
if (input.MouseLeftDown())
|
if (input.MouseLeftDown())
|
||||||
{
|
{
|
||||||
|
|
|
||||||
3
Camera.h
3
Camera.h
|
|
@ -6,7 +6,7 @@
|
||||||
class Camera
|
class Camera
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
Camera(float _x, float _y, float _z, float _aspect, float _fov, float _near, float _far);
|
Camera(float _x, float _y, float _z, float _aspect, float _fov, float _near, float _far, float _moveSpeed);
|
||||||
~Camera();
|
~Camera();
|
||||||
|
|
||||||
void Update(float _dt);
|
void Update(float _dt);
|
||||||
|
|
@ -23,6 +23,7 @@ public:
|
||||||
void SetFarClip(float _far);
|
void SetFarClip(float _far);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
float moveSpeed;
|
||||||
float aspect;
|
float aspect;
|
||||||
float fovYRadians;
|
float fovYRadians;
|
||||||
float clipNear;
|
float clipNear;
|
||||||
|
|
|
||||||
|
|
@ -182,12 +182,24 @@
|
||||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
|
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
|
||||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
|
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
|
||||||
</FxCompile>
|
</FxCompile>
|
||||||
|
<FxCompile Include="SimplePixelPBR.hlsl">
|
||||||
|
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
|
||||||
|
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
|
||||||
|
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
|
||||||
|
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
|
||||||
|
</FxCompile>
|
||||||
<FxCompile Include="SimplePixelShader.hlsl">
|
<FxCompile Include="SimplePixelShader.hlsl">
|
||||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
|
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
|
||||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
|
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
|
||||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
|
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
|
||||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
|
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
|
||||||
</FxCompile>
|
</FxCompile>
|
||||||
|
<FxCompile Include="SimpleVertexPBR.hlsl">
|
||||||
|
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Vertex</ShaderType>
|
||||||
|
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Vertex</ShaderType>
|
||||||
|
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Vertex</ShaderType>
|
||||||
|
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Vertex</ShaderType>
|
||||||
|
</FxCompile>
|
||||||
<FxCompile Include="SkyboxPixelShader.hlsl">
|
<FxCompile Include="SkyboxPixelShader.hlsl">
|
||||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
|
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
|
||||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
|
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
|
||||||
|
|
@ -321,7 +333,9 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Helpers.hlsli" />
|
<None Include="Helpers.hlsli" />
|
||||||
<None Include="Defines.hlsli" />
|
<None Include="Defines.hlsli" />
|
||||||
|
<None Include="HelpersPBR.hlsli" />
|
||||||
<None Include="Lights.hlsli" />
|
<None Include="Lights.hlsli" />
|
||||||
|
<None Include="LightsPBR.hlsli" />
|
||||||
<None Include="packages.config" />
|
<None Include="packages.config" />
|
||||||
<None Include="SkyboxDefines.hlsli" />
|
<None Include="SkyboxDefines.hlsli" />
|
||||||
<None Include="ThirdPartyFunctions.hlsli" />
|
<None Include="ThirdPartyFunctions.hlsli" />
|
||||||
|
|
@ -356,232 +370,6 @@
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-blocked.tga">
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-carpet.tga">
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-deepfloor_albedo.tga">
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-deepfloor_bump.tga">
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-dirt.tga">
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-floor_albedo.tga">
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-floor_bump.tga">
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-wall_albedo.tga">
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-wall_bump.tga">
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-water.tga">
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-tile.tga">
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-vrgrid-a.tga">
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-vrgrid-b.tga">
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-wall_albedo.tga">
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-wall_bump.tga">
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-wood.tga">
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
|
||||||
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/HQGame</DestinationFolders>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-deepfloor_albedo.png">
|
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-deepfloor_albedo.png">
|
||||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
|
@ -914,6 +702,400 @@
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/Skies/planets</DestinationFolders>
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/Skies/planets</DestinationFolders>
|
||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\bronze_albedo.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\bronze_metal.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\bronze_normals.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\bronze_roughness.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\cobblestone_albedo.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\cobblestone_metal.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\cobblestone_normals.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\cobblestone_roughness.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\floor_albedo.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\floor_metal.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\floor_normals.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\floor_roughness.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\paint_albedo.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\paint_metal.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\paint_normals.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\paint_roughness.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\rough_albedo.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\rough_metal.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\rough_normals.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\rough_roughness.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\scratched_albedo.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\scratched_metal.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\scratched_normals.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\scratched_roughness.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\wood_albedo.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\wood_metal.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\wood_normals.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\wood_roughness.png">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
|
||||||
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/Assets/Textures/PBR</DestinationFolders>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
<ImportGroup Label="ExtensionTargets">
|
<ImportGroup Label="ExtensionTargets">
|
||||||
<Import Project="packages\Microsoft.XAudio2.Redist.1.2.8\build\native\Microsoft.XAudio2.Redist.targets" Condition="Exists('packages\Microsoft.XAudio2.Redist.1.2.8\build\native\Microsoft.XAudio2.Redist.targets')" />
|
<Import Project="packages\Microsoft.XAudio2.Redist.1.2.8\build\native\Microsoft.XAudio2.Redist.targets" Condition="Exists('packages\Microsoft.XAudio2.Redist.1.2.8\build\native\Microsoft.XAudio2.Redist.targets')" />
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,9 @@
|
||||||
<Filter Include="Assets\Textures\Skies\planets">
|
<Filter Include="Assets\Textures\Skies\planets">
|
||||||
<UniqueIdentifier>{f0ccea00-427b-47f7-8fce-7110b649b668}</UniqueIdentifier>
|
<UniqueIdentifier>{f0ccea00-427b-47f7-8fce-7110b649b668}</UniqueIdentifier>
|
||||||
</Filter>
|
</Filter>
|
||||||
|
<Filter Include="Assets\Textures\PBR">
|
||||||
|
<UniqueIdentifier>{5a00f65f-2015-451b-9c46-5131e9fd2555}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="DXCore.cpp">
|
<ClCompile Include="DXCore.cpp">
|
||||||
|
|
@ -130,6 +133,12 @@
|
||||||
<FxCompile Include="SkyboxVertexShader.hlsl">
|
<FxCompile Include="SkyboxVertexShader.hlsl">
|
||||||
<Filter>Shaders</Filter>
|
<Filter>Shaders</Filter>
|
||||||
</FxCompile>
|
</FxCompile>
|
||||||
|
<FxCompile Include="SimplePixelPBR.hlsl">
|
||||||
|
<Filter>Shaders</Filter>
|
||||||
|
</FxCompile>
|
||||||
|
<FxCompile Include="SimpleVertexPBR.hlsl">
|
||||||
|
<Filter>Shaders</Filter>
|
||||||
|
</FxCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<CopyFileToFolders Include="Assets\Models\cube.obj">
|
<CopyFileToFolders Include="Assets\Models\cube.obj">
|
||||||
|
|
@ -159,54 +168,6 @@
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\license_CC-BY-SA-4.0.txt">
|
<CopyFileToFolders Include="Assets\Textures\HQGame\license_CC-BY-SA-4.0.txt">
|
||||||
<Filter>Assets\Textures\HQGame</Filter>
|
<Filter>Assets\Textures\HQGame</Filter>
|
||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-blocked.tga">
|
|
||||||
<Filter>Assets\Textures\HQGame</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-carpet.tga">
|
|
||||||
<Filter>Assets\Textures\HQGame</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-deepfloor_albedo.tga">
|
|
||||||
<Filter>Assets\Textures\HQGame</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-deepfloor_bump.tga">
|
|
||||||
<Filter>Assets\Textures\HQGame</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-dirt.tga">
|
|
||||||
<Filter>Assets\Textures\HQGame</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-floor_albedo.tga">
|
|
||||||
<Filter>Assets\Textures\HQGame</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-floor_bump.tga">
|
|
||||||
<Filter>Assets\Textures\HQGame</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-wall_albedo.tga">
|
|
||||||
<Filter>Assets\Textures\HQGame</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-wall_bump.tga">
|
|
||||||
<Filter>Assets\Textures\HQGame</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-water.tga">
|
|
||||||
<Filter>Assets\Textures\HQGame</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-tile.tga">
|
|
||||||
<Filter>Assets\Textures\HQGame</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-vrgrid-a.tga">
|
|
||||||
<Filter>Assets\Textures\HQGame</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-vrgrid-b.tga">
|
|
||||||
<Filter>Assets\Textures\HQGame</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-wall_albedo.tga">
|
|
||||||
<Filter>Assets\Textures\HQGame</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-wall_bump.tga">
|
|
||||||
<Filter>Assets\Textures\HQGame</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-wood.tga">
|
|
||||||
<Filter>Assets\Textures\HQGame</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-deepfloor_albedo.png">
|
<CopyFileToFolders Include="Assets\Textures\HQGame\structure-endgame-deepfloor_albedo.png">
|
||||||
<Filter>Assets\Textures\HQGame</Filter>
|
<Filter>Assets\Textures\HQGame</Filter>
|
||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
|
|
@ -276,6 +237,90 @@
|
||||||
<CopyFileToFolders Include="Assets\Textures\Skies\planets\right.png">
|
<CopyFileToFolders Include="Assets\Textures\Skies\planets\right.png">
|
||||||
<Filter>Assets\Textures\Skies\planets</Filter>
|
<Filter>Assets\Textures\Skies\planets</Filter>
|
||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\bronze_albedo.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\bronze_metal.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\bronze_normals.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\bronze_roughness.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\cobblestone_albedo.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\cobblestone_metal.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\cobblestone_normals.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\cobblestone_roughness.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\floor_albedo.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\floor_metal.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\floor_normals.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\floor_roughness.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\paint_albedo.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\paint_metal.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\paint_normals.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\paint_roughness.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\rough_albedo.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\rough_metal.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\rough_normals.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\rough_roughness.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\scratched_albedo.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\scratched_metal.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\scratched_normals.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\scratched_roughness.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\wood_albedo.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\wood_metal.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\wood_normals.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="Assets\Textures\PBR\wood_roughness.png">
|
||||||
|
<Filter>Assets\Textures\PBR</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Helpers.hlsli">
|
<None Include="Helpers.hlsli">
|
||||||
|
|
@ -294,5 +339,11 @@
|
||||||
<None Include="SkyboxDefines.hlsli">
|
<None Include="SkyboxDefines.hlsli">
|
||||||
<Filter>Shaders</Filter>
|
<Filter>Shaders</Filter>
|
||||||
</None>
|
</None>
|
||||||
|
<None Include="HelpersPBR.hlsli">
|
||||||
|
<Filter>Shaders</Filter>
|
||||||
|
</None>
|
||||||
|
<None Include="LightsPBR.hlsli">
|
||||||
|
<Filter>Shaders</Filter>
|
||||||
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
119
Game.cpp
119
Game.cpp
|
|
@ -34,7 +34,7 @@ Game::Game(HINSTANCE hInstance)
|
||||||
CreateConsoleWindow(500, 120, 32, 120);
|
CreateConsoleWindow(500, 120, 32, 120);
|
||||||
printf("Console window created successfully. Feel free to printf() here.\n");
|
printf("Console window created successfully. Feel free to printf() here.\n");
|
||||||
#endif
|
#endif
|
||||||
camera = std::make_shared<Camera>(0.0f, 0.0f, -20.0f, (float)width / height, 60, 0.01f, 1000.0f);
|
camera = std::make_shared<Camera>(0.0f, 0.0f, -10.0f, (float)width / height, 60, 0.01f, 1000.0f, 5.0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
// --------------------------------------------------------
|
// --------------------------------------------------------
|
||||||
|
|
@ -74,14 +74,20 @@ void Game::LoadShadersAndMaterials()
|
||||||
{
|
{
|
||||||
vertexShader = std::make_shared<SimpleVertexShader>(device, context, GetFullPathTo_Wide(L"VertexShader.cso").c_str());
|
vertexShader = std::make_shared<SimpleVertexShader>(device, context, GetFullPathTo_Wide(L"VertexShader.cso").c_str());
|
||||||
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());
|
||||||
|
vertexShaderPBR = std::make_shared<SimpleVertexShader>(device, context, GetFullPathTo_Wide(L"SimpleVertexPBR.cso").c_str());
|
||||||
|
pixelShaderPBR = std::make_shared<SimplePixelShader>(device, context, GetFullPathTo_Wide(L"SimplePixelPBR.cso").c_str());
|
||||||
|
|
||||||
XMFLOAT3 white = XMFLOAT3(1.0f, 1.0f, 1.0f);
|
XMFLOAT3 white = XMFLOAT3(1.0f, 1.0f, 1.0f);
|
||||||
|
|
||||||
materials = {
|
materials = {
|
||||||
std::make_shared<Material>(white, 0, vertexShader, pixelShader),
|
std::make_shared<Material>(false, white, 0, vertexShader, pixelShader),
|
||||||
std::make_shared<Material>(white, 0, vertexShader, pixelShader),
|
std::make_shared<Material>(true, white, 0, vertexShaderPBR, pixelShaderPBR),
|
||||||
std::make_shared<Material>(white, 0, vertexShader, pixelShader),
|
std::make_shared<Material>(true, white, 0, vertexShaderPBR, pixelShaderPBR),
|
||||||
std::make_shared<Material>(white, 0, vertexShader, pixelShader),
|
std::make_shared<Material>(true, white, 0, vertexShaderPBR, pixelShaderPBR),
|
||||||
|
std::make_shared<Material>(true, white, 0, vertexShaderPBR, pixelShaderPBR),
|
||||||
|
std::make_shared<Material>(true, white, 0, vertexShaderPBR, pixelShaderPBR),
|
||||||
|
std::make_shared<Material>(true, white, 0, vertexShaderPBR, pixelShaderPBR),
|
||||||
|
std::make_shared<Material>(true, white, 0, vertexShaderPBR, pixelShaderPBR),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -113,30 +119,51 @@ void Game::LoadTextures()
|
||||||
materials[0]->PushSampler("BasicSampler", sampler);
|
materials[0]->PushSampler("BasicSampler", sampler);
|
||||||
materials[0]->PushTexture(TEXTYPE_REFLECTION, demoCubemap);
|
materials[0]->PushTexture(TEXTYPE_REFLECTION, demoCubemap);
|
||||||
materials[0]->hasReflectionMap = true;
|
materials[0]->hasReflectionMap = true;
|
||||||
materials[0]->LoadTexture(L"Assets/Textures/HQGame/structure-endgame-deepfloor_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
|
materials[0]->LoadTexture(L"Assets/Textures/WithNormals/cobblestone.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
|
||||||
materials[0]->LoadTexture(L"Assets/Textures/HQGame/structure-endgame-deepfloor_specular.png", TEXTYPE_SPECULAR, device.Get(), context.Get());
|
materials[0]->LoadTexture(L"Assets/Textures/WithNormals/cobblestone_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
|
||||||
materials[0]->LoadTexture(L"Assets/Textures/HQGame/structure-endgame-deepfloor_emissive.png", TEXTYPE_EMISSIVE, device.Get(), context.Get());
|
materials[0]->LoadTexture(L"Assets/Textures/WithNormals/cobblestone_specular.png", TEXTYPE_SPECULAR, device.Get(), context.Get());
|
||||||
|
|
||||||
materials[1]->PushSampler("BasicSampler", sampler);
|
materials[1]->PushSampler("BasicSampler", sampler);
|
||||||
materials[1]->PushTexture(TEXTYPE_REFLECTION, demoCubemap);
|
materials[1]->LoadTexture(L"Assets/Textures/PBR/bronze_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
|
||||||
materials[1]->hasReflectionMap = true;
|
materials[1]->LoadTexture(L"Assets/Textures/PBR/bronze_metal.png", TEXTYPE_METALNESS, 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/PBR/bronze_roughness.png", TEXTYPE_ROUGHNESS, 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/PBR/bronze_normals.png", TEXTYPE_NORMAL, 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]->PushSampler("BasicSampler", sampler);
|
||||||
materials[2]->PushTexture(TEXTYPE_REFLECTION, demoCubemap);
|
materials[2]->LoadTexture(L"Assets/Textures/PBR/cobblestone_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
|
||||||
materials[2]->hasReflectionMap = true;
|
materials[2]->LoadTexture(L"Assets/Textures/PBR/cobblestone_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
|
||||||
materials[2]->LoadTexture(L"Assets/Textures/WithNormals/rock.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
|
materials[2]->LoadTexture(L"Assets/Textures/PBR/cobblestone_roughness.png", TEXTYPE_ROUGHNESS, 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/PBR/cobblestone_normals.png", TEXTYPE_NORMAL, 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]->PushSampler("BasicSampler", sampler);
|
||||||
materials[3]->PushTexture(TEXTYPE_REFLECTION, demoCubemap);
|
materials[3]->LoadTexture(L"Assets/Textures/PBR/floor_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
|
||||||
materials[3]->hasReflectionMap = true;
|
materials[3]->LoadTexture(L"Assets/Textures/PBR/floor_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
|
||||||
materials[3]->LoadTexture(L"Assets/Textures/WithNormals/cushion.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
|
materials[3]->LoadTexture(L"Assets/Textures/PBR/floor_roughness.png", TEXTYPE_ROUGHNESS, 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/PBR/floor_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
|
||||||
materials[3]->LoadTexture(L"Assets/Textures/WithNormals/cushion_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
|
|
||||||
|
materials[4]->PushSampler("BasicSampler", sampler);
|
||||||
|
materials[4]->LoadTexture(L"Assets/Textures/PBR/paint_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
|
||||||
|
materials[4]->LoadTexture(L"Assets/Textures/PBR/paint_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
|
||||||
|
materials[4]->LoadTexture(L"Assets/Textures/PBR/paint_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
|
||||||
|
materials[4]->LoadTexture(L"Assets/Textures/PBR/paint_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
|
||||||
|
|
||||||
|
materials[5]->PushSampler("BasicSampler", sampler);
|
||||||
|
materials[5]->LoadTexture(L"Assets/Textures/PBR/rough_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
|
||||||
|
materials[5]->LoadTexture(L"Assets/Textures/PBR/rough_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
|
||||||
|
materials[5]->LoadTexture(L"Assets/Textures/PBR/rough_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
|
||||||
|
materials[5]->LoadTexture(L"Assets/Textures/PBR/rough_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
|
||||||
|
|
||||||
|
materials[6]->PushSampler("BasicSampler", sampler);
|
||||||
|
materials[6]->LoadTexture(L"Assets/Textures/PBR/scratched_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
|
||||||
|
materials[6]->LoadTexture(L"Assets/Textures/PBR/scratched_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
|
||||||
|
materials[6]->LoadTexture(L"Assets/Textures/PBR/scratched_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
|
||||||
|
materials[6]->LoadTexture(L"Assets/Textures/PBR/scratched_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
|
||||||
|
|
||||||
|
materials[7]->PushSampler("BasicSampler", sampler);
|
||||||
|
materials[7]->LoadTexture(L"Assets/Textures/PBR/wood_albedo.png", TEXTYPE_ALBEDO, device.Get(), context.Get());
|
||||||
|
materials[7]->LoadTexture(L"Assets/Textures/PBR/wood_metal.png", TEXTYPE_METALNESS, device.Get(), context.Get());
|
||||||
|
materials[7]->LoadTexture(L"Assets/Textures/PBR/wood_roughness.png", TEXTYPE_ROUGHNESS, device.Get(), context.Get());
|
||||||
|
materials[7]->LoadTexture(L"Assets/Textures/PBR/wood_normals.png", TEXTYPE_NORMAL, device.Get(), context.Get());
|
||||||
}
|
}
|
||||||
|
|
||||||
// --------------------------------------------------------
|
// --------------------------------------------------------
|
||||||
|
|
@ -147,13 +174,13 @@ void Game::LoadLighting()
|
||||||
ambient = XMFLOAT3(0.1f, 0.1f, 0.15f);
|
ambient = XMFLOAT3(0.1f, 0.1f, 0.15f);
|
||||||
|
|
||||||
lights = {
|
lights = {
|
||||||
Light::Directional(XMFLOAT3(1, 0.5f, 0.5f), XMFLOAT3(1, 1, 1), 0.75f),
|
Light::Directional(XMFLOAT3(1, 0.5f, -0.5f), XMFLOAT3(1, 1, 1), 1.0f),
|
||||||
Light::Directional(XMFLOAT3(-0.25f, -1, 0.75f), XMFLOAT3(1, 1, 1), 0.75f),
|
Light::Directional(XMFLOAT3(-0.25f, -1, 0.75f), XMFLOAT3(1, 1, 1), 0.25f),
|
||||||
Light::Directional(XMFLOAT3(-1, 1, -0.5f), XMFLOAT3(1, 1, 1), 0.75f),
|
Light::Directional(XMFLOAT3(-1, 1, -0.5f), XMFLOAT3(1, 1, 1), 0.25f),
|
||||||
Light::Point(XMFLOAT3(-1.5f, 0, 0), XMFLOAT3(1, 1, 1), 0.5f, 10),
|
Light::Point(XMFLOAT3(-1.5f, 0, 0), XMFLOAT3(1, 1, 1), 0.35f, 10),
|
||||||
Light::Point(XMFLOAT3(1.5f, 0, 0), XMFLOAT3(1, 1, 1), 0.25f, 10),
|
Light::Point(XMFLOAT3(1.5f, 0, 0), XMFLOAT3(1, 1, 1), 0.35f, 10),
|
||||||
Light::Point(XMFLOAT3(0, 2, 0), XMFLOAT3(1, 0, 0), 0.25f, 10),
|
Light::Point(XMFLOAT3(0, 2, 0), XMFLOAT3(1, 0, 0), 0.35f, 10),
|
||||||
Light::Point(XMFLOAT3(-27.5f, 0, 0), XMFLOAT3(1, 1, 0.5f), 5, 20),
|
Light::Point(XMFLOAT3(-27.5f, 0, 0), XMFLOAT3(1, 1, 0.5f), 0.35f, 20),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -187,31 +214,29 @@ void Game::CreateBasicGeometry()
|
||||||
};
|
};
|
||||||
|
|
||||||
entities = {
|
entities = {
|
||||||
std::make_shared<Entity>(materials[1], shapes[0]),
|
std::make_shared<Entity>(materials[1], shapes[3]),
|
||||||
std::make_shared<Entity>(materials[2], shapes[1]),
|
|
||||||
std::make_shared<Entity>(materials[3], shapes[2]),
|
|
||||||
std::make_shared<Entity>(materials[2], shapes[3]),
|
std::make_shared<Entity>(materials[2], shapes[3]),
|
||||||
std::make_shared<Entity>(materials[1], shapes[4]),
|
std::make_shared<Entity>(materials[3], shapes[3]),
|
||||||
std::make_shared<Entity>(materials[0], shapes[5]),
|
std::make_shared<Entity>(materials[4], shapes[3]),
|
||||||
std::make_shared<Entity>(materials[0], shapes[6]),
|
std::make_shared<Entity>(materials[5], shapes[3]),
|
||||||
|
std::make_shared<Entity>(materials[6], shapes[3]),
|
||||||
|
std::make_shared<Entity>(materials[7], shapes[3]),
|
||||||
|
std::make_shared<Entity>(materials[0], shapes[3]),
|
||||||
};
|
};
|
||||||
|
|
||||||
entities[6]->GetMaterial()->SetEmitAmount(0.75f);
|
|
||||||
|
|
||||||
for (int i = 0; i < entities.size(); ++i)
|
for (int i = 0; i < entities.size(); ++i)
|
||||||
{
|
{
|
||||||
entities[i]->GetTransform()->SetPosition((-(int)(entities.size() / 2) + i) * 5, 0, 0);
|
entities[i]->GetTransform()->SetPosition((-(int)(entities.size() / 2) + i + 0.5f) * 2.5f, 0, 0);
|
||||||
entities[i]->GetMaterial()->SetRoughness(0.60f);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
skybox = std::make_shared<Sky>(
|
skybox = std::make_shared<Sky>(
|
||||||
shapes[0],
|
shapes[0],
|
||||||
std::make_shared<SimpleVertexShader>(device, context, GetFullPathTo_Wide(L"SkyboxVertexShader.cso").c_str()),
|
std::make_shared<SimpleVertexShader>(device, context, GetFullPathTo_Wide(L"SkyboxVertexShader.cso").c_str()),
|
||||||
std::make_shared<SimplePixelShader>(device, context, GetFullPathTo_Wide(L"SkyboxPixelShader.cso").c_str()),
|
std::make_shared<SimplePixelShader>(device, context, GetFullPathTo_Wide(L"SkyboxPixelShader.cso").c_str()),
|
||||||
demoCubemap,
|
demoCubemap,
|
||||||
sampler,
|
sampler,
|
||||||
device
|
device
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
2
Game.h
2
Game.h
|
|
@ -47,6 +47,8 @@ private:
|
||||||
// Shaders and shader-related constructs
|
// Shaders and shader-related constructs
|
||||||
std::shared_ptr<SimplePixelShader> pixelShader;
|
std::shared_ptr<SimplePixelShader> pixelShader;
|
||||||
std::shared_ptr<SimpleVertexShader> vertexShader;
|
std::shared_ptr<SimpleVertexShader> vertexShader;
|
||||||
|
std::shared_ptr<SimplePixelShader> pixelShaderPBR;
|
||||||
|
std::shared_ptr<SimpleVertexShader> vertexShaderPBR;
|
||||||
|
|
||||||
// A2 shapes
|
// A2 shapes
|
||||||
std::vector<std::shared_ptr<Mesh>> shapes;
|
std::vector<std::shared_ptr<Mesh>> shapes;
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,12 @@
|
||||||
// from environment map demo
|
// from environment map demo
|
||||||
static const float F0_NON_METAL = 0.04f;
|
static const float F0_NON_METAL = 0.04f;
|
||||||
|
|
||||||
|
// Minimum roughness for when spec distribution function denominator goes to zero
|
||||||
|
static const float MIN_ROUGHNESS = 0.0000001f; // 6 zeros after decimal
|
||||||
|
|
||||||
|
// Handy to have this as a constant
|
||||||
|
static const float PI = 3.14159265359f;
|
||||||
|
|
||||||
// gets view vector, needed once per shader
|
// gets view vector, needed once per shader
|
||||||
float3 getView(float3 cameraPosition, float3 pixelWorldPosition)
|
float3 getView(float3 cameraPosition, float3 pixelWorldPosition)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
104
HelpersPBR.hlsli
Normal file
104
HelpersPBR.hlsli
Normal file
|
|
@ -0,0 +1,104 @@
|
||||||
|
#ifndef __SHADER_HELPERS_PBR__
|
||||||
|
#define __SHADER_HELPERS_PBR__
|
||||||
|
|
||||||
|
// Lambert diffuse BRDF - Same as the basic lighting diffuse calculation!
|
||||||
|
// - NOTE: this function assumes the vectors are already NORMALIZED!
|
||||||
|
float DiffusePBR(float3 normal, float3 dirToLight)
|
||||||
|
{
|
||||||
|
return saturate(dot(normal, dirToLight));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calculates diffuse amount based on energy conservation
|
||||||
|
//
|
||||||
|
// diffuse - Diffuse amount
|
||||||
|
// specular - Specular color (including light color)
|
||||||
|
// metalness - surface metalness amount
|
||||||
|
//
|
||||||
|
// Metals should have an albedo of (0,0,0)...mostly
|
||||||
|
// See slide 65: http://blog.selfshadow.com/publications/s2014-shading-course/hoffman/s2014_pbs_physics_math_slides.pdf
|
||||||
|
float3 DiffuseEnergyConserve(float3 diffuse, float3 specular, float metalness)
|
||||||
|
{
|
||||||
|
return diffuse * ((1 - saturate(specular)) * (1 - metalness));
|
||||||
|
}
|
||||||
|
|
||||||
|
// GGX (Trowbridge-Reitz)
|
||||||
|
//
|
||||||
|
// a - Roughness
|
||||||
|
// h - Half vector
|
||||||
|
// n - Normal
|
||||||
|
//
|
||||||
|
// D(h, n) = a^2 / pi * ((n dot h)^2 * (a^2 - 1) + 1)^2
|
||||||
|
float SpecDistribution(float3 n, float3 h, float roughness)
|
||||||
|
{
|
||||||
|
// Pre-calculations
|
||||||
|
float NdotH = saturate(dot(n, h));
|
||||||
|
float NdotH2 = NdotH * NdotH;
|
||||||
|
float a = roughness * roughness;
|
||||||
|
float a2 = max(a * a, MIN_ROUGHNESS); // Applied after remap!
|
||||||
|
|
||||||
|
// ((n dot h)^2 * (a^2 - 1) + 1)
|
||||||
|
float denomToSquare = NdotH2 * (a2 - 1) + 1;
|
||||||
|
// Can go to zero if roughness is 0 and NdotH is 1; MIN_ROUGHNESS helps here
|
||||||
|
|
||||||
|
// Final value
|
||||||
|
return a2 / (PI * denomToSquare * denomToSquare);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fresnel term - Schlick approx.
|
||||||
|
//
|
||||||
|
// v - View vector
|
||||||
|
// h - Half vector
|
||||||
|
// f0 - Value when l = n (full specular color)
|
||||||
|
//
|
||||||
|
// F(v,h,f0) = f0 + (1-f0)(1 - (v dot h))^5
|
||||||
|
float3 Fresnel(float3 v, float3 h, float3 f0)
|
||||||
|
{
|
||||||
|
// Pre-calculations
|
||||||
|
float VdotH = saturate(dot(v, h));
|
||||||
|
|
||||||
|
// Final value
|
||||||
|
return f0 + (1 - f0) * pow(1 - VdotH, 5);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Geometric Shadowing - Schlick-GGX (based on Schlick-Beckmann)
|
||||||
|
// - k is remapped to a / 2, roughness remapped to (r+1)/2
|
||||||
|
//
|
||||||
|
// n - Normal
|
||||||
|
// v - View vector
|
||||||
|
//
|
||||||
|
// G(l,v)
|
||||||
|
float GeometricShadowing(float3 n, float3 v, float roughness)
|
||||||
|
{
|
||||||
|
// End result of remapping:
|
||||||
|
float k = pow(roughness + 1, 2) / 8.0f;
|
||||||
|
float NdotV = saturate(dot(n, v));
|
||||||
|
|
||||||
|
// Final value
|
||||||
|
return NdotV / (NdotV * (1 - k) + k);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Microfacet BRDF (Specular)
|
||||||
|
//
|
||||||
|
// f(l,v) = D(h)F(v,h)G(l,v,h) / 4(n dot l)(n dot v)
|
||||||
|
// - part of the denominator are canceled out by numerator (see below)
|
||||||
|
//
|
||||||
|
// D() - Spec Dist - Trowbridge-Reitz (GGX)
|
||||||
|
// F() - Fresnel - Schlick approx
|
||||||
|
// G() - Geometric Shadowing - Schlick-GGX
|
||||||
|
float3 MicrofacetBRDF(float3 n, float3 l, float3 v, float roughness, float3 specColor)
|
||||||
|
{
|
||||||
|
// Other vectors
|
||||||
|
float3 h = normalize(v + l);
|
||||||
|
|
||||||
|
// Grab various functions
|
||||||
|
float D = SpecDistribution(n, h, roughness);
|
||||||
|
float3 F = Fresnel(v, h, specColor);
|
||||||
|
float G = GeometricShadowing(n, v, roughness) * GeometricShadowing(n, l, roughness);
|
||||||
|
|
||||||
|
// Final formula
|
||||||
|
// Denominator dot products partially canceled by G()!
|
||||||
|
// See page 16: http://blog.selfshadow.com/publications/s2012-shading-course/hoffman/s2012_pbs_physics_math_notes.pdf
|
||||||
|
return (D * F * G) / (4 * max(dot(n, v), dot(n, l)));
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
29
LightsPBR.hlsli
Normal file
29
LightsPBR.hlsli
Normal file
|
|
@ -0,0 +1,29 @@
|
||||||
|
#ifndef __SHADER_LIGHTS_PBR__
|
||||||
|
#define __SHADER_LIGHTS_PBR__
|
||||||
|
|
||||||
|
// Gets the RGB value of a pixel with a directional light
|
||||||
|
float3 directionalLightPBR(Light light, float3 normal, float3 view, float roughness, float metalness, float3 surfaceColor, float3 specularColor)
|
||||||
|
{
|
||||||
|
float3 lightDirection = normalize(light.Direction);
|
||||||
|
float diffuse = DiffusePBR(normal, lightDirection);
|
||||||
|
float3 specular = MicrofacetBRDF(normal, lightDirection, view, roughness, specularColor);
|
||||||
|
|
||||||
|
float3 balancedDiff = DiffuseEnergyConserve(diffuse, specular, metalness);
|
||||||
|
|
||||||
|
return (balancedDiff * surfaceColor + specular) * light.Intensity * light.Color;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gets the RGB value of a pixel with a point light
|
||||||
|
float3 pointLightPBR(Light light, float3 normal, float3 view, float roughness, float metalness, float3 surfaceColor, float3 specularColor, float3 worldPosition)
|
||||||
|
{
|
||||||
|
float3 lightDirection = normalize(light.Position - worldPosition);
|
||||||
|
float attenuation = getAttenuation(light.Position, worldPosition, light.Range);
|
||||||
|
float diffuse = DiffusePBR(normal, lightDirection);
|
||||||
|
float3 specular = MicrofacetBRDF(normal, lightDirection, view, roughness, specularColor);
|
||||||
|
|
||||||
|
float3 balancedDiff = DiffuseEnergyConserve(diffuse, specular, metalness);
|
||||||
|
|
||||||
|
return (balancedDiff * surfaceColor + specular) * attenuation * light.Intensity * light.Color;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
97
Material.cpp
97
Material.cpp
|
|
@ -1,11 +1,13 @@
|
||||||
#include "Material.h"
|
#include "Material.h"
|
||||||
|
|
||||||
Material::Material(
|
Material::Material(
|
||||||
|
bool _pbr,
|
||||||
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)
|
||||||
{
|
{
|
||||||
|
pbr = _pbr;
|
||||||
tint = _tint;
|
tint = _tint;
|
||||||
roughness = _roughness;
|
roughness = _roughness;
|
||||||
vertexShader = _vertexShader;
|
vertexShader = _vertexShader;
|
||||||
|
|
@ -25,37 +27,8 @@ Material::~Material()
|
||||||
|
|
||||||
void Material::Activate(Transform* _transform, std::shared_ptr<Camera> _camera, DirectX::XMFLOAT3 _ambient, std::vector<Light> _lights)
|
void Material::Activate(Transform* _transform, std::shared_ptr<Camera> _camera, DirectX::XMFLOAT3 _ambient, std::vector<Light> _lights)
|
||||||
{
|
{
|
||||||
vertexShader->SetMatrix4x4("world", _transform->GetWorldMatrix());
|
if (pbr) ActivatePBR(_transform, _camera, _ambient, _lights);
|
||||||
vertexShader->SetMatrix4x4("worldInvTranspose", _transform->GetWorldMatrixInverseTranspose());
|
else ActivateStandard(_transform, _camera, _ambient, _lights);
|
||||||
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->SetFloat2("scale", GetUVScale());
|
|
||||||
pixelShader->SetFloat2("offset", GetUVOffset());
|
|
||||||
pixelShader->SetFloat3("ambient", _ambient);
|
|
||||||
pixelShader->SetFloat("emitAmount", GetEmitAmount());
|
|
||||||
pixelShader->SetFloat3("tint", GetTint());
|
|
||||||
pixelShader->SetFloat("lightCount", (int)_lights.size());
|
|
||||||
pixelShader->SetInt("hasEmissiveMap", (int)hasEmissiveMap);
|
|
||||||
pixelShader->SetInt("hasSpecularMap", (int)hasSpecularMap);
|
|
||||||
pixelShader->SetInt("hasNormalMap", (int)hasNormalMap);
|
|
||||||
pixelShader->SetInt("hasReflectionMap", (int)hasReflectionMap);
|
|
||||||
pixelShader->SetData("lights", &_lights[0], sizeof(Light) * (int)_lights.size());
|
|
||||||
pixelShader->CopyAllBufferData();
|
|
||||||
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()
|
||||||
|
|
@ -160,3 +133,65 @@ void Material::PushTexture(std::string _name, Microsoft::WRL::ComPtr<ID3D11Shade
|
||||||
{
|
{
|
||||||
textures.insert({ _name, _texture });
|
textures.insert({ _name, _texture });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Material::ActivateStandard(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->SetFloat2("scale", GetUVScale());
|
||||||
|
pixelShader->SetFloat2("offset", GetUVOffset());
|
||||||
|
pixelShader->SetFloat3("ambient", _ambient);
|
||||||
|
pixelShader->SetFloat("emitAmount", GetEmitAmount());
|
||||||
|
pixelShader->SetFloat3("tint", GetTint());
|
||||||
|
pixelShader->SetFloat("lightCount", (int)_lights.size());
|
||||||
|
pixelShader->SetInt("hasEmissiveMap", (int)hasEmissiveMap);
|
||||||
|
pixelShader->SetInt("hasSpecularMap", (int)hasSpecularMap);
|
||||||
|
pixelShader->SetInt("hasNormalMap", (int)hasNormalMap);
|
||||||
|
pixelShader->SetInt("hasReflectionMap", (int)hasReflectionMap);
|
||||||
|
pixelShader->SetData("lights", &_lights[0], sizeof(Light) * (int)_lights.size());
|
||||||
|
pixelShader->CopyAllBufferData();
|
||||||
|
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());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Material::ActivatePBR(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->SetFloat2("scale", GetUVScale());
|
||||||
|
pixelShader->SetFloat2("offset", GetUVOffset());
|
||||||
|
pixelShader->SetFloat3("cameraPosition", _camera->GetTransform()->GetPosition());
|
||||||
|
pixelShader->SetFloat("lightCount", (int)_lights.size());
|
||||||
|
pixelShader->SetData("lights", &_lights[0], sizeof(Light) * (int)_lights.size());
|
||||||
|
pixelShader->CopyAllBufferData();
|
||||||
|
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());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
16
Material.h
16
Material.h
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
#include <DirectXMath.h>
|
#include <DirectXMath.h>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
#include <functional>
|
||||||
#include "DXCore.h"
|
#include "DXCore.h"
|
||||||
#include "SimpleShader.h"
|
#include "SimpleShader.h"
|
||||||
#include "Transform.h"
|
#include "Transform.h"
|
||||||
|
|
@ -14,11 +15,14 @@ constexpr auto TEXTYPE_NORMAL = "Normal";
|
||||||
constexpr auto TEXTYPE_EMISSIVE = "Emissive";
|
constexpr auto TEXTYPE_EMISSIVE = "Emissive";
|
||||||
constexpr auto TEXTYPE_SPECULAR = "Specular";
|
constexpr auto TEXTYPE_SPECULAR = "Specular";
|
||||||
constexpr auto TEXTYPE_REFLECTION = "Reflection";
|
constexpr auto TEXTYPE_REFLECTION = "Reflection";
|
||||||
|
constexpr auto TEXTYPE_ROUGHNESS = "Roughness";
|
||||||
|
constexpr auto TEXTYPE_METALNESS = "Metalness";
|
||||||
|
|
||||||
class Material
|
class Material
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
Material(
|
Material(
|
||||||
|
bool _pbr,
|
||||||
DirectX::XMFLOAT3 _tint,
|
DirectX::XMFLOAT3 _tint,
|
||||||
float _roughness,
|
float _roughness,
|
||||||
std::shared_ptr<SimpleVertexShader> _vertexShader,
|
std::shared_ptr<SimpleVertexShader> _vertexShader,
|
||||||
|
|
@ -56,6 +60,18 @@ public:
|
||||||
bool hasNormalMap;
|
bool hasNormalMap;
|
||||||
bool hasReflectionMap;
|
bool hasReflectionMap;
|
||||||
private:
|
private:
|
||||||
|
void ActivateStandard(
|
||||||
|
Transform* _transform,
|
||||||
|
std::shared_ptr<Camera> _camera,
|
||||||
|
DirectX::XMFLOAT3 _ambient,
|
||||||
|
std::vector<Light> _lights);
|
||||||
|
void ActivatePBR(
|
||||||
|
Transform* _transform,
|
||||||
|
std::shared_ptr<Camera> _camera,
|
||||||
|
DirectX::XMFLOAT3 _ambient,
|
||||||
|
std::vector<Light> _lights);
|
||||||
|
|
||||||
|
bool pbr;
|
||||||
DirectX::XMFLOAT3 tint;
|
DirectX::XMFLOAT3 tint;
|
||||||
float roughness;
|
float roughness;
|
||||||
float emitAmount;
|
float emitAmount;
|
||||||
|
|
|
||||||
63
SimplePixelPBR.hlsl
Normal file
63
SimplePixelPBR.hlsl
Normal file
|
|
@ -0,0 +1,63 @@
|
||||||
|
#include "Defines.hlsli"
|
||||||
|
#include "Helpers.hlsli"
|
||||||
|
#include "HelpersPBR.hlsli"
|
||||||
|
#include "Lights.hlsli"
|
||||||
|
#include "LightsPBR.hlsli"
|
||||||
|
|
||||||
|
#define MAX_LIGHTS 128
|
||||||
|
|
||||||
|
cbuffer ExternalData : register(b0)
|
||||||
|
{
|
||||||
|
float2 offset;
|
||||||
|
float2 scale;
|
||||||
|
|
||||||
|
float3 cameraPosition;
|
||||||
|
float lightCount;
|
||||||
|
|
||||||
|
Light lights[MAX_LIGHTS];
|
||||||
|
}
|
||||||
|
|
||||||
|
Texture2D Albedo : register(t0);
|
||||||
|
Texture2D Normal : register(t1);
|
||||||
|
Texture2D Roughness : register(t2);
|
||||||
|
Texture2D Metalness : register(t3);
|
||||||
|
TextureCube Reflection : register(t4);
|
||||||
|
SamplerState Sampler : register(s0);
|
||||||
|
|
||||||
|
float4 main(VertexToPixel input) : SV_TARGET
|
||||||
|
{
|
||||||
|
input.normal = normalize(input.normal);
|
||||||
|
input.tangent = normalize(input.tangent);
|
||||||
|
|
||||||
|
float3 view = normalize(cameraPosition - input.worldPosition);
|
||||||
|
|
||||||
|
float4 albedo = pow(Albedo.Sample(Sampler, input.uv), 2.2f);
|
||||||
|
|
||||||
|
float3 N = Normal.Sample(Sampler, input.uv).rgb * 2 - 1;
|
||||||
|
float3 T = normalize(input.tangent - input.normal * dot(input.tangent, input.normal));
|
||||||
|
float3 B = cross(T, input.normal);
|
||||||
|
float3x3 TBN = float3x3(T, B, input.normal);
|
||||||
|
input.normal = mul(N, TBN);
|
||||||
|
|
||||||
|
float roughness = Roughness.Sample(Sampler, input.uv).r;
|
||||||
|
float metalness = Metalness.Sample(Sampler, input.uv).r;
|
||||||
|
float3 specular = lerp(F0_NON_METAL.rrr, albedo.rgb, metalness);
|
||||||
|
|
||||||
|
float3 light = float3(0, 0, 0);
|
||||||
|
for (int i = 0; i < lightCount; i++)
|
||||||
|
{
|
||||||
|
switch (lights[i].Type)
|
||||||
|
{
|
||||||
|
case LIGHT_TYPE_DIRECTIONAL:
|
||||||
|
light += directionalLightPBR(lights[i], input.normal, view, roughness, metalness, albedo, specular);
|
||||||
|
break;
|
||||||
|
case LIGHT_TYPE_POINT:
|
||||||
|
light += pointLightPBR(lights[i], input.normal, view, roughness, metalness, albedo, specular, input.worldPosition);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
float3 final = light;
|
||||||
|
|
||||||
|
return float4(pow(final, 1.0f / 2.2f), albedo.a);
|
||||||
|
}
|
||||||
|
|
@ -52,7 +52,7 @@ float4 main(VertexToPixel input) : SV_TARGET
|
||||||
// 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);
|
||||||
|
|
||||||
float4 albedo = Albedo.Sample(BasicSampler, input.uv).rgba;
|
float4 albedo = pow(Albedo.Sample(BasicSampler, input.uv).rgba, 2.2f);
|
||||||
float specular = 1;
|
float specular = 1;
|
||||||
if (hasSpecularMap > 0) specular = Specular.Sample(BasicSampler, input.uv).r;
|
if (hasSpecularMap > 0) specular = Specular.Sample(BasicSampler, input.uv).r;
|
||||||
float3 emit = float3(1, 1, 1);
|
float3 emit = float3(1, 1, 1);
|
||||||
|
|
@ -83,5 +83,5 @@ float4 main(VertexToPixel input) : SV_TARGET
|
||||||
final = lerp(final, reflCol, getFresnel(input.normal, view, F0_NON_METAL));
|
final = lerp(final, reflCol, getFresnel(input.normal, view, F0_NON_METAL));
|
||||||
}
|
}
|
||||||
|
|
||||||
return float4(final, albedo.a);
|
return float4(pow(final, 1.0f/2.2f), albedo.a);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
24
SimpleVertexPBR.hlsl
Normal file
24
SimpleVertexPBR.hlsl
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
#include "Defines.hlsli"
|
||||||
|
|
||||||
|
cbuffer ExternalData : register(b0)
|
||||||
|
{
|
||||||
|
matrix world;
|
||||||
|
matrix worldInvTranspose;
|
||||||
|
matrix view;
|
||||||
|
matrix projection;
|
||||||
|
}
|
||||||
|
|
||||||
|
VertexToPixel main(VertexShaderInput input)
|
||||||
|
{
|
||||||
|
VertexToPixel output;
|
||||||
|
|
||||||
|
matrix worldViewProjection = mul(projection, mul(view, world));
|
||||||
|
output.screenPosition = mul(worldViewProjection, float4(input.localPosition, 1.0f));
|
||||||
|
|
||||||
|
output.uv = input.uv;
|
||||||
|
output.normal = normalize(mul((float3x3)worldInvTranspose, input.normal));
|
||||||
|
output.tangent = normalize(mul((float3x3)worldInvTranspose, input.tangent));
|
||||||
|
output.worldPosition = mul(world, float4(input.localPosition, 1)).xyz;
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
||||||
Reference in a new issue