OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Move monte carlo math functions to its own file

Browse source
This commit is contained in:
Magnus Norddahl 2024-02-26 16:21:04 +01:00
commit a831fdb027
4 changed files with 35 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

30
wadsrc/static/shaders/lightmap/montecarlo.glsl Normal file
View file

@ -0,0 +1,30 @@
float RadicalInverse_VdC(uint bits)
{
bits = (bits << 16u) | (bits >> 16u);
bits = ((bits & 0x55555555u) << 1u) | ((bits & 0xAAAAAAAAu) >> 1u);
bits = ((bits & 0x33333333u) << 2u) | ((bits & 0xCCCCCCCCu) >> 2u);
bits = ((bits & 0x0F0F0F0Fu) << 4u) | ((bits & 0xF0F0F0F0u) >> 4u);
bits = ((bits & 0x00FF00FFu) << 8u) | ((bits & 0xFF00FF00u) >> 8u);
return float(bits) * 2.3283064365386963e-10f; // / 0x100000000
}
vec2 Hammersley(uint i, uint N)
{
return vec2(float(i) / float(N), RadicalInverse_VdC(i));
}
vec2 getVogelDiskSample(int sampleIndex, int sampleCount, float phi)
{
const float goldenAngle = radians(180.0) * (3.0 - sqrt(5.0));
float sampleIndexF = float(sampleIndex);
float sampleCountF = float(sampleCount);
float r = sqrt((sampleIndexF + 0.5) / sampleCountF); // Assuming index and count are positive
float theta = sampleIndexF * goldenAngle + phi;
float sine = sin(theta);
float cosine = cos(theta);
return vec2(cosine, sine) * r;
}

18
wadsrc/static/shaders/lightmap/trace_ambient_occlusion.glsl
View file

@ -1,6 +1,5 @@
vec2 Hammersley(uint i, uint N);
float RadicalInverse_VdC(uint bits);
#include <shaders/lightmap/montecarlo.glsl>
float TraceAORay(vec3 origin, float tmin, vec3 dir, float tmax);
@ -58,18 +57,3 @@ float TraceAORay(vec3 origin, float tmin, vec3 dir, float tmax)
}
return tmax;
}
vec2 Hammersley(uint i, uint N)
{
return vec2(float(i) / float(N), RadicalInverse_VdC(i));
}
float RadicalInverse_VdC(uint bits)
{
bits = (bits << 16u) | (bits >> 16u);
bits = ((bits & 0x55555555u) << 1u) | ((bits & 0xAAAAAAAAu) >> 1u);
bits = ((bits & 0x33333333u) << 2u) | ((bits & 0xCCCCCCCCu) >> 2u);
bits = ((bits & 0x0F0F0F0Fu) << 4u) | ((bits & 0xF0F0F0F0u) >> 4u);
bits = ((bits & 0x00FF00FFu) << 8u) | ((bits & 0xFF00FF00u) >> 8u);
return float(bits) * 2.3283064365386963e-10f; // / 0x100000000
}

18
wadsrc/static/shaders/lightmap/trace_light.glsl
View file

@ -1,6 +1,7 @@
#include <shaders/lightmap/montecarlo.glsl>
vec4 TracePointLightRay(vec3 origin, vec3 lightpos, float tmin, vec4 rayColor);
vec2 getVogelDiskSample(int sampleIndex, int sampleCount, float phi);
vec3 TraceLight(vec3 origin, vec3 normal, LightInfo light, int surfaceIndex)
{
@ -86,18 +87,3 @@ vec4 TracePointLightRay(vec3 origin, vec3 lightpos, float tmin, vec4 rayColor)
}
return vec4(0.0);
}
vec2 getVogelDiskSample(int sampleIndex, int sampleCount, float phi)
{
const float goldenAngle = radians(180.0) * (3.0 - sqrt(5.0));
float sampleIndexF = float(sampleIndex);
float sampleCountF = float(sampleCount);
float r = sqrt((sampleIndexF + 0.5) / sampleCountF); // Assuming index and count are positive
float theta = sampleIndexF * goldenAngle + phi;
float sine = sin(theta);
float cosine = cos(theta);
return vec2(cosine, sine) * r;
}

3
wadsrc/static/shaders/lightmap/trace_sunlight.glsl
View file

@ -1,5 +1,6 @@
vec2 getVogelDiskSample(int sampleIndex, int sampleCount, float phi);
#include <shaders/lightmap/montecarlo.glsl>
vec4 TraceSunRay(vec3 origin, float tmin, vec3 dir, float tmax, vec4 rayColor);
vec3 TraceSunLight(vec3 origin, vec3 normal, int surfaceIndex)