ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-07-23 16:07:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix incorrect resource kind string table; fix incorrect usage of resource kind table when doing texture format lookups in bitmap view

Browse Source
This commit is contained in:
Ryan Fleury
2024-08-27 15:48:27 -07:00
parent 32ac4f10bb
commit be93968c8d
5 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/df/core/df_core.c
+1 -1
View File
@@ -5392,7 +5392,7 @@ df_tex2dformat_from_eval_params(E_Eval eval, MD_Node *params)
MD_Node *fmt_node = md_child_from_string(params, str8_lit("fmt"), 0);
for(EachNonZeroEnumVal(R_Tex2DFormat, fmt))
{
if(str8_match(r_tex2d_kind_display_string_table[fmt], fmt_node->first->string, StringMatchFlag_CaseInsensitive))
if(str8_match(r_tex2d_format_display_string_table[fmt], fmt_node->first->string, StringMatchFlag_CaseInsensitive))
{
result = fmt;
break;
src/df/gfx/df_views.c
+10 -4
View File
@@ -8233,11 +8233,7 @@ DF_VIEW_UI_FUNCTION_DEF(Bitmap)
Rng2F32 canvas_rect = r2f32p(0, 0, canvas_dim.x, canvas_dim.y);
UI_Rect(canvas_rect)
{
DF_BitmapCanvasBoxDrawData *draw_data = push_array(ui_build_arena(), DF_BitmapCanvasBoxDrawData, 1);
draw_data->view_center_pos = view_center_pos;
draw_data->zoom = zoom;
canvas_box = ui_build_box_from_stringf(UI_BoxFlag_Clip|UI_BoxFlag_Clickable|UI_BoxFlag_Scroll, "bmp_canvas_%p", view);
ui_box_equip_custom_draw(canvas_box, df_bitmap_view_canvas_box_draw, draw_data);
}
//////////////////////////////
@@ -8278,6 +8274,16 @@ DF_VIEW_UI_FUNCTION_DEF(Bitmap)
}
}
//////////////////////////////
//- rjf: equip canvas draw info
//
{
DF_BitmapCanvasBoxDrawData *draw_data = push_array(ui_build_arena(), DF_BitmapCanvasBoxDrawData, 1);
draw_data->view_center_pos = view_center_pos;
draw_data->zoom = zoom;
ui_box_equip_custom_draw(canvas_box, df_bitmap_view_canvas_box_draw, draw_data);
}
//////////////////////////////
//- rjf: calculate image coordinates
//