WIP

Author: hoffstadt

editor/app.c

@@ -438,6 +438,24 @@ pl_app_load(plApiRegistryI* ptApiRegistry, plAppData* ptAppData)
     plTransformComponent* ptSecondaryCameraTransform = (plTransformComponent* )gptEcs->add_component(ptAppData->ptComponentLibrary, gptEcs->get_ecs_type_key_transform(), ptAppData->tSecondaryCamera);
     ptSecondaryCameraTransform->tTranslation = pl_create_vec3(-4.012f, 2.984f, -1.109f);
 
+    plEnvironmentProbeComponent* ptProbe = NULL;
+    plVec3 atProbeLocations[] = {
+        pl_create_vec3(0.0f, 3.0f, 0.0f),
+        // pl_create_vec3(-8.7f, 1.5f, 0.0f),
+        // pl_create_vec3(8.8f, 1.5f, 0.0f),
+    };
+
+    for(uint32_t i = 0; i < PL_ARRAYSIZE(atProbeLocations); i++)
+    {
+        plEntity tProbeEntity = gptRenderer->create_environment_probe(ptAppData->ptComponentLibrary, "Probe", atProbeLocations[i], &ptProbe);
+        ptProbe->fRange = 30.0f;
+        ptProbe->uResolution = 128;
+        ptProbe->uSamples = 1024;
+        ptProbe->uInterval = 6;
+        ptProbe->tFlags |= PL_ENVIRONMENT_PROBE_FLAGS_INCLUDE_SKY;
+        gptRenderer->add_probe_to_scene(ptAppData->ptScene, tProbeEntity);
+    }
+
     // create lights
     plLightComponent* ptLight = NULL;
     // plEntity tDirectionLight = gptRenderer->create_directional_light(ptAppData->ptComponentLibrary, "direction light", pl_create_vec3(0.425f, -1.0f, -0.384f), &ptLight);
@@ -453,7 +471,7 @@ pl_app_load(plApiRegistryI* ptApiRegistry, plAppData* ptAppData)
     plEntity tPointLight = gptRenderer->create_point_light(ptAppData->ptComponentLibrary, "point light", pl_create_vec3(9.316f, 1.497f, -1.042f), &ptLight);
     ptLight->uShadowResolution = 512;
     ptLight->tColor = (plVec3){0.0f, 1.0f, 0.0f};
-    ptLight->tFlags |= PL_LIGHT_FLAG_CAST_SHADOW | PL_LIGHT_FLAG_VISUALIZER;
+    // ptLight->tFlags |= PL_LIGHT_FLAG_CAST_SHADOW | PL_LIGHT_FLAG_VISUALIZER;
     plTransformComponent* ptPLightTransform = (plTransformComponent* )gptEcs->add_component(ptAppData->ptComponentLibrary, gptEcs->get_ecs_type_key_transform(), tPointLight);
     ptPLightTransform->tTranslation = pl_create_vec3(9.316f, 1.497f, -1.042f);
 
@@ -463,7 +481,7 @@ pl_app_load(plApiRegistryI* ptApiRegistry, plAppData* ptAppData)
     ptLight->fRange = 10.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 = (plTransformComponent* )gptEcs->add_component(ptAppData->ptComponentLibrary, gptEcs->get_ecs_type_key_transform(), tSpotLight);
     ptSLightTransform->tTranslation = pl_create_vec3(0.0f, 3.27f, -1.5f);
 
@@ -504,23 +522,7 @@ pl_app_load(plApiRegistryI* ptApiRegistry, plAppData* ptAppData)
     // gptRenderer->add_materials_to_scene(ptAppData->ptScene, uMaterialCount, ptMaterialEntities);
 
 
-    plEnvironmentProbeComponent* ptProbe = NULL;
-    plVec3 atProbeLocations[] = {
-        pl_create_vec3(0.0f, 3.0f, 0.0f),
-        // pl_create_vec3(-8.7f, 1.5f, 0.0f),
-        // pl_create_vec3(8.8f, 1.5f, 0.0f),
-    };
 
-    for(uint32_t i = 0; i < PL_ARRAYSIZE(atProbeLocations); i++)
-    {
-        plEntity tProbeEntity = gptRenderer->create_environment_probe(ptAppData->ptComponentLibrary, "Probe", atProbeLocations[i], &ptProbe);
-        ptProbe->fRange = 30.0f;
-        ptProbe->uResolution = 128;
-        ptProbe->uSamples = 1024;
-        ptProbe->uInterval = 6;
-        ptProbe->tFlags |= PL_ENVIRONMENT_PROBE_FLAGS_INCLUDE_SKY;
-        gptRenderer->add_probe_to_scene(ptAppData->ptScene, tProbeEntity);
-    }
 
     bool bResult0 = gptRenderer->add_drawable_objects_to_scene(ptAppData->ptScene, tLoaderData0.uObjectCount, tLoaderData0.atObjects);
     bool bResult1 = gptRenderer->add_drawable_objects_to_scene(ptAppData->ptScene, tLoaderData1.uObjectCount, tLoaderData1.atObjects);

extensions/pl_renderer_ext.c

@@ -3680,7 +3680,7 @@ pl_renderer_render_view(plView* ptView, plCamera* ptCamera, plCamera* ptCullCame
     plDeferredLightingPassInfo tDeferredLightingPassInfo = {
         .tBG2 = ptView->tLightingBindGroup,
         .ptArea = &tArea,
-        .uView  = ptView->uIndex,
+        // .uView  = ptView->uIndex,
         .uProbe = 0
     };
 

extensions/pl_renderer_internal.c

@@ -2604,7 +2604,7 @@ pl__renderer_create_probe_data(plScene* ptScene, plEntity tProbeHandle)
         {
             { .uSlot = 0, .tBuffer = tProbeData.atViewBuffers[i],            .szBufferRange = sizeof(plGpuViewData) },
             { .uSlot = 1, .tBuffer = tProbeData.atView2Buffers[i],           .szBufferRange = sizeof(plGpuViewData) * 6 },
-            { .uSlot = 2, .tBuffer = ptScene->atLightBuffer[i],            .szBufferRange = sizeof(plGpuLight) * pl_sb_size(ptScene->sbtLightData)},
+            { .uSlot = 2, .tBuffer = ptScene->atLightBuffer[i],            .szBufferRange = gptGfx->get_buffer(gptData->ptDevice, ptScene->atLightBuffer[i])->tDesc.szByteSize},
             { .uSlot = 3, .tBuffer = ptScene->atDLightShadowDataBuffer[i], .szBufferRange = gptGfx->get_buffer(gptData->ptDevice, ptScene->atDLightShadowDataBuffer[i])->tDesc.szByteSize},
             { .uSlot = 4, .tBuffer = ptScene->atLightShadowDataBuffer[i],  .szBufferRange = sizeof(plGpuLightShadow) * pl_sb_size(ptScene->sbtLightShadowData)},
             { .uSlot = 5, .tBuffer = ptScene->atGPUProbeDataBuffers[i],    .szBufferRange = sizeof(plGpuProbe) * pl_sb_size(ptScene->sbtGPUProbeData)},
@@ -3264,6 +3264,7 @@ pl__render_view_deferred_lighting_pass(plScene* ptScene, plRenderEncoder* ptScen
         plDynamicBinding tLightingDynamicData = pl__allocate_dynamic_data(ptDevice);
         plGpuDynDeferredLighting* ptLightingDynamicData = (plGpuDynDeferredLighting*)tLightingDynamicData.pcData;
         ptLightingDynamicData->uGlobalIndex = ptInfo->uView;
+        // ptLightingDynamicData->uGlobalIndex = 0;
         ptLightingDynamicData->iLightIndex = (int)uLightIndex;
         gptGfx->reset_draw_stream(ptStream, 1);
         if(ptScene->sbtLightData[uLightIndex].iType == PL_LIGHT_TYPE_DIRECTIONAL)