From e8c084a815303c037952b8acea1834d6cde0a3f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0toura=C4=8D?= <525032@mail.muni.cz>
Date: Wed, 4 Oct 2023 13:28:32 +0200
Subject: [PATCH] common & controls libs created (files moved)
---
src/CMakeLists.txt | 8 +++++++
src/common/CMakeLists.txt | 21 +++++++++++++++++++
.../gfx => common/include/common}/aabb.hpp | 2 +-
.../gfx => common/include/common}/frame.hpp | 0
.../gfx => common/include/common}/node.hpp | 2 +-
src/{gfx => common}/src/aabb.cpp | 2 +-
src/common/src/frame.cpp | 1 +
src/controls/CMakeLists.txt | 21 +++++++++++++++++++
.../include/controls}/cam_control.hpp | 2 +-
.../include/controls}/control.hpp | 2 +-
.../include/controls}/obj_control.hpp | 4 ++--
src/{gfx => controls}/src/cam_control.cpp | 2 +-
src/{gfx => controls}/src/control.cpp | 2 +-
src/{gfx => controls}/src/obj_control.cpp | 2 +-
src/gfx/CMakeLists.txt | 18 ----------------
src/gfx/include/gfx/camera.hpp | 2 +-
src/gfx/include/gfx/light.hpp | 4 ++--
src/gfx/include/gfx/object.hpp | 2 +-
src/gfx/src/frame.cpp | 1 -
src/gfx/src/render.cpp | 2 +-
src/studio/include/studio/simulator.hpp | 8 +++----
21 files changed, 70 insertions(+), 38 deletions(-)
create mode 100644 src/common/CMakeLists.txt
rename src/{gfx/include/gfx => common/include/common}/aabb.hpp (92%)
rename src/{gfx/include/gfx => common/include/common}/frame.hpp (100%)
rename src/{gfx/include/gfx => common/include/common}/node.hpp (95%)
rename src/{gfx => common}/src/aabb.cpp (95%)
create mode 100644 src/common/src/frame.cpp
create mode 100644 src/controls/CMakeLists.txt
rename src/{gfx/include/gfx => controls/include/controls}/cam_control.hpp (92%)
rename src/{gfx/include/gfx => controls/include/controls}/control.hpp (93%)
rename src/{gfx/include/gfx => controls/include/controls}/obj_control.hpp (91%)
rename src/{gfx => controls}/src/cam_control.cpp (94%)
rename src/{gfx => controls}/src/control.cpp (93%)
rename src/{gfx => controls}/src/obj_control.cpp (96%)
delete mode 100644 src/gfx/src/frame.cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bccc60c..6d2557e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,6 +5,8 @@ include_directories(
"${PROJECT_SOURCE_DIR}/src/gfx/include"
"${PROJECT_SOURCE_DIR}/src/gui/include"
"${PROJECT_SOURCE_DIR}/src/filein/include"
+ "${PROJECT_SOURCE_DIR}/src/common/include"
+ "${PROJECT_SOURCE_DIR}/src/controls/include"
)
set(ROFIBOTS_LIBRARIES_TO_LINK_WITH
@@ -13,6 +15,8 @@ set(ROFIBOTS_LIBRARIES_TO_LINK_WITH
gfx
gui
filein
+ common
+ controls
)
message("Including the following libraries to the build:")
@@ -26,6 +30,10 @@ add_subdirectory(./gui)
message("-- gui")
add_subdirectory(./filein)
message("-- filein")
+add_subdirectory(./common)
+message("-- common")
+add_subdirectory(./controls)
+message("-- controls")
message("Including the following executables to the build:")
add_subdirectory(./studio)
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
new file mode 100644
index 0000000..0de07b0
--- /dev/null
+++ b/src/common/CMakeLists.txt
@@ -0,0 +1,21 @@
+set(THIS_TARGET_NAME common)
+
+add_library(${THIS_TARGET_NAME}
+ ./include/common/aabb.hpp
+ ./src/aabb.cpp
+
+ ./include/common/frame.hpp
+ ./src/frame.cpp
+
+ ./include/common/node.hpp
+ # ./src/node.cpp
+
+ )
+
+set_target_properties(${THIS_TARGET_NAME} PROPERTIES
+ DEBUG_OUTPUT_NAME "${THIS_TARGET_NAME}_${CMAKE_SYSTEM_NAME}_Debug"
+ RELEASE_OUTPUT_NAME "${THIS_TARGET_NAME}_${CMAKE_SYSTEM_NAME}_Release"
+ RELWITHDEBINFO_OUTPUT_NAME "${THIS_TARGET_NAME}_${CMAKE_SYSTEM_NAME}_RelWithDebInfo"
+ )
+
+#install(TARGETS ${THIS_TARGET_NAME} DESTINATION "lib")
diff --git a/src/gfx/include/gfx/aabb.hpp b/src/common/include/common/aabb.hpp
similarity index 92%
rename from src/gfx/include/gfx/aabb.hpp
rename to src/common/include/common/aabb.hpp
index 65c78f3..103455f 100644
--- a/src/gfx/include/gfx/aabb.hpp
+++ b/src/common/include/common/aabb.hpp
@@ -7,7 +7,7 @@
#include <array>
#include <utility>
#include <memory>
-#include <gfx/node.hpp>
+#include <common/node.hpp>
using node_ptr = std::shared_ptr<Node>;
diff --git a/src/gfx/include/gfx/frame.hpp b/src/common/include/common/frame.hpp
similarity index 100%
rename from src/gfx/include/gfx/frame.hpp
rename to src/common/include/common/frame.hpp
diff --git a/src/gfx/include/gfx/node.hpp b/src/common/include/common/node.hpp
similarity index 95%
rename from src/gfx/include/gfx/node.hpp
rename to src/common/include/common/node.hpp
index f221afd..0223b89 100644
--- a/src/gfx/include/gfx/node.hpp
+++ b/src/common/include/common/node.hpp
@@ -1,7 +1,7 @@
#ifndef NODE_INCLUDED
#define NODE_INCLUDED
-#include <gfx/frame.hpp>
+#include <common/frame.hpp>
#include <gfx/objectbase.hpp>
#include <vector>
#include <memory>
diff --git a/src/gfx/src/aabb.cpp b/src/common/src/aabb.cpp
similarity index 95%
rename from src/gfx/src/aabb.cpp
rename to src/common/src/aabb.cpp
index 374839a..c75a59f 100644
--- a/src/gfx/src/aabb.cpp
+++ b/src/common/src/aabb.cpp
@@ -1,4 +1,4 @@
-#include <gfx/aabb.hpp>
+#include <common/aabb.hpp>
AABB::AABB(std::vector<float> const &vertices)
{
diff --git a/src/common/src/frame.cpp b/src/common/src/frame.cpp
new file mode 100644
index 0000000..b5a0ba5
--- /dev/null
+++ b/src/common/src/frame.cpp
@@ -0,0 +1 @@
+#include <common/frame.hpp>
diff --git a/src/controls/CMakeLists.txt b/src/controls/CMakeLists.txt
new file mode 100644
index 0000000..4ff3517
--- /dev/null
+++ b/src/controls/CMakeLists.txt
@@ -0,0 +1,21 @@
+set(THIS_TARGET_NAME controls)
+
+add_library(${THIS_TARGET_NAME}
+ ./include/controls/control.hpp
+ ./src/control.cpp
+
+ ./include/controls/cam_control.hpp
+ ./src/cam_control.cpp
+
+ ./include/controls/obj_control.hpp
+ ./src/obj_control.cpp
+
+ )
+
+set_target_properties(${THIS_TARGET_NAME} PROPERTIES
+ DEBUG_OUTPUT_NAME "${THIS_TARGET_NAME}_${CMAKE_SYSTEM_NAME}_Debug"
+ RELEASE_OUTPUT_NAME "${THIS_TARGET_NAME}_${CMAKE_SYSTEM_NAME}_Release"
+ RELWITHDEBINFO_OUTPUT_NAME "${THIS_TARGET_NAME}_${CMAKE_SYSTEM_NAME}_RelWithDebInfo"
+ )
+
+#install(TARGETS ${THIS_TARGET_NAME} DESTINATION "lib")
diff --git a/src/gfx/include/gfx/cam_control.hpp b/src/controls/include/controls/cam_control.hpp
similarity index 92%
rename from src/gfx/include/gfx/cam_control.hpp
rename to src/controls/include/controls/cam_control.hpp
index 36aa781..d9af945 100644
--- a/src/gfx/include/gfx/cam_control.hpp
+++ b/src/controls/include/controls/cam_control.hpp
@@ -6,7 +6,7 @@
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
-#include <gfx/control.hpp>
+#include <controls/control.hpp>
#include <osi/window.hpp>
#include <osi/keyboard.hpp>
diff --git a/src/gfx/include/gfx/control.hpp b/src/controls/include/controls/control.hpp
similarity index 93%
rename from src/gfx/include/gfx/control.hpp
rename to src/controls/include/controls/control.hpp
index 36c4bc4..b4c9507 100644
--- a/src/gfx/include/gfx/control.hpp
+++ b/src/controls/include/controls/control.hpp
@@ -6,7 +6,7 @@
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
-#include <gfx/frame.hpp>
+#include <common/frame.hpp>
#include <unordered_set>
#include <string>
#include <memory>
diff --git a/src/gfx/include/gfx/obj_control.hpp b/src/controls/include/controls/obj_control.hpp
similarity index 91%
rename from src/gfx/include/gfx/obj_control.hpp
rename to src/controls/include/controls/obj_control.hpp
index 6f9c4dc..ba12468 100644
--- a/src/gfx/include/gfx/obj_control.hpp
+++ b/src/controls/include/controls/obj_control.hpp
@@ -6,8 +6,8 @@
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
-#include <gfx/control.hpp>
-#include <gfx/frame.hpp>
+#include <controls/control.hpp>
+#include <common/frame.hpp>
#include <unordered_set>
#include <string>
diff --git a/src/gfx/src/cam_control.cpp b/src/controls/src/cam_control.cpp
similarity index 94%
rename from src/gfx/src/cam_control.cpp
rename to src/controls/src/cam_control.cpp
index 7d824d1..0ed0aaf 100644
--- a/src/gfx/src/cam_control.cpp
+++ b/src/controls/src/cam_control.cpp
@@ -1,4 +1,4 @@
-#include <gfx/cam_control.hpp>
+#include <controls/cam_control.hpp>
void CameraController::turn(float xoffset, float yoffset)
{
diff --git a/src/gfx/src/control.cpp b/src/controls/src/control.cpp
similarity index 93%
rename from src/gfx/src/control.cpp
rename to src/controls/src/control.cpp
index c1ae9e0..71c295f 100644
--- a/src/gfx/src/control.cpp
+++ b/src/controls/src/control.cpp
@@ -1,4 +1,4 @@
-#include <gfx/control.hpp>
+#include <controls/control.hpp>
void Controller::setStep(float dt)
{
diff --git a/src/gfx/src/obj_control.cpp b/src/controls/src/obj_control.cpp
similarity index 96%
rename from src/gfx/src/obj_control.cpp
rename to src/controls/src/obj_control.cpp
index 95bc68b..d3f7e55 100644
--- a/src/gfx/src/obj_control.cpp
+++ b/src/controls/src/obj_control.cpp
@@ -1,4 +1,4 @@
-#include <gfx/obj_control.hpp>
+#include <controls/obj_control.hpp>
void ObjectController::mouseRotate(const osi::Mouse &mouse)
{
diff --git a/src/gfx/CMakeLists.txt b/src/gfx/CMakeLists.txt
index f77f4f3..0ba8830 100644
--- a/src/gfx/CMakeLists.txt
+++ b/src/gfx/CMakeLists.txt
@@ -22,30 +22,12 @@ add_library(${THIS_TARGET_NAME}
./include/gfx/object.hpp
./src/object.cpp
- ./include/gfx/frame.hpp
- ./src/frame.cpp
-
- ./include/gfx/control.hpp
- ./src/control.cpp
-
- ./include/gfx/cam_control.hpp
- ./src/cam_control.cpp
-
- ./include/gfx/obj_control.hpp
- ./src/obj_control.cpp
-
./include/gfx/light.hpp
#./src/light.cpp
- ./include/gfx/node.hpp
- #./src/node.cpp
-
./include/gfx/objectbase.hpp
#./src/objectbase.cpp
- ./include/gfx/aabb.hpp
- ./src/aabb.cpp
-
# ./include/osi/opengl.hpp
# ./include/osi/gui.hpp
)
diff --git a/src/gfx/include/gfx/camera.hpp b/src/gfx/include/gfx/camera.hpp
index e8e831a..a9de5a5 100644
--- a/src/gfx/include/gfx/camera.hpp
+++ b/src/gfx/include/gfx/camera.hpp
@@ -8,7 +8,7 @@
#include <memory>
#include <gfx/objectbase.hpp>
-#include <gfx/frame.hpp>
+#include <common/frame.hpp>
using frame_ptr = std::shared_ptr<Frame>;
using frame_weak_ptr = std::weak_ptr<Frame>;
diff --git a/src/gfx/include/gfx/light.hpp b/src/gfx/include/gfx/light.hpp
index 163e6d9..9896d63 100644
--- a/src/gfx/include/gfx/light.hpp
+++ b/src/gfx/include/gfx/light.hpp
@@ -4,8 +4,8 @@
#include <glad/glad.h>
#include <glm/glm.hpp>
-#include <gfx/frame.hpp>
-#include <gfx/node.hpp>
+#include <common/frame.hpp>
+#include <common/node.hpp>
#include <gfx/objectbase.hpp>
using frame_ptr = std::shared_ptr<Frame>;
diff --git a/src/gfx/include/gfx/object.hpp b/src/gfx/include/gfx/object.hpp
index a6db624..89950ee 100644
--- a/src/gfx/include/gfx/object.hpp
+++ b/src/gfx/include/gfx/object.hpp
@@ -10,7 +10,7 @@
#include <gfx/vao.hpp>
#include <gfx/vbo.hpp>
#include <gfx/ebo.hpp>
-#include <gfx/aabb.hpp>
+#include <common/aabb.hpp>
using VAO_ptr = std::shared_ptr<VAO>;
diff --git a/src/gfx/src/frame.cpp b/src/gfx/src/frame.cpp
deleted file mode 100644
index a73e8b3..0000000
--- a/src/gfx/src/frame.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <gfx/frame.hpp>
diff --git a/src/gfx/src/render.cpp b/src/gfx/src/render.cpp
index 67c79c4..7268297 100644
--- a/src/gfx/src/render.cpp
+++ b/src/gfx/src/render.cpp
@@ -8,7 +8,7 @@
#include <gfx/ebo.hpp>
#include <gfx/camera.hpp>
#include <gfx/object.hpp>
-#include <gfx/frame.hpp>
+#include <common/frame.hpp>
#include <gfx/render.hpp> // Order important for compile
#include <gfx/shader.hpp>
#include <iostream>
diff --git a/src/studio/include/studio/simulator.hpp b/src/studio/include/studio/simulator.hpp
index 4d4179a..aa6ece7 100644
--- a/src/studio/include/studio/simulator.hpp
+++ b/src/studio/include/studio/simulator.hpp
@@ -15,11 +15,11 @@
#include <gfx/camera.hpp>
#include <gfx/objectbase.hpp>
#include <gfx/object.hpp>
-#include <gfx/frame.hpp>
+#include <common/frame.hpp>
#include <gfx/light.hpp>
-#include <gfx/node.hpp>
-#include <gfx/cam_control.hpp>
-#include <gfx/obj_control.hpp>
+#include <common/node.hpp>
+#include <controls/cam_control.hpp>
+#include <controls/obj_control.hpp>
#include <gfx/shader.hpp>
#include <gfx/render.hpp>
#include <iostream>
--
GitLab