Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop_mirrors' into realtime_shader_reloading

Browse source
This commit is contained in:
Lwmte 2024-12-24 01:49:18 +01:00
commit 63539e4f98
3 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TombEngine/Game/collision/floordata.cpp
View file

@ -546,7 +546,7 @@ namespace TEN::Collision::Floordata
// For bridges with zero thickness (which is incorrect setup, but still possible), break out of // For bridges with zero thickness (which is incorrect setup, but still possible), break out of
// infinite loop caused by infinite traversal over the same height value. // infinite loop caused by infinite traversal over the same height value.
int nextPos = sector->GetBridgeSurfaceHeight(pos, !isBottom); int nextPos = sector->GetBridgeSurfaceHeight(pos, !isBottom);
if (nextPos = pos.y) if (nextPos == pos.y)
nextPos += (isBottom ? 1 : -1); nextPos += (isBottom ? 1 : -1);
// Set vertical position to lowest bridge ceiling height or highest bridge floor height. // Set vertical position to lowest bridge ceiling height or highest bridge floor height.

6
TombEngine/Renderer/RendererDraw.cpp
View file

@ -209,6 +209,12 @@ namespace TEN::Renderer
for (int k = 0; k < obj.ObjectMeshes.size(); k++) for (int k = 0; k < obj.ObjectMeshes.size(); k++)
{ {
if (item->MeshIds.size() <= k)
{
TENLog("Mesh structure was not properly initialized for object " + GetObjectName((GAME_OBJECT_ID)item->ObjectID));
break;
}
auto* mesh = GetMesh(item->MeshIds[k]); auto* mesh = GetMesh(item->MeshIds[k]);
for (auto& bucket : mesh->Buckets) for (auto& bucket : mesh->Buckets)

29
TombEngine/Shaders/Shadows.hlsli
View file

@ -2,8 +2,9 @@
#include "./Math.hlsli" #include "./Math.hlsli"
#include "./ShaderLight.hlsli" #include "./ShaderLight.hlsli"
#define SHADOW_INTENSITY (0.55f) #define SHADOW_INTENSITY (0.5f)
#define INV_SHADOW_INTENSITY (1.0f - SHADOW_INTENSITY) #define SHADOW_BLUR_MIN (2.0f)
#define SHADOW_BLUR_MAX (8.0f)
struct Sphere struct Sphere
{ {
@ -102,6 +103,11 @@ float3 DoShadow(float3 worldPos, float3 normal, float3 lighting, float bias)
float ndot = dot(normal, dir); float ndot = dot(normal, dir);
float facingFactor = saturate((ndot - bias) / (1.0f - bias + EPSILON)); float facingFactor = saturate((ndot - bias) / (1.0f - bias + EPSILON));
// Calculate distance-based blur factor with non-linear progression
float distanceToLight = length(Light.Position - worldPos);
float blurFactor = pow(saturate(distanceToLight / Light.Out), 2.0f);
float kernelSize = lerp(SHADOW_BLUR_MIN, SHADOW_BLUR_MAX, blurFactor);
[unroll] [unroll]
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
@ -119,18 +125,19 @@ float3 DoShadow(float3 worldPos, float3 normal, float3 lighting, float bias)
lightClipSpace.y = lightClipSpace.y / -2 + 0.5; lightClipSpace.y = lightClipSpace.y / -2 + 0.5;
float sum = 0; float sum = 0;
float x, y; float samples = 0;
// Perform PCF filtering on a 4 x 4 texel neighborhood. // Perform basic PCF filtering with distance-based kernel size
for (y = -1.5; y <= 1.5; y += 1.0) for (float y = -kernelSize; y <= kernelSize; y += 1.0)
{ {
for (x = -1.5; x <= 1.5; x += 1.0) for (float x = -kernelSize; x <= kernelSize; x += 1.0)
{ {
sum += ShadowMap.SampleCmpLevelZero(ShadowMapSampler, float3(lightClipSpace.xy + TexOffset(x, y), i), lightClipSpace.z); sum += ShadowMap.SampleCmpLevelZero(ShadowMapSampler, float3(lightClipSpace.xy + TexOffset(x, y), i), lightClipSpace.z);
samples += 1.0;
} }
} }
shadowFactor = lerp(shadowFactor, sum / 16.0, facingFactor * insideLightBounds); shadowFactor = lerp(shadowFactor, sum / samples, facingFactor * insideLightBounds);
} }
} }
@ -138,11 +145,11 @@ float3 DoShadow(float3 worldPos, float3 normal, float3 lighting, float bias)
float isSpot = step(0.5f, Light.Type == LT_SPOT); // 1.0 if LT_SPOT, 0.0 otherwise float isSpot = step(0.5f, Light.Type == LT_SPOT); // 1.0 if LT_SPOT, 0.0 otherwise
float isOther = 1.0 - (isPoint + isSpot); // 1.0 if neither LT_POINT nor LT_SPOT float isOther = 1.0 - (isPoint + isSpot); // 1.0 if neither LT_POINT nor LT_SPOT
float pointFactor = 1.0f - Luma(DoPointLight(worldPos, normal, Light)); float pointFactor = Luma(DoPointLight(worldPos, normal, Light));
float spotFactor = 1.0f - Luma(DoSpotLight(worldPos, normal, Light)); float spotFactor = Luma(DoSpotLight(worldPos, normal, Light));
float3 pointShadow = lighting * saturate((shadowFactor + SHADOW_INTENSITY) + (pow(pointFactor, 4) * INV_SHADOW_INTENSITY)); float3 pointShadow = lighting * (1.0f - (1.0f - shadowFactor) * SHADOW_INTENSITY * pointFactor);
float3 spotShadow = lighting * saturate((shadowFactor + SHADOW_INTENSITY) + (pow(spotFactor, 4) * INV_SHADOW_INTENSITY)); float3 spotShadow = lighting * (1.0f - (1.0f - shadowFactor) * SHADOW_INTENSITY * spotFactor );
return pointShadow * isPoint + spotShadow * isSpot + lighting * isOther; return pointShadow * isPoint + spotShadow * isSpot + lighting * isOther;
} }