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:
@@ -63,6 +63,7 @@ static const DemoEntry k_demos[] = {
|
||||
{"table_view", "table_view", "Viz", &gallery::demo_table_view},
|
||||
{"surface_plot_3d", "surface_plot_3d", "Viz", &gallery::demo_surface_plot_3d},
|
||||
{"scatter_3d", "scatter_3d", "Viz", &gallery::demo_scatter_3d},
|
||||
{"mesh_viewer", "mesh_viewer", "Viz", &gallery::demo_mesh_viewer},
|
||||
// Gfx (shaders_lab core)
|
||||
{"shader_canvas", "shader_canvas", "Gfx", &gallery::demo_shader_canvas},
|
||||
{"gl_texture", "gl_texture_load", "Gfx", &gallery::demo_gl_texture}, // wave 1
|
||||
|
||||
Reference in New Issue
Block a user