Skip to content

Commit

Permalink
[RFR] : Splitting of PostPro ScreenSpace Effect is a dedicated Screen…
Browse files Browse the repository at this point in the history
…Space Plugin

[ADD] : add an EffectInterface for incomming effects (similar to PostPro's)
[ADD] : add MipMapping feature in ComputeBuffer and FrameBuffer since SSR need a MipMapped depth Buffer (to finalize btw)
  • Loading branch information
aiekick committed Nov 26, 2023
1 parent 766358f commit d649992
Show file tree
Hide file tree
Showing 54 changed files with 346 additions and 2,559 deletions.
4 changes: 2 additions & 2 deletions Plugins/CodeGenerator/src/Headers/CodeGeneratorBuild.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#define CodeGenerator_Prefix "CodeGenerator"
#define CodeGenerator_BuildNumber 648
#define CodeGenerator_BuildNumber 656
#define CodeGenerator_MinorNumber 0
#define CodeGenerator_MajorNumber 0
#define CodeGenerator_BuildId "0.0.648"
#define CodeGenerator_BuildId "0.0.656"
4 changes: 2 additions & 2 deletions Plugins/Lighting/src/Headers/LightingBuild.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#define Lighting_Prefix "Lighting"
#define Lighting_BuildNumber 598
#define Lighting_BuildNumber 609
#define Lighting_MinorNumber 0
#define Lighting_MajorNumber 0
#define Lighting_BuildId "0.0.598"
#define Lighting_BuildId "0.0.609"
4 changes: 2 additions & 2 deletions Plugins/MeshGen/src/Headers/MeshGenBuild.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#define MeshGen_Prefix "MeshGen"
#define MeshGen_BuildNumber 355
#define MeshGen_BuildNumber 364
#define MeshGen_MinorNumber 0
#define MeshGen_MajorNumber 0
#define MeshGen_BuildId "0.0.355"
#define MeshGen_BuildId "0.0.364"
4 changes: 2 additions & 2 deletions Plugins/Misc/src/Headers/MiscBuild.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#define Misc_Prefix "Misc"
#define Misc_BuildNumber 147
#define Misc_BuildNumber 158
#define Misc_MinorNumber 1
#define Misc_MajorNumber 0
#define Misc_BuildId "0.1.147"
#define Misc_BuildId "0.1.158"
4 changes: 2 additions & 2 deletions Plugins/PostProcessing/src/Headers/PostProcessingBuild.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#define PostProcessing_Prefix "PostProcessing"
#define PostProcessing_BuildNumber 586
#define PostProcessing_BuildNumber 629
#define PostProcessing_MinorNumber 1
#define PostProcessing_MajorNumber 0
#define PostProcessing_BuildId "0.1.586"
#define PostProcessing_BuildId "0.1.629"
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ bool BloomModule::Init() {
if (BaseRenderer::InitCompute2D(map_size)) {
m_BloomModule_Comp_2D_Pass_Ptr = BloomModule_Comp_2D_Pass::Create(map_size, m_VulkanCorePtr);
if (m_BloomModule_Comp_2D_Pass_Ptr) {
// by default but can be changed via widget
m_BloomModule_Comp_2D_Pass_Ptr->AllowResizeOnResizeEvents(true);
m_BloomModule_Comp_2D_Pass_Ptr->AllowResizeByHandOrByInputs(false);
AddGenericPass(m_BloomModule_Comp_2D_Pass_Ptr);
m_Loaded = true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ bool BlurModule::Init() {
if (BaseRenderer::InitCompute2D(map_size)) {
m_BlurModule_Comp_2D_Pass_Ptr = BlurModule_Comp_2D_Pass::Create(map_size, m_VulkanCorePtr);
if (m_BlurModule_Comp_2D_Pass_Ptr) {
// by default but can be changed via widget
m_BlurModule_Comp_2D_Pass_Ptr->AllowResizeOnResizeEvents(true);
m_BlurModule_Comp_2D_Pass_Ptr->AllowResizeByHandOrByInputs(false);
AddGenericPass(m_BlurModule_Comp_2D_Pass_Ptr);
m_Loaded = true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,9 @@ std::shared_ptr<BloomModule_Comp_2D_Pass> BloomModule_Comp_2D_Pass::Create(const
//// CTOR / DTOR /////////////////////////////////////////////
//////////////////////////////////////////////////////////////

BloomModule_Comp_2D_Pass::BloomModule_Comp_2D_Pass(GaiApi::VulkanCorePtr vVulkanCorePtr) : ShaderPass(vVulkanCorePtr) {
BloomModule_Comp_2D_Pass::BloomModule_Comp_2D_Pass(GaiApi::VulkanCorePtr vVulkanCorePtr) : EffectPass(vVulkanCorePtr) {
SetRenderDocDebugName("Comp 2D Pass : Bloom", COMPUTE_SHADER_PASS_DEBUG_COLOR);
m_DontUseShaderFilesOnDisk = true;
*IsEffectEnabled() = false;
}

BloomModule_Comp_2D_Pass::~BloomModule_Comp_2D_Pass() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ limitations under the License.
#include <ctools/ConfigAbstract.h>

#include <LumoBackend/Base/BaseRenderer.h>
#include <LumoBackend/Base/ShaderPass.h>
#include <LumoBackend/Base/EffectPass.h>

#include <Gaia/gaia.h>
#include <Gaia/Resources/Texture2D.h>
Expand All @@ -43,10 +43,8 @@ limitations under the License.
#include <LumoBackend/Interfaces/TextureOutputInterface.h>

class BloomModule_Comp_2D_Pass :
public ShaderPass,
public NodeInterface,
public TextureInputInterface<1U>,
public TextureOutputInterface
public EffectPass<1U>,
public NodeInterface
{
public:
static std::shared_ptr<BloomModule_Comp_2D_Pass> Create(const ct::uvec2& vSize, GaiApi::VulkanCorePtr vVulkanCorePtr);
Expand All @@ -71,8 +69,8 @@ class BloomModule_Comp_2D_Pass :
public:
BloomModule_Comp_2D_Pass(GaiApi::VulkanCorePtr vVulkanCorePtr);
~BloomModule_Comp_2D_Pass() override;
void ActionBeforeInit();
void ActionBeforeCompilation();
void ActionBeforeInit() override;
void ActionBeforeCompilation() override;
bool DrawWidgets(const uint32_t& vCurrentFrame, ImGuiContext* vContextPtr = nullptr, const std::string& vUserDatas = {}) override;
bool DrawOverlays(const uint32_t& vCurrentFrame, const ImRect& vRect, ImGuiContext* vContextPtr = nullptr, const std::string& vUserDatas = {}) override;
bool DrawDialogsAndPopups(const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr = nullptr, const std::string& vUserDatas = {}) override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,9 @@ std::shared_ptr<BlurModule_Comp_2D_Pass> BlurModule_Comp_2D_Pass::Create(const c
//// CTOR / DTOR /////////////////////////////////////////////
//////////////////////////////////////////////////////////////

BlurModule_Comp_2D_Pass::BlurModule_Comp_2D_Pass(GaiApi::VulkanCorePtr vVulkanCorePtr) : ShaderPass(vVulkanCorePtr) {
BlurModule_Comp_2D_Pass::BlurModule_Comp_2D_Pass(GaiApi::VulkanCorePtr vVulkanCorePtr) : EffectPass(vVulkanCorePtr) {
SetRenderDocDebugName("Comp Pass : Blur", COMPUTE_SHADER_PASS_DEBUG_COLOR);
m_DontUseShaderFilesOnDisk = true;
*IsEffectEnabled() = false;
}

BlurModule_Comp_2D_Pass::~BlurModule_Comp_2D_Pass() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ limitations under the License.
#include <ctools/ConfigAbstract.h>

#include <LumoBackend/Base/BaseRenderer.h>
#include <LumoBackend/Base/ShaderPass.h>
#include <LumoBackend/Base/EffectPass.h>

#include <Gaia/gaia.h>
#include <Gaia/Resources/Texture2D.h>
Expand All @@ -43,10 +43,8 @@ limitations under the License.
#include <LumoBackend/Interfaces/TextureOutputInterface.h>

class BlurModule_Comp_2D_Pass :
public ShaderPass,
public NodeInterface,
public TextureInputInterface<1U>,
public TextureOutputInterface {
public EffectPass<1U>,
public NodeInterface {
public:
static std::shared_ptr<BlurModule_Comp_2D_Pass> Create(const ct::uvec2& vSize, GaiApi::VulkanCorePtr vVulkanCorePtr);

Expand Down Expand Up @@ -80,8 +78,8 @@ class BlurModule_Comp_2D_Pass :
BlurModule_Comp_2D_Pass(GaiApi::VulkanCorePtr vVulkanCorePtr);
virtual ~BlurModule_Comp_2D_Pass();

void ActionBeforeInit();
void ActionBeforeCompilation();
void ActionBeforeInit() override;
void ActionBeforeCompilation() override;

bool DrawWidgets(const uint32_t& vCurrentFrame, ImGuiContext* vContextPtr = nullptr, const std::string& vUserDatas = {}) override;
bool DrawOverlays(const uint32_t& vCurrentFrame, const ImRect& vRect, ImGuiContext* vContextPtr = nullptr, const std::string& vUserDatas = {}) override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,10 @@ std::shared_ptr<ChromaticAberrationsModule_Comp_2D_Pass> ChromaticAberrationsMod
///// CTOR / DTOR ////////////////////////////////////////////
//////////////////////////////////////////////////////////////

ChromaticAberrationsModule_Comp_2D_Pass::ChromaticAberrationsModule_Comp_2D_Pass(GaiApi::VulkanCorePtr vVulkanCorePtr) : ShaderPass(vVulkanCorePtr) {
ChromaticAberrationsModule_Comp_2D_Pass::ChromaticAberrationsModule_Comp_2D_Pass(GaiApi::VulkanCorePtr vVulkanCorePtr) : EffectPass(vVulkanCorePtr) {
ZoneScoped;
SetRenderDocDebugName("Comp Pass : Chromatic Aberrations", COMPUTE_SHADER_PASS_DEBUG_COLOR);
m_DontUseShaderFilesOnDisk = true;
*IsEffectEnabled() = false;
}

ChromaticAberrationsModule_Comp_2D_Pass::~ChromaticAberrationsModule_Comp_2D_Pass() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ limitations under the License.
#include <ctools/ConfigAbstract.h>

#include <LumoBackend/Base/BaseRenderer.h>
#include <LumoBackend/Base/ShaderPass.h>
#include <LumoBackend/Base/EffectPass.h>
#include <Gaia/gaia.h>
#include <Gaia/Resources/Texture2D.h>
#include <Gaia/Core/VulkanCore.h>
Expand All @@ -44,9 +44,7 @@ limitations under the License.
#include <LumoBackend/Interfaces/TextureOutputInterface.h>

class ChromaticAberrationsModule_Comp_2D_Pass :
public ShaderPass,
public TextureInputInterface<1>,
public TextureOutputInterface,
public EffectPass<1U>,
public NodeInterface
{
public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,10 @@ std::shared_ptr<DilationModule_Comp_2D_Pass> DilationModule_Comp_2D_Pass::Create
///// CTOR / DTOR ////////////////////////////////////////////
//////////////////////////////////////////////////////////////

DilationModule_Comp_2D_Pass::DilationModule_Comp_2D_Pass(GaiApi::VulkanCorePtr vVulkanCorePtr) : ShaderPass(vVulkanCorePtr) {
DilationModule_Comp_2D_Pass::DilationModule_Comp_2D_Pass(GaiApi::VulkanCorePtr vVulkanCorePtr) : EffectPass(vVulkanCorePtr) {
ZoneScoped;
SetRenderDocDebugName("Comp Pass : Dilation", COMPUTE_SHADER_PASS_DEBUG_COLOR);
m_DontUseShaderFilesOnDisk = true;
*IsEffectEnabled() = true;
}

DilationModule_Comp_2D_Pass::~DilationModule_Comp_2D_Pass() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ limitations under the License.
#include <ctools/ConfigAbstract.h>

#include <LumoBackend/Base/BaseRenderer.h>
#include <LumoBackend/Base/ShaderPass.h>
#include <LumoBackend/Base/EffectPass.h>
#include <Gaia/gaia.h>
#include <Gaia/Resources/Texture2D.h>
#include <Gaia/Core/VulkanCore.h>
Expand All @@ -43,7 +43,9 @@ limitations under the License.
#include <LumoBackend/Interfaces/TextureInputInterface.h>
#include <LumoBackend/Interfaces/TextureOutputInterface.h>

class DilationModule_Comp_2D_Pass : public ShaderPass, public TextureInputInterface<2>, public TextureOutputInterface, public NodeInterface {
class DilationModule_Comp_2D_Pass :
public EffectPass<2U>,
public NodeInterface {
public:
static std::shared_ptr<DilationModule_Comp_2D_Pass> Create(const ct::uvec2& vSize, GaiApi::VulkanCorePtr vVulkanCorePtr);

Expand Down
Loading

0 comments on commit d649992

Please sign in to comment.