merge: issue/0031 — animation curves (timeline + bezier_editor + tween_curves)
# Conflicts: # cpp/apps/primitives_gallery/CMakeLists.txt
This commit is contained in:
@@ -10,6 +10,11 @@ add_imgui_app(primitives_gallery
|
||||
demos_gl_texture.cpp
|
||||
demos_extras.cpp
|
||||
demos_mesh.cpp
|
||||
# animation primitives (issue 0031)
|
||||
demos_animation.cpp
|
||||
${CMAKE_SOURCE_DIR}/functions/core/tween_curves.cpp
|
||||
${CMAKE_SOURCE_DIR}/functions/core/bezier_editor.cpp
|
||||
${CMAKE_SOURCE_DIR}/functions/core/timeline.cpp
|
||||
# text_editor + file_watcher (issue 0025)
|
||||
${CMAKE_SOURCE_DIR}/functions/core/text_editor.cpp
|
||||
${CMAKE_SOURCE_DIR}/functions/core/file_watcher.cpp
|
||||
|
||||
Reference in New Issue
Block a user