Skip to content

Commit

Permalink
feat: add water pipeline
Browse files Browse the repository at this point in the history 
Signed-off-by: Michael Pollind <[email protected]>
  • Loading branch information
@pollend
pollend committed Jan 5, 2024
1 parent 8f288b5 commit 43c0d36
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 44 deletions.
4 changes: 3 additions & 1 deletion HPL2/include/graphics/SceneResource.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ namespace hpl::resource {
uint32_t constexpr IsAlphaSingleChannel = 0x1;
uint32_t constexpr IsHeightSingleChannel = 0x2;
uint32_t constexpr UseAlphaDissolveFilter = 0x4;
uint32_t constexpr UseReflection = 0x8;
uint32_t constexpr UseRefraction = 0x16;

struct ViewportInfo {
static constexpr uint32_t PrmaryViewportIndex = 0;
Expand Down Expand Up @@ -172,7 +174,7 @@ namespace hpl::resource {

struct WaterMaterial {
uint32_t m_diffuseTextureIndex;
uint32_t m_normalTextureIndex;
uint32_t m_normalTextureIndex;
uint32_t m_cubemapTextureIndex;
uint32_t m_config;

Expand Down
5 changes: 0 additions & 5 deletions HPL2/resource/translucency_water_shade.frag.fsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,6 @@ PsOut PS_MAIN(PsIn In, SV_PrimitiveID(uint) primitiveID)
float fSpecular = pow(fLDotN,16.0);

float fFogAmount = 0.0;
// if (UseFog(Get(options))) {
// fFogAmount = (-In.pos.z - Get(worldFogStart)) /Get(worldFogLength);
// fFogAmount = clamp(fFogAmount, 0.0, 1.0);
// fFogAmount = pow(fFogAmount, Get(fogFalloffExp)) * Get(worldFogColor).a;
// }
if ((Get(worldInfo).worldFlags & WORLD_FLAG_IS_FOG_ENABLED) > 0) {
fFogAmount = pow(clamp((-In.pos.z - Get(worldInfo).worldFogStart) / Get(worldInfo).worldFogLength, 0.0, 1.0), Get(worldInfo).fogFalloffExp) * Get(worldInfo).worldFogColor.a;
}
Expand Down
93 changes: 55 additions & 38 deletions HPL2/sources/graphics/RendererDeferred2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1676,12 +1676,16 @@ namespace hpl {
RangeSubsetAlloc::RangeSubset range;
eMaterialBlendMode blend;
};
enum class TranslucentDrawType : uint8_t { Translucency, TranslucencyIllumination, Particle, Water };
enum class TranslucentDrawType : uint8_t {
Translucency,
Particle,
Water
};
struct TranslucentArgs {
TranslucentDrawType type;
iRenderable* renderable;
bool m_refraction;
bool m_reflection;
Pipeline* pipeline;
Pipeline* illuminationPipline;
uint32_t indirectDrawIndex;
uint32_t numberIndecies;
uint32_t indexOffset;
Expand Down Expand Up @@ -1738,8 +1742,10 @@ namespace hpl {
translucenctArgs.push_back({
TranslucentDrawType::Particle,
renderable,
false,
false,
material->GetDepthTest() ?
m_particlePipeline.getPipelineByBlendMode(material->GetBlendMode()).m_handle:
m_particlePipelineNoDepth.getPipelineByBlendMode(material->GetBlendMode()).m_handle,
nullptr,
frameVars.m_particleIndex,
packet.m_unified.m_numIndices,
packet.m_unified.m_subAllocation->indexOffset(),
Expand Down Expand Up @@ -1815,16 +1821,20 @@ namespace hpl {
(*tex.m_value) = resourceMaterial.m_textureHandles[tex.m_type];
}

waterMaterial.m_config =
(isReflection ? resource::UseReflection : 0) |
(isRefraction ? resource::UseRefraction : 0);

waterMaterial.m_refractionScale = descriptor.m_water.m_refractionScale;
waterMaterial.m_frenselBias = descriptor.m_water.m_frenselBias;
waterMaterial.m_frenselPow = descriptor.m_water.m_frenselPow;

waterMaterial.m_reflectionFadeStart = descriptor.m_water.m_reflectionFadeStart;
waterMaterial.m_reflectionFadeEnd = descriptor.m_water.m_reflectionFadeEnd;
waterMaterial.m_waveSpeed = descriptor.m_water.m_waveSpeed;
waterMaterial.mfWaveAmplitude = descriptor.m_water.m_waveAmplitude;
waterMaterial.m_waveAmplitude = descriptor.m_water.m_waveAmplitude;

waterMaterial.mfWaveFreq = descriptor.m_water.m_waveFreq;
waterMaterial.m_waveFreq = descriptor.m_water.m_waveFreq;
endUpdateResource(&updateDesc);
break;
}
Expand Down Expand Up @@ -1860,12 +1870,24 @@ namespace hpl {
if (descriptor.m_id == MaterialID::Water) {
return TranslucentDrawType::Water;
}
return (cubeMap && !isRefraction) ? TranslucentDrawType::TranslucencyIllumination
: TranslucentDrawType::Translucency;
return TranslucentDrawType::Translucency;
})(),
renderable,
isRefraction,
isReflection,
([&]() {
if (isRefraction) {
if (material->GetDepthTest()) {
return m_translucencyRefractionPipline.getPipelineByBlendMode(material->GetBlendMode()).m_handle;
}
return m_translucencyRefractionPiplineNoDepth.getPipelineByBlendMode(material->GetBlendMode()).m_handle;
}
if (material->GetDepthTest()) {
return m_translucencyPipline.getPipelineByBlendMode(material->GetBlendMode()).m_handle;
}
return m_translucencyPiplineNoDepth.getPipelineByBlendMode(material->GetBlendMode()).m_handle;
})(),
(cubeMap && !isRefraction) ? (material->GetDepthTest() ? m_translucencyIlluminationPipline.m_handle
: m_translucencyIlluminationPiplineNoDepth.m_handle)
: nullptr,
slot,
packet.m_unified.m_numIndices,
packet.m_unified.m_subAllocation->indexOffset(),
Expand Down Expand Up @@ -2391,12 +2413,7 @@ namespace hpl {
particleSet.cmdBindGeometrySet(cmd, semantics);
cmdBindDescriptorSet(cmd, 0, m_sceneDescriptorConstSet.m_handle);
cmdBindDescriptorSet(cmd, 0, m_sceneDescriptorPerFrameSet[frame.m_frameIndex].m_handle);
if (pMaterial->GetDepthTest()) {
cmdBindPipeline(cmd, m_particlePipeline.getPipelineByBlendMode(pMaterial->GetBlendMode()).m_handle);
} else {
cmdBindPipeline(cmd, m_particlePipelineNoDepth.getPipelineByBlendMode(pMaterial->GetBlendMode()).m_handle);
}

cmdBindPipeline(cmd, arg.pipeline);
if (m_supportIndirectRootConstant) {
const uint32_t pushConstantIndex =
getDescriptorIndexFromName(m_sceneRootSignature.m_handle, "indirectRootConstant");
Expand All @@ -2405,7 +2422,24 @@ namespace hpl {
cmdDrawIndexedInstanced(cmd, arg.numberIndecies, arg.indexOffset, 1, arg.vertexOffset, arg.indirectDrawIndex);
break;
}
case TranslucentDrawType::TranslucencyIllumination:
case TranslucentDrawType::Water: {
std::array semantics = { ShaderSemantic::SEMANTIC_POSITION,
ShaderSemantic::SEMANTIC_TEXCOORD0,
ShaderSemantic::SEMANTIC_NORMAL,
ShaderSemantic::SEMANTIC_TANGENT,
ShaderSemantic::SEMANTIC_COLOR };
opaqueSet.cmdBindGeometrySet(cmd, semantics);
cmdBindDescriptorSet(cmd, 0, m_sceneDescriptorConstSet.m_handle);
cmdBindDescriptorSet(cmd, 0, m_sceneDescriptorPerFrameSet[frame.m_frameIndex].m_handle);
cmdBindPipeline(cmd, m_translucencyWaterPipeline.m_handle);
if (m_supportIndirectRootConstant) {
const uint32_t pushConstantIndex =
getDescriptorIndexFromName(m_sceneRootSignature.m_handle, "indirectRootConstant");
cmdBindPushConstants(cmd, m_sceneRootSignature.m_handle, pushConstantIndex, &arg.indirectDrawIndex);
}
cmdDrawIndexedInstanced(cmd, arg.numberIndecies, arg.indexOffset, 1, arg.vertexOffset, arg.indirectDrawIndex);
break;
}
case TranslucentDrawType::Translucency:
{
std::array semantics = { ShaderSemantic::SEMANTIC_POSITION,
Expand All @@ -2416,20 +2450,7 @@ namespace hpl {
opaqueSet.cmdBindGeometrySet(cmd, semantics);
cmdBindDescriptorSet(cmd, 0, m_sceneDescriptorConstSet.m_handle);
cmdBindDescriptorSet(cmd, 0, m_sceneDescriptorPerFrameSet[frame.m_frameIndex].m_handle);

if (arg.m_refraction) {
if (pMaterial->GetDepthTest()) {
cmdBindPipeline(cmd, m_translucencyRefractionPipline.getPipelineByBlendMode(pMaterial->GetBlendMode()).m_handle);
} else {
cmdBindPipeline(cmd, m_translucencyRefractionPiplineNoDepth.getPipelineByBlendMode(pMaterial->GetBlendMode()).m_handle);
}
} else {
if (pMaterial->GetDepthTest()) {
cmdBindPipeline(cmd, m_translucencyPipline.getPipelineByBlendMode(pMaterial->GetBlendMode()).m_handle);
} else {
cmdBindPipeline(cmd, m_translucencyPiplineNoDepth.getPipelineByBlendMode(pMaterial->GetBlendMode()).m_handle);
}
}
cmdBindPipeline(cmd, arg.pipeline);

if (m_supportIndirectRootConstant) {
const uint32_t pushConstantIndex =
Expand All @@ -2438,12 +2459,8 @@ namespace hpl {
}
cmdDrawIndexedInstanced(cmd, arg.numberIndecies, arg.indexOffset, 1, arg.vertexOffset, arg.indirectDrawIndex);

if (arg.type == TranslucentDrawType::TranslucencyIllumination) {
if (pMaterial->GetDepthTest()) {
cmdBindPipeline(cmd, m_translucencyIlluminationPipline.m_handle);
} else {
cmdBindPipeline(cmd, m_translucencyIlluminationPiplineNoDepth.m_handle);
}
if (arg.illuminationPipline) {
cmdBindPipeline(cmd, arg.illuminationPipline);
cmdDrawIndexedInstanced(cmd, arg.numberIndecies, arg.indexOffset, 1, arg.vertexOffset, arg.indirectDrawIndex);
}
break;
Expand Down

0 comments on commit 43c0d36

Please sign in to comment.