diff --git a/BUILD_INFO.txt b/BUILD_INFO.txt index 166b7aa2..1097e9ca 100644 --- a/BUILD_INFO.txt +++ b/BUILD_INFO.txt @@ -1,11 +1,11 @@ REM-Client test build (64-bit) -date: 2026-11-08 16:04 -commit: 480163c3a3bf7949c893362bb197d9c7b8162866 (main) -subject: Fix surface relief on asteroid fields with unrecognized texture names +date: 2026-11-08 19:34 +commit: c238ef4a6b2386ba0dd4016951dbd22df267397f (main) +subject: Jump tunnel fixes tree: clean; committed source matches tested build manifest -build: OK (Release|x64: RP8/RemGfx and pixel regression; existing client unchanged) +build: OK (Release|x64: client, RP8/RemGfx, GPU regression) -asteroid quality: Low / Medium / High / Ultra; Ultra retains the previous reach -relief correction: explicit asteroid field identification; Badlands textures no longer skipped -renderer sha256: 9691b542ccf406572b718306470fb1956be146df4070c227a0e15031f0a08334 -source manifest sha256: f45a91e0481273e9000e0d7a374612454b6efbdfbf965cd75f8786756c5f8ae0 +jump tunnels: smooth light, viewport-correct refraction, batched geometry, separate gate/hole profiles +tunnel quality: Low / Medium / High / Ultra; default High +renderer sha256: 5b6478f77b03e5406cab1c54ef7f67d85d1dfa46310aefb6e14de49bfdef1b46 +source manifest sha256: 1d9b165d7ffc51e8f50a56c1f255cc7cb6a03aac3049de112eef1bd8b688fa29 diff --git a/DATA/FX/gate_tunnel.ini b/DATA/FX/gate_tunnel.ini index 48a08671..8e2a3a99 100644 --- a/DATA/FX/gate_tunnel.ini +++ b/DATA/FX/gate_tunnel.ini @@ -24,8 +24,8 @@ max_rgb = 0, 0, 100 [layer] texture = jumptube color = 0, 0, 200 -near_alpha_factor = 0.8 -far_alpha_factor = 0 +near_alpha = 0.8 +far_alpha = 0 radius_factor = 1.5 u_offset = 0 v_offset = 0 @@ -36,8 +36,8 @@ v_scale = 10 [layer] texture = jumptube5 color = 100, 200, 255 -near_alpha_factor = 1 -far_alpha_factor = 0 +near_alpha = 1 +far_alpha = 0 radius_factor = 1 u_offset = 0.5 v_offset = 0.33 @@ -71,8 +71,8 @@ max_rgb = 255, 255, 255 [layer] texture = jumptube color = 0, 0, 200 -near_alpha_factor = 0.8 -far_alpha_factor = 0 +near_alpha = 0.8 +far_alpha = 0 radius_factor = 1.5 u_offset = 0 v_offset = 0 @@ -83,8 +83,8 @@ v_scale = 10 [layer] texture = jumptube5 color = 255, 255, 255 -near_alpha_factor = 1 -far_alpha_factor = 0 +near_alpha = 1 +far_alpha = 0 radius_factor = 1 u_offset = 0.5 v_offset = 0.33 @@ -110,34 +110,34 @@ near_alpha = 1 far_alpha = 1 num_t_steps = 200 num_s_steps = 12 -min_rotation = 3 -max_rotation = -3 +min_rotation = -0.35 +max_rotation = 0.35 min_rgb = 0, 0, 30 -max_rgb = 0, 0, 100 +max_rgb = 16, 30, 65 [layer] texture = jumptube color = 0, 0, 200 -near_alpha_factor = 0.8 -far_alpha_factor = 0 +near_alpha = 0.8 +far_alpha = 0 radius_factor = 1.5 u_offset = 0 v_offset = 0 -du = 0.1 +du = 0.055 dv = 0.07 v_scale = 10 [layer] texture = jumptube5 color = 100, 200, 255 -near_alpha_factor = 1 -far_alpha_factor = 0 +near_alpha = 1 +far_alpha = 0 radius_factor = 1 u_offset = 0.5 v_offset = 0.33 -du = -0.2 -dv = 0.1 -v_scale = 15 +du = -0.095 +dv = 0.16 +v_scale = 13.7 [gate_tunnel] nickname = gate_tunnel_liberty @@ -165,8 +165,8 @@ max_rgb = 100, 100, 255 [layer] texture = jumptube color = 50, 50, 200 -near_alpha_factor = 1 -far_alpha_factor = 0 +near_alpha = 1 +far_alpha = 0 radius_factor = 1 u_offset = 0 v_offset = 0 @@ -177,8 +177,8 @@ v_scale = 10 [layer] texture = jumptube5 color = 0, 50, 255 -near_alpha_factor = 0.5 -far_alpha_factor = 0.3 +near_alpha = 0.5 +far_alpha = 0.3 radius_factor = 1 u_offset = 0.5 v_offset = 0.33 @@ -186,3 +186,52 @@ du = -0.05 dv = 0.7 v_scale = 10 + +; REM: irregular jump-hole presentation; no route/protocol changes. +[gate_tunnel] +nickname = rem_tunnel_hole +write_depth_buffer = 0 +num_spline_control_points = 9 +x_range = 850 +y_range = 700 +z_range = 20000 +min_radius = 50 +max_radius = 100 +far_radius_factor = 0 +min_speed = 0.003 +max_speed = 0.08 +time_to_max_speed = 5 +fade_distance = 0.1 +near_alpha = 1 +far_alpha = 1 +num_t_steps = 200 +num_s_steps = 12 +min_rotation = -0.85 +max_rotation = 0.85 +min_rgb = 0, 0, 30 +max_rgb = 16, 30, 65 + +[layer] +texture = jumptube +color = 55, 25, 140 +near_alpha = 0.8 +far_alpha = 0 +radius_factor = 1.5 +u_offset = 0 +v_offset = 0 +du = 0.055 +dv = 0.07 +v_scale = 10 + +[layer] +texture = jumptube5 +color = 130, 145, 255 +near_alpha = 1 +far_alpha = 0 +radius_factor = 1 +u_offset = 0.5 +v_offset = 0.33 +du = -0.16 +dv = 0.16 +v_scale = 11.3 + diff --git a/DATA/FX/jumpeffect.ini b/DATA/FX/jumpeffect.ini index f9405b90..02c3423a 100644 --- a/DATA/FX/jumpeffect.ini +++ b/DATA/FX/jumpeffect.ini @@ -15,7 +15,7 @@ kill_time_before_done = 0.65 jump_tunnel_effect = jump_tunnel_interior_player jump_tunnel = gate_tunnel_bretonia jump_ambient = 25, 25, 50 -jump_background_color = 255, 255, 255 +jump_background_color = 8, 12, 28 [JumpGateEffect] nickname = jump_effect_asteroid_belt @@ -30,7 +30,7 @@ kill_time_before_done = 0.65 jump_tunnel_effect = jump_tunnel_interior_player jump_tunnel = gate_tunnel_bretonia jump_ambient = 25, 25, 50 -jump_background_color = 255, 255, 255 +jump_background_color = 8, 12, 28 [JumpGateEffect] nickname = jump_effect_liberty @@ -45,7 +45,7 @@ kill_time_before_done = 0.65 jump_tunnel_effect = jump_tunnel_interior_player jump_tunnel = gate_tunnel_bretonia jump_ambient = 25, 25, 50 -jump_background_color = 255, 255, 255 +jump_background_color = 8, 12, 28 [JumpGateEffect] nickname = jump_effect_bretonia @@ -60,7 +60,7 @@ kill_time_before_done = 0.6 jump_tunnel_effect = jump_tunnel_interior_player jump_tunnel = gate_tunnel_bretonia jump_ambient = 25, 25, 50 -jump_background_color = 255, 255, 255 +jump_background_color = 8, 12, 28 [JumpGateEffect] nickname = jump_effect_hole @@ -73,7 +73,7 @@ jump_in_tunnel_time = 1.5 jump_in_time = 1 kill_time_before_done = 0.6 jump_tunnel_effect = jump_tunnel_interior_player -jump_tunnel = gate_tunnel_bretonia +jump_tunnel = rem_tunnel_hole jump_ambient = 25, 25, 50 -jump_background_color = 255, 255, 255 +jump_background_color = 14, 8, 26 diff --git a/DLLS/BIN/content.dll b/DLLS/BIN/content.dll index 8d76d2b4..ef16402b 100644 Binary files a/DLLS/BIN/content.dll and b/DLLS/BIN/content.dll differ diff --git a/EXE/DALib.dll b/EXE/DALib.dll index 3132e119..3935c170 100644 Binary files a/EXE/DALib.dll and b/EXE/DALib.dll differ diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe index ab2bd4ce..d54d9d49 100755 Binary files a/EXE/Freelancer.exe and b/EXE/Freelancer.exe differ diff --git a/EXE/alchemy.dll b/EXE/alchemy.dll index 500cd87a..b4018520 100644 Binary files a/EXE/alchemy.dll and b/EXE/alchemy.dll differ diff --git a/EXE/common.dll b/EXE/common.dll index 23d7f039..af1a3525 100644 Binary files a/EXE/common.dll and b/EXE/common.dll differ diff --git a/EXE/dacom.dll b/EXE/dacom.dll index 9f616d19..e07ee225 100644 Binary files a/EXE/dacom.dll and b/EXE/dacom.dll differ diff --git a/EXE/deformable2.dll b/EXE/deformable2.dll index aed3812c..a44c4a49 100644 Binary files a/EXE/deformable2.dll and b/EXE/deformable2.dll differ diff --git a/EXE/engbase.dll b/EXE/engbase.dll index f146bf34..6206b8cf 100644 Binary files a/EXE/engbase.dll and b/EXE/engbase.dll differ diff --git a/EXE/flmaterials.dll b/EXE/flmaterials.dll index 99b835c0..3a09a7be 100644 Binary files a/EXE/flmaterials.dll and b/EXE/flmaterials.dll differ diff --git a/EXE/gundll.dll b/EXE/gundll.dll index 615a63bd..95f91eee 100644 Binary files a/EXE/gundll.dll and b/EXE/gundll.dll differ diff --git a/EXE/imeui.dll b/EXE/imeui.dll index d094fb32..14e5c137 100644 Binary files a/EXE/imeui.dll and b/EXE/imeui.dll differ diff --git a/EXE/luaprofile.dll b/EXE/luaprofile.dll index 2b1308fd..5e98c306 100644 Binary files a/EXE/luaprofile.dll and b/EXE/luaprofile.dll differ diff --git a/EXE/readfile.dll b/EXE/readfile.dll index 7023b03a..ed346580 100644 Binary files a/EXE/readfile.dll and b/EXE/readfile.dll differ diff --git a/EXE/rem_dlss.dll b/EXE/rem_dlss.dll index 987fad7f..ec80486f 100644 Binary files a/EXE/rem_dlss.dll and b/EXE/rem_dlss.dll differ diff --git a/EXE/remoteclient.dll b/EXE/remoteclient.dll index 7517ed0b..de05ad73 100644 Binary files a/EXE/remoteclient.dll and b/EXE/remoteclient.dll differ diff --git a/EXE/rendcomp.dll b/EXE/rendcomp.dll index d632f6e9..4e2d1814 100644 Binary files a/EXE/rendcomp.dll and b/EXE/rendcomp.dll differ diff --git a/EXE/rp8.dll b/EXE/rp8.dll index 9de4537e..4e9638f6 100644 Binary files a/EXE/rp8.dll and b/EXE/rp8.dll differ diff --git a/EXE/rpclocal.dll b/EXE/rpclocal.dll index 5924becd..8d9306f1 100644 Binary files a/EXE/rpclocal.dll and b/EXE/rpclocal.dll differ diff --git a/EXE/server.dll b/EXE/server.dll index 00796a17..bd17dbcc 100644 Binary files a/EXE/server.dll and b/EXE/server.dll differ diff --git a/EXE/shading.dll b/EXE/shading.dll index 7df0f5cf..28262528 100644 Binary files a/EXE/shading.dll and b/EXE/shading.dll differ diff --git a/EXE/soundmanager.dll b/EXE/soundmanager.dll index 765b9460..57b130c7 100644 Binary files a/EXE/soundmanager.dll and b/EXE/soundmanager.dll differ diff --git a/EXE/soundstreamer.dll b/EXE/soundstreamer.dll index 2b29de52..68dccd77 100644 Binary files a/EXE/soundstreamer.dll and b/EXE/soundstreamer.dll differ diff --git a/EXE/system.dll b/EXE/system.dll index 0a8ec9ae..f956b2bf 100644 Binary files a/EXE/system.dll and b/EXE/system.dll differ diff --git a/EXE/thorn.dll b/EXE/thorn.dll index b49d71c4..45b1ec71 100644 Binary files a/EXE/thorn.dll and b/EXE/thorn.dll differ diff --git a/EXE/x86math.dll b/EXE/x86math.dll index 7fc1a5e5..3b82c513 100644 Binary files a/EXE/x86math.dll and b/EXE/x86math.dll differ diff --git a/EXE/ximage.dll b/EXE/ximage.dll index bbab4d49..51695bb8 100644 Binary files a/EXE/ximage.dll and b/EXE/ximage.dll differ diff --git a/EXE/zlib.dll b/EXE/zlib.dll index c5932fb8..dd54fc9b 100644 Binary files a/EXE/zlib.dll and b/EXE/zlib.dll differ