Commit dbbe6ba6 authored by Chuck Walbourn's avatar Chuck Walbourn
Browse files

Samples refresh

parent d3aee972

Kits/ATGTK/FrontPanel/FrontPanelDisplay.cpp

+13 −1
Original line number Diff line number Diff line
@@ -486,3 +486,15 @@ BufferDesc FrontPanelDisplay::LoadWICFromFile(_In_z_ const wchar_t* filename, st 
    result.height = m_displayHeight;

    return result;

}



BufferDesc FrontPanelDisplay::LoadWICFromFile(_In_z_ const wchar_t* filename, unsigned int frameindex)

{

    BufferDesc result = LoadWICFromFile(filename, m_buffer, frameindex);



    // LoadWicFromFile is robust and will scale the image dimensions to fit the front panel...

    // ...assert here if this is not true:

    assert(m_displayWidth == result.width);

    assert(m_displayHeight == result.height);



    return result;

}
 
 No newline at end of file

Kits/ATGTK/FrontPanel/FrontPanelDisplay.h

+7 −4
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ namespace ATG 
        // Loads a buffer from a file

        BufferDesc LoadWICFromFile(_In_z_ const wchar_t* filename, std::unique_ptr<uint8_t[]>& data, unsigned int frameindex = 0);



        // Loads a buffer from a file directly into the display buffer

        BufferDesc LoadWICFromFile(_In_z_ const wchar_t *filename, unsigned int frameIndex = 0);



        // Determine whether the front panel is available

        bool IsAvailable() const { return m_frontPanelControl; }

Kits/ATGTK/PBREffect/PBREffect.cpp

+26 −39
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <..\Src\EffectCommon.h>



using namespace DirectX;

using namespace ATG;



// Include the precompiled shader code.

namespace
@@ -145,7 +144,7 @@ const int EffectBase<PBREffectTraits>::PixelShaderIndices[] = 
SharedResourcePool<ID3D12Device*, EffectBase<PBREffectTraits>::DeviceResources> EffectBase<PBREffectTraits>::deviceResourcesPool;



// Constructor.

PBREffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const EffectPipelineStateDescription& pipelineDescription, bool generateVelocity)

ATG::PBREffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const EffectPipelineStateDescription& pipelineDescription, bool generateVelocity)

    : EffectBase(device),

      flags(effectFlags),

      doGenerateVelocity(generateVelocity),
@@ -223,7 +222,7 @@ PBREffect::Impl::Impl(_In_ ID3D12Device* device, int effectFlags, const EffectPi 
}





int PBREffect::Impl::GetPipelineStatePermutation(bool textureEnabled, bool velocityEnabled) const

int ATG::PBREffect::Impl::GetPipelineStatePermutation(bool textureEnabled, bool velocityEnabled) const

{

    int permutation = 0;
@@ -235,7 +234,7 @@ int PBREffect::Impl::GetPipelineStatePermutation(bool textureEnabled, bool veloc 




// Sets our state onto the D3D device.

void PBREffect::Impl::Apply(_In_ ID3D12GraphicsCommandList* commandList)

void ATG::PBREffect::Impl::Apply(_In_ ID3D12GraphicsCommandList* commandList)

{

    // Store old wvp for velocity calculation in shader

    constants.prevWorldViewProj = constants.worldViewProj;
@@ -300,7 +299,7 @@ void PBREffect::Impl::Apply(_In_ ID3D12GraphicsCommandList* commandList) 
}



// Public constructor.

PBREffect::PBREffect(_In_ ID3D12Device* device, 

ATG::PBREffect::PBREffect(_In_ ID3D12Device* device,

                     int effectFlags, 

                    const EffectPipelineStateDescription& pipelineDescription, 

                    bool generateVelocity)
@@ -310,14 +309,14 @@ PBREffect::PBREffect(_In_ ID3D12Device* device, 




// Move constructor.

PBREffect::PBREffect(PBREffect&& moveFrom)

ATG::PBREffect::PBREffect(PBREffect&& moveFrom)

  : pImpl(std::move(moveFrom.pImpl))

{

}





// Move assignment.

PBREffect& PBREffect::operator= (PBREffect&& moveFrom)

ATG::PBREffect& ATG::PBREffect::operator= (ATG::PBREffect&& moveFrom)

{

    pImpl = std::move(moveFrom.pImpl);

    return *this;
@@ -325,18 +324,18 @@ PBREffect& PBREffect::operator= (PBREffect&& moveFrom) 




// Public destructor.

PBREffect::~PBREffect()

ATG::PBREffect::~PBREffect()

{

}



// IEffect methods.

void PBREffect::Apply(_In_ ID3D12GraphicsCommandList* commandList)

void ATG::PBREffect::Apply(_In_ ID3D12GraphicsCommandList* commandList)

{

    pImpl->Apply(commandList);

}



// Camera settings.

void XM_CALLCONV PBREffect::SetWorld(FXMMATRIX value)

void XM_CALLCONV ATG::PBREffect::SetWorld(FXMMATRIX value)

{

    pImpl->matrices.world = value;
@@ -344,7 +343,7 @@ void XM_CALLCONV PBREffect::SetWorld(FXMMATRIX value) 
}





void XM_CALLCONV PBREffect::SetView(FXMMATRIX value)

void XM_CALLCONV ATG::PBREffect::SetView(FXMMATRIX value)

{

    pImpl->matrices.view = value;
@@ -352,7 +351,7 @@ void XM_CALLCONV PBREffect::SetView(FXMMATRIX value) 
}





void XM_CALLCONV PBREffect::SetProjection(FXMMATRIX value)

void XM_CALLCONV ATG::PBREffect::SetProjection(FXMMATRIX value)

{

    pImpl->matrices.projection = value;
@@ -360,7 +359,7 @@ void XM_CALLCONV PBREffect::SetProjection(FXMMATRIX value) 
}





void XM_CALLCONV PBREffect::SetMatrices(FXMMATRIX world, CXMMATRIX view, CXMMATRIX projection)

void XM_CALLCONV ATG::PBREffect::SetMatrices(FXMMATRIX world, CXMMATRIX view, CXMMATRIX projection)

{

    pImpl->matrices.world = world;

    pImpl->matrices.view = view;
@@ -369,7 +368,7 @@ void XM_CALLCONV PBREffect::SetMatrices(FXMMATRIX world, CXMMATRIX view, CXMMATR 
    pImpl->dirtyFlags |= EffectDirtyFlags::WorldViewProj | EffectDirtyFlags::WorldInverseTranspose | EffectDirtyFlags::EyePosition | EffectDirtyFlags::FogVector;

}



void XM_CALLCONV PBREffect::SetLightDirection(int whichLight, FXMVECTOR value)

void XM_CALLCONV ATG::PBREffect::SetLightDirection(int whichLight, FXMVECTOR value)

{

    pImpl->constants.lightDirection[whichLight] = value;
@@ -377,7 +376,7 @@ void XM_CALLCONV PBREffect::SetLightDirection(int whichLight, FXMVECTOR value) 
}





void XM_CALLCONV PBREffect::SetLightColorAndIntensity(int whichLight, FXMVECTOR value)

void XM_CALLCONV ATG::PBREffect::SetLightColorAndIntensity(int whichLight, FXMVECTOR value)

{

    pImpl->constants.lightDiffuseColor[whichLight] = value;
@@ -385,7 +384,7 @@ void XM_CALLCONV PBREffect::SetLightColorAndIntensity(int whichLight, FXMVECTOR 
}

 



void PBREffect::EnableDefaultLighting()

void ATG::PBREffect::EnableDefaultLighting()

{

    static const XMVECTORF32 defaultDirections[Impl::MaxDirectionalLights] =

    {
@@ -410,40 +409,28 @@ void PBREffect::EnableDefaultLighting() 




// PBR Settings

void PBREffect::SetConstantAlbedo(FXMVECTOR value)

void ATG::PBREffect::SetConstantAlbedo(FXMVECTOR value)

{

    pImpl->constants.Albedo = value;



    pImpl->dirtyFlags |= EffectDirtyFlags::ConstantBuffer;

}



void PBREffect::SetConstantMetallic(float value)

void ATG::PBREffect::SetConstantMetallic(float value)

{

    pImpl->constants.Metallic = value;



    pImpl->dirtyFlags |= EffectDirtyFlags::ConstantBuffer;

}



void PBREffect::SetConstantRoughness(float value)

void ATG::PBREffect::SetConstantRoughness(float value)

{

    pImpl->constants.Roughness = value;



    pImpl->dirtyFlags |= EffectDirtyFlags::ConstantBuffer;

}



#ifdef DEBUG

void PBREffect::SetDebugFlags(bool diffuse, bool D, bool F, bool G)

{

    pImpl->constants.enable_Diffuse = diffuse;

    pImpl->constants.enable_Specular_D = D;

    pImpl->constants.enable_Specular_F = F;

    pImpl->constants.enable_Specular_G = G;



    pImpl->dirtyFlags |= EffectDirtyFlags::ConstantBuffer;

}

#endif



void PBREffect::SetSurfaceTextures(_In_ D3D12_GPU_DESCRIPTOR_HANDLE albedo,

void ATG::PBREffect::SetSurfaceTextures(_In_ D3D12_GPU_DESCRIPTOR_HANDLE albedo,

    _In_ D3D12_GPU_DESCRIPTOR_HANDLE normal,

    _In_ D3D12_GPU_DESCRIPTOR_HANDLE RMA,

    _In_ D3D12_GPU_DESCRIPTOR_HANDLE sampler)
@@ -454,7 +441,7 @@ void PBREffect::SetSurfaceTextures(_In_ D3D12_GPU_DESCRIPTOR_HANDLE albedo, 
    pImpl->descriptors[Impl::RootParameterIndex::SurfaceSampler] =   sampler;

}



void PBREffect::SetIBLTextures(_In_ D3D12_GPU_DESCRIPTOR_HANDLE radiance,

void ATG::PBREffect::SetIBLTextures(_In_ D3D12_GPU_DESCRIPTOR_HANDLE radiance,

                                int numRadianceMips,

                                _In_ D3D12_GPU_DESCRIPTOR_HANDLE irradiance,

                                _In_ D3D12_GPU_DESCRIPTOR_HANDLE sampler)
@@ -468,7 +455,7 @@ void PBREffect::SetIBLTextures(_In_ D3D12_GPU_DESCRIPTOR_HANDLE radiance, 
    pImpl->dirtyFlags |= EffectDirtyFlags::ConstantBuffer;

}



void PBREffect::SetRenderTargetSizeInPixels(int width, int height)

void ATG::PBREffect::SetRenderTargetSizeInPixels(int width, int height)

{

    pImpl->constants.targetWidth = static_cast<float>(width);

    pImpl->constants.targetHeight = static_cast<float>(height);
@@ -477,7 +464,7 @@ void PBREffect::SetRenderTargetSizeInPixels(int width, int height) 


//--------------------------------------------------------------------------------------

// PBR 

const D3D12_INPUT_ELEMENT_DESC VertexPositionNormalTextureTangent::InputElements[] =

const D3D12_INPUT_ELEMENT_DESC ATG::VertexPositionNormalTextureTangent::InputElements[] =

{

    { "SV_Position", 0, DXGI_FORMAT_R32G32B32_FLOAT,    0, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 },

    { "NORMAL",      0, DXGI_FORMAT_R32G32B32_FLOAT,    0, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 },
@@ -485,10 +472,10 @@ const D3D12_INPUT_ELEMENT_DESC VertexPositionNormalTextureTangent::InputElements 
    { "TANGENT",     0, DXGI_FORMAT_R32G32B32_FLOAT,    0, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 },

};



static_assert(sizeof(VertexPositionNormalTextureTangent) == 48, "Vertex struct/layout mismatch");

static_assert(sizeof(ATG::VertexPositionNormalTextureTangent) == 48, "Vertex struct/layout mismatch");



const D3D12_INPUT_LAYOUT_DESC VertexPositionNormalTextureTangent::InputLayout =

const D3D12_INPUT_LAYOUT_DESC ATG::VertexPositionNormalTextureTangent::InputLayout =

{

    VertexPositionNormalTextureTangent::InputElements,

    VertexPositionNormalTextureTangent::InputElementCount

    ATG::VertexPositionNormalTextureTangent::InputElements,

    ATG::VertexPositionNormalTextureTangent::InputElementCount

};
 
 No newline at end of file

Kits/ATGTK/PBREffect/PBREffect.h

+1 −3
Original line number Diff line number Diff line
@@ -47,9 +47,7 @@ namespace ATG 
        void XM_CALLCONV SetConstantAlbedo(DirectX::FXMVECTOR value);

        void __cdecl     SetConstantMetallic(float value);

        void __cdecl     SetConstantRoughness(float value);

#ifdef DEBUG

        void __cdecl     SetDebugFlags(bool diffuse, bool D, bool F, bool G);

#endif



        // Texture settings.

        void __cdecl SetSurfaceTextures(

            _In_ D3D12_GPU_DESCRIPTOR_HANDLE albedo,

Kits/ATGTK/PBREffect/PBREffect_Math.hlsli

+11 −23
Original line number Diff line number Diff line
@@ -11,10 +11,11 @@ 
#define __PBR_MATH_HLSLI__



static const float PI = 3.14159265f;

static const float EPSILON = 1e-6f;



float3 BiasX2(float3 x)

{

    return 2.0f * x - 1.0f;

    return 2.f * x - 1.f;

}



// Given a local normal, transform it into a tangent space given by surface normal and tangent
@@ -29,18 +30,14 @@ float3 PeturbNormal(float3 localNormal, float3 surfaceNormalWS, float3 surfaceTa 
}



// Shlick's approximation of Fresnel

// https://en.wikipedia.org/wiki/Schlick%27s_approximation

float3 Fresnel_Shlick(in float3 f0, in float3 f90, in float x)

{

    return f0 + (f90 - f0) * pow(1.f - x, 5.f);

}



// No frills Lambert shading.

float Diffuse_Lambert(in float NdotL)

{

    return NdotL;

}



// Burley's diffuse BRDF

// Burley B. "Physically Based Shading at Disney"

// SIGGRAPH 2012 Course: Practical Physically Based Shading in Film and Game Production, 2012.

float Diffuse_Burley(in float NdotL, in float NdotV, in float LdotH, in float roughness)

{

    float fd90 = 0.5f + 2.f * roughness * LdotH * LdotH;
@@ -48,28 +45,20 @@ float Diffuse_Burley(in float NdotL, in float NdotV, in float LdotH, in float ro 
}



// GGX specular D (normal distribution)

// https://www.cs.cornell.edu/~srm/publications/EGSR07-btdf.pdf

float Specular_D_GGX(in float alpha, in float NdotH)

{

    const float alpha2 = alpha * alpha;

    const float lower = (NdotH * NdotH * (alpha2 - 1)) + 1;

    const float result = alpha2 / (PI * lower * lower);



    return result;

    return alpha2 / max(EPSILON, PI * lower * lower);

}



// Schlick-Smith specular G (visibility) with Hable's LdotH optimization

// http://www.cs.virginia.edu/~jdl/bib/appearance/analytic%20models/schlick94b.pdf

// http://graphicrants.blogspot.se/2013/08/specular-brdf-reference.html

float G_Shlick_Smith_Hable(float alpha, float LdotH)

{

    const float k = alpha / 2.0;

    const float k2 = k * 2;

    const float invk2 = 1 - k2;

    return rcp(LdotH * LdotH * invk2 + k2);

}



// Map a normal on unit sphere to UV coordinates

float2 SphereMap(float3 N)

{

    return float2(atan2(N.x, N.z) / (PI * 2) + 0.5, 0.5 - (asin(N.y) / PI));

    return rcp(lerp(LdotH * LdotH, 1, alpha * alpha * 0.25f));

}



// A microfacet based BRDF.
@@ -110,8 +99,7 @@ float3 Specular_IBL(in float3 N, in float3 V, in float lodBias) 
{

    float mip = lodBias * PBR_NumRadianceMipLevels;

    float3 dir = reflect(-V, N);

    float3 envColor = PBR_RadianceTexture.SampleLevel(PBR_IBLSampler, dir, mip);

    return envColor;

    return PBR_RadianceTexture.SampleLevel(PBR_IBLSampler, dir, mip);

}



#endif
 
 No newline at end of file