merge: issue/0029 — mesh_viewer + obj loader + orbit_camera
# Conflicts: # cpp/apps/primitives_gallery/demos.h # cpp/apps/primitives_gallery/main.cpp
This commit is contained in:
@@ -36,6 +36,7 @@ void demo_heatmap();
|
||||
void demo_table_view();
|
||||
void demo_surface_plot_3d(); // issue 0028, ImPlot3D
|
||||
void demo_scatter_3d(); // issue 0028, ImPlot3D
|
||||
void demo_mesh_viewer(); // issue 0029
|
||||
|
||||
// --- Gfx ---
|
||||
void demo_shader_canvas();
|
||||
|
||||
Reference in New Issue
Block a user