Refactor about imgui_platform (#945)

Refactor about imgui_platform
effekseer · Jul 12, 2023 · 462c2a6 · 462c2a6
1 parent b4df771
commit 462c2a6
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 3,749 deletions.
diff --git a/Dev/Cpp/3rdParty/CMakeLists.txt b/Dev/Cpp/3rdParty/CMakeLists.txt
@@ -96,5 +96,6 @@ if (BUILD_VIEWER OR BUILD_EDITOR)
     target_link_libraries(ImGradientHDR PRIVATE imgui)
     set_target_properties (ImGradientHDR PROPERTIES FOLDER Thirdparty)
 
+    add_subdirectory(imgui_platform)
 endif()
 
diff --git a/Dev/Cpp/3rdParty/imgui_platform/CMakeLists.txt b/Dev/Cpp/3rdParty/imgui_platform/CMakeLists.txt
@@ -0,0 +1,35 @@
+cmake_minimum_required(VERSION 3.15)
+project(imgui_platform)
+
+set(srcs
+    imgui_impl_glfw.cpp
+    imgui_impl_glfw.h
+    imgui_impl_opengl3.cpp
+    imgui_impl_opengl3.h
+    imgui_impl_opengl3_loader.h)
+
+if (WIN32)
+
+list(APPEND srcs
+	imgui_impl_dx11.cpp
+	imgui_impl_dx11.h
+)
+
+
+endif()
+
+add_library(${PROJECT_NAME} STATIC ${srcs})
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(${PROJECT_NAME} PRIVATE imgui)
+target_include_directories(
+    ${PROJECT_NAME}
+    PRIVATE
+    ${EFK_THIRDPARTY_INCLUDES}
+)
+
+add_dependencies(
+    ${PROJECT_NAME}
+	ExternalProject_glfw)
+
+set_target_properties (${PROJECT_NAME} PROPERTIES FOLDER Thirdparty)
+
diff --git a/...dParty/imgui_platform/imgui_impl_dx11.cpp → ...dParty/imgui_platform/imgui_impl_dx11.cpp b/...dParty/imgui_platform/imgui_impl_dx11.cpp → ...dParty/imgui_platform/imgui_impl_dx11.cpp
diff --git a/...irdParty/imgui_platform/imgui_impl_dx11.h → ...3rdParty/imgui_platform/imgui_impl_dx11.h b/...irdParty/imgui_platform/imgui_impl_dx11.h → ...3rdParty/imgui_platform/imgui_impl_dx11.h
diff --git a/...dParty/imgui_platform/imgui_impl_glfw.cpp → ...dParty/imgui_platform/imgui_impl_glfw.cpp b/...dParty/imgui_platform/imgui_impl_glfw.cpp → ...dParty/imgui_platform/imgui_impl_glfw.cpp
diff --git a/...irdParty/imgui_platform/imgui_impl_glfw.h → ...3rdParty/imgui_platform/imgui_impl_glfw.h b/...irdParty/imgui_platform/imgui_impl_glfw.h → ...3rdParty/imgui_platform/imgui_impl_glfw.h
diff --git a/...rty/imgui_platform/imgui_impl_opengl3.cpp → ...rty/imgui_platform/imgui_impl_opengl3.cpp b/...rty/imgui_platform/imgui_impl_opengl3.cpp → ...rty/imgui_platform/imgui_impl_opengl3.cpp
diff --git a/...Party/imgui_platform/imgui_impl_opengl3.h → ...Party/imgui_platform/imgui_impl_opengl3.h b/...Party/imgui_platform/imgui_impl_opengl3.h → ...Party/imgui_platform/imgui_impl_opengl3.h
diff --git a/...mgui_platform/imgui_impl_opengl3_loader.h → ...mgui_platform/imgui_impl_opengl3_loader.h b/...mgui_platform/imgui_impl_opengl3_loader.h → ...mgui_platform/imgui_impl_opengl3_loader.h
diff --git a/Dev/Cpp/EffekseerMaterialEditor/CMakeLists.txt b/Dev/Cpp/EffekseerMaterialEditor/CMakeLists.txt
@@ -2,7 +2,7 @@
 project(EffekseerMaterialEditor)
 
 # Check cmake version
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.15)
 
 # For MSVC
 if (MSVC)
@@ -20,18 +20,14 @@ file(GLOB hs
     Dialog/*.h
     Graphics/*.h)
 
-file(GLOB srcs_third_imgui_platform
-    ThirdParty/imgui_platform/imgui_impl_opengl3.cpp
-    ThirdParty/imgui_platform/imgui_impl_glfw.cpp)
-
 link_directories(
     ${PROJECT_SOURCE_DIR}/../lib/
     )
 
 # Add compile targets
 add_executable(
     EffekseerMaterialEditor
-    ${hs} ${srcs} ${srcs_third_imgui_platform})
+    ${hs} ${srcs})
 
 # Flags
 if (MSVC)
@@ -56,7 +52,6 @@ target_include_directories(
     ../include/
     ${PROJECT_SOURCE_DIR}/../3rdParty/AltseedRHI/include/
     ../EffekseerMaterial/
-    ThirdParty/imgui_platform/
     ThirdParty/picojson/
     ThirdParty/stb_image/)
 
@@ -75,6 +70,7 @@ target_link_libraries(
     Boxer
     nfd
     imgui
+    imgui_platform
     imgui-node-editor
     ImGradientHDR
 )

diff --git a/Dev/Cpp/Viewer/3rdParty/imgui_platform/imgui_impl_dx11.cpp b/Dev/Cpp/Viewer/3rdParty/imgui_platform/imgui_impl_dx11.cpp
diff --git a/Dev/Cpp/Viewer/3rdParty/imgui_platform/imgui_impl_dx11.h b/Dev/Cpp/Viewer/3rdParty/imgui_platform/imgui_impl_dx11.h
diff --git a/Dev/Cpp/Viewer/3rdParty/imgui_platform/imgui_impl_glfw.cpp b/Dev/Cpp/Viewer/3rdParty/imgui_platform/imgui_impl_glfw.cpp
diff --git a/Dev/Cpp/Viewer/3rdParty/imgui_platform/imgui_impl_glfw.h b/Dev/Cpp/Viewer/3rdParty/imgui_platform/imgui_impl_glfw.h