reorganize numeric sources

evanbowman · Aug 9, 2019 · aa46c51 · aa46c51
1 parent 29ab2ee
commit aa46c51
Show file tree

Hide file tree

Showing 22 changed files with 19 additions and 19 deletions.
diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
@@ -38,6 +38,8 @@ add_executable(BlindJump
   ${SOURCE_DIR}/entity/enemies/probe.cpp
   ${SOURCE_DIR}/entity/details/item.cpp
   ${SOURCE_DIR}/graphics/sprite.cpp
+  ${SOURCE_DIR}/number/numeric.cpp
+  ${SOURCE_DIR}/number/random.cpp
   ${SOURCE_DIR}/graphics/view.cpp
   ${SOURCE_DIR}/entity/entity.cpp
   ${SOURCE_DIR}/entity/player.cpp
@@ -46,9 +48,7 @@ add_executable(BlindJump
   ${SOURCE_DIR}/collision.cpp
   ${SOURCE_DIR}/easterEgg.cpp
   ${SOURCE_DIR}/tileMap.cpp
-  ${SOURCE_DIR}/numeric.cpp
   ${SOURCE_DIR}/camera.cpp
-  ${SOURCE_DIR}/random.cpp
   ${SOURCE_DIR}/start.cpp
   ${SOURCE_DIR}/game.cpp
   ${BLINDJUMP_PLATFORM_SOURCE})

diff --git a/source/camera.hpp b/source/camera.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "entity/entity.hpp"
-#include "numeric.hpp"
+#include "number/numeric.hpp"
 
 class Platform;
 

diff --git a/source/entity/details/item.cpp b/source/entity/details/item.cpp
@@ -1,6 +1,6 @@
 #include "item.hpp"
 #include "platform/platform.hpp"
-#include "random.hpp"
+#include "number/random.hpp"
 
 
 Item::Item(const Vec2<Float>& pos, Platform&, Type type)

diff --git a/source/entity/enemies/critter.hpp b/source/entity/enemies/critter.hpp
@@ -2,7 +2,7 @@
 
 #include "collision.hpp"
 #include "entity/entity.hpp"
-#include "numeric.hpp"
+#include "number/numeric.hpp"
 
 
 class Game;

diff --git a/source/entity/enemies/dasher.cpp b/source/entity/enemies/dasher.cpp
@@ -1,6 +1,6 @@
 #include "dasher.hpp"
 #include "game.hpp"
-#include "random.hpp"
+#include "number/random.hpp"
 
 
 Dasher::Dasher(const Vec2<Float>& position)

diff --git a/source/entity/player.hpp b/source/entity/player.hpp
@@ -3,7 +3,7 @@
 #include "graphics/animation.hpp"
 #include "collision.hpp"
 #include "entity.hpp"
-#include "numeric.hpp"
+#include "number/numeric.hpp"
 
 
 class Game;

diff --git a/source/game.cpp b/source/game.cpp
@@ -1,6 +1,6 @@
 #include "game.hpp"
 #include "macros.hpp"
-#include "random.hpp"
+#include "number/random.hpp"
 #include <algorithm>
 #include <iterator>
 #include <type_traits>

diff --git a/source/graphics/animation.hpp b/source/graphics/animation.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "numeric.hpp"
+#include "number/numeric.hpp"
 #include "sprite.hpp"
 
 

diff --git a/source/graphics/color.hpp b/source/graphics/color.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "numeric.hpp"
+#include "number/numeric.hpp"
 
 
 // Color representation is often platform specific, e.g., OpenGL uses

diff --git a/source/graphics/sprite.hpp b/source/graphics/sprite.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "color.hpp"
-#include "numeric.hpp"
+#include "number/numeric.hpp"
 
 
 using TextureIndex = u32;

diff --git a/source/graphics/view.hpp b/source/graphics/view.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "numeric.hpp"
+#include "number/numeric.hpp"
 
 
 class View {

diff --git a/source/memory/buffer.hpp b/source/memory/buffer.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "macros.hpp"
-#include "numeric.hpp"
+#include "number/numeric.hpp"
 #include <array>
 #include <new>
 

diff --git a/source/memory/pool.hpp b/source/memory/pool.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <array>
-#include "numeric.hpp"
+#include "number/numeric.hpp"
 #include <new>
 
 

diff --git a/source/memory/rc.hpp b/source/memory/rc.hpp
@@ -2,7 +2,7 @@
 
 #include <optional>
 #include "pool.hpp"
-#include "numeric.hpp"
+#include "number/numeric.hpp"
 
 
 // This program targets embedded systems, and intentionally doesn't

diff --git a/source/numeric.cpp → source/number/numeric.cpp b/source/numeric.cpp → source/number/numeric.cpp
diff --git a/source/numeric.hpp → source/number/numeric.hpp b/source/numeric.hpp → source/number/numeric.hpp
diff --git a/source/random.cpp → source/number/random.cpp b/source/random.cpp → source/number/random.cpp
diff --git a/source/random.hpp → source/number/random.hpp b/source/random.hpp → source/number/random.hpp
diff --git a/source/platform/gba_platform.cpp b/source/platform/gba_platform.cpp
@@ -11,7 +11,7 @@
 
 #include "macros.hpp"
 #include "platform.hpp"
-#include "random.hpp"
+#include "number/random.hpp"
 #include <string.h>
 
 

diff --git a/source/platform/platform.hpp b/source/platform/platform.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "numeric.hpp"
+#include "number/numeric.hpp"
 #include "save.hpp"
 #include "graphics/sprite.hpp"
 #include "graphics/view.hpp"

diff --git a/source/save.hpp b/source/save.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 
-#include "numeric.hpp"
+#include "number/numeric.hpp"
 
 
 struct SaveData {

diff --git a/source/tileMap.hpp b/source/tileMap.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "numeric.hpp"
+#include "number/numeric.hpp"
 #include <array>