diff --git a/cpp/apps/primitives_gallery/CMakeLists.txt b/cpp/apps/primitives_gallery/CMakeLists.txt index 7fb2bae9..d4691387 100644 --- a/cpp/apps/primitives_gallery/CMakeLists.txt +++ b/cpp/apps/primitives_gallery/CMakeLists.txt @@ -6,6 +6,7 @@ add_imgui_app(primitives_gallery demos_graph.cpp demos_gfx.cpp demos_text_editor.cpp + demos_gl_texture.cpp # text_editor + file_watcher (issue 0025) ${CMAKE_SOURCE_DIR}/functions/core/text_editor.cpp ${CMAKE_SOURCE_DIR}/functions/core/file_watcher.cpp @@ -46,9 +47,13 @@ add_imgui_app(primitives_gallery ${CMAKE_SOURCE_DIR}/functions/gfx/gl_framebuffer.cpp ${CMAKE_SOURCE_DIR}/functions/gfx/fullscreen_quad.cpp ${CMAKE_SOURCE_DIR}/functions/gfx/shader_canvas.cpp + # gl_texture_load (issue 0026) + stb_image + ${CMAKE_SOURCE_DIR}/functions/gfx/gl_texture_load.cpp + ${CMAKE_SOURCE_DIR}/vendor/stb/stb_image_impl.cpp ) target_include_directories(primitives_gallery PRIVATE ${CMAKE_SOURCE_DIR}/vendor/imgui_text_edit + ${CMAKE_SOURCE_DIR}/vendor/stb ) if(WIN32) diff --git a/cpp/apps/primitives_gallery/demos.h b/cpp/apps/primitives_gallery/demos.h index 4fe67342..ada59e70 100644 --- a/cpp/apps/primitives_gallery/demos.h +++ b/cpp/apps/primitives_gallery/demos.h @@ -30,6 +30,7 @@ void demo_graph(); // --- Gfx --- void demo_shader_canvas(); +void demo_gl_texture(); // --- Core (combined demo: text_editor + file_watcher) --- void demo_text_editor(); diff --git a/cpp/apps/primitives_gallery/main.cpp b/cpp/apps/primitives_gallery/main.cpp index cba55d8d..fa9d41f2 100644 --- a/cpp/apps/primitives_gallery/main.cpp +++ b/cpp/apps/primitives_gallery/main.cpp @@ -57,6 +57,7 @@ static const DemoEntry k_demos[] = { {"graph_viewport", "graph_viewport", "Viz", &gallery::demo_graph}, // Gfx (shaders_lab core) {"shader_canvas", "shader_canvas", "Gfx", &gallery::demo_shader_canvas}, + {"gl_texture", "gl_texture_load", "Gfx", &gallery::demo_gl_texture}, }; static constexpr int k_demo_count = sizeof(k_demos) / sizeof(k_demos[0]);