Move OpenGL renderer

albin-johansson · Oct 8, 2024 · eb67585 · eb67585
1 parent db09205
commit eb67585
Show file tree

Hide file tree

Showing 18 changed files with 30 additions and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -118,7 +118,7 @@ endif ()
 add_subdirectory("source/renderers/null")
 
 if (TACTILE_BUILD_OPENGL_RENDERER)
-  add_subdirectory("source/opengl_renderer")
+  add_subdirectory("source/renderers/opengl")
 endif ()
 
 if (TACTILE_BUILD_VULKAN_RENDERER)

diff --git a/source/opengl_renderer/CMakeLists.txt → source/renderers/opengl/CMakeLists.txt b/source/opengl_renderer/CMakeLists.txt → source/renderers/opengl/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(tactile-opengl-renderer CXX)
+project(tactile-renderers-opengl CXX)
 
 find_package(imgui CONFIG REQUIRED)
 find_package(glad CONFIG REQUIRED)

diff --git a/source/opengl_renderer/lib/CMakeLists.txt → source/renderers/opengl/lib/CMakeLists.txt b/source/opengl_renderer/lib/CMakeLists.txt → source/renderers/opengl/lib/CMakeLists.txt
@@ -1,21 +1,21 @@
-project(tactile-opengl-renderer-lib CXX)
+project(tactile-renderers-opengl-lib CXX)
 
 add_library(tactile-opengl-renderer SHARED)
 add_library(tactile::opengl_renderer ALIAS tactile-opengl-renderer)
 
 target_sources(tactile-opengl-renderer
                PRIVATE
-               "src/tactile/opengl_renderer/opengl_error.cpp"
-               "src/tactile/opengl_renderer/opengl_renderer.cpp"
-               "src/tactile/opengl_renderer/opengl_renderer_plugin.cpp"
-               "src/tactile/opengl_renderer/opengl_texture.cpp"
+               "src/opengl_error.cpp"
+               "src/opengl_renderer.cpp"
+               "src/opengl_renderer_plugin.cpp"
+               "src/opengl_texture.cpp"
 
                PUBLIC FILE_SET "HEADERS" BASE_DIRS "inc" FILES
-               "inc/tactile/opengl_renderer/api.hpp"
-               "inc/tactile/opengl_renderer/opengl_error.hpp"
-               "inc/tactile/opengl_renderer/opengl_renderer.hpp"
-               "inc/tactile/opengl_renderer/opengl_renderer_plugin.hpp"
-               "inc/tactile/opengl_renderer/opengl_texture.hpp"
+               "inc/tactile/opengl/api.hpp"
+               "inc/tactile/opengl/opengl_error.hpp"
+               "inc/tactile/opengl/opengl_renderer.hpp"
+               "inc/tactile/opengl/opengl_renderer_plugin.hpp"
+               "inc/tactile/opengl/opengl_texture.hpp"
                )
 
 tactile_prepare_target(tactile-opengl-renderer)

diff --git a/...r/lib/inc/tactile/opengl_renderer/api.hpp → ...ers/opengl/lib/inc/tactile/opengl/api.hpp b/...r/lib/inc/tactile/opengl_renderer/api.hpp → ...ers/opengl/lib/inc/tactile/opengl/api.hpp
diff --git a/.../tactile/opengl_renderer/opengl_error.hpp → ...l/lib/inc/tactile/opengl/opengl_error.hpp b/.../tactile/opengl_renderer/opengl_error.hpp → ...l/lib/inc/tactile/opengl/opengl_error.hpp
@@ -7,7 +7,7 @@
 #include <utility>       // to_underlying
 
 #include "tactile/base/prelude.hpp"
-#include "tactile/opengl_renderer/api.hpp"
+#include "tactile/opengl/api.hpp"
 
 namespace tactile {
 

diff --git a/...ctile/opengl_renderer/opengl_renderer.hpp → ...ib/inc/tactile/opengl/opengl_renderer.hpp b/...ctile/opengl_renderer/opengl_renderer.hpp → ...ib/inc/tactile/opengl/opengl_renderer.hpp
@@ -8,7 +8,7 @@
 
 #include "tactile/base/prelude.hpp"
 #include "tactile/base/render/renderer.hpp"
-#include "tactile/opengl_renderer/api.hpp"
+#include "tactile/opengl/api.hpp"
 
 namespace tactile {
 

diff --git a/...pengl_renderer/opengl_renderer_plugin.hpp → ...tactile/opengl/opengl_renderer_plugin.hpp b/...pengl_renderer/opengl_renderer_plugin.hpp → ...tactile/opengl/opengl_renderer_plugin.hpp
@@ -5,8 +5,8 @@
 #include <optional>  // optional
 
 #include "tactile/base/prelude.hpp"
-#include "tactile/opengl_renderer/api.hpp"
-#include "tactile/opengl_renderer/opengl_renderer.hpp"
+#include "tactile/opengl/api.hpp"
+#include "tactile/opengl/opengl_renderer.hpp"
 #include "tactile/runtime/plugin.hpp"
 
 namespace tactile {

diff --git a/...actile/opengl_renderer/opengl_texture.hpp → ...lib/inc/tactile/opengl/opengl_texture.hpp b/...actile/opengl_renderer/opengl_texture.hpp → ...lib/inc/tactile/opengl/opengl_texture.hpp
@@ -7,7 +7,7 @@
 
 #include "tactile/base/prelude.hpp"
 #include "tactile/base/render/texture.hpp"
-#include "tactile/opengl_renderer/api.hpp"
+#include "tactile/opengl/api.hpp"
 
 namespace tactile {
 

diff --git a/.../tactile/opengl_renderer/opengl_error.cpp → ...renderers/opengl/lib/src/opengl_error.cpp b/.../tactile/opengl_renderer/opengl_error.cpp → ...renderers/opengl/lib/src/opengl_error.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0)
 
-#include "tactile/opengl_renderer/opengl_error.hpp"
+#include "tactile/opengl/opengl_error.hpp"
 
 #include <glad/glad.h>
 

diff --git a/...ctile/opengl_renderer/opengl_renderer.cpp → ...derers/opengl/lib/src/opengl_renderer.cpp b/...ctile/opengl_renderer/opengl_renderer.cpp → ...derers/opengl/lib/src/opengl_renderer.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0)
 
-#include "tactile/opengl_renderer/opengl_renderer.hpp"
+#include "tactile/opengl/opengl_renderer.hpp"
 
 #include <cstdlib>        // malloc, free
 #include <list>           // list
@@ -17,8 +17,8 @@
 
 #include "tactile/base/render/window.hpp"
 #include "tactile/base/util/scope_exit.hpp"
-#include "tactile/opengl_renderer/opengl_error.hpp"
-#include "tactile/opengl_renderer/opengl_texture.hpp"
+#include "tactile/opengl/opengl_error.hpp"
+#include "tactile/opengl/opengl_texture.hpp"
 #include "tactile/runtime/logging.hpp"
 
 namespace tactile {

diff --git a/...pengl_renderer/opengl_renderer_plugin.cpp → ...opengl/lib/src/opengl_renderer_plugin.cpp b/...pengl_renderer/opengl_renderer_plugin.cpp → ...opengl/lib/src/opengl_renderer_plugin.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0)
 
-#include "tactile/opengl_renderer/opengl_renderer_plugin.hpp"
+#include "tactile/opengl/opengl_renderer_plugin.hpp"
 
 #include <new>  // nothrow
 

diff --git a/...actile/opengl_renderer/opengl_texture.cpp → ...nderers/opengl/lib/src/opengl_texture.cpp b/...actile/opengl_renderer/opengl_texture.cpp → ...nderers/opengl/lib/src/opengl_texture.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0)
 
-#include "tactile/opengl_renderer/opengl_texture.hpp"
+#include "tactile/opengl/opengl_texture.hpp"
 
 #define STB_IMAGE_IMPLEMENTATION
 
@@ -12,7 +12,7 @@
 #include <stb_image.h>
 
 #include "tactile/base/render/renderer_options.hpp"
-#include "tactile/opengl_renderer/opengl_error.hpp"
+#include "tactile/opengl/opengl_error.hpp"
 
 namespace tactile {
 

diff --git a/source/opengl_renderer/test/.clang-tidy → source/renderers/opengl/test/.clang-tidy b/source/opengl_renderer/test/.clang-tidy → source/renderers/opengl/test/.clang-tidy
diff --git a/source/opengl_renderer/test/CMakeLists.txt → source/renderers/opengl/test/CMakeLists.txt b/source/opengl_renderer/test/CMakeLists.txt → source/renderers/opengl/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(tactile-opengl-renderer-test CXX)
+project(tactile-renderers-opengl-test CXX)
 
 add_executable(tactile-opengl-renderer-test)
 

diff --git a/source/opengl_renderer/test/src/main.cpp → source/renderers/opengl/test/src/main.cpp b/source/opengl_renderer/test/src/main.cpp → source/renderers/opengl/test/src/main.cpp
diff --git a/...l_renderer/test/src/opengl_error_test.cpp → ...ers/opengl/test/src/opengl_error_test.cpp b/...l_renderer/test/src/opengl_error_test.cpp → ...ers/opengl/test/src/opengl_error_test.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0)
 
-#include "tactile/opengl_renderer/opengl_error.hpp"
+#include "tactile/opengl/opengl_error.hpp"
 
 #include <utility>  // to_underlying
 

diff --git a/...enderer/test/src/opengl_renderer_test.cpp → .../opengl/test/src/opengl_renderer_test.cpp b/...enderer/test/src/opengl_renderer_test.cpp → .../opengl/test/src/opengl_renderer_test.cpp
@@ -1,10 +1,10 @@
 // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0)
 
-#include "tactile/opengl_renderer/opengl_renderer.hpp"
+#include "tactile/opengl/opengl_renderer.hpp"
 
 #include <gtest/gtest.h>
 
-#include "tactile/opengl_renderer/opengl_renderer_plugin.hpp"
+#include "tactile/opengl/opengl_renderer_plugin.hpp"
 #include "tactile/runtime/command_line_options.hpp"
 #include "tactile/runtime/runtime.hpp"
 

diff --git a/...renderer/test/src/opengl_texture_test.cpp → ...s/opengl/test/src/opengl_texture_test.cpp b/...renderer/test/src/opengl_texture_test.cpp → ...s/opengl/test/src/opengl_texture_test.cpp
@@ -1,10 +1,10 @@
 // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0)
 
-#include "tactile/opengl_renderer/opengl_texture.hpp"
+#include "tactile/opengl/opengl_texture.hpp"
 
 #include <gtest/gtest.h>
 
-#include "tactile/opengl_renderer/opengl_renderer_plugin.hpp"
+#include "tactile/opengl/opengl_renderer_plugin.hpp"
 #include "tactile/runtime/command_line_options.hpp"
 #include "tactile/runtime/runtime.hpp"