REM-Client 64f58045: sectors as one ini each (DATA/UNIVERSE/SECTORS: sirius.ini, sol.ini) - galaxy place, systems, jump mode, map art, sky and labels configurable; worldmap.ini removed, sectors.ini keeps [Map] and [Galaxy]
This commit is contained in:
1 parent
2bbf7c2f19
commit
dc3d313f60
8 files changed
+88
-72
No files matched your search
@@ -10,7 +10,7 @@ and any later incremental client updates, with their source commits and validati
|
|||||||
| Path | Contents |
|
| Path | Contents |
|
||||||
|---|---|
|
|---|---|
|
||||||
| `DATA/` | Freelancer game data: inis (`UNIVERSE/`, `EQUIPMENT/`, `SHIPS/`, `SOLAR/`, `MISSIONS/`, `INTERFACE/`, `constants.ini`, `initialworld.ini`, ...), models, textures, audio |
|
| `DATA/` | Freelancer game data: inis (`UNIVERSE/`, `EQUIPMENT/`, `SHIPS/`, `SOLAR/`, `MISSIONS/`, `INTERFACE/`, `constants.ini`, `initialworld.ini`, ...), models, textures, audio |
|
||||||
| `DATA/UNIVERSE/` | `universe.ini`, `SYSTEMS/<System>/` (system ini next to its bases), `sectors.ini` (nav map sectors and spacing) |
|
| `DATA/UNIVERSE/` | `universe.ini`, `SYSTEMS/<System>/` (system ini next to its bases), `SECTORS/*.ini` (one file per sector: galaxy position, systems, map art, jump mode; REM-Client `docs/rem/sectors.md`), `sectors.ini` (nav map spacing, galaxy) |
|
||||||
| `DATA/SCRIPTS/` | Compiled THN scripts (`*.thn`, Lua 3.2 bytecode); sources are in the `Lua-Scripts` repo |
|
| `DATA/SCRIPTS/` | Compiled THN scripts (`*.thn`, Lua 3.2 bytecode); sources are in the `Lua-Scripts` repo |
|
||||||
| `DATA/INTERFACE/REM/` | REM HUD/window art (`rem_hud.txm`, `IMAGES/*.3db`) |
|
| `DATA/INTERFACE/REM/` | REM HUD/window art (`rem_hud.txm`, `IMAGES/*.3db`) |
|
||||||
| `EXE/` | `Freelancer.exe`, engine DLLs (`common.dll`, `server.dll`, `rp8.dll`, ...), `dacom.ini`, `freelancer.ini`, `rem.ini`, `remgfx.ini`, VC runtime |
|
| `EXE/` | `Freelancer.exe`, engine DLLs (`common.dll`, `server.dll`, `rp8.dll`, ...), `dacom.ini`, `freelancer.ini`, `rem.ini`, `remgfx.ini`, VC runtime |
|
||||||
|
|||||||
@@ -1,3 +1,14 @@
|
|||||||
|
REM-Client 64f58045: sectors configured by one ini per sector (DATA/UNIVERSE/SECTORS) (64-bit)
|
||||||
|
date: 2026-11-16T21:49:45+01:00
|
||||||
|
source: 64f58045 (main) = 83b205ea plus the sector files change; built from that tree before the commit (the committed files are exactly the built ones)
|
||||||
|
change: a sector is one file in DATA/UNIVERSE/SECTORS ([Sector] galaxy place, origin, grid, default, system_shape, au, jump_mode, map_art, sky; [Label]; [System] with its map field or origin); sectors.ini keeps [Map] and [Galaxy], worldmap.ini removed (still read when there is no SECTORS folder). The HUD's jump drive checks, the sector sky, the sector view's backdrop and the house labels come from the sector files instead of the names sirius/sol; the classic universe view shows the map_art = universe sector (Sirius) alone, Sol01 no longer in its corner. Matching rem-server 8dfef86 (reads the same files, jump_mode / name in the jump drive)
|
||||||
|
files: EXE/Freelancer.exe, EXE/remui/navmap.rml, DATA/UNIVERSE/SECTORS/sirius.ini, DATA/UNIVERSE/SECTORS/sol.ini, DATA/UNIVERSE/sectors.ini, DATA/UNIVERSE/worldmap.ini (removed)
|
||||||
|
build: Release|x64 incremental freelancer.vcxproj build succeeded; dependency DLLs not deployed (common.dll rebuilt for the shared world_map.h header, no change in its behaviour or exports)
|
||||||
|
validation: header tests (worldpostest, g++, 29 tests) and rem-server rem_tests (264 tests) pass; all 59 universe.ini systems get the same world position, region and chart shape from SECTORS/*.ini as from the old sectors.ini + worldmap.ini (scripted comparison); runtime exe byte-identical to build; NOT tested in game, single player or multiplayer
|
||||||
|
runtime: REM-LOCAL uses REM-Mod/EXE directly; restart Freelancer to load; a server needs rem-server 8dfef86 or later for the sector files (an older one finds no worldmap.ini and runs without a world map)
|
||||||
|
SHA-256 EXE/Freelancer.exe: 1663b71c071f3b342e616df4cdc4430a233076a283ec150bd04356ff38df96ab
|
||||||
|
|
||||||
|
Previous deployment record:
|
||||||
REM-Client 6b9c5f61: turret view at the third-person camera distance, all ship tethers matched (64-bit)
|
REM-Client 6b9c5f61: turret view at the third-person camera distance, all ship tethers matched (64-bit)
|
||||||
date: 2026-11-16T10:45:00+01:00
|
date: 2026-11-16T10:45:00+01:00
|
||||||
source: 6b9c5f61 (main) = d9c88fea plus src/freelancer/Client/space_camera_turret.cpp (TurretCameraComputeView) and docs/re/deviations.md; built from that tree before the commit
|
source: 6b9c5f61 (main) = d9c88fea plus src/freelancer/Client/space_camera_turret.cpp (TurretCameraComputeView) and docs/re/deviations.md; built from that tree before the commit
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
; REM Freelancer: the Sirius sector - every Freelancer system, 8.6 light years from Sol.
|
||||||
|
; One file per sector in DATA\UNIVERSE\SECTORS (read by the client's nav map and by rem-server's world map;
|
||||||
|
; REM-Client src/include/rem/world_map.h and navmap_sectors.h describe every key).
|
||||||
|
;
|
||||||
|
; Grid 400 km: the tightest neighbours on the REM universe map (Rh01 153 km and Rh03 133 km, one field apart)
|
||||||
|
; need 306 km, so every pair of systems keeps at least ~94 km of empty space between their outermost objects.
|
||||||
|
; The map is 16 x 16 fields = 6,400 km (x the server's [World] Spacing / sectors.ini [Map] spacing).
|
||||||
|
; The sector's origin is the map's (0, 0) field, so that the map's centre (8, 8) lies at x = 81362082064195072 m.
|
||||||
|
|
||||||
|
[Sector]
|
||||||
|
nickname = sirius
|
||||||
|
name = Sirius Sector
|
||||||
|
star = A1V+DA2 ; Sirius A and its white dwarf Sirius B: the galaxy view's icon
|
||||||
|
galactic_lbd = 227.23, -8.89, 8.6
|
||||||
|
origin = 81362082060995072, 0, -3200000 ; set by hand (older than galactic -> world): keep it
|
||||||
|
grid = 400000
|
||||||
|
default = true ; every system no other sector names stands here, at its universe.ini pos
|
||||||
|
system_shape = square
|
||||||
|
jump_mode = open_space ; class drives fly out of a system and through open space to another
|
||||||
|
map_art = universe ; the classic universe map's art; the universe view shows this sector alone
|
||||||
|
sky = img/sky_sirius.png ; the sky between the systems (remui path)
|
||||||
|
|
||||||
|
; the houses' names on the universe map's art (fractions of the art, as the classic map has them)
|
||||||
|
[Label]
|
||||||
|
ids = 1249
|
||||||
|
pos = 0.469, 0.674
|
||||||
|
|
||||||
|
[Label]
|
||||||
|
ids = 1250
|
||||||
|
pos = 0.143, 0.737
|
||||||
|
|
||||||
|
[Label]
|
||||||
|
ids = 1251
|
||||||
|
pos = 0.574, 0.294
|
||||||
|
|
||||||
|
[Label]
|
||||||
|
ids = 1252
|
||||||
|
pos = 0.717, 0.786
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
; REM Freelancer: the Sol sector - our solar system. For now one system, Sol01 (REM Freelancer:
|
||||||
|
; tools/build_solar_system.py), at the sector's origin; its own scale (1 AU = 30,000 km) stays inside the system.
|
||||||
|
; REM-Client src/include/rem/world_map.h and navmap_sectors.h describe every key.
|
||||||
|
|
||||||
|
[Sector]
|
||||||
|
nickname = sol
|
||||||
|
name = Sol Sector
|
||||||
|
star = G2V
|
||||||
|
galactic = 0, 0, 0
|
||||||
|
origin = 0, 0, 0
|
||||||
|
grid = 400000
|
||||||
|
system_shape = round
|
||||||
|
au = 30000000 ; metres per AU on its round charts: 1 AU = 30,000 km in REM's Sol
|
||||||
|
jump_mode = in_system ; Sol's drives fly within the system alone
|
||||||
|
map_art = none ; one system: a dark sky in the sector view
|
||||||
|
sky = none
|
||||||
|
|
||||||
|
[System]
|
||||||
|
nickname = Sol01
|
||||||
|
origin = 0, 0, 0
|
||||||
|
|
||||||
|
; How Sol comes in at true scale (once its systems exist): each planet's neighbourhood is a system of its own (a
|
||||||
|
; classic FL-sized ini: its station, moons, lanes), placed at its true distance from the Sun with an exact origin
|
||||||
|
; (metres, relative to the sector). The systems keep small coordinates, so client physics stays exact; between them
|
||||||
|
; the jump drive's FTL jump carries the ship. Sirius <-> Sol (8.6 light years) is the same FTL jump.
|
||||||
|
;
|
||||||
|
; [System]
|
||||||
|
; nickname = sol_earth
|
||||||
|
; origin = 149597870700, 0, 0 ; 1 AU
|
||||||
|
;
|
||||||
|
; [System]
|
||||||
|
; nickname = sol_mars
|
||||||
|
; origin = 0, 0, -227939200000 ; 1.524 AU
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
; REM nav map: the sectors of the galaxy view (REM-Client docs/rem/navmap-rework-plan.md, rem/navmap_sectors.h).
|
; REM nav map: the galaxy view's settings (REM-Client docs/rem/navmap-rework-plan.md, rem/navmap_sectors.h).
|
||||||
; A sector is a region of worldmap.ini; it shows once the player has been to one of its systems.
|
; The sectors themselves: one file each in SECTORS\ (sirius.ini, sol.ini; a new sector is a new file there).
|
||||||
|
; A sector shows once the player has been to one of its systems.
|
||||||
; universe.ini [system] navmap_shape = square | round overrides a sector's system_shape.
|
; universe.ini [system] navmap_shape = square | round overrides a sector's system_shape.
|
||||||
|
|
||||||
[Map]
|
[Map]
|
||||||
@@ -7,20 +8,3 @@ spacing = 5000 ; the world map's spacing for the map (a server
|
|||||||
|
|
||||||
[Galaxy]
|
[Galaxy]
|
||||||
sun_from_center_ly = 26000 ; Sol to the galactic centre, in the Orion Arm
|
sun_from_center_ly = 26000 ; Sol to the galactic centre, in the Orion Arm
|
||||||
|
|
||||||
[Sector]
|
|
||||||
nickname = sirius
|
|
||||||
region = sirius
|
|
||||||
name = Sirius Sector
|
|
||||||
star = A1V+DA2 ; Sirius A and its white dwarf Sirius B
|
|
||||||
galactic_lbd = 227.23, -8.89, 8.6
|
|
||||||
system_shape = square
|
|
||||||
|
|
||||||
[Sector]
|
|
||||||
nickname = sol
|
|
||||||
region = sol
|
|
||||||
name = Sol Sector
|
|
||||||
star = G2V
|
|
||||||
galactic = 0, 0, 0
|
|
||||||
system_shape = round
|
|
||||||
au = 30000000 ; metres per AU on its round charts: 1 AU = 30,000 km in REM's Sol
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
; REM Freelancer world map (src/core/world_map.h; REM-Client docs/rem/large-world-scale-plan.md 4.7).
|
|
||||||
; rem-server.ini: [World] Map = <path of this file>. Multiplayer only - without it every system stands at
|
|
||||||
; the origin as before (single player, the classic systems). The system inis are never changed: each
|
|
||||||
; system is placed as a whole at its universe.ini map position x the region's grid.
|
|
||||||
;
|
|
||||||
; Grid 400 km: the tightest neighbours on the REM universe map (Rh01 153 km and Rh03 133 km, one field
|
|
||||||
; apart) need 306 km, so every pair of systems keeps at least ~94 km of empty space between their
|
|
||||||
; outermost objects. The map is 16 x 16 fields = 6,400 km.
|
|
||||||
|
|
||||||
; The Sirius sector: every Freelancer system, 8.6 light years from Sol along +x. The region's origin is
|
|
||||||
; the map's (0, 0) field, so that the map's centre (8, 8) lies at x = 81362082064195072 m, z = 0.
|
|
||||||
[Region]
|
|
||||||
nickname = sirius
|
|
||||||
origin = 81362082060995072, 0, -3200000
|
|
||||||
grid = 400000
|
|
||||||
default = true
|
|
||||||
|
|
||||||
; Sol: our solar system. For now one system, Sol01 (REM Freelancer: tools/build_solar_system.py), at the region's
|
|
||||||
; origin; later each planet's neighbourhood a system of its own (the template below).
|
|
||||||
[Region]
|
|
||||||
nickname = sol
|
|
||||||
origin = 0, 0, 0
|
|
||||||
grid = 400000
|
|
||||||
|
|
||||||
; How Sol comes in at true scale (once its systems exist - mod data, not here yet): each planet's
|
|
||||||
; neighbourhood is a system of its own (a classic FL-sized ini: its station, moons, lanes), placed at its
|
|
||||||
; true distance from the Sun with an exact [Place] origin (metres, relative to the region). The systems
|
|
||||||
; keep small coordinates, so client physics stays exact; between them the jump drive's FTL jump carries the
|
|
||||||
; ship (no jump connection needed: [Native.JumpDrive] Interstellar, the tunnel lasts the distance at
|
|
||||||
; FtlLightYearsPerMinute). Sirius <-> Sol (8.6 light years) is the same FTL jump.
|
|
||||||
;
|
|
||||||
; [Place]
|
|
||||||
; system = sol_sun
|
|
||||||
; region = sol
|
|
||||||
; origin = 0, 0, 0
|
|
||||||
;
|
|
||||||
; [Place]
|
|
||||||
; system = sol_earth
|
|
||||||
; region = sol
|
|
||||||
; origin = 149597870700, 0, 0 ; 1 AU
|
|
||||||
;
|
|
||||||
; [Place]
|
|
||||||
; system = sol_mars
|
|
||||||
; region = sol
|
|
||||||
; origin = 0, 0, -227939200000 ; 1.524 AU
|
|
||||||
|
|
||||||
; REM Freelancer: the solar system as one system (REM Freelancer, tools/build_solar_system.py): the Sun at the
|
|
||||||
; region's origin. Its own scale (1 AU = 30,000 km) stays inside the system.
|
|
||||||
[Place]
|
|
||||||
system = Sol01
|
|
||||||
region = sol
|
|
||||||
origin = 0, 0, 0
|
|
||||||
Binary file not shown.
@@ -284,6 +284,7 @@
|
|||||||
/* REM: atmospheric image beneath sharp, animated geometry stars. No unsupported gradient decorators. */
|
/* REM: atmospheric image beneath sharp, animated geometry stars. No unsupported gradient decorators. */
|
||||||
#map.galaxyview, #map.galaxyview.revealed, #map.galaxyview.own.revealed,
|
#map.galaxyview, #map.galaxyview.revealed, #map.galaxyview.own.revealed,
|
||||||
#map.plainsec, #map.plainsec.revealed, #map.plainsec.own.revealed { background-color: #030914; }
|
#map.plainsec, #map.plainsec.revealed, #map.plainsec.own.revealed { background-color: #030914; }
|
||||||
|
.sector-art { position: absolute; pointer-events: none; } /* REM: a sector's own map art (sector file map_art) */
|
||||||
.galaxy-art { position: absolute; left: 0; top: 0; width: 100%; height: 100%; opacity: 0.72; pointer-events: none; }
|
.galaxy-art { position: absolute; left: 0; top: 0; width: 100%; height: 100%; opacity: 0.72; pointer-events: none; }
|
||||||
.galaxy-caption { position: absolute; left: 24dp; top: 22dp; pointer-events: none; }
|
.galaxy-caption { position: absolute; left: 24dp; top: 22dp; pointer-events: none; }
|
||||||
.galaxy-caption .eyebrow { font-family: "IBM Plex Mono"; font-size: 10dp; letter-spacing: 3dp; color: #81afca; }
|
.galaxy-caption .eyebrow { font-family: "IBM Plex Mono"; font-size: 10dp; letter-spacing: 3dp; color: #81afca; }
|
||||||
@@ -352,6 +353,7 @@
|
|||||||
<div class="content">
|
<div class="content">
|
||||||
<div class="split">
|
<div class="split">
|
||||||
<div class="mapframe"><div id="map" data-class-blank="universe && uncharted" data-class-sectorview="sector" data-class-galaxyview="galaxy">
|
<div class="mapframe"><div id="map" data-class-blank="universe && uncharted" data-class-sectorview="sector" data-class-galaxyview="galaxy">
|
||||||
|
<img id="sector-art" class="sector-art" data-if="sector && sec_art_on" data-attr-src="sec_art" data-style-left="sec_art_left" data-style-top="sec_art_top" data-style-width="sec_art_w" data-style-height="sec_art_h"/>
|
||||||
<sectordetail id="sector-detail"></sectordetail>
|
<sectordetail id="sector-detail"></sectordetail>
|
||||||
<img class="galaxy-art" data-if="galaxy" src="img/galaxy-dust.png"/>
|
<img class="galaxy-art" data-if="galaxy" src="img/galaxy-dust.png"/>
|
||||||
<div class="galaxy-caption" data-if="galaxy"><div class="eyebrow">GALACTIC CARTOGRAPHY</div><div class="heading">The local stars</div><div class="sub">Galactic plane / distance rings from Sol</div></div>
|
<div class="galaxy-caption" data-if="galaxy"><div class="eyebrow">GALACTIC CARTOGRAPHY</div><div class="heading">The local stars</div><div class="sub">Galactic plane / distance rings from Sol</div></div>
|
||||||
|
|||||||
Reference in new issue
Block a user