Split gui into two libraries (#1012)

xelatihy · Aug 15, 2020 · 7d23bf7 · 7d23bf7
1 parent fc63d17
commit 7d23bf7
Show file tree

Hide file tree

Showing 12 changed files with 1,276 additions and 1,154 deletions.
diff --git a/apps/yimageview/yimageview.cpp b/apps/yimageview/yimageview.cpp
@@ -28,7 +28,8 @@
 
 #include <yocto/yocto_commonio.h>
 #include <yocto/yocto_image.h>
-#include <yocto_gui/yocto_gui.h>
+#include <yocto_gui/yocto_imgui.h>
+#include <yocto_gui/yocto_opengl.h>
 using namespace yocto;
 
 #include <atomic>

diff --git a/apps/yimageviews/yimageviews.cpp b/apps/yimageviews/yimageviews.cpp
@@ -28,7 +28,8 @@
 
 #include <yocto/yocto_commonio.h>
 #include <yocto/yocto_image.h>
-#include <yocto_gui/yocto_gui.h>
+#include <yocto_gui/yocto_imgui.h>
+#include <yocto_gui/yocto_opengl.h>
 using namespace yocto;
 
 #include <future>

diff --git a/apps/ysceneitrace/ysceneitrace.cpp b/apps/ysceneitrace/ysceneitrace.cpp
@@ -31,7 +31,8 @@
 #include <yocto/yocto_sceneio.h>
 #include <yocto/yocto_shape.h>
 #include <yocto/yocto_trace.h>
-#include <yocto_gui/yocto_gui.h>
+#include <yocto_gui/yocto_imgui.h>
+#include <yocto_gui/yocto_opengl.h>
 using namespace yocto;
 
 #include <atomic>

diff --git a/apps/ysceneitraces/ysceneitraces.cpp b/apps/ysceneitraces/ysceneitraces.cpp
@@ -31,7 +31,8 @@
 #include <yocto/yocto_sceneio.h>
 #include <yocto/yocto_shape.h>
 #include <yocto/yocto_trace.h>
-#include <yocto_gui/yocto_gui.h>
+#include <yocto_gui/yocto_imgui.h>
+#include <yocto_gui/yocto_opengl.h>
 using namespace yocto;
 
 #include <future>

diff --git a/apps/ysceneview/ysceneview.cpp b/apps/ysceneview/ysceneview.cpp
@@ -31,7 +31,8 @@
 #include <yocto/yocto_image.h>
 #include <yocto/yocto_sceneio.h>
 #include <yocto/yocto_shape.h>
-#include <yocto_gui/yocto_gui.h>
+#include <yocto_gui/yocto_imgui.h>
+#include <yocto_gui/yocto_opengl.h>
 using namespace yocto;
 
 #include <atomic>

diff --git a/apps/ysceneviews/ysceneviews.cpp b/apps/ysceneviews/ysceneviews.cpp
@@ -31,7 +31,8 @@
 #include <yocto/yocto_image.h>
 #include <yocto/yocto_sceneio.h>
 #include <yocto/yocto_shape.h>
-#include <yocto_gui/yocto_gui.h>
+#include <yocto_gui/yocto_imgui.h>
+#include <yocto_gui/yocto_opengl.h>
 using namespace yocto;
 
 #include <atomic>

diff --git a/apps/yshapeview/yshapeview.cpp b/apps/yshapeview/yshapeview.cpp
@@ -31,7 +31,8 @@
 #include <yocto/yocto_image.h>
 #include <yocto/yocto_sceneio.h>
 #include <yocto/yocto_shape.h>
-#include <yocto_gui/yocto_gui.h>
+#include <yocto_gui/yocto_imgui.h>
+#include <yocto_gui/yocto_opengl.h>
 using namespace yocto;
 
 #include <atomic>

diff --git a/libs/yocto_gui/CMakeLists.txt b/libs/yocto_gui/CMakeLists.txt
@@ -8,8 +8,10 @@ if(YOCTO_OPENGL)
   add_subdirectory(ext/glfw glfw)
 
   add_library(yocto_gui 
-    yocto_gui.h 
-    yocto_gui.cpp 
+    yocto_opengl.h 
+    yocto_opengl.cpp 
+    yocto_imgui.h 
+    yocto_imgui.cpp 
     ext/imgui/imgui.cpp 
     ext/imgui/imgui_draw.cpp 
     ext/imgui/imgui_widgets.cpp