edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Improve pathtracer

Browse Source
This commit is contained in:
luboslenco
2023-07-24 15:33:24 +02:00
parent 307b75929d
commit e308c8a1f4
7 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/Shaders/raytrace/raytrace_brute_core.cso
BIN
View File
Binary file not shown.
base/Shaders/raytrace/raytrace_brute_core.metal
+13 -4
View File
@@ -3,11 +3,11 @@
#define _EMISSION
#define _SUBSURFACE
#define _TRANSLUCENCY
#define _FRESNEL
#define _ROULETTE
#define _TRANSPARENCY
#endif
#define _FRESNEL
#define _RENDER
// #define _ROULETTE
// #define _TRANSPARENCY
using namespace metal;
using namespace raytracing;
@@ -282,7 +282,7 @@ kernel void raytracingKernel(
#endif
#ifdef _FRESNEL
float specularChance = fresnel(ray.direction, n);
float specularChance = fresnel(n, ray.direction);
#else
const float specularChance = 0.5;
#endif
@@ -299,11 +299,20 @@ kernel void raytracingKernel(
float dotNV = max(dot(n, v), 0.0);
float3 specular = surfaceSpecular(texcolor, texpaint2.b);
payload.color.xyz *= envBRDFApprox(specular, texpaint2.g, dotNV);
#ifdef _FRESNEL
payload.color.xyz /= specularChance;
#endif
}
else {
payload.ray_dir = diffuseDir;
payload.color.xyz *= surfaceAlbedo(texcolor, texpaint2.b);
#ifdef _FRESNEL
payload.color.xyz /= 1.0 - specularChance;
#endif
}
#ifdef _FRESNEL
payload.color.xyz *= 0.5;
#endif
payload.ray_origin = hit_world_position(ray, intersection) + payload.ray_dir * 0.0001f;
base/Shaders/raytrace/raytrace_brute_core.spirv
BIN
View File
Binary file not shown.
base/Shaders/raytrace/raytrace_brute_full.cso
BIN
View File
Binary file not shown.
base/Shaders/raytrace/raytrace_brute_full.metal
+13 -4
View File
@@ -4,11 +4,11 @@
#define _EMISSION
#define _SUBSURFACE
#define _TRANSLUCENCY
#define _FRESNEL
#define _ROULETTE
#define _TRANSPARENCY
#endif
#define _FRESNEL
#define _RENDER
// #define _ROULETTE
// #define _TRANSPARENCY
using namespace metal;
using namespace raytracing;
@@ -283,7 +283,7 @@ kernel void raytracingKernel(
#endif
#ifdef _FRESNEL
float specularChance = fresnel(ray.direction, n);
float specularChance = fresnel(n, ray.direction);
#else
const float specularChance = 0.5;
#endif
@@ -300,11 +300,20 @@ kernel void raytracingKernel(
float dotNV = max(dot(n, v), 0.0);
float3 specular = surfaceSpecular(texcolor, texpaint2.b);
payload.color.xyz *= envBRDFApprox(specular, texpaint2.g, dotNV);
#ifdef _FRESNEL
payload.color.xyz /= specularChance;
#endif
}
else {
payload.ray_dir = diffuseDir;
payload.color.xyz *= surfaceAlbedo(texcolor, texpaint2.b);
#ifdef _FRESNEL
payload.color.xyz /= 1.0 - specularChance;
#endif
}
#ifdef _FRESNEL
payload.color.xyz *= 0.5;
#endif
payload.ray_origin = hit_world_position(ray, intersection) + payload.ray_dir * 0.0001f;
base/Shaders/raytrace/raytrace_brute_full.spirv
BIN
View File
Binary file not shown.
base/Shaders/raytrace/src/raytrace_brute.hlsl
+13 -4
View File
@@ -3,11 +3,11 @@
#define _EMISSION
#define _SUBSURFACE
#define _TRANSLUCENCY
#define _FRESNEL
#define _ROULETTE
#define _TRANSPARENCY
#endif
#define _FRESNEL
// #define _RENDER
// #define _ROULETTE
// #define _TRANSPARENCY
#include "std/rand.hlsl"
#include "std/attrib.hlsl"
@@ -211,7 +211,7 @@ void closesthit(inout RayPayload payload, in BuiltInTriangleIntersectionAttribut
#endif
#ifdef _FRESNEL
float specularChance = fresnel(WorldRayDirection(), n);
float specularChance = fresnel(n, WorldRayDirection());
#else
const float specularChance = 0.5;
#endif
@@ -228,11 +228,20 @@ void closesthit(inout RayPayload payload, in BuiltInTriangleIntersectionAttribut
float dotNV = max(dot(n, v), 0.0);
float3 specular = surfaceSpecular(texcolor, texpaint2.b);
payload.color.xyz *= envBRDFApprox(specular, texpaint2.g, dotNV);
#ifdef _FRESNEL
payload.color.xyz /= specularChance;
#endif
}
else {
payload.ray_dir = diffuseDir;
payload.color.xyz *= surfaceAlbedo(texcolor, texpaint2.b);
#ifdef _FRESNEL
payload.color.xyz /= 1.0 - specularChance;
#endif
}
#ifdef _FRESNEL
payload.color.xyz *= 0.5;
#endif
payload.ray_origin = hit_world_position() + payload.ray_dir * 0.0001f;