curve: Refactor and move curve containers to subfolder.

SFTtech · Jan 19, 2025 · d571822 · d571822
1 parent ad747a6
commit d571822
Show file tree

Hide file tree

Showing 21 changed files with 46 additions and 44 deletions.
diff --git a/libopenage/curve/CMakeLists.txt b/libopenage/curve/CMakeLists.txt
@@ -1,19 +1,13 @@
 add_sources(libopenage
-	array.cpp
 	base_curve.cpp
 	continuous.cpp
 	discrete.cpp
 	discrete_mod.cpp
-    element_wrapper.cpp
 	interpolated.cpp
-	iterator.cpp
 	keyframe.cpp
 	keyframe_container.cpp
-	map.cpp
-	map_filter_iterator.cpp
-	queue.cpp
-	queue_filter_iterator.cpp
 	segmented.cpp
 )
 
+add_subdirectory("container")
 add_subdirectory("tests")
diff --git a/libopenage/curve/container/CMakeLists.txt b/libopenage/curve/container/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_sources(libopenage
+	array.cpp
+    element_wrapper.cpp
+	iterator.cpp
+	map.cpp
+	map_filter_iterator.cpp
+	queue.cpp
+	queue_filter_iterator.cpp
+)
diff --git a/libopenage/curve/array.cpp → libopenage/curve/container/array.cpp b/libopenage/curve/array.cpp → libopenage/curve/container/array.cpp
@@ -1,4 +1,4 @@
-// Copyright 2024-2024 the openage authors. See copying.md for legal info.
+// Copyright 2024-2025 the openage authors. See copying.md for legal info.
 
 
 #include "array.h"

diff --git a/libopenage/curve/array.h → libopenage/curve/container/array.h b/libopenage/curve/array.h → libopenage/curve/container/array.h
@@ -4,7 +4,7 @@
 
 #include <array>
 
-#include "curve/iterator.h"
+#include "curve/container/iterator.h"
 #include "curve/keyframe_container.h"
 #include "event/evententity.h"
 

diff --git a/libopenage/curve/element_wrapper.cpp → ...enage/curve/container/element_wrapper.cpp b/libopenage/curve/element_wrapper.cpp → ...enage/curve/container/element_wrapper.cpp
@@ -1,4 +1,4 @@
-// Copyright 2024-2024 the openage authors. See copying.md for legal info.
+// Copyright 2024-2025 the openage authors. See copying.md for legal info.
 
 #include "element_wrapper.h"
 

diff --git a/libopenage/curve/element_wrapper.h → libopenage/curve/container/element_wrapper.h b/libopenage/curve/element_wrapper.h → libopenage/curve/container/element_wrapper.h
@@ -1,4 +1,4 @@
-// Copyright 2024-2024 the openage authors. See copying.md for legal info.
+// Copyright 2024-2025 the openage authors. See copying.md for legal info.
 
 #pragma once
 

diff --git a/libopenage/curve/iterator.cpp → libopenage/curve/container/iterator.cpp b/libopenage/curve/iterator.cpp → libopenage/curve/container/iterator.cpp
@@ -1,4 +1,4 @@
-// Copyright 2017-2018 the openage authors. See copying.md for legal info.
+// Copyright 2017-2025 the openage authors. See copying.md for legal info.
 
 #include "iterator.h"
 

diff --git a/libopenage/curve/iterator.h → libopenage/curve/container/iterator.h b/libopenage/curve/iterator.h → libopenage/curve/container/iterator.h
@@ -1,4 +1,4 @@
-// Copyright 2017-2024 the openage authors. See copying.md for legal info.
+// Copyright 2017-2025 the openage authors. See copying.md for legal info.
 
 #pragma once
 

diff --git a/libopenage/curve/map.cpp → libopenage/curve/container/map.cpp b/libopenage/curve/map.cpp → libopenage/curve/container/map.cpp
@@ -1,4 +1,4 @@
-// Copyright 2017-2018 the openage authors. See copying.md for legal info.
+// Copyright 2017-2025 the openage authors. See copying.md for legal info.
 
 #include "map.h"
 

diff --git a/libopenage/curve/map.h → libopenage/curve/container/map.h b/libopenage/curve/map.h → libopenage/curve/container/map.h
@@ -1,4 +1,4 @@
-// Copyright 2017-2024 the openage authors. See copying.md for legal info.
+// Copyright 2017-2025 the openage authors. See copying.md for legal info.
 
 #pragma once
 
@@ -7,8 +7,8 @@
 #include <unordered_map>
 #include <utility>
 
-#include "curve/map_filter_iterator.h"
-#include "curve/element_wrapper.h"
+#include "curve/container/element_wrapper.h"
+#include "curve/container/map_filter_iterator.h"
 #include "time/time.h"
 #include "util/fixed_point.h"
 
@@ -21,7 +21,6 @@ namespace openage::curve {
  */
 template <typename key_t, typename val_t>
 class UnorderedMap {
-
 	/**
 	 * Data holder. Maps keys to map elements.
 	 * Map elements themselves store when they are valid.

diff --git a/libopenage/curve/map_filter_iterator.cpp → ...e/curve/container/map_filter_iterator.cpp b/libopenage/curve/map_filter_iterator.cpp → ...e/curve/container/map_filter_iterator.cpp
@@ -1,4 +1,4 @@
-// Copyright 2017-2018 the openage authors. See copying.md for legal info.
+// Copyright 2017-2025 the openage authors. See copying.md for legal info.
 
 #include "map_filter_iterator.h"
 

diff --git a/libopenage/curve/map_filter_iterator.h → ...age/curve/container/map_filter_iterator.h b/libopenage/curve/map_filter_iterator.h → ...age/curve/container/map_filter_iterator.h
@@ -1,8 +1,8 @@
-// Copyright 2017-2024 the openage authors. See copying.md for legal info.
+// Copyright 2017-2025 the openage authors. See copying.md for legal info.
 
 #pragma once
 
-#include "curve/iterator.h"
+#include "curve/container/iterator.h"
 #include "time/time.h"
 
 

diff --git a/libopenage/curve/queue.cpp → libopenage/curve/container/queue.cpp b/libopenage/curve/queue.cpp → libopenage/curve/container/queue.cpp
@@ -1,4 +1,4 @@
-// Copyright 2017-2018 the openage authors. See copying.md for legal info.
+// Copyright 2017-2025 the openage authors. See copying.md for legal info.
 
 #include "queue.h"
 

diff --git a/libopenage/curve/queue.h → libopenage/curve/container/queue.h b/libopenage/curve/queue.h → libopenage/curve/container/queue.h
@@ -1,4 +1,4 @@
-// Copyright 2017-2024 the openage authors. See copying.md for legal info.
+// Copyright 2017-2025 the openage authors. See copying.md for legal info.
 
 #pragma once
 
@@ -11,9 +11,9 @@
 
 #include "error/error.h"
 
-#include "curve/iterator.h"
-#include "curve/queue_filter_iterator.h"
-#include "curve/element_wrapper.h"
+#include "curve/container/element_wrapper.h"
+#include "curve/container/iterator.h"
+#include "curve/container/queue_filter_iterator.h"
 #include "event/evententity.h"
 #include "time/time.h"
 #include "util/fixed_point.h"

diff --git a/libopenage/curve/queue_filter_iterator.cpp → ...curve/container/queue_filter_iterator.cpp b/libopenage/curve/queue_filter_iterator.cpp → ...curve/container/queue_filter_iterator.cpp
@@ -1,4 +1,4 @@
-// Copyright 2017-2018 the openage authors. See copying.md for legal info.
+// Copyright 2017-2025 the openage authors. See copying.md for legal info.
 
 #include "queue_filter_iterator.h"
 

diff --git a/libopenage/curve/queue_filter_iterator.h → ...e/curve/container/queue_filter_iterator.h b/libopenage/curve/queue_filter_iterator.h → ...e/curve/container/queue_filter_iterator.h
@@ -1,8 +1,8 @@
-// Copyright 2017-2024 the openage authors. See copying.md for legal info.
+// Copyright 2017-2025 the openage authors. See copying.md for legal info.
 
 #pragma once
 
-#include "curve/iterator.h"
+#include "curve/container/iterator.h"
 #include "time/time.h"
 
 

diff --git a/libopenage/curve/tests/container.cpp b/libopenage/curve/tests/container.cpp
@@ -9,12 +9,12 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "curve/array.h"
-#include "curve/iterator.h"
-#include "curve/map.h"
-#include "curve/map_filter_iterator.h"
-#include "curve/queue.h"
-#include "curve/queue_filter_iterator.h"
+#include "curve/container/array.h"
+#include "curve/container/iterator.h"
+#include "curve/container/map.h"
+#include "curve/container/map_filter_iterator.h"
+#include "curve/container/queue.h"
+#include "curve/container/queue_filter_iterator.h"
 #include "event/event_loop.h"
 #include "testing/testing.h"
 

diff --git a/libopenage/gamestate/component/api/live.cpp b/libopenage/gamestate/component/api/live.cpp
@@ -1,12 +1,12 @@
-// Copyright 2021-2023 the openage authors. See copying.md for legal info.
+// Copyright 2021-2025 the openage authors. See copying.md for legal info.
 
 #include "live.h"
 
 #include <optional>
 
+#include "curve/container/iterator.h"
+#include "curve/container/map_filter_iterator.h"
 #include "curve/discrete.h"
-#include "curve/iterator.h"
-#include "curve/map_filter_iterator.h"
 #include "gamestate/component/types.h"
 
 

diff --git a/libopenage/gamestate/component/api/live.h b/libopenage/gamestate/component/api/live.h
@@ -1,4 +1,4 @@
-// Copyright 2021-2024 the openage authors. See copying.md for legal info.
+// Copyright 2021-2025 the openage authors. See copying.md for legal info.
 
 #pragma once
 
@@ -7,7 +7,7 @@
 
 #include <nyan/nyan.h>
 
-#include "curve/map.h"
+#include "curve/container/map.h"
 #include "gamestate/component/api_component.h"
 #include "gamestate/component/types.h"
 #include "time/time.h"

diff --git a/libopenage/gamestate/component/internal/command_queue.h b/libopenage/gamestate/component/internal/command_queue.h
@@ -1,10 +1,10 @@
-// Copyright 2021-2024 the openage authors. See copying.md for legal info.
+// Copyright 2021-2025 the openage authors. See copying.md for legal info.
 
 #pragma once
 
 #include <memory>
 
-#include "curve/queue.h"
+#include "curve/container/queue.h"
 #include "gamestate/component/internal/commands/base_command.h"
 #include "gamestate/component/internal_component.h"
 #include "gamestate/component/types.h"

diff --git a/libopenage/gamestate/entity_factory.cpp b/libopenage/gamestate/entity_factory.cpp
@@ -1,4 +1,4 @@
-// Copyright 2023-2023 the openage authors. See copying.md for legal info.
+// Copyright 2023-2025 the openage authors. See copying.md for legal info.
 
 #include "entity_factory.h"
 
@@ -10,8 +10,8 @@
 
 #include "error/error.h"
 
+#include "curve/container/queue.h"
 #include "curve/discrete.h"
-#include "curve/queue.h"
 #include "event/event_loop.h"
 #include "gamestate/activity/activity.h"
 #include "gamestate/activity/condition/command_in_queue.h"