jacob/power_play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename ui_canvas -> screen_canvas

Browse Source
This commit is contained in:
jacob 2024-03-11 19:43:17 -05:00
parent 0f67701761
commit 4f52d24c94
2 changed files with 19 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/game.c
View File

@ -145,31 +145,7 @@ INTERNAL void game_update(void)
/* Child ent */ /* Child ent */
struct entity *parent = player_ent; struct entity *parent = player_ent;
{ {
#if 0
f32 x_pos = 0;
f32 y_pos = 0;
if (parent == player_ent) {
x_pos = (((f32)sys_rand_u32() - (U32_MAX / 2)) / U32_MAX) * 10;
y_pos = (((f32)sys_rand_u32() - (U32_MAX / 2)) / U32_MAX) * 10;
} else {
u64 child_count = 0;
struct entity *sibling = world_entity_from_handle(&L.world, parent->first);
while (sibling->valid) {
++child_count;
sibling = world_entity_from_handle(&L.world, sibling->next);
}
x_pos = 0.5f * child_count;
//if (child_count % 2 != 0) {
//x_pos = -x_pos;
//}
y_pos = 1.0;
}
struct v2 pos = V2(x_pos, y_pos);
#else
struct v2 pos = V2(0, 0.25); struct v2 pos = V2(0, 0.25);
#endif
//struct v2 pos = V2(0, 0.25 * (i + 1)); //struct v2 pos = V2(0, 0.25 * (i + 1));

38
src/user.c
View File

@ -41,7 +41,7 @@ GLOBAL struct {
struct sys_window *window; struct sys_window *window;
struct renderer_canvas *world_canvas; struct renderer_canvas *world_canvas;
struct renderer_canvas *ui_canvas; struct renderer_canvas *screen_canvas;
struct view world_view; struct view world_view;
struct world blend_ticks[2]; struct world blend_ticks[2];
@ -712,7 +712,7 @@ INTERNAL void user_update(void)
); );
draw_text(L.ui_canvas, disp_font, pos, text); draw_text(L.screen_canvas, disp_font, pos, text);
} }
debug_draw_xform(ent->world_xform); debug_draw_xform(ent->world_xform);
@ -725,14 +725,14 @@ INTERNAL void user_update(void)
/* Draw hierarchy */ /* Draw hierarchy */
struct entity *parent = world_entity_from_handle(&L.world, ent->parent); struct entity *parent = world_entity_from_handle(&L.world, ent->parent);
if (parent->valid && !v2_eq(ent->world_xform.og, V2(0, 0))) { if (parent->valid) {
u32 color = RGBA_F(1, 0.7, 0.7, 0.75); u32 color = RGBA_F(0.6, 0.6, 1, 0.75);
f32 thickness = 3; f32 thickness = 5;
f32 arrow_height = 15; f32 arrow_height = 15;
struct v2 start = view_xform_point(L.world_view, ent->world_xform.og); struct v2 start = view_xform_point(L.world_view, ent->world_xform.og);
struct v2 end = view_xform_point(L.world_view, parent->world_xform.og); struct v2 end = view_xform_point(L.world_view, parent->world_xform.og);
draw_solid_arrow_line(L.ui_canvas, start, end, thickness, arrow_height, color); draw_solid_arrow_line(L.screen_canvas, start, end, thickness, arrow_height, color);
} }
arena_temp_end(temp); arena_temp_end(temp);
@ -762,31 +762,31 @@ INTERNAL void user_update(void)
struct v2 pos = V2(10, 8); struct v2 pos = V2(10, 8);
struct font *font = font_load(STR("res/fonts/fixedsys.ttf"), 12.0f); struct font *font = font_load(STR("res/fonts/fixedsys.ttf"), 12.0f);
draw_text(L.ui_canvas, font, pos, string_format(temp.arena, STR("time: %F"), FMT_FLOAT((f64)L.time))); draw_text(L.screen_canvas, font, pos, string_format(temp.arena, STR("time: %F"), FMT_FLOAT((f64)L.time)));
pos.y += spacing; pos.y += spacing;
draw_text(L.ui_canvas, font, pos, string_format(temp.arena, STR("screen_size: (%F, %F)"), FMT_FLOAT((f64)L.screen_size.x), FMT_FLOAT((f64)L.screen_size.y))); draw_text(L.screen_canvas, font, pos, string_format(temp.arena, STR("screen_size: (%F, %F)"), FMT_FLOAT((f64)L.screen_size.x), FMT_FLOAT((f64)L.screen_size.y)));
pos.y += spacing; pos.y += spacing;
draw_text(L.ui_canvas, font, pos, string_format(temp.arena, STR("screen_center: (%F, %F)"), FMT_FLOAT((f64)L.screen_center.x), FMT_FLOAT((f64)L.screen_center.y))); draw_text(L.screen_canvas, font, pos, string_format(temp.arena, STR("screen_center: (%F, %F)"), FMT_FLOAT((f64)L.screen_center.x), FMT_FLOAT((f64)L.screen_center.y)));
pos.y += spacing; pos.y += spacing;
draw_text(L.ui_canvas, font, pos, string_format(temp.arena, STR("screen_mouse: (%F, %F)"), FMT_FLOAT((f64)L.screen_mouse.x), FMT_FLOAT((f64)L.screen_mouse.y))); draw_text(L.screen_canvas, font, pos, string_format(temp.arena, STR("screen_mouse: (%F, %F)"), FMT_FLOAT((f64)L.screen_mouse.x), FMT_FLOAT((f64)L.screen_mouse.y)));
pos.y += spacing; pos.y += spacing;
draw_text(L.ui_canvas, font, pos, string_format(temp.arena, STR("world_view.center: (%F, %F)"), FMT_FLOAT((f64)L.world_view.center.x), FMT_FLOAT((f64)L.world_view.center.y))); draw_text(L.screen_canvas, font, pos, string_format(temp.arena, STR("world_view.center: (%F, %F)"), FMT_FLOAT((f64)L.world_view.center.x), FMT_FLOAT((f64)L.world_view.center.y)));
pos.y += spacing; pos.y += spacing;
draw_text(L.ui_canvas, font, pos, string_format(temp.arena, STR("world_view.rot: %F"), FMT_FLOAT((f64)L.world_view.rot))); draw_text(L.screen_canvas, font, pos, string_format(temp.arena, STR("world_view.rot: %F"), FMT_FLOAT((f64)L.world_view.rot)));
pos.y += spacing; pos.y += spacing;
draw_text(L.ui_canvas, font, pos, string_format(temp.arena, STR("world_view.zoom: %F"), FMT_FLOAT((f64)L.world_view.zoom))); draw_text(L.screen_canvas, font, pos, string_format(temp.arena, STR("world_view.zoom: %F"), FMT_FLOAT((f64)L.world_view.zoom)));
pos.y += spacing; pos.y += spacing;
draw_text(L.ui_canvas, font, pos, string_format(temp.arena, STR("world_mouse: (%F, %F)"), FMT_FLOAT((f64)world_mouse.x), FMT_FLOAT((f64)world_mouse.y))); draw_text(L.screen_canvas, font, pos, string_format(temp.arena, STR("world_mouse: (%F, %F)"), FMT_FLOAT((f64)world_mouse.x), FMT_FLOAT((f64)world_mouse.y)));
pos.y += spacing; pos.y += spacing;
draw_text(L.ui_canvas, font, pos, string_format(temp.arena, STR("debug_camera: %F"), FMT_STR(L.debug_camera ? STR("true") : STR("false")))); draw_text(L.screen_canvas, font, pos, string_format(temp.arena, STR("debug_camera: %F"), FMT_STR(L.debug_camera ? STR("true") : STR("false"))));
pos.y += spacing; pos.y += spacing;
arena_temp_end(temp); arena_temp_end(temp);
@ -801,11 +801,11 @@ INTERNAL void user_update(void)
/* Send canvases to GPU */ /* Send canvases to GPU */
renderer_canvas_send_to_gpu(L.world_canvas); renderer_canvas_send_to_gpu(L.world_canvas);
renderer_canvas_send_to_gpu(L.ui_canvas); renderer_canvas_send_to_gpu(L.screen_canvas);
/* Set canvas views before presenting */ /* Set canvas views before presenting */
renderer_canvas_set_view(L.world_canvas, view_get_xform(L.world_view)); renderer_canvas_set_view(L.world_canvas, view_get_xform(L.world_view));
renderer_canvas_set_view(L.ui_canvas, view_get_xform((struct view) {.px_per_unit = 1, .center = L.screen_center, .rot = 0, .zoom = 1})); renderer_canvas_set_view(L.screen_canvas, view_get_xform((struct view) {.px_per_unit = 1, .center = L.screen_center, .rot = 0, .zoom = 1}));
/* Present */ /* Present */
i32 vsync = VSYNC_ENABLED; i32 vsync = VSYNC_ENABLED;
@ -819,7 +819,7 @@ INTERNAL void user_update(void)
++canvases_count; ++canvases_count;
} }
*arena_push(scratch.arena, struct renderer_canvas *) = L.ui_canvas; *arena_push(scratch.arena, struct renderer_canvas *) = L.screen_canvas;
++canvases_count; ++canvases_count;
} }
@ -868,7 +868,7 @@ void user_startup(struct sys_window *window)
.zoom = 1 .zoom = 1
}; };
L.ui_canvas = renderer_canvas_alloc(); L.screen_canvas = renderer_canvas_alloc();
L.user_thread = sys_thread_init(&user_thread_entry_point, NULL, STR("[P1] User thread")); L.user_thread = sys_thread_init(&user_thread_entry_point, NULL, STR("[P1] User thread"));
} }