summaryrefslogtreecommitdiff
path: root/modules/csg
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-09-11 18:13:45 +0200
committerRémi Verschelde <rverschelde@gmail.com>2018-09-12 09:52:22 +0200
commit277b24dfb7acdb42589b931252bbe7be81c7536e (patch)
tree248dc6dfca0e27c3b03533b45753a16d186d2811 /modules/csg
parentcc71012266f880dcf3b37e40d5f90d9ce8b7a432 (diff)
Make core/ includes absolute, remove subfolders from include path
This allows more consistency in the manner we include core headers, where previously there would be a mix of absolute, relative and include path-dependent includes.
Diffstat (limited to 'modules/csg')
-rw-r--r--modules/csg/csg.cpp8
-rw-r--r--modules/csg/csg.h16
2 files changed, 12 insertions, 12 deletions
diff --git a/modules/csg/csg.cpp b/modules/csg/csg.cpp
index 87c2caec0d..0184018274 100644
--- a/modules/csg/csg.cpp
+++ b/modules/csg/csg.cpp
@@ -29,10 +29,10 @@
/*************************************************************************/
#include "csg.h"
-#include "face3.h"
-#include "geometry.h"
-#include "os/os.h"
-#include "sort.h"
+#include "core/math/face3.h"
+#include "core/math/geometry.h"
+#include "core/os/os.h"
+#include "core/sort.h"
#include "thirdparty/misc/triangulator.h"
void CSGBrush::clear() {
diff --git a/modules/csg/csg.h b/modules/csg/csg.h
index 2e07c23e28..5d6432eca8 100644
--- a/modules/csg/csg.h
+++ b/modules/csg/csg.h
@@ -31,15 +31,15 @@
#ifndef CSG_H
#define CSG_H
-#include "aabb.h"
-#include "dvector.h"
-#include "map.h"
-#include "oa_hash_map.h"
-#include "plane.h"
-#include "rect2.h"
+#include "core/dvector.h"
+#include "core/map.h"
+#include "core/math/aabb.h"
+#include "core/math/plane.h"
+#include "core/math/rect2.h"
+#include "core/math/transform.h"
+#include "core/math/vector3.h"
+#include "core/oa_hash_map.h"
#include "scene/resources/material.h"
-#include "transform.h"
-#include "vector3.h"
struct CSGBrush {