Skip to content

Martin/unify lists #151

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
martinfouilleul merged 3 commits into from
May 27, 2026
Merged

Martin/unify lists #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b8c193
- use same links type for typed and untyped lists
martinfouilleul May 27, 2026
69ebce1
list name convention changes: rename elt to links, oc_list_xxx_entry …
martinfouilleul May 27, 2026
3572f86
update api.json
martinfouilleul May 27, 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
2 changes: 1 addition & 1 deletion samples/ui/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ ORCA_EXPORT void oc_on_frame_refresh(void)
}

i32 i = 0;
oc_list_for(logLines.list, logLine, oc_str8_elt, listElt)
oc_typed_list_for(logLines.list, logLine)
{
char id[15];
snprintf(id, sizeof(id), "%d", i);
Expand Down
22 changes: 11 additions & 11 deletions sketches/code-canvas/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ typedef struct oc_card_group oc_card_group;

typedef struct oc_card
{
oc_list_elt listElt;
oc_list_elt groupElt;
oc_list_elt interactedElt;
oc_list_links listElt;
oc_list_links groupElt;
oc_list_links interactedElt;
bool interacted;

oc_card_group* group;
Expand All @@ -36,7 +36,7 @@ typedef struct oc_card

typedef struct oc_card_group
{
oc_list_elt listElt;
oc_list_links listElt;
u64 id;
oc_list cards;
} oc_card_group;
Expand Down Expand Up @@ -87,7 +87,7 @@ void oc_code_canvas_init(oc_code_canvas* canvas)

void oc_code_canvas_create_card(oc_code_canvas* canvas, f32 x, f32 y)
{
oc_card* card = oc_list_pop_front_entry(&canvas->cardFreeList, oc_card, listElt);
oc_card* card = oc_list_pop_front_elt(&canvas->cardFreeList, oc_card, listElt);
if(!card)
{
card = oc_arena_push_type_uninitialized(&canvas->arena, oc_card);
Expand All @@ -105,7 +105,7 @@ void oc_code_canvas_create_card(oc_code_canvas* canvas, f32 x, f32 y)

oc_card_group* oc_code_canvas_create_group(oc_code_canvas* canvas)
{
oc_card_group* group = oc_list_pop_front_entry(&canvas->groupFreeList, oc_card_group, listElt);
oc_card_group* group = oc_list_pop_front_elt(&canvas->groupFreeList, oc_card_group, listElt);
if(!group)
{
group = oc_arena_push_type_uninitialized(&canvas->arena, oc_card_group);
Expand All @@ -123,7 +123,7 @@ void oc_card_remove_from_group(oc_code_canvas* canvas, oc_card_group* group, oc_

if(group->cards.first == group->cards.last)
{
oc_card* lastCard = oc_list_first_entry(group->cards, oc_card, groupElt);
oc_card* lastCard = oc_list_first_elt(group->cards, oc_card, groupElt);
OC_ASSERT(lastCard);

oc_list_remove(&group->cards, &lastCard->groupElt);
Expand Down Expand Up @@ -414,9 +414,9 @@ void oc_canvas_compute_groups(oc_code_canvas* canvas)
oc_scratch scratch = oc_scratch_begin();

//NOTE: recycle previous groups
for(oc_card_group* group = oc_list_pop_front_entry(&canvas->groups, oc_card_group, listElt);
for(oc_card_group* group = oc_list_pop_front_elt(&canvas->groups, oc_card_group, listElt);
group != 0;
group = oc_list_pop_front_entry(&canvas->groups, oc_card_group, listElt))
group = oc_list_pop_front_elt(&canvas->groups, oc_card_group, listElt))
{
oc_list_push_front(&canvas->groupFreeList, &group->listElt);
}
Expand All @@ -432,9 +432,9 @@ void oc_canvas_compute_groups(oc_code_canvas* canvas)
card->rect.w + 2 * OC_CARD_GROUPING_THRESHOLD,
card->rect.h + 2 * OC_CARD_GROUPING_THRESHOLD,
};
for(oc_card* other = oc_list_first_entry(canvas->cards, oc_card, listElt);
for(oc_card* other = oc_list_first_elt(canvas->cards, oc_card, listElt);
other != card;
other = oc_list_next_entry(other, oc_card, listElt))
other = oc_list_next_elt(other, oc_card, listElt))
{
if(oc_rect_overlap(r, other->rect))
{
Expand Down
Loading
Loading