diff --git a/src/editor.c b/src/editor.c index 69de968..3c4946d 100644 --- a/src/editor.c +++ b/src/editor.c @@ -189,7 +189,7 @@ void editor_welcome_loop() { editor_init_panel_welcome(); - ui_register_component("welcome", editor_panel_welcome); + ui_register_component("welcome", (void (*)(void)) editor_panel_welcome); editor_update_window_title("Yoyo Engine Editor - Home"); @@ -244,11 +244,11 @@ void editor_editing_loop() { } // register all editor ui components - ui_register_component("heiarchy", ye_editor_paint_hiearchy); - ui_register_component("entity", ye_editor_paint_inspector); - ui_register_component("options", ye_editor_paint_options); - ui_register_component("project", ye_editor_paint_project); - ui_register_component("editor_menu_bar", ye_editor_paint_menu); + ui_register_component("heiarchy", (void (*)(void)) ye_editor_paint_hiearchy); + ui_register_component("entity", (void (*)(void)) ye_editor_paint_inspector); + ui_register_component("options", (void (*)(void)) ye_editor_paint_options); + ui_register_component("project", (void (*)(void)) ye_editor_paint_project); + ui_register_component("editor_menu_bar", (void (*)(void)) ye_editor_paint_menu); origin = get_ent_by_name_silent("origin"); if(!origin){ diff --git a/src/ui/editor_settings_ui.c b/src/ui/editor_settings_ui.c index 47d9ae0..5076e49 100644 --- a/src/ui/editor_settings_ui.c +++ b/src/ui/editor_settings_ui.c @@ -546,7 +546,7 @@ void ye_editor_paint_project(struct nk_context *ctx){ editor_reload_build_file(); project_settings_open = true; lock_viewport_interaction = true; - ui_register_component("project settings",ye_editor_paint_project_settings); + ui_register_component("project settings",(void (*)(void)) ye_editor_paint_project_settings); // ye_json_log(SETTINGS); // setup a bunch of stack variables for showing current settings @@ -810,7 +810,7 @@ void ye_editor_paint_project(struct nk_context *ctx){ Open a popout editor for the editor styles */ if(!ui_component_exists("editor styles")){ - ui_register_component("editor styles", editor_panel_styles); + ui_register_component("editor styles", (void (*)(void)) editor_panel_styles); lock_viewport(); } else { remove_ui_component("editor styles"); diff --git a/src/ui/editor_ui.c b/src/ui/editor_ui.c index 3e2d3b3..b684d68 100644 --- a/src/ui/editor_ui.c +++ b/src/ui/editor_ui.c @@ -265,7 +265,7 @@ void ye_editor_paint_options(struct nk_context *ctx){ nk_layout_row_dynamic(ctx, 25, 4); if(nk_checkbox_label(ctx, "Debug", (nk_bool*)&show_debug_overlay)){ if(show_debug_overlay){ - ui_register_component("debug",ui_paint_debug_overlay); + ui_register_component("debug",(void (*)(void)) ui_paint_debug_overlay); } else{ remove_ui_component("debug"); @@ -273,7 +273,7 @@ void ye_editor_paint_options(struct nk_context *ctx){ } if(nk_checkbox_label(ctx, "Info", (nk_bool*)&show_info_overlay)){ if(show_info_overlay){ - ui_register_component("info_overlay",ye_editor_paint_info_overlay); + ui_register_component("info_overlay", (void (*)(void)) ye_editor_paint_info_overlay); } else{ remove_ui_component("info_overlay"); @@ -281,7 +281,7 @@ void ye_editor_paint_options(struct nk_context *ctx){ } if(nk_checkbox_label(ctx, "Camera", (nk_bool*)&show_camera_overlay)){ if(show_camera_overlay){ - ui_register_component("cam_info",ui_paint_cam_info); + ui_register_component("cam_info", (void (*)(void)) ui_paint_cam_info); } else{ remove_ui_component("cam_info"); @@ -650,7 +650,7 @@ void ye_editor_paint_menu(struct nk_context *ctx){ if(nk_menu_item_label(ctx, "Scene Settings", NK_TEXT_LEFT)){ if(!ui_component_exists("scene_settings")){ - ui_register_component("scene_settings", editor_panel_scene_settings); + ui_register_component("scene_settings", (void (*)(void)) editor_panel_scene_settings); lock_viewport(); } else{ @@ -666,7 +666,7 @@ void ye_editor_paint_menu(struct nk_context *ctx){ nk_layout_row_dynamic(ctx, 25, 1); if(nk_menu_item_label(ctx, "Editor Settings", NK_TEXT_LEFT)){ if(!ui_component_exists("editor_settings")){ - ui_register_component("editor_settings", ye_editor_paint_editor_settings); + ui_register_component("editor_settings", (void (*)(void)) ye_editor_paint_editor_settings); } else{ remove_ui_component("editor_settings"); @@ -681,7 +681,7 @@ void ye_editor_paint_menu(struct nk_context *ctx){ nk_layout_row_dynamic(ctx, 25, 1); if (nk_menu_item_label(ctx, "Shortcuts", NK_TEXT_LEFT)) { if(!ui_component_exists("editor keybinds")){ - ui_register_component("editor keybinds", editor_panel_keybinds); + ui_register_component("editor keybinds", (void (*)(void)) editor_panel_keybinds); lock_viewport(); } else { remove_ui_component("editor keybinds"); @@ -696,7 +696,7 @@ void ye_editor_paint_menu(struct nk_context *ctx){ } if(nk_menu_item_label(ctx, "Credits", NK_TEXT_LEFT)) { if(!ui_component_exists("credits")){ - ui_register_component("editor_credits", editor_panel_credits); + ui_register_component("editor_credits", (void (*)(void)) editor_panel_credits); lock_viewport(); } else { remove_ui_component("editor_credits");