feat(render): SAGE water/ocean shaders, per-user logs, camera & culling
Terrain pass now ports the SAGE water model (Ocean.fx / OpenSAGE Water.frag): a de-gridded procedural wave normal combined with the retail ra3_deepocean flow and ra3_deepocean_nrm bump maps (appended as the last two terrain-atlas layers, no new backend binding), Schlick fresnel, sky reflection + depth-graded refraction, SAGE diffuse/specular lighting, depth-based transparency, and an underwater tint (UnderwaterDeferred.fx). Mirrored across terrain.frag / dx_terrain.hlsl / webgl_terrain_frag.glsl / webgpu_terrain.wgsl. Also: logs move to the per-user state dir (%LOCALAPPDATA%\\OpenRA3\\logs, else XDG) and archive as openra3.<stamp>.log; the FPS label shows the active backend; middle-drag camera reset; objects and roads below the water plane are culled.
This commit is contained in:
EnderTheCoder
+144
-39
@@ -17,6 +17,12 @@ struct TerrainUniforms {
|
||||
|
||||
const CELL: f32 = 10.0; // must match ra3::terrain::cell_size
|
||||
|
||||
// SAGE water model constants (see docs/REVERSE_ENGINEERING.md).
|
||||
const WATER_SCALE: f32 = 1.0 / 320.0;
|
||||
const WATER_TRANSPARENT_DEPTH: f32 = 10.0;
|
||||
const WATER_MIN_OPACITY: f32 = 0.70;
|
||||
const WATER_RIVER_MULTIPLIER: f32 = 1.0;
|
||||
|
||||
fn cam_uniform() -> vec4<f32> { return u.data[0]; } // x=target_x, y=target_y, z=yaw, w=height
|
||||
fn params_uniform() -> vec4<f32> { return u.data[1]; } // x=pitch, y=fov, z=water_z, w=has_water
|
||||
fn sun_uniform() -> vec4<f32> { return u.data[2]; } // xyz=sun dir, w=ambient
|
||||
@@ -100,6 +106,92 @@ fn sample_layer(layer: u32, wx: f32, wy: f32) -> vec3<f32> {
|
||||
return vec3<f32>(c.b, c.g, c.r);
|
||||
}
|
||||
|
||||
// ---- SAGE water (Ocean.fx / RiverWater.fx / Water.frag port) ----------------
|
||||
|
||||
// Sample an atlas layer by an explicit layer index (the water flow/bump maps
|
||||
// are appended as the last two layers of the tile atlas). The atlas is
|
||||
// 0xAARRGGBB, so the b/g/r swap restores RGB (as `sample_layer`).
|
||||
fn water_tex(layer: i32, uv: vec2<f32>) -> vec3<f32> {
|
||||
let lc = i32(textureNumLayers(u_atlas));
|
||||
let l = clamp(layer, 0, max(lc - 1, 0));
|
||||
let c = textureSampleLevel(u_atlas, u_atlas_samp, uv, l, 0.0);
|
||||
return vec3<f32>(c.b, c.g, c.r);
|
||||
}
|
||||
|
||||
// Scrolling wave normal on the water plane: the retail bump map (atlas's last
|
||||
// layer), offset by the flow map (second-last layer) and combined with a
|
||||
// de-gridded procedural wave so the sun glint is irregular and always moving.
|
||||
fn water_normal(world_xy: vec2<f32>, time: f32) -> vec3<f32> {
|
||||
let q = world_xy * (WATER_SCALE * 6.0);
|
||||
let a1 = q.x * 0.80 + q.y * 0.30 + time * 1.10;
|
||||
let a2 = q.y * 0.95 - q.x * 0.45 - time * 1.30;
|
||||
let a3 = (q.x + q.y) * 1.60 + time * 2.10;
|
||||
let a4 = (q.x - q.y) * 2.30 - time * 1.70;
|
||||
let dx = 0.224 * cos(a1) - 0.099 * cos(a2) + 0.256 * cos(a3) + 0.230 * cos(a4);
|
||||
let dy = 0.084 * cos(a1) + 0.209 * cos(a2) + 0.256 * cos(a3) - 0.230 * cos(a4);
|
||||
let lc = i32(textureNumLayers(u_atlas));
|
||||
let flow = water_tex(lc - 2, q - vec2<f32>(time * 0.010, time * 0.014)) * 2.0 - 1.0;
|
||||
let bump = water_tex(lc - 1, q + flow.xy * 0.05 + vec2<f32>(time * 0.006, time * 0.008)) * 2.0 - 1.0;
|
||||
let sx = -dx * 0.30 + bump.x * 0.45;
|
||||
let sy = -dy * 0.30 + bump.y * 0.45;
|
||||
return normalize(vec3<f32>(sx, sy, 1.0));
|
||||
}
|
||||
|
||||
// Water.frag distortionPower * the flow texture: a small scrolling UV offset.
|
||||
fn water_distortion(world_xy: vec2<f32>, time: f32) -> f32 {
|
||||
let q = world_xy * (WATER_SCALE * 6.0);
|
||||
return 0.05 * (sin(q.x * 0.9 + time * 0.7) + sin(q.y * 1.1 - time * 0.5));
|
||||
}
|
||||
|
||||
// Water.frag GetCloudColor: no cloud texture is bound, so a slow scroll stands in.
|
||||
fn water_cloud(world_xy: vec2<f32>, time: f32) -> vec3<f32> {
|
||||
return vec3<f32>(0.85 + 0.15 * sin((world_xy.x + world_xy.y) * 0.0007 - time * 0.05));
|
||||
}
|
||||
|
||||
// Retail UnderwaterDeferred.fx: absorbs red and fogs with distance.
|
||||
fn apply_underwater(color: vec3<f32>, distance: f32, cam_z: f32, water_z: f32) -> vec3<f32> {
|
||||
if (cam_z >= water_z - 0.5) { return color; }
|
||||
let absorb = vec3<f32>(0.35, 0.62, 0.75);
|
||||
let fog = clamp(1.0 - exp(-distance * 0.00022), 0.0, 0.9);
|
||||
return mix(color * absorb, vec3<f32>(0.02, 0.10, 0.16), fog);
|
||||
}
|
||||
|
||||
// Water.frag: fresnel-mixed sky reflection and depth-graded seabed refraction,
|
||||
// SAGE diffuse + specular lighting, cloud term, depth-based transparency fade.
|
||||
fn water_shade(hitpos: vec3<f32>, dir: vec3<f32>, distance: f32) -> vec3<f32> {
|
||||
let time = misc_uniform().x;
|
||||
let river = misc_uniform().y;
|
||||
let seabed = world_height(hitpos.x, hitpos.y);
|
||||
let depth = max(0.0, params_uniform().z - seabed);
|
||||
|
||||
let n = water_normal(hitpos.xy, time + water_distortion(hitpos.xy, time));
|
||||
let sun_dir = normalize(sun_uniform().xyz);
|
||||
|
||||
let cos_theta = clamp(dot(-dir, n), 0.0, 1.0);
|
||||
let fresnel = 0.02 + 0.98 * pow(1.0 - cos_theta, 5.0);
|
||||
|
||||
let reflection = sky_color(reflect(dir, n));
|
||||
let shallow = vec3<f32>(0.10, 0.34, 0.38);
|
||||
let deep = vec3<f32>(0.02, 0.12, 0.22);
|
||||
let refraction = mix(shallow, deep, clamp(depth / 40.0, 0.0, 1.0));
|
||||
|
||||
let ndotl = max(dot(n, sun_dir), 0.0);
|
||||
let ambient = sun_uniform().w;
|
||||
let diffuse = vec3<f32>(ambient + (1.0 - ambient) * ndotl);
|
||||
let half_v = normalize(sun_dir - dir);
|
||||
let spec = pow(max(dot(n, half_v), 0.0), 90.0);
|
||||
|
||||
var color = mix(refraction, reflection, clamp(fresnel, 0.0, 1.0)) * diffuse * water_cloud(hitpos.xy, time);
|
||||
color += vec3<f32>(1.0, 0.97, 0.9) * spec * 0.45;
|
||||
|
||||
var alpha = clamp(depth / WATER_TRANSPARENT_DEPTH, 0.0, 1.0) * WATER_MIN_OPACITY;
|
||||
if (river > 0.5) { alpha *= WATER_RIVER_MULTIPLIER; }
|
||||
color = mix(refraction, color, clamp(alpha + 0.15, 0.0, 1.0));
|
||||
|
||||
let wfog = clamp(1.0 - exp(-distance * 0.00009), 0.0, 0.75);
|
||||
return mix(color, sky_color(vec3<f32>(dir.x, dir.y, 0.0)), wfog);
|
||||
}
|
||||
|
||||
@fragment
|
||||
fn fs_main(in: TerrainOut) -> @location(0) vec4<f32> {
|
||||
let p = cam_uniform();
|
||||
@@ -124,49 +216,75 @@ fn fs_main(in: TerrainOut) -> @location(0) vec4<f32> {
|
||||
let dir = normalize(fwd + right * ndc.x * th * aspect + up * ndc.y * th);
|
||||
|
||||
if (dir.z >= -1e-4) {
|
||||
return vec4<f32>(sky_color(dir), 1.0);
|
||||
return vec4<f32>(apply_underwater(sky_color(dir), 0.0, cam.z, params_uniform().z), 1.0);
|
||||
}
|
||||
|
||||
// March the heightfield. The step grows quickly: the map diagonal is only
|
||||
// ~9000 world units, so marching past ~20000 adds cost without detail.
|
||||
var t = CELL * 0.5;
|
||||
var dt = CELL * 0.5;
|
||||
// Clip the ray to the map's XY rectangle: the boundary is an exact plane,
|
||||
// so the silhouette there stays razor-sharp instead of stair-stepping
|
||||
// across it. Outside the map is sky.
|
||||
var t_enter = 0.0;
|
||||
var t_exit = 1.0e30;
|
||||
var inside = true;
|
||||
if (abs(dir.x) < 1e-6) {
|
||||
inside = (cam.x >= 0.0 && cam.x <= world_w);
|
||||
} else {
|
||||
let a = (0.0 - cam.x) / dir.x;
|
||||
let b = (world_w - cam.x) / dir.x;
|
||||
t_enter = max(t_enter, min(a, b));
|
||||
t_exit = min(t_exit, max(a, b));
|
||||
}
|
||||
if (inside) {
|
||||
if (abs(dir.y) < 1e-6) {
|
||||
inside = (cam.y >= 0.0 && cam.y <= world_h);
|
||||
} else {
|
||||
let a = (0.0 - cam.y) / dir.y;
|
||||
let b = (world_h - cam.y) / dir.y;
|
||||
t_enter = max(t_enter, min(a, b));
|
||||
t_exit = min(t_exit, max(a, b));
|
||||
}
|
||||
}
|
||||
if (!inside || t_exit <= 0.0) {
|
||||
return vec4<f32>(apply_underwater(sky_color(dir), 0.0, cam.z, params_uniform().z), 1.0);
|
||||
}
|
||||
|
||||
// March the heightfield cell by cell: the step is never longer than the
|
||||
// time to cross one cell (dominant horizontal axis), while a clearance term
|
||||
// lets the ray skip the empty air above the surface. Resolving every cell is
|
||||
// what keeps cliff and map-edge silhouettes from quantising into huge
|
||||
// stair-steps that crawl as the camera pans.
|
||||
let horiz = max(abs(dir.x), abs(dir.y));
|
||||
let cell_step = min(CELL / max(horiz, 1e-4), CELL * 32.0);
|
||||
var t = max(t_enter, CELL * 0.5);
|
||||
var prev = t;
|
||||
var hit = false;
|
||||
var hit_t = 0.0;
|
||||
for (var i = 0; i < 256 && t < 20000.0; i = i + 1) {
|
||||
for (var i = 0; i < 1024 && t <= t_exit; i = i + 1) {
|
||||
let w = cam + dir * t;
|
||||
if (w.x < 0.0 || w.y < 0.0 || w.x >= world_w || w.y >= world_h) {
|
||||
prev = t;
|
||||
dt *= 1.10;
|
||||
t += dt;
|
||||
continue;
|
||||
}
|
||||
if (params_uniform().w > 0.5 && w.z <= params_uniform().z) {
|
||||
hit = true;
|
||||
hit_t = t;
|
||||
break;
|
||||
}
|
||||
if (w.z <= world_height(w.x, w.y)) {
|
||||
let h = world_height(w.x, w.y);
|
||||
let surface = select(h, max(h, params_uniform().z), params_uniform().w > 0.5);
|
||||
if (w.z <= surface) {
|
||||
hit = true;
|
||||
hit_t = t;
|
||||
break;
|
||||
}
|
||||
let clearance = (w.z - surface) / max(-dir.z, 1e-4);
|
||||
prev = t;
|
||||
dt *= 1.10;
|
||||
t += dt;
|
||||
t += clamp(clearance, cell_step, cell_step * 8.0);
|
||||
}
|
||||
if (!hit) {
|
||||
return vec4<f32>(sky_color(dir), 1.0);
|
||||
return vec4<f32>(apply_underwater(sky_color(dir), 0.0, cam.z, params_uniform().z), 1.0);
|
||||
}
|
||||
|
||||
// Refine the first crossing; with a sub-cell bracket this converges to the
|
||||
// exact surface point.
|
||||
var lo = prev;
|
||||
var hi = hit_t;
|
||||
for (var i = 0; i < 6; i = i + 1) {
|
||||
for (var i = 0; i < 18; i = i + 1) {
|
||||
let mid = 0.5 * (lo + hi);
|
||||
let w = cam + dir * mid;
|
||||
let water = params_uniform().w > 0.5 && w.z <= params_uniform().z;
|
||||
if (water || w.z <= world_height(w.x, w.y)) {
|
||||
let h = world_height(w.x, w.y);
|
||||
let surface = select(h, max(h, params_uniform().z), params_uniform().w > 0.5);
|
||||
if (w.z <= surface) {
|
||||
hi = mid;
|
||||
} else {
|
||||
lo = mid;
|
||||
@@ -178,20 +296,7 @@ fn fs_main(in: TerrainOut) -> @location(0) vec4<f32> {
|
||||
let ambient = sun_uniform().w;
|
||||
|
||||
if (params_uniform().w > 0.5 && hitpos.z <= params_uniform().z + 0.01) {
|
||||
let time = misc_uniform().x;
|
||||
let q = hitpos.xy * 0.015;
|
||||
let nx = sin(q.x * 1.3 + time * 1.7) + 0.5 * sin(q.x * 3.1 - time * 2.3);
|
||||
let ny = sin(q.y * 1.1 - time * 1.3) + 0.5 * sin(q.y * 2.7 + time * 1.9);
|
||||
let n = normalize(vec3<f32>(nx * 0.06, ny * 0.06, 1.0));
|
||||
let fres = pow(1.0 - clamp(-dir.z, 0.0, 1.0), 3.0);
|
||||
let deep = vec3<f32>(0.03, 0.16, 0.28);
|
||||
let refl = sky_color(reflect(dir, n));
|
||||
let lam = max(0.0, dot(n, sun));
|
||||
var water = mix(deep, refl, clamp(0.25 + 0.55 * fres, 0.0, 0.9));
|
||||
water += vec3<f32>(1.0, 0.98, 0.9) * pow(lam, 64.0) * 0.6;
|
||||
let wfog = clamp(1.0 - exp(-hi * 0.00009), 0.0, 0.75);
|
||||
water = mix(water, sky_color(vec3<f32>(dir.x, dir.y, 0.0)), wfog);
|
||||
return vec4<f32>(water, 1.0);
|
||||
return vec4<f32>(apply_underwater(water_shade(hitpos, dir, hi), hi, cam.z, params_uniform().z), 1.0);
|
||||
}
|
||||
|
||||
let wx = hitpos.x / CELL;
|
||||
@@ -225,5 +330,5 @@ fn fs_main(in: TerrainOut) -> @location(0) vec4<f32> {
|
||||
var lit = albedo * (ambient + (1.0 - ambient) * lambert);
|
||||
let fog = clamp(1.0 - exp(-hi * 0.00009), 0.0, 0.75);
|
||||
lit = mix(lit, sky_color(vec3<f32>(dir.x, dir.y, 0.0)), fog);
|
||||
return vec4<f32>(lit, 1.0);
|
||||
return vec4<f32>(apply_underwater(lit, hi, cam.z, params_uniform().z), 1.0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user