diff --git a/BUILD_INFO.txt b/BUILD_INFO.txt index aceec07c..e69f95e5 100644 --- a/BUILD_INFO.txt +++ b/BUILD_INFO.txt @@ -1,3 +1,58 @@ +REM-Client e7791764: HUD on the cockpit's displays, status and scanner holograms, one button strip, cockpit v09 (64-bit) +date: 2026-11-15T21:47:54.237833+01:00 +source: e7791764 (main) = d52dda02 plus the cockpit display work; the four records below describe that work as it was built step by step on b7dead81 before the commit +change: rebuilt from the committed tree after rebasing onto d52dda02, so this exe has the cockpit displays (see the records below) and the outfitter / pause menu fixes of 29476891 and d52dda02 +files: EXE/Freelancer.exe, EXE/remui/hud.rml, radar.rml, rembar.rml, nnbar.rml, DATA/COCKPITS/REM/MODELS/rem_starflier_cockpit.3db (Cockpit-Workshop civilian v09), DATA/COCKPITS/REM/starflier_civilian.ini ([RemDisplay], 6 panels) +build: Release|x64 incremental freelancer.vcxproj build succeeded; dependency DLLs not deployed +validation: compile and link only; runtime exe byte-identical to build; cockpit model export/readback round trip passed (14,238 triangles); NOT tested in game +runtime: REM-LOCAL uses REM-Mod/EXE directly; restart Freelancer to load +SHA-256 EXE/Freelancer.exe: 606ce97168068ecdeadd8c93898cece6e08505875c17cec0456aa1c822bf2ff9 + +Previous deployment record: +REM-Client incremental prototype: radar hologram, reworked 3D scanner, one button strip, cockpit v09 (64-bit) +date: 2026-11-15T21:37:12.867541+01:00 +source: b7dead818e2051dfbbb6adfa928b7954ec6786aa (main) plus UNCOMMITTED working-tree changes: those of the previous records and src/freelancer/Client/rem_ui_radar.cpp, rem_ui_nnbar.cpp, rem_ui_host.cpp/.h, rem_ui_hud.cpp, assets/remui/radar.rml, rembar.rml, nnbar.rml, hud.rml, docs/ini/client-ui-config.md, docs/re/deviations.md +change: in the cockpit the 3D scanner is a hologram without a screen above the ship status (panel 'radar' without a mesh, larger; only the dish and contacts take the mouse); scanner look reworked in every view (perspective depth, lattice fading to the rim, tick scale and forward arrow on the rim, view wedge, contact stems with foot spots, HUD theme colours); the REM bar and the NeuroNet bar share one frameless strip below the maneuver strip (new panel 'buttons', bar_left / bar_right gone); maneuver strip flatter; cockpit model v09: radar screen, top bars and their bow removed, button strip on the plinth front +files: EXE/Freelancer.exe, EXE/remui/hud.rml, radar.rml, rembar.rml, nnbar.rml, DATA/COCKPITS/REM/MODELS/rem_starflier_cockpit.3db (Cockpit-Workshop civilian v09), DATA/COCKPITS/REM/starflier_civilian.ini ([RemDisplay], 6 panels) +build: Release|x64 freelancer.vcxproj build succeeded (dependencies were rebuilt too); dependency DLLs not deployed +validation: compile and link only; runtime exe byte-identical to build; cockpit model export/readback round trip passed (14,238 triangles); NOT tested in game +runtime: REM-LOCAL uses REM-Mod/EXE directly; restart Freelancer to load; Lutris/RemLauncher install got the cockpit model and ini but not this exe or the .rml files +SHA-256 EXE/Freelancer.exe: 71b4ef020db44ee6b5d5eb11236312a5b8d25ec0c0637856ead139272c04f3c9 + +Previous deployment record: +REM-Client incremental prototype: cockpit HUD around a status hologram, cockpit v08 (64-bit) +date: 2026-11-15T21:17:33.823103+01:00 +source: b7dead818e2051dfbbb6adfa928b7954ec6786aa (main) plus UNCOMMITTED working-tree changes: those of the previous records and src/freelancer/Client/rem_ui_hud.cpp, assets/remui/hud.rml, docs/ini/client-ui-config.md, docs/re/deviations.md +change: cockpit layout of the HUD redesigned: the ship status is a hologram over the console (ship in larger shield/hull rings, shield/hull/power bars left, speed and thrust right, cruise arc around the ring; panel 'status' without a mesh), the maneuver keys are a strip below it (panel renamed bar_mid -> maneuvers), contacts and weapons are lower with a single head line and tighter rows; cockpit model v08: top middle display removed, centre binnacle lowered to an emitter plinth, side displays 3 degrees lower +files: EXE/Freelancer.exe, EXE/remui/hud.rml, DATA/COCKPITS/REM/MODELS/rem_starflier_cockpit.3db (Cockpit-Workshop civilian v08), DATA/COCKPITS/REM/starflier_civilian.ini ([RemDisplay], 7 panels) +build: Release|x64 incremental freelancer.vcxproj build succeeded; dependency DLLs not deployed +validation: compile and link only; runtime exe byte-identical to build; cockpit model export/readback round trip passed (14,494 triangles); NOT tested in game +runtime: REM-LOCAL uses REM-Mod/EXE directly; restart Freelancer to load; Lutris/RemLauncher install got the cockpit model and ini but not this exe or hud.rml +SHA-256 EXE/Freelancer.exe: 228c11aca7ef2051add5308f678713168b4165f152b42b5bea6686f66da4d096 + +Previous deployment record: +REM-Client incremental prototype: cockpit HUD layout, display clicks, head sway (64-bit) +date: 2026-11-15T20:58:34.408192+01:00 +source: b7dead818e2051dfbbb6adfa928b7954ec6786aa (main) plus UNCOMMITTED working-tree changes: those of the previous record and src/freelancer/Client/space_camera_first.cpp, rem_ui_host.cpp, rem_ui_hud.cpp, nn_preferences_rem.cpp, assets/remui/hud.rml, bin/rem.ini, docs/re/deviations.md +change: the head's forward/back lag when accelerating or braking is scaled by rem.ini cockpit_head_sway (default 0.4, slider on the REM options page; 1 = retail); clicks on HUD parts drawn on a moving cockpit display are sent by the host when RmlUi drops them (press and release on different elements); hud.rml has a cockpit layout (body.cockpit: flat screens, maneuver bar filling its display with larger icons, cruise button as its first cell, list heads as wide as their bodies) +files: EXE/Freelancer.exe, EXE/remui/hud.rml +build: Release|x64 incremental freelancer.vcxproj build succeeded; dependency DLLs not deployed +validation: compile and link only; runtime exe byte-identical to build; NOT tested in game +runtime: REM-LOCAL uses REM-Mod/EXE directly; restart Freelancer to load; Lutris/RemLauncher install not updated +SHA-256 EXE/Freelancer.exe: ca75e5e99ccdbddc93b330cd6148f7c3a91d015ed46153437cce290b5bd848c0 + +Previous deployment record: +REM-Client incremental prototype: HUD on the cockpit's displays (64-bit) +date: 2026-11-15T20:37:39.406146+01:00 +source: b7dead818e2051dfbbb6adfa928b7954ec6786aa (main) plus UNCOMMITTED working-tree changes: src/freelancer/Client/space_camera_first.cpp/.h, rem_ui_host.cpp/.h, rem_ui_render.cpp, rem_ui_hud.cpp, rem_ui_radar.cpp, rem_ui_nnbar.cpp, nn_preferences_rem.cpp, bin/rem.ini, docs/ini/client-ui-config.md, docs/re/deviations.md +change: in the cockpit view the HUD groups, radar, REM bar, maneuver bar and NeuroNet bar are drawn on the cockpit's display panels ([RemDisplay] panel = ... in the cockpit ini, perspective transform per frame); every other view keeps the normal screen HUD; switch on the REM options page (rem.ini cockpit_displays) +files: EXE/Freelancer.exe, DATA/COCKPITS/REM/MODELS/rem_starflier_cockpit.3db (Cockpit-Workshop civilian v07 with seven display panels), DATA/COCKPITS/REM/starflier_civilian.ini ([RemDisplay]) +build: Release|x64 incremental freelancer.vcxproj build succeeded; dependency DLLs not deployed +validation: compile and link only; cockpit model export/readback round trip passed (13,886 triangles); display transform checked numerically against the panel corners; NOT tested in game +runtime: REM-LOCAL uses REM-Mod/EXE directly; restart Freelancer to load; Lutris/RemLauncher install got the cockpit model and ini but not this exe +SHA-256 EXE/Freelancer.exe: 6fbc3bfc267a8a461332378a10d621af9095e7887cf92bfe00116b32665398f0 + +Previous deployment record: REM-Client incremental Change account rejoin fix (64-bit) date: 2026-11-15T21:30:00+01:00 source: d52dda02 (main; 29476891 + src/freelancer/Client/nn_pause.cpp/.h, rem_ui_pause.cpp) diff --git a/DATA/COCKPITS/REM/MODELS/rem_starflier_cockpit.3db b/DATA/COCKPITS/REM/MODELS/rem_starflier_cockpit.3db index 2f0358b3..b7f59463 100644 Binary files a/DATA/COCKPITS/REM/MODELS/rem_starflier_cockpit.3db and b/DATA/COCKPITS/REM/MODELS/rem_starflier_cockpit.3db differ diff --git a/DATA/COCKPITS/REM/starflier_civilian.ini b/DATA/COCKPITS/REM/starflier_civilian.ini index 4a120818..6c7d7a62 100644 --- a/DATA/COCKPITS/REM/starflier_civilian.ini +++ b/DATA/COCKPITS/REM/starflier_civilian.ini @@ -11,3 +11,11 @@ yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 +[RemDisplay] +; panel = name, top left, top right, bottom left (cockpit mesh coordinates) +panel = maneuvers, -0.2975, -0.3648, -1.2692, 0.2975, -0.3648, -1.2692, -0.2975, -0.4401, -1.2451 +panel = buttons, -0.2975, -0.4418, -1.2441, 0.2975, -0.4418, -1.2441, -0.2975, -0.4806, -1.2296 +panel = status, -0.3061, -0.1586, -1.4363, 0.3061, -0.1586, -1.4363, -0.3061, -0.3959, -1.3898 +panel = radar, -0.2527, -0.0023, -1.3036, 0.2527, -0.0023, -1.3036, -0.2527, -0.1949, -1.2889 +panel = contacts, -0.6082, -0.2032, -0.909, -0.3779, -0.2032, -1.0263, -0.5822, -0.4032, -0.8579 +panel = weapons, 0.3779, -0.2032, -1.0263, 0.6082, -0.2032, -0.909, 0.3519, -0.4032, -0.9753 diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe index 0455b243..03cd24cf 100755 Binary files a/EXE/Freelancer.exe and b/EXE/Freelancer.exe differ diff --git a/EXE/remui/hud.rml b/EXE/remui/hud.rml index 55e1d759..82a6a1ac 100644 --- a/EXE/remui/hud.rml +++ b/EXE/remui/hud.rml @@ -203,9 +203,69 @@ .edbar .eh { margin: 6dp 0 12dp 0; font-size: 14dp; color: #b9cbe0; } .edbar .eb { display: flex; flex-direction: row; justify-content: center; } .edbar .btn { margin: 0 4dp; } + /* REM: the cockpit's layout (body.cockpit while the parts draw on the cockpit's displays, rem_ui_hud.cpp + UpdateDisplays; the places' sizes there match the ones here). The display's bezel is the frame, so the + panels are flat lit screens that fill their display. + - ship status: a hologram over the console's emitter, no screen behind it -- the ship in its shield and + hull rings larger in the middle, shield / hull / power as bars on its left, speed and thrust on its + right, the cruise engine's arc around the ring (.core.ck, .cruisearc.ck: 640 x 256 dp, ring at 320, 156) + - maneuvers: a strip of large keys under the hologram, the cruise button its first key + - contacts / weapons: one low head line, tighter rows (367 x 296 dp instead of 367 x 376) */ + .cockpit .mans, .cockpit .fp.cruise, .cockpit .lhead, .cockpit .lbody, .cockpit .rhead, .cockpit .rbody { decorator: none; background-color: #04090fd9; } + .cockpit .runner { display: none; } + .cockpit .mans { margin-left: -290dp; width: 660dp; height: 100dp; padding: 0 10dp 0 0; } + .cockpit .mans .ib { height: 92dp; padding-top: 8dp; } + .cockpit .mans .ib:first-child { border-left-width: 1dp; } + .cockpit .mans .ico { width: 52dp; height: 52dp; } + .cockpit .mans .lb { margin-top: 3dp; font-size: 15dp; } + .cockpit .mans .jump-control .state { font-size: 13dp; } + .cockpit .fp.cruise { margin-left: -370dp; top: 8dp; width: 80dp; height: 100dp; } + .cockpit .cruise .ib { padding: 8dp 4dp; } + .cockpit .cruise .ico { width: 52dp; height: 52dp; margin: 0; } + .cockpit .jump-info { top: -16dp; font-size: 15dp; } + .cockpit .fp.special { bottom: 272dp; } + + .fp.core.ck { margin-left: -320dp; width: 640dp; height: 256dp; } + .core.ck .disc { left: 232dp; top: 68dp; width: 174dp; height: 174dp; border: 1dp #5cc8f066; border-radius: 88dp; decorator: radial-gradient(circle, #5cc8f000 55%, #5cc8f01c 100%); } + .core.ck .ship { left: 274dp; top: 108dp; width: 92dp; height: 86dp; } + .core.ck .pc { left: 252dp; top: 198dp; font-size: 13dp; } + .core.ck .col { position: absolute; width: 204dp; } + .core.ck .col.l { left: 10dp; top: 111dp; } + .core.ck .col.r { left: 426dp; top: 86dp; } + .crow { display: flex; flex-direction: row; align-items: center; height: 30dp; } + .crow .l { width: 62dp; font-weight: 600; font-size: 12dp; letter-spacing: 1.5dp; color: #b9d4ea; } + .crow .bar, .crow .chips, .crow .sg { height: 12dp; } + .crow .v { width: 50dp; text-align: right; font-weight: 600; font-size: 16dp; color: #e8f4ff; } + .crow .v.low { color: #ef6a5b; } + .core.ck .spd { height: 44dp; text-align: right; } + .core.ck .spd .big { font-size: 34dp; } + .core.ck .spd .u { font-size: 14dp; color: #8fb3d0; margin-left: 5dp; } + .speed .sg { background-color: #5cc8f026; } + .speed .sg.lit { background-color: #5cc8f0; } + .thr .sg { background-color: #dbe6f026; } + .thr .sg.lit { background-color: #dbe6f0; } + .fp.cruisearc.ck { margin-left: -320dp; width: 640dp; height: 256dp; } + .cruisearc.ck .head { left: 170dp; top: -10dp; } + + .cockpit .lhead, .cockpit .rhead { width: 367dp; height: 34dp; bottom: 270dp; padding: 0 8dp 0 12dp; border-bottom: 2dp #2b6f9e; } + .cockpit .lhead .ico { width: 24dp; height: 24dp; } + .cockpit .rhead .ico { width: 22dp; height: 22dp; } + .cockpit .rhead .cnt { font-size: 16dp; } + .cockpit .lbody, .cockpit .rbody { height: 262dp; padding: 6dp 12dp; } + .cockpit .filters { margin-bottom: 3dp; padding-bottom: 3dp; } + .cockpit .filters .ico { width: 26dp; height: 26dp; } + .cockpit .rows { height: 208dp; } + .cockpit .c { height: 26dp; } + .cockpit .c .n, .cockpit .c .r, .cockpit .w { font-weight: 600; } + .cockpit .sbar { top: 44dp; bottom: 6dp; } + .cockpit .w { height: 24dp; } + .cockpit .tname { font-size: 20dp; } + .cockpit .tsub { margin-bottom: 6dp; } + .cockpit .tbtns { margin-top: 6dp; } + .cockpit .tbtns .ico { width: 34dp; height: 34dp; } - +
{{ s.name }}
@@ -224,7 +284,7 @@
{{ grp[1].shown ? 'Hide' : 'Show' }}Ship status
{{ grp[1].shown ? 'Hide' : 'Show' }}Ship status
-
+
@@ -243,7 +303,7 @@
-
+
THRUST{{ thrust }}
@@ -257,23 +317,48 @@
+ +
+
+
+ + + +
{{ shield_t }}%{{ hull_t }}%
+
+
SHIELD
{{ shield_t }}%
+
HULL
{{ hull_t }}%
+
POWER
{{ power_t }}%
+
+
+
{{ speed }}{{ speed_u }}
+
SPEED
+
THRUST
{{ thrust }}
+
+
+
-
+
{{ cruise_val }}{{ cruise_cap }}
-
+
» {{ cruise_cap }} «
{{ cruise_val }}
+
+ + +
{{ cruise_val }}{{ cruise_cap }}
+
{{ special }}
diff --git a/EXE/remui/nnbar.rml b/EXE/remui/nnbar.rml index 97b8ece1..2c422ee5 100644 --- a/EXE/remui/nnbar.rml +++ b/EXE/remui/nnbar.rml @@ -21,13 +21,18 @@ .nb.alert { background-color: #ff4a3d22; } @keyframes nb-alert { from { opacity: 1; } to { opacity: 0.25; } } .nb .tip { top: 46dp; right: 0; left: auto; bottom: auto; width: 230dp; white-space: normal; text-align: right; } + /* REM: the cockpit's button strip (body.cockpit while the bar draws on the cockpit's panel "buttons", + rem_ui_nnbar.cpp PlaceOnStrip): the display is the frame, the icons stand side by side with the other + bar's, the tool tips open upwards */ + .cockpit .nnbar { decorator: none; padding: 0; } + .cockpit .nb .tip { top: auto; bottom: 50dp; } .edit-grip { display: none; position: absolute; left: 0; top: 0; padding: 2dp 8dp; background-color: #f2b13c; color: #05080d; font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 13dp; border-radius: 3dp; white-space: nowrap; drag: drag; cursor: move; pointer-events: auto; z-index: 10; } .hud-editing .edit-grip { display: block; } - +
NeuroNet bar ✥
-
+
{{ i.label }}
diff --git a/EXE/remui/radar.rml b/EXE/remui/radar.rml index 39146502..87b66f11 100644 --- a/EXE/remui/radar.rml +++ b/EXE/remui/radar.rml @@ -31,11 +31,22 @@ radar { display: block; position: absolute; left: 0; top: 0; right: 0; bottom: 0; } .lbl { position: absolute; font-size: 12dp; white-space: nowrap; pointer-events: none; } .fwd { position: absolute; left: 50%; margin-left: -4dp; top: 4dp; font-family: "IBM Plex Mono"; font-size: 10dp; color: #f2b13c; pointer-events: none; } + /* REM: the cockpit's radar (body.cockpit while it draws on the cockpit's panel "radar", rem_ui_radar.cpp): + a hologram over the ship status -- no frame, no ground, the box as wide as the dish; the title at its + left corner, projection and ranges at the right one */ + body.radar.cockpit { width: 440dp; height: 170dp; } + .cockpit .frame { decorator: none; display: block; pointer-events: none; } + .cockpit .head { position: absolute; left: 0; right: 0; top: 0; height: 22dp; padding: 0; border-bottom-width: 0; z-index: 2; } + .cockpit .head .rng { pointer-events: auto; background-color: #04090f99; } + .cockpit .head .rng.on { background-color: #f2b13c33; } + .cockpit #scope { position: absolute; left: 0; top: 0; right: 0; bottom: 0; } + .cockpit radar { pointer-events: auto; } + .cockpit .lbl { font-weight: 600; font-effect: shadow(0dp 1dp #000000cc); } .edit-grip { display: none; position: absolute; left: 0; top: 0; padding: 2dp 8dp; background-color: #f2b13c; color: #05080d; font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 13dp; border-radius: 3dp; white-space: nowrap; drag: drag; cursor: move; pointer-events: auto; z-index: 10; } .hud-editing .edit-grip { display: block; } - +
Radar ✥
diff --git a/EXE/remui/rembar.rml b/EXE/remui/rembar.rml index 34928cf7..c8f967f8 100644 --- a/EXE/remui/rembar.rml +++ b/EXE/remui/rembar.rml @@ -17,13 +17,18 @@ .nb img { transform: perspective(240dp) rotateY(0deg) scale(1); transition: transform 0.2s cubic-out; } .nb.active img { image-color: #f2b13c; } .nb .tip { top: 46dp; left: 0; right: auto; bottom: auto; width: 230dp; white-space: normal; } + /* REM: the cockpit's button strip (body.cockpit while the bar draws on the cockpit's panel "buttons", + rem_ui_nnbar.cpp PlaceOnStrip): the display is the frame, the icons stand side by side with the other + bar's, the tool tips open upwards */ + .cockpit .nnbar { decorator: none; padding: 0; } + .cockpit .nb .tip { top: auto; bottom: 50dp; } .edit-grip { display: none; position: absolute; left: 0; top: 0; padding: 2dp 8dp; background-color: #f2b13c; color: #05080d; font-family: "Saira SemiCondensed"; font-weight: 600; font-size: 13dp; border-radius: 3dp; white-space: nowrap; drag: drag; cursor: move; pointer-events: auto; z-index: 10; } .hud-editing .edit-grip { display: block; } - +
REM bar ✥
-
+
{{ i.label }}