more entity code deletion

This commit is contained in:
Ryan Fleury
2025-01-07 15:53:22 -08:00
parent ee181c685b
commit 1bf66afef9
2 changed files with 27 additions and 97 deletions
+3 -70
View File
@@ -271,72 +271,6 @@ rd_entity_array_from_list(Arena *arena, RD_EntityList *list)
return result; return result;
} }
//- rjf: display string entities, for referencing entities in ui
internal String8
rd_display_string_from_entity(Arena *arena, RD_Entity *entity)
{
String8 result = {0};
switch(entity->kind)
{
default:
{
if(entity->string.size != 0)
{
result = push_str8_copy(arena, entity->string);
}
else
{
String8 kind_string = d_entity_kind_display_string_table[entity->kind];
result = push_str8f(arena, "%S $%I64u", kind_string, entity->id);
}
}break;
case RD_EntityKind_Target:
{
if(entity->string.size != 0)
{
result = push_str8_copy(arena, entity->string);
}
else
{
RD_Entity *exe = rd_entity_child_from_kind(entity, RD_EntityKind_Executable);
result = push_str8_copy(arena, exe->string);
}
}break;
case RD_EntityKind_Breakpoint:
{
if(entity->string.size != 0)
{
result = push_str8_copy(arena, entity->string);
}
else
{
RD_Entity *loc = rd_entity_child_from_kind(entity, RD_EntityKind_Location);
if(loc->flags & RD_EntityFlag_HasTextPoint)
{
result = push_str8f(arena, "%S:%I64d:%I64d", str8_skip_last_slash(loc->string), loc->text_point.line, loc->text_point.column);
}
else if(loc->flags & RD_EntityFlag_HasVAddr)
{
result = str8_from_u64(arena, loc->vaddr, 16, 16, 0);
}
else if(loc->string.size != 0)
{
result = push_str8_copy(arena, loc->string);
}
}
}break;
case RD_EntityKind_RecentProject:
{
result = push_str8_copy(arena, str8_skip_last_slash(entity->string));
}break;
}
return result;
}
//- rjf: entity -> color operations //- rjf: entity -> color operations
internal Vec4F32 internal Vec4F32
@@ -1209,10 +1143,8 @@ rd_entity_release(RD_Entity *entity)
} }
LogInfoNamedBlockF("end_entity") LogInfoNamedBlockF("end_entity")
{ {
String8 name = rd_display_string_from_entity(scratch.arena, task->e);
log_infof("kind: \"%S\"\n", d_entity_kind_display_string_table[task->e->kind]); log_infof("kind: \"%S\"\n", d_entity_kind_display_string_table[task->e->kind]);
log_infof("id: $0x%I64x\n", task->e->id); log_infof("id: $0x%I64x\n", task->e->id);
log_infof("display_string: \"%S\"\n", name);
} }
SLLStackPush(rd_state->entities_free[free_list_idx], task->e); SLLStackPush(rd_state->entities_free[free_list_idx], task->e);
rd_state->entities_free_count += 1; rd_state->entities_free_count += 1;
@@ -5544,8 +5476,9 @@ rd_window_frame(RD_Window *ws)
ui_labelf("Launch all active targets:"); ui_labelf("Launch all active targets:");
for(RD_EntityNode *n = targets.first; n != 0; n = n->next) for(RD_EntityNode *n = targets.first; n != 0; n = n->next)
{ {
String8 target_display_name = rd_display_string_from_entity(scratch.arena, n->entity); DR_FancyStringList title_fstrs = rd_title_fstrs_from_entity(ui_build_arena(), n->entity, ui_top_palette()->text_weak, ui_top_font_size());
ui_label(target_display_name); UI_Box *box = ui_build_box_from_key(UI_BoxFlag_DrawText, ui_key_zero());
ui_box_equip_display_fancy_strings(box, &title_fstrs);
} }
} }
} }
-3
View File
@@ -1012,9 +1012,6 @@ internal void rd_entity_list_push(Arena *arena, RD_EntityList *list, RD_Entity *
internal RD_EntityArray rd_entity_array_from_list(Arena *arena, RD_EntityList *list); internal RD_EntityArray rd_entity_array_from_list(Arena *arena, RD_EntityList *list);
#define rd_first_entity_from_list(list) ((list)->first != 0 ? (list)->first->entity : &rd_nil_entity) #define rd_first_entity_from_list(list) ((list)->first != 0 ? (list)->first->entity : &rd_nil_entity)
//- rjf: display string entities, for referencing entities in ui
internal String8 rd_display_string_from_entity(Arena *arena, RD_Entity *entity);
//- rjf: entity -> color operations //- rjf: entity -> color operations
internal Vec4F32 rd_hsva_from_entity(RD_Entity *entity); internal Vec4F32 rd_hsva_from_entity(RD_Entity *entity);
internal Vec4F32 rd_rgba_from_entity(RD_Entity *entity); internal Vec4F32 rd_rgba_from_entity(RD_Entity *entity);