From 83c6d210e28ae7cc8eaff4eb2adf154d5f2598bb Mon Sep 17 00:00:00 2001
From: maelstrom <maelstrom@maelstrom.dev>
Date: Thu, 10 Apr 2025 23:06:51 +0200
Subject: [PATCH] refactor: cleaned up some includes

---
 client/src/main.cpp              | 14 +----------
 core/src/datatypes/cframe.h      |  6 +----
 core/src/datatypes/color3.cpp    |  5 ----
 core/src/objects/base/instance.h |  2 --
 core/src/objects/datamodel.cpp   |  1 -
 core/src/objects/part.h          |  3 +--
 core/src/rendering/renderer.cpp  |  2 --
 editor/mainglwidget.cpp          | 43 ++++----------------------------
 editor/mainwindow.cpp            | 41 +++---------------------------
 editor/mainwindow.h              |  2 --
 editor/panes/explorermodel.cpp   | 17 ++-----------
 editor/panes/explorermodel.h     |  5 ----
 editor/panes/explorerview.cpp    |  9 +------
 editor/panes/explorerview.h      | 13 +++-------
 editor/panes/propertiesmodel.h   |  5 ----
 editor/panes/propertiesview.h    |  8 ------
 16 files changed, 18 insertions(+), 158 deletions(-)

diff --git a/client/src/main.cpp b/client/src/main.cpp
index f46bedc..fbd62f3 100644
--- a/client/src/main.cpp
+++ b/client/src/main.cpp
@@ -1,20 +1,8 @@
 #include <GL/glew.h>
-#include <GL/gl.h>
 #include <GLFW/glfw3.h>
-#include <glm/ext/matrix_transform.hpp>
-#include <glm/ext/quaternion_trigonometric.hpp>
-#include <glm/ext/vector_float3.hpp>
-#include <glm/gtc/quaternion.hpp>
-#include <memory>
-#include <stdio.h>
-#include <format>
-
-#include "logger.h"
 #include "objects/part.h"
-#include "rendering/renderer.h"
 #include "physics/simulation.h"
-#include "camera.h"
-
+#include "rendering/renderer.h"
 #include "common.h"
 
 void errorCatcher(int id, const char* str);
diff --git a/core/src/datatypes/cframe.h b/core/src/datatypes/cframe.h
index 6072d6b..d362085 100644
--- a/core/src/datatypes/cframe.h
+++ b/core/src/datatypes/cframe.h
@@ -2,12 +2,8 @@
 
 #include "base.h"
 #include "datatypes/vector.h"
-#include <glm/ext/matrix_float3x3.hpp>
-#include <glm/ext/quaternion_geometric.hpp>
-#include <glm/ext/vector_float3.hpp>
-#include <glm/fwd.hpp>
+#include <glm/ext/quaternion_float.hpp>
 #include <glm/gtc/matrix_access.hpp>
-#include <glm/gtc/matrix_inverse.hpp>
 #include <glm/matrix.hpp>
 #include <reactphysics3d/mathematics/Transform.h>
 #include <reactphysics3d/reactphysics3d.h>
diff --git a/core/src/datatypes/color3.cpp b/core/src/datatypes/color3.cpp
index a45fddb..2e0132b 100644
--- a/core/src/datatypes/color3.cpp
+++ b/core/src/datatypes/color3.cpp
@@ -1,9 +1,4 @@
 #include "color3.h"
-#include <algorithm>
-#include <glm/ext/quaternion_geometric.hpp>
-#include <iomanip>
-#include <ios>
-#include <string>
 #include "meta.h" // IWYU pragma: keep
 
 Data::Color3::Color3(float r, float g, float b) : r(std::clamp(r, 0.f, 1.f)), g(std::clamp(g, 0.f, 1.f)), b(std::clamp(b, 0.f, 1.f)) {};
diff --git a/core/src/objects/base/instance.h b/core/src/objects/base/instance.h
index b7ef341..738f01c 100644
--- a/core/src/objects/base/instance.h
+++ b/core/src/objects/base/instance.h
@@ -8,8 +8,6 @@
 #include <memory>
 #include <optional>
 #include <string>
-#include <variant>
-#include <map>
 #include <vector>
 // #include <../../include/expected.hpp>
 #include <expected.hpp>
diff --git a/core/src/objects/datamodel.cpp b/core/src/objects/datamodel.cpp
index fb9559d..376c1dd 100644
--- a/core/src/objects/datamodel.cpp
+++ b/core/src/objects/datamodel.cpp
@@ -9,7 +9,6 @@
 #include <cstdio>
 #include <fstream>
 #include <memory>
-#include <functional>
 
 const InstanceType DataModel::TYPE = {
     .super = &Instance::TYPE,
diff --git a/core/src/objects/part.h b/core/src/objects/part.h
index 73c63ed..6537b75 100644
--- a/core/src/objects/part.h
+++ b/core/src/objects/part.h
@@ -1,13 +1,12 @@
 #pragma once
 
-#include "base.h"
 #include <memory>
 #include <glm/glm.hpp>
 #include <glm/ext.hpp>
-#include "../rendering/material.h"
 #include "datatypes/cframe.h"
 #include "datatypes/color3.h"
 #include "datatypes/vector.h"
+#include "objects/base/instance.h"
 #include "rendering/surface.h"
 #include <reactphysics3d/reactphysics3d.h>
 
diff --git a/core/src/rendering/renderer.cpp b/core/src/rendering/renderer.cpp
index 5da2c60..5c2f55e 100644
--- a/core/src/rendering/renderer.cpp
+++ b/core/src/rendering/renderer.cpp
@@ -9,10 +9,8 @@
 #include <glm/glm.hpp>
 #include <glm/trigonometric.hpp>
 #include <memory>
-#include <vector>
 
 #include "datatypes/cframe.h"
-#include "physics/util.h"
 #include "shader.h"
 #include "mesh.h"
 #include "defaultmeshes.h"
diff --git a/editor/mainglwidget.cpp b/editor/mainglwidget.cpp
index 9d8caf6..5efcfcd 100644
--- a/editor/mainglwidget.cpp
+++ b/editor/mainglwidget.cpp
@@ -1,45 +1,12 @@
 #include <GL/glew.h>
-#include <chrono>
-
-#include <QMouseEvent>
-#include <glm/common.hpp>
-#include <glm/ext/matrix_projection.hpp>
-#include <glm/ext/matrix_transform.hpp>
-#include <glm/ext/scalar_constants.hpp>
-#include <glm/ext/vector_float3.hpp>
-#include <glm/geometric.hpp>
-#include <glm/gtc/round.hpp>
-#include <glm/matrix.hpp>
-#include <glm/trigonometric.hpp>
-#include <memory>
-#include <numbers>
-#include <optional>
 #include <qsoundeffect.h>
-#include <reactphysics3d/collision/RaycastInfo.h>
-#include <vector>
-#include <QSoundEffect>
-
-#include "datatypes/cframe.h"
-#include "datatypes/vector.h"
-#include "editorcommon.h"
-#include "logger.h"
-#include "mainwindow.h"
-#include "objects/handles.h"
-#include "physics/util.h"
-#include "qcursor.h"
-#include "qevent.h"
-#include "qnamespace.h"
-#include "qwindowdefs.h"
-#include "rendering/renderer.h"
-#include "physics/simulation.h"
-#include "camera.h"
-
-#include "common.h"
-#include "rendering/shader.h"
-
 #include "mainglwidget.h"
+#include "common.h"
 #include "math_helper.h"
-#include "rendering/surface.h"
+#include "physics/simulation.h"
+#include "physics/util.h"
+#include "rendering/renderer.h"
+#include "rendering/shader.h"
 
 static Data::CFrame XYZToZXY(glm::vec3(0, 0, 0), -glm::vec3(1, 0, 0), glm::vec3(0, 0, 1));
 
diff --git a/editor/mainwindow.cpp b/editor/mainwindow.cpp
index 07a526d..007e434 100644
--- a/editor/mainwindow.cpp
+++ b/editor/mainwindow.cpp
@@ -1,44 +1,11 @@
 #include "mainwindow.h"
 #include "./ui_mainwindow.h"
-
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QProcess>
-#include <QThread>
-#include <QTimerEvent>
-#include <QMouseEvent>
-#include <QWidget>
-#include <QTreeView>
-#include <QAbstractItemView>
-#include <cstdio>
-#include <functional>
-#include <memory>
-#include <optional>
-#include <qcoreapplication.h>
-#include <qglobal.h>
-#include <qguiapplication.h>
-#include <qicon.h>
-#include <qmessagebox.h>
-#include <qnamespace.h>
-#include <qwindowdefs.h>
-#include <reactphysics3d/engine/PhysicsCommon.h>
-#include <reactphysics3d/engine/PhysicsWorld.h>
-#include <sstream>
-#include <QStyleHints>
-
 #include "common.h"
-#include "editorcommon.h"
-#include "logger.h"
-#include "objects/base/instance.h"
-#include "objects/datamodel.h"
-#include "objects/handles.h"
 #include "physics/simulation.h"
-#include "objects/part.h"
-#include "qfiledialog.h"
-#include "qclipboard.h"
-#include "qmimedata.h"
-#include "qobject.h"
-#include "qsysinfo.h"
+#include <qclipboard.h>
+#include <qmessagebox.h>
+#include <qmimedata.h>
+#include <qstylehints.h>
 
 #ifdef _NDEBUG
 #define NDEBUG
diff --git a/editor/mainwindow.h b/editor/mainwindow.h
index 94db3d7..35c446e 100644
--- a/editor/mainwindow.h
+++ b/editor/mainwindow.h
@@ -2,10 +2,8 @@
 #define MAINWINDOW_H
 
 #include "logger.h"
-#include "panes/explorerview.h"
 #include "qbasictimer.h"
 #include "qcoreevent.h"
-#include "qmenu.h"
 #include <QMainWindow>
 #include <QLineEdit>
 #include <qfiledialog.h>
diff --git a/editor/panes/explorermodel.cpp b/editor/panes/explorermodel.cpp
index 5dbbd17..596ca9d 100644
--- a/editor/panes/explorermodel.cpp
+++ b/editor/panes/explorermodel.cpp
@@ -1,20 +1,7 @@
 #include "explorermodel.h"
-#include "objects/base/instance.h"
-#include "qabstractitemmodel.h"
-#include "qcontainerfwd.h"
-#include "qimage.h"
-#include "qnamespace.h"
-#include "qobject.h"
-#include "qstringview.h"
-#include "qwidget.h"
-#include "qmimedata.h"
 #include "common.h"
-#include "logger.h"
-#include <algorithm>
-#include <cstdio>
-#include <optional>
-#include <vector>
-#include "objects/base/instance.h"
+#include <qmimedata.h>
+#include <QWidget>
 
 // https://doc.qt.io/qt-6/qtwidgets-itemviews-simpletreemodel-example.html#testing-the-model
 
diff --git a/editor/panes/explorermodel.h b/editor/panes/explorermodel.h
index 6ea7037..378bee4 100644
--- a/editor/panes/explorermodel.h
+++ b/editor/panes/explorermodel.h
@@ -2,11 +2,6 @@
 
 #include "objects/base/instance.h"
 #include "qabstractitemmodel.h"
-#include "qevent.h"
-#include "qnamespace.h"
-#include <QOpenGLWidget>
-#include <QWidget>
-
 
 class ExplorerModel : public QAbstractItemModel {
     Q_OBJECT
diff --git a/editor/panes/explorerview.cpp b/editor/panes/explorerview.cpp
index e1c407b..4de6692 100644
--- a/editor/panes/explorerview.cpp
+++ b/editor/panes/explorerview.cpp
@@ -1,13 +1,6 @@
 #include "explorerview.h"
-#include "explorermodel.h"
-#include "mainwindow.h"
-#include "../ui_mainwindow.h"
 #include "common.h"
-#include "objects/base/instance.h"
-#include "qabstractitemmodel.h"
-#include <qaction.h>
-#include <qnamespace.h>
-#include <qitemselectionmodel.h>
+#include "../ui_mainwindow.h"
 
 #define M_mainWindow dynamic_cast<MainWindow*>(window())
 
diff --git a/editor/panes/explorerview.h b/editor/panes/explorerview.h
index 607c18d..4882e61 100644
--- a/editor/panes/explorerview.h
+++ b/editor/panes/explorerview.h
@@ -1,15 +1,8 @@
 #pragma once
 
-#include "objects/base/instance.h"
-#include "objects/part.h"
-#include "qevent.h"
-#include "qmenu.h"
-#include "qnamespace.h"
-#include "qtreeview.h"
-#include <QOpenGLWidget>
-#include <QWidget>
-#include <memory>
-#include "explorermodel.h"
+#include "panes/explorermodel.h"
+#include <qmenu.h>
+#include <qtreeview.h>
 
 class Ui_MainWindow;
 
diff --git a/editor/panes/propertiesmodel.h b/editor/panes/propertiesmodel.h
index 9d6e0f7..8c3aae9 100644
--- a/editor/panes/propertiesmodel.h
+++ b/editor/panes/propertiesmodel.h
@@ -1,15 +1,10 @@
 #pragma once
 
 #include "objects/base/instance.h"
-#include "objects/part.h"
 #include "qabstractitemmodel.h"
-#include "qevent.h"
-#include "qmenu.h"
 #include "qnamespace.h"
-#include "qtreeview.h"
 #include <QOpenGLWidget>
 #include <QWidget>
-#include <memory>
 
 class PropertiesModel : public QAbstractItemModel {
     Q_OBJECT
diff --git a/editor/panes/propertiesview.h b/editor/panes/propertiesview.h
index 4570c23..d934ae4 100644
--- a/editor/panes/propertiesview.h
+++ b/editor/panes/propertiesview.h
@@ -1,15 +1,7 @@
 #pragma once
 
 #include "objects/base/instance.h"
-#include "objects/part.h"
-#include "qevent.h"
-#include "qmenu.h"
-#include "qnamespace.h"
 #include "qtreeview.h"
-#include <QOpenGLWidget>
-#include <QWidget>
-#include <memory>
-#include "explorermodel.h"
 
 class Ui_MainWindow;