WIP

hoffstadt · hoffstadt · commit 28f7d17015c3 · 2025-01-15T21:56:26.000-06:00
diff --git a/extensions/pl_ecs_ext.c b/extensions/pl_ecs_ext.c
@@ -593,7 +593,7 @@ pl_ecs_add_component(plComponentLibrary* ptLibrary, plComponentType tType, plEnt
         ptManager->pComponents = sbComponents;
         sbComponents[uComponentIndex] = (plMaterialComponent){
             .tBlendMode            = PL_BLEND_MODE_OPAQUE,
-            .tFlags                = PL_MATERIAL_FLAG_NONE,
+            .tFlags                = PL_MATERIAL_FLAG_CAST_SHADOW | PL_MATERIAL_FLAG_CAST_RECEIVE_SHADOW,
             .tShaderType           = PL_SHADER_TYPE_PBR,
             .tBaseColor            = {1.0f, 1.0f, 1.0f, 1.0f},
             .tEmissiveColor        = {0.0f, 0.0f, 0.0f, 0.0f},
diff --git a/extensions/pl_ecs_ext.h b/extensions/pl_ecs_ext.h
@@ -221,9 +221,11 @@ enum _plShaderType
 
 enum _plMaterialFlags
 {
-    PL_MATERIAL_FLAG_NONE         = 0,
-    PL_MATERIAL_FLAG_DOUBLE_SIDED = 1 << 0,
-    PL_MATERIAL_FLAG_OUTLINE      = 1 << 1,
+    PL_MATERIAL_FLAG_NONE                = 0,
+    PL_MATERIAL_FLAG_DOUBLE_SIDED        = 1 << 0,
+    PL_MATERIAL_FLAG_OUTLINE             = 1 << 1,
+    PL_MATERIAL_FLAG_CAST_SHADOW         = 1 << 2,
+    PL_MATERIAL_FLAG_CAST_RECEIVE_SHADOW = 1 << 3
 };
 
 enum _plBlendMode
diff --git a/extensions/pl_graphics_vulkan.c b/extensions/pl_graphics_vulkan.c
@@ -1293,7 +1293,6 @@ pl_create_shader(plDevice* ptDevice, const plShaderDesc* ptDescription)
     plShaderHandle tHandle = pl__get_new_shader_handle(ptDevice);
     plShader* ptShader = pl__get_shader(ptDevice, tHandle);
     ptShader->tDesc = *ptDescription;
-    
     uint32_t uStageCount = 1;
 
     plVulkanShader* ptVulkanShader = &ptDevice->sbtShadersHot[tHandle.uIndex];
diff --git a/extensions/pl_renderer_ext.c b/extensions/pl_renderer_ext.c
diff --git a/extensions/pl_renderer_internal.c b/extensions/pl_renderer_internal.c
diff --git a/extensions/pl_renderer_internal.h b/extensions/pl_renderer_internal.h
@@ -255,8 +255,8 @@ typedef struct _plEnvironmentProbeData
     plBufferHandle atGlobalBuffers[PL_MAX_FRAMES_IN_FLIGHT];
 
     // submitted drawables
-    plDrawable* sbtVisibleOpaqueDrawables;
-    plDrawable* sbtVisibleTransparentDrawables;
+    plDrawable* sbtVisibleOpaqueDrawables[6];
+    plDrawable* sbtVisibleTransparentDrawables[6];
 
     // shadows
     plDirectionLightShadowData tDirectionLightShadowData;
@@ -373,8 +373,11 @@ typedef struct _plRefScene
     // drawables (per scene, will be culled by views)
     plDrawable* sbtDeferredDrawables;
     plDrawable* sbtForwardDrawables;
+    uint32_t*   sbuShadowDeferredDrawables;
+    uint32_t*   sbuShadowForwardDrawables;
     plDrawable* sbtOutlineDrawables;
     plShaderHandle* sbtOutlineDrawablesOldShaders;
+    plShaderHandle* sbtOutlineDrawablesOldEnvShaders;
 
     // entity to drawable hashmaps
     plHashMap* ptDeferredHashmap;
@@ -513,6 +516,7 @@ typedef struct _plRefRendererData
     bool     bShowSelectedBoundingBox;
     bool     bMultiViewportShadows;
     bool     bImageBasedLighting;
+    bool     bPunctualLighting;
     float    fShadowConstantDepthBias;
     float    fShadowSlopeDepthBias;
     uint32_t uOutlineWidth;
@@ -556,7 +560,8 @@ enum _plMaterialInfoFlags
 enum _plRenderingFlags
 {
     PL_RENDERING_FLAG_USE_PUNCTUAL = 1 << 0,
-    PL_RENDERING_FLAG_USE_IBL      = 1 << 1
+    PL_RENDERING_FLAG_USE_IBL      = 1 << 1,
+    PL_RENDERING_FLAG_SHADOWS      = 1 << 2
 };
 
 //-----------------------------------------------------------------------------
diff --git a/sandbox/app.c b/sandbox/app.c
@@ -207,7 +207,7 @@ pl_app_load(plApiRegistryI* ptApiRegistry, plEditorData* ptEditorData)
 
     ptEditorData->tPointLight = gptEcs->create_point_light(ptMainComponentLibrary, "point light", (plVec3){0.0f, 2.0f, 2.0f}, &ptLight);
     ptLight->uShadowResolution = 1024;
-    // ptLight->tFlags |= PL_LIGHT_FLAG_CAST_SHADOW | PL_LIGHT_FLAG_VISUALIZER;
+    ptLight->tFlags |= PL_LIGHT_FLAG_CAST_SHADOW;
     plTransformComponent* ptPLightTransform = gptEcs->add_component(ptMainComponentLibrary, PL_COMPONENT_TYPE_TRANSFORM, ptEditorData->tPointLight);
     ptPLightTransform->tTranslation = (plVec3){0.0f, 1.497f, 2.0f};
 
@@ -216,21 +216,18 @@ pl_app_load(plApiRegistryI* ptApiRegistry, plEditorData* ptEditorData)
     ptLight->fRange = 5.0f;
     ptLight->fRadius = 0.025f;
     ptLight->fIntensity = 20.0f;
-    // ptLight->tFlags |= PL_LIGHT_FLAG_CAST_SHADOW | PL_LIGHT_FLAG_VISUALIZER;
+    ptLight->tFlags |= PL_LIGHT_FLAG_CAST_SHADOW | PL_LIGHT_FLAG_VISUALIZER;
     plTransformComponent* ptSLightTransform = gptEcs->add_component(ptMainComponentLibrary, PL_COMPONENT_TYPE_TRANSFORM, ptEditorData->tSpotLight);
     ptSLightTransform->tTranslation = (plVec3){0.0f, 4.0f, 0.0f};
 
     plEnvironmentProbeComponent* ptProbe = NULL;
-    plEntity tProbe = gptEcs->create_environment_probe(ptMainComponentLibrary, "Main Probe", (plVec3){0.0f, 2.0f, 0.0f}, &ptProbe);
-    ptProbe->fRange = 10.0f;
+    gptEcs->create_environment_probe(ptMainComponentLibrary, "Main Probe", (plVec3){0.0f, 2.0f, 2.0f}, &ptProbe);
+    ptProbe->fRange = 30.0f;
     ptProbe->uResolution = 128;
-    plTransformComponent* ptProbeTransform = gptEcs->add_component(ptMainComponentLibrary, PL_COMPONENT_TYPE_TRANSFORM, tProbe);
-    ptProbeTransform->tTranslation = (plVec3){0.0f, 2.0f, 0.0f};
-
+    ptProbe->tFlags = PL_ENVIRONMENT_PROBE_FLAGS_REALTIME;
 
     // load models
 
-
     // plTransformComponent* ptTargetTransform = NULL;
     // ptEditorData->tTrackPoint = gptEcs->create_transform(ptMainComponentLibrary, "track 0", &ptTargetTransform);
     // ptTargetTransform->tTranslation = (plVec3){0.1f, 0.017f};
diff --git a/sandbox/pl_ecs_tools.c b/sandbox/pl_ecs_tools.c
@@ -123,6 +123,7 @@ pl_show_ecs_window(plEntity* ptSelectedEntity, plComponentLibrary* ptLibrary, bo
                     {
                         ptProbeComp->tFlags |= PL_ENVIRONMENT_PROBE_FLAGS_DIRTY;
                     }
+                    gptUi->input_float("Range:", &ptProbeComp->fRange, NULL, 0);
                     gptUi->end_collapsing_header();
                 }
 
diff --git a/shaders/defines.glsl b/shaders/defines.glsl
@@ -33,6 +33,7 @@ const int PL_MATERIAL_METALLICROUGHNESS = 1 << 0;
 // iRenderingFlags
 const int PL_RENDERING_FLAG_USE_PUNCTUAL = 1 << 0;
 const int PL_RENDERING_FLAG_USE_IBL      = 1 << 1;
+const int PL_RENDERING_FLAG_SHADOWS      = 1 << 2;
 
 // lights
 const int PL_LIGHT_TYPE_DIRECTIONAL = 0;
diff --git a/shaders/filter_environment.comp b/shaders/filter_environment.comp
@@ -56,7 +56,7 @@ vec3 sampleCube(vec3 v)
 	{
 		faceIndex = v.y < 0.0 ? 5 : 4;
 		ma = 0.5 / vAbs.y;
-		uv = vec2(v.x, v.y < 0.0 ? -v.z : v.z);
+		uv = vec2(-v.x, v.y < 0.0 ? v.z : -v.z);
 	}
 	else
 	{
diff --git a/shaders/lighting.frag b/shaders/lighting.frag
@@ -404,7 +404,6 @@ void main()
     // clipSpace.y += tGlobalInfo.tViewportInfo.y;
     vec4 homoLocation = inverse(tGlobalInfo.tCameraProjection) * vec4(clipSpace, 1.0);
 
-
     // vec4 tWorldPosition0 = subpassLoad(tPositionSampler);
     vec4 tViewPosition = homoLocation;
     tViewPosition.xyz = tViewPosition.xyz / tViewPosition.w;
@@ -417,7 +416,6 @@ void main()
 
     const vec3 f90 = vec3(1.0);
     
-
     // LIGHTING
     vec3 f_specular = vec3(0.0);
     vec3 f_diffuse = vec3(0.0);
diff --git a/shaders/transparent.frag b/shaders/transparent.frag
@@ -585,6 +585,7 @@ void main()
     f_specular = vec3(0.0);
 
     uint cascadeIndex = 0;
+    const bool bShadows = bool(iRenderingFlags & PL_RENDERING_FLAG_SHADOWS);
     if(bool(iRenderingFlags & PL_RENDERING_FLAG_USE_PUNCTUAL))
     {
         for(int i = 0; i < iDirectionLightCount; i++)
@@ -594,7 +595,7 @@ void main()
             vec3 pointToLight = -tLightData.tDirection;
             float shadow = 1.0;
 
-            if(tLightData.iCastShadow > 0)
+            if(bShadows && tLightData.iCastShadow > 0)
             {
                 plLightShadowData tShadowData = tDShadowData.atData[tLightData.iShadowIndex];
 
@@ -648,7 +649,7 @@ void main()
 
             float shadow = 1.0;
 
-            if(tLightData.iCastShadow > 0)
+            if(bShadows && tLightData.iCastShadow > 0)
             {
                 plLightShadowData tShadowData = tSShadowData.atData[tLightData.iShadowIndex];
 
@@ -695,7 +696,7 @@ void main()
             vec3 pointToLight = tLightData.tPosition - tShaderIn.tPosition.xyz;
             float shadow = 1.0;
 
-            if(tLightData.iCastShadow > 0)
+            if(bShadows && tLightData.iCastShadow > 0)
             {
                 plLightShadowData tShadowData = tPShadowData.atData[tLightData.iShadowIndex];
 

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,7 @@ pl_show_ecs_window(plEntity* ptSelectedEntity, plComponentLibrary* ptLibrary, bo`
`123`	`123`	`{`
`124`	`124`	`ptProbeComp->tFlags \|= PL_ENVIRONMENT_PROBE_FLAGS_DIRTY;`
`125`	`125`	`}`
	`126`	`+ gptUi->input_float("Range:", &ptProbeComp->fRange, NULL, 0);`
`126`	`127`	`gptUi->end_collapsing_header();`
`127`	`128`	`}`
`128`	`129`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ vec3 sampleCube(vec3 v)`
`56`	`56`	`{`
`57`	`57`	`faceIndex = v.y < 0.0 ? 5 : 4;`
`58`	`58`	`ma = 0.5 / vAbs.y;`
`59`		`- uv = vec2(v.x, v.y < 0.0 ? -v.z : v.z);`
	`59`	`+ uv = vec2(-v.x, v.y < 0.0 ? v.z : -v.z);`
`60`	`60`	`}`
`61`	`61`	`else`
`62`	`62`	`{`