|
@@ -510,8 +510,6 @@ SOKOL_IMGUI_API_DECL bool simgui_handle_event(const sapp_event* ev);
|
|
|
SOKOL_IMGUI_API_DECL int simgui_map_keycode(sapp_keycode keycode); // returns ImGuiKey_*
|
|
|
#endif
|
|
|
SOKOL_IMGUI_API_DECL void simgui_shutdown(void);
|
|
|
-SOKOL_IMGUI_API_DECL void simgui_create_fonts_texture(const simgui_font_tex_desc_t* desc);
|
|
|
-SOKOL_IMGUI_API_DECL void simgui_destroy_fonts_texture(void);
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
} // extern "C"
|
|
@@ -519,7 +517,6 @@ SOKOL_IMGUI_API_DECL void simgui_destroy_fonts_texture(void);
|
|
|
// reference-based equivalents for C++
|
|
|
inline void simgui_setup(const simgui_desc_t& desc) { return simgui_setup(&desc); }
|
|
|
inline void simgui_new_frame(const simgui_frame_desc_t& desc) { return simgui_new_frame(&desc); }
|
|
|
-inline void simgui_create_fonts_texture(const simgui_font_tex_desc_t& desc) { return simgui_create_fonts_texture(&desc); }
|
|
|
|
|
|
#endif
|
|
|
#endif /* SOKOL_IMGUI_INCLUDED */
|
|
@@ -2671,67 +2668,9 @@ SOKOL_API_IMPL void simgui_setup(const simgui_desc_t* desc) {
|
|
|
def_sampler_desc.label = "sokol-imgui-default-sampler";
|
|
|
_simgui.def_smp = sg_make_sampler(&def_sampler_desc);
|
|
|
|
|
|
- // default font texture
|
|
|
- /*
|
|
|
- if (!_simgui.desc.no_default_font) {
|
|
|
- simgui_font_tex_desc_t simgui_font_smp_desc;
|
|
|
- _simgui_clear(&simgui_font_smp_desc, sizeof(simgui_font_smp_desc));
|
|
|
- simgui_create_fonts_texture(&simgui_font_smp_desc);
|
|
|
- }
|
|
|
- */
|
|
|
sg_pop_debug_group();
|
|
|
}
|
|
|
|
|
|
-SOKOL_API_IMPL void simgui_create_fonts_texture(const simgui_font_tex_desc_t* desc) {
|
|
|
- (void)desc;
|
|
|
-/*
|
|
|
- SOKOL_ASSERT(desc);
|
|
|
- SOKOL_ASSERT(SG_INVALID_ID == _simgui.font_smp.id);
|
|
|
- SOKOL_ASSERT(SG_INVALID_ID == _simgui.font_img.id);
|
|
|
- ImGuiIO* io = _simgui_get_io();
|
|
|
-
|
|
|
- // a default font sampler
|
|
|
- sg_sampler_desc font_smp_desc;
|
|
|
- _simgui_clear(&font_smp_desc, sizeof(font_smp_desc));
|
|
|
- font_smp_desc.wrap_u = SG_WRAP_CLAMP_TO_EDGE;
|
|
|
- font_smp_desc.wrap_v = SG_WRAP_CLAMP_TO_EDGE;
|
|
|
- font_smp_desc.min_filter = desc->min_filter;
|
|
|
- font_smp_desc.mag_filter = desc->mag_filter;
|
|
|
- font_smp_desc.label = "sokol-imgui-font-sampler";
|
|
|
- _simgui.font_smp = sg_make_sampler(&font_smp_desc);
|
|
|
-
|
|
|
- unsigned char* font_pixels;
|
|
|
- int font_width, font_height;
|
|
|
- #if defined(__cplusplus)
|
|
|
- io->Fonts->GetTexDataAsRGBA32(&font_pixels, &font_width, &font_height);
|
|
|
- #else
|
|
|
- int bytes_per_pixel;
|
|
|
- ImFontAtlas_GetTexDataAsRGBA32(io->Fonts, &font_pixels, &font_width, &font_height, &bytes_per_pixel);
|
|
|
- #endif
|
|
|
- sg_image_desc font_img_desc;
|
|
|
- _simgui_clear(&font_img_desc, sizeof(font_img_desc));
|
|
|
- font_img_desc.width = font_width;
|
|
|
- font_img_desc.height = font_height;
|
|
|
- font_img_desc.pixel_format = SG_PIXELFORMAT_RGBA8;
|
|
|
- font_img_desc.data.subimage[0][0].ptr = font_pixels;
|
|
|
- font_img_desc.data.subimage[0][0].size = (size_t)(font_width * font_height) * sizeof(uint32_t);
|
|
|
- font_img_desc.label = "sokol-imgui-font-image";
|
|
|
- _simgui.font_img = sg_make_image(&font_img_desc);
|
|
|
-
|
|
|
- io->Fonts->TexID = simgui_imtextureid_with_sampler(_simgui.font_img, _simgui.font_smp);
|
|
|
-*/
|
|
|
-}
|
|
|
-
|
|
|
-SOKOL_API_IMPL void simgui_destroy_fonts_texture(void) {
|
|
|
-/*
|
|
|
- // NOTE: it's valid to call the destroy funcs with SG_INVALID_ID
|
|
|
- sg_destroy_sampler(_simgui.font_smp);
|
|
|
- sg_destroy_image(_simgui.font_img);
|
|
|
- _simgui.font_smp.id = SG_INVALID_ID;
|
|
|
- _simgui.font_img.id = SG_INVALID_ID;
|
|
|
-*/
|
|
|
-}
|
|
|
-
|
|
|
SOKOL_API_IMPL void simgui_shutdown(void) {
|
|
|
SOKOL_ASSERT(_SIMGUI_INIT_COOKIE == _simgui.init_cookie);
|
|
|
|