Skip to content

feat(lighting): add RGB colored light rendering #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zoeyrose merged 6 commits into from
Aug 10, 2026
Merged

feat(lighting): add RGB colored light rendering #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b9c3c6f
feat(lighting): add RGB colored light rendering
zoeyrose Aug 10, 2026
0d29b96
fix(lighting): guard swapped-map teardown
zoeyrose Aug 10, 2026
0eef043
fix(lighting): complete RGB scene and continuation safety
zoeyrose Aug 10, 2026
30030db
fix(protocol): harden map continuation framing
zoeyrose Aug 10, 2026
6188f2f
fix(lighting): preserve blended color state
zoeyrose Aug 10, 2026
52d85b4
fix(lighting): keep darkness subtraction achromatic
zoeyrose Aug 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,17 @@ if (BUILD_TESTING AND NOT MINGW)
target_link_libraries(client-widget-priority-tests PRIVATE Atrinik::Core SDL3::SDL3)
add_test(NAME client-widget-priority COMMAND client-widget-priority-tests)

add_executable(client-map-light-state-tests src/tests/map_light_state.c)
atrinik_configure_target(client-map-light-state-tests)
target_compile_definitions(client-map-light-state-tests PRIVATE SDL_DISABLE_OLD_NAMES)
target_include_directories(client-map-light-state-tests BEFORE PRIVATE
${CMAKE_CURRENT_BINARY_DIR}/src/include
${CMAKE_CURRENT_SOURCE_DIR}/src/include
${CMAKE_CURRENT_SOURCE_DIR}/src/gui/toolkit/include
${CMAKE_CURRENT_SOURCE_DIR}/src)
target_link_libraries(client-map-light-state-tests PRIVATE Atrinik::Core SDL3::SDL3)
add_test(NAME client-map-light-state COMMAND client-map-light-state-tests)

add_test(NAME client-widget-priority-integration
COMMAND atrinik --widget-priority-test
"${CMAKE_CURRENT_SOURCE_DIR}/src/tests/fixtures/widget-priority-interface.cfg"
Expand All @@ -516,6 +527,10 @@ if (BUILD_TESTING AND NOT MINGW)
"${player_view_fixtures}/smooth-player-sublayer-1.xml" -)
add_test(NAME client-player-view-discrete
COMMAND atrinik --player-view "${player_view_fixtures}/discrete.xml" -)
add_test(NAME client-player-view-colored-smooth
COMMAND atrinik --player-view "${player_view_fixtures}/colored-smooth.xml" -)
add_test(NAME client-player-view-colored-discrete
COMMAND atrinik --player-view "${player_view_fixtures}/colored-discrete.xml" -)
add_test(NAME client-player-view-output
COMMAND ${CMAKE_COMMAND}
"-DATRINIK_CLIENT=$<TARGET_FILE:atrinik>"
Expand Down
78 changes: 66 additions & 12 deletions client/src/client/commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ void socket_command_map(uint8_t *data, size_t len, size_t pos) {

mapstat = packet_reader_read_uint8(&reader);

if (mapstat != MAP_UPDATE_CMD_SAME) {
if (mapstat != MAP_UPDATE_CMD_SAME && mapstat != MAP_UPDATE_CMD_PARTIAL) {
char mapname[HUGE_BUF], bg_music[HUGE_BUF], weather[MAX_BUF], region_name[MAX_BUF],
region_longname[MAX_BUF], mappath[HUGE_BUF];
uint8_t height_diff;
Expand Down Expand Up @@ -796,22 +796,19 @@ void socket_command_map(uint8_t *data, size_t len, size_t pos) {
ypos = packet_reader_read_uint8(&reader);

/* Have we moved? */
if ((xpos - mx || ypos - my)) {
if (mapstat == MAP_UPDATE_CMD_SAME && (xpos - mx || ypos - my)) {
display_mapscroll(xpos - mx, ypos - my, 0, 0);
map_play_footstep();
}

mx = xpos;
my = ypos;
if (mapstat == MAP_UPDATE_CMD_SAME) {
mx = xpos;
my = ypos;
}
}

MapData.posx = xpos;
MapData.posy = ypos;
MapData.player_sub_layer = packet_reader_read_uint8(&reader);
def_map = region_map_find_map(MapData.region_map, MapData.map_path);

map_get_real_coords(&rx, &ry);
region_map_fow_need_update = false;
uint8_t player_sub_layer = packet_reader_read_uint8(&reader);
uint16_t continuation_marker = packet_reader_read_uint16(&reader);

if (pos >= len) {
LOG(PACKET, "Map packet has no level count.");
Expand All @@ -824,6 +821,38 @@ void socket_command_map(uint8_t *data, size_t len, size_t pos) {
return;
}

uint16_t incoming_level_mask = 0;
size_t scan_pos = pos;
packet_reader_t scan;
packet_reader_init_cursor(&scan, data, len, &scan_pos);
for (uint8_t level_num = 0; level_num < level_count; level_num++) {
int depth = packet_reader_read_int8(&scan);
uint32_t level_size = packet_reader_read_uint32(&scan);
incoming_level_mask |= UINT16_C(1) << MAP2_DEPTH_INDEX(depth);
packet_reader_skip(&scan, level_size);
}
if (!packet_reader_finish(&scan)) {
LOG(PACKET, "Could not inspect validated map level blocks.");
return;
}
if (mapstat == MAP_UPDATE_CMD_PARTIAL &&
!map_protocol_continuation_matches(&MapData.continuation,
continuation_marker,
xpos,
ypos,
player_sub_layer,
incoming_level_mask)) {
LOG(PACKET, "Rejected unsolicited, mismatched, or out-of-sequence map continuation.");
return;
}

MapData.posx = xpos;
MapData.posy = ypos;
MapData.player_sub_layer = player_sub_layer;
def_map = region_map_find_map(MapData.region_map, MapData.map_path);
map_get_real_coords(&rx, &ry);
region_map_fow_need_update = false;

uint16_t level_mask = 0;
size_t packet_end = len;

Expand Down Expand Up @@ -1097,6 +1126,21 @@ void socket_command_map(uint8_t *data, size_t len, size_t pos) {
/* Get tile flags. */
ext_flags = packet_reader_read_uint8(&reader);

if (ext_flags & MAP2_FLAG_EXT_LIGHT_RGB) {
uint8_t bitmap = packet_reader_read_uint8(&reader);
uint8_t rgb[NUM_SUB_LAYERS][3] = {{0}};

for (uint8_t sub_layer = 0; sub_layer < NUM_SUB_LAYERS; sub_layer++) {
if (!(bitmap & (UINT8_C(1) << sub_layer))) {
continue;
}
for (size_t channel = 0; channel < 3; channel++) {
rgb[sub_layer][channel] = packet_reader_read_uint8(&reader);
}
}
map_set_light_rgb(x, y, bitmap, rgb);
}

/* Animation? */
if (ext_flags & MAP2_FLAG_EXT_ANIM) {
uint8_t anim_num = packet_reader_read_uint8(&reader);
Expand Down Expand Up @@ -1138,7 +1182,17 @@ void socket_command_map(uint8_t *data, size_t len, size_t pos) {
return;
}

map_set_level_mask(level_mask);
if (mapstat == MAP_UPDATE_CMD_PARTIAL) {
map_protocol_continuation_advance(&MapData.continuation);
} else {
map_set_level_mask(level_mask);
map_protocol_continuation_begin(&MapData.continuation,
continuation_marker,
xpos,
ypos,
player_sub_layer,
level_mask);
}

for (int depth = -MAP2_MAX_DEPTH; depth <= MAP2_MAX_DEPTH; depth++) {
if ((level_mask & (UINT16_C(1) << MAP2_DEPTH_INDEX(depth))) &&
Expand Down
Loading