cleanup

markaren · Mar 16, 2024 · 1c23002 · 1c23002
1 parent d8b5d00
commit 1c23002
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 25 deletions.
diff --git a/examples/libs/geo/MapView.cpp b/examples/libs/geo/MapView.cpp
@@ -1,13 +1,8 @@
 
-#include "MapView.hpp"
-
-#include "lod/LODControl.hpp"
-#include "lod/LODFrustum.hpp"
-#include "lod/LODRaycast.hpp"
+#include "geo/MapView.hpp"
 
 using namespace threepp;
 
-
 namespace {
 
     void subdivide(MapNode& node, float depth) {
@@ -28,7 +23,8 @@ namespace {
 }// namespace
 
 
-MapView::MapView(std::unique_ptr<MapProvider> provider, std::unique_ptr<LODControl> lod): provider(std::move(provider)), lod(std::move(lod)) {
+MapView::MapView(std::unique_ptr<MapProvider> provider, std::unique_ptr<LODControl> lod)
+    : provider(std::move(provider)), lod(std::move(lod)) {
 
     root = std::make_unique<MapPlaneNode>(nullptr, this);
 

diff --git a/examples/libs/geo/MapView.hpp b/examples/libs/geo/MapView.hpp
@@ -6,8 +6,8 @@
 #include "threepp/objects/Mesh.hpp"
 
 #include "geo/lod/LODControl.hpp"
-#include "nodes/MapPlaneNode.hpp"
-#include "providers/MapProvider.hpp"
+#include "geo/nodes/MapPlaneNode.hpp"
+#include "geo/providers/MapProvider.hpp"
 
 namespace threepp {
 

diff --git a/examples/libs/geo/lod/LODFrustum.hpp b/examples/libs/geo/lod/LODFrustum.hpp
@@ -6,8 +6,8 @@
 #include "threepp/math/Frustum.hpp"
 #include "threepp/math/Matrix4.hpp"
 
-#include "../lod/LODRadial.hpp"
-#include "../MapView.hpp"
+#include "geo/lod/LODRadial.hpp"
+#include "geo/MapView.hpp"
 
 namespace threepp {
 

diff --git a/examples/libs/geo/lod/LODRadial.hpp b/examples/libs/geo/lod/LODRadial.hpp
@@ -5,9 +5,9 @@
 
 #include "threepp/core/Object3D.hpp"
 
-#include "../MapView.hpp"
-#include "../lod/LODControl.hpp"
-#include "../nodes/MapNode.hpp"
+#include "geo/MapView.hpp"
+#include "geo/lod/LODControl.hpp"
+#include "geo/nodes/MapNode.hpp"
 
 #include <cmath>
 #include <iostream>

diff --git a/examples/libs/geo/lod/LODRaycast.hpp b/examples/libs/geo/lod/LODRaycast.hpp
@@ -6,9 +6,9 @@
 #include "threepp/core/Raycaster.hpp"
 #include "threepp/math/MathUtils.hpp"
 
-#include "../MapView.hpp"
-#include "../lod/LODControl.hpp"
-#include "../nodes/MapNode.hpp"
+#include "geo/MapView.hpp"
+#include "geo/lod/LODControl.hpp"
+#include "geo/nodes/MapNode.hpp"
 
 namespace threepp {
 

diff --git a/examples/libs/geo/nodes/MapNode.cpp b/examples/libs/geo/nodes/MapNode.cpp
@@ -1,6 +1,6 @@
 
-#include "MapNode.hpp"
-#include "../MapView.hpp"
+#include "geo/nodes/MapNode.hpp"
+#include "geo/MapView.hpp"
 
 #include <iostream>
 

diff --git a/examples/libs/geo/nodes/MapPlaneNode.hpp b/examples/libs/geo/nodes/MapPlaneNode.hpp
@@ -3,14 +3,13 @@
 #ifndef THREEPP_MAPPLANENODE_HPP
 #define THREEPP_MAPPLANENODE_HPP
 
-#include "MapNode.hpp"
 #include "geo/geometries/MapNodeGeometry.hpp"
+#include "geo/nodes/MapNode.hpp"
 #include "geo/utils/UnitUtils.hpp"
 #include "threepp/materials/MeshBasicMaterial.hpp"
 
 #include <iostream>
 
-
 namespace threepp {
 
     namespace {

diff --git a/examples/libs/geo/providers/BingMapsProvider.hpp b/examples/libs/geo/providers/BingMapsProvider.hpp
@@ -3,8 +3,8 @@
 #ifndef THREEPP_BINGMAPSPROVIDER_HPP
 #define THREEPP_BINGMAPSPROVIDER_HPP
 
-#include "../../utility/URLFetcher.hpp"
-#include "../providers/MapProvider.hpp"
+#include "geo/providers/MapProvider.hpp"
+#include "utility/URLFetcher.hpp"
 
 #include "threepp/loaders/ImageLoader.hpp"
 

diff --git a/examples/libs/geo/providers/OpenStreetMapsProvider.hpp b/examples/libs/geo/providers/OpenStreetMapsProvider.hpp
@@ -3,8 +3,8 @@
 #ifndef THREEPP_OPENSTREETMAPSPROVIDER_HPP
 #define THREEPP_OPENSTREETMAPSPROVIDER_HPP
 
-#include "../../utility/URLFetcher.hpp"
-#include "../providers/MapProvider.hpp"
+#include "geo/providers/MapProvider.hpp"
+#include "utility/URLFetcher.hpp"
 
 #include "threepp/loaders/ImageLoader.hpp"