celisej567/Nuake-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Started working towards supporting all the splits

Browse Source
This commit is contained in:
antopilo
2025-01-12 00:02:56 -05:00
parent 890b1c44b2
commit e203ac5bd8
10 changed files with 106 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Nuake/src/Rendering/Vulkan/VulkanSceneRenderer.cpp
View File

@@ -123,7 +123,7 @@ void VkSceneRenderer::BeginScene(RenderContext inContext)
{
auto [transform, light] = view.get<TransformComponent, LightComponent>(e);
for (int i = 0; i < light.m_LightViews.size(); i++)
for (int i = 0; i < CSM_AMOUNT; i++)
{
LightView& view = light.m_LightViews[i];
CameraView viewData{};
@@ -132,8 +132,8 @@ void VkSceneRenderer::BeginScene(RenderContext inContext)
viewData.InverseView = glm::inverse(view.View);
viewData.InverseProjection = glm::inverse(view.Proj);
viewData.Position = transform.GetGlobalTransform()[3];
viewData.Near = 25.0;
viewData.Far = -25.0;
viewData.Near = 0;
viewData.Far = 0;
GPUResources::Get().AddCamera(view.CameraID, viewData);
}
}
@@ -850,8 +850,11 @@ void VkSceneRenderer::BuildMatrixBuffer()
light.type = lightComp.Type;
light.color = Vector4(lightComp.Color * lightComp.Strength, 1.0);
light.castShadow = lightComp.CastShadows;
light.transformId = GPUResources::Get().GetBindlessCameraID(lightComp.m_LightViews[0].CameraID);
light.shadowMapTextureId = GPUResources::Get().GetBindlessTextureID(lightComp.LightMapID);
for (int i = 0; i < CSM_AMOUNT; i++)
{
light.transformId[i] = GPUResources::Get().GetBindlessCameraID(lightComp.m_LightViews[i].CameraID);
light.shadowMapTextureId[i] = GPUResources::Get().GetBindlessTextureID(lightComp.LightMapID);
}
allLights[currentIndex] = light;
@@ -862,6 +865,12 @@ void VkSceneRenderer::BuildMatrixBuffer()
MaterialDataContainer = MaterialData{ allMaterials };
LightDataContainerArray = LightDataContainer{ allLights };
shadingPushConstant.LightCount = currentIndex;
// Copy CSM split depths
for (int i = 0; i < CSM_AMOUNT; i++)
{
shadingPushConstant.CascadeSplits[i] = LightComponent::mCascadeSplitDepth[i];
}
}
void VkSceneRenderer::UpdateTransformBuffer()

6
Nuake/src/Rendering/Vulkan/VulkanSceneRenderer.h
View File

@@ -34,6 +34,7 @@ namespace Nuake
int MaterialTextureID;
int LightCount;
int CameraID;
float CascadeSplits[4];
};
struct ModelData
@@ -75,8 +76,9 @@ namespace Nuake
float outerConeAngle;
float innerConeAngle;
bool castShadow;
int shadowMapTextureId;
int transformId;
int shadowMapTextureId[4];
int transformId[4];
float pad[2];
};
struct LightDataContainer

1
Nuake/src/Scene/Components/LightComponent.cpp
View File

@@ -9,6 +9,7 @@
namespace Nuake
{
float LightComponent::mCascadeSplitDepth[CSM_AMOUNT];
LightComponent::LightComponent() :
Color(1, 1, 1),
Strength(10.0f),

4
Nuake/src/Scene/Components/LightComponent.h
View File

@@ -47,7 +47,7 @@ namespace Nuake
Ref<FrameBuffer> m_Framebuffers[CSM_AMOUNT];
Matrix4 mViewProjections[CSM_AMOUNT];
std::vector<LightView> m_LightViews;
float mCascadeSplitDepth[CSM_AMOUNT];
static float mCascadeSplitDepth[CSM_AMOUNT];
float mCascadeSplits[CSM_AMOUNT];
public:
@@ -223,7 +223,7 @@ namespace Nuake
bool Deserialize(const json& j)
{
if (j.contains("Type"))
Type = (LightType)j["Type"];
Type = static_cast<LightType>(j["Type"]);
if (j.contains("IsVolumetric"))
IsVolumetric = j["IsVolumetric"];
if (j.contains("Color"))