Moved coordinate system types to Coord.h/cpp.

afritz1 · Feb 12, 2021 · 1ce5671 · 1ce5671
1 parent cb8fdab
commit 1ce5671
Show file tree

Hide file tree

Showing 4 changed files with 140 additions and 130 deletions.
diff --git a/OpenTESArena/src/World/Coord.cpp b/OpenTESArena/src/World/Coord.cpp
@@ -0,0 +1,54 @@
+#include "ChunkUtils.h"
+#include "Coord.h"
+
+CoordDouble2 CoordDouble2::operator+(const VoxelDouble2 &other) const
+{
+	return CoordDouble2(this->chunk, this->point + other);
+}
+
+CoordDouble2 CoordDouble2::operator-(const VoxelDouble2 &other) const
+{
+	return CoordDouble2(this->chunk, this->point - other);
+}
+
+VoxelDouble2 CoordDouble2::operator-(const CoordDouble2 &other) const
+{
+	// Combine three vectors:
+	// 1) Other chunk origin to other point.
+	// 2) Other chunk origin to chunk origin.
+	// 3) Point to chunk origin.
+	const VoxelDouble2 otherPointToOtherOrigin = -other.point;
+
+	const ChunkInt2 chunkDiff = this->chunk - other.chunk;
+	const VoxelDouble2 otherOriginToOrigin(
+		chunkDiff.x * static_cast<SNDouble>(ChunkUtils::CHUNK_DIM),
+		chunkDiff.y * static_cast<WEDouble>(ChunkUtils::CHUNK_DIM));
+
+	const VoxelDouble2 originToPoint = this->point;
+
+	return otherPointToOtherOrigin + otherOriginToOrigin + originToPoint;
+}
+
+CoordDouble3 CoordDouble3::operator+(const VoxelDouble3 &other) const
+{
+	return CoordDouble3(this->chunk, this->point + other);
+}
+
+VoxelDouble3 CoordDouble3::operator-(const CoordDouble3 &other) const
+{
+	// Combine three vectors:
+	// 1) Other chunk origin to other point.
+	// 2) Other chunk origin to chunk origin.
+	// 3) Point to chunk origin.
+	const VoxelDouble3 otherPointToOtherOrigin = -other.point;
+
+	const ChunkInt2 chunkDiff = this->chunk - other.chunk;
+	const VoxelDouble3 otherOriginToOrigin(
+		chunkDiff.x * static_cast<SNDouble>(ChunkUtils::CHUNK_DIM),
+		0.0,
+		chunkDiff.y * static_cast<WEDouble>(ChunkUtils::CHUNK_DIM));
+
+	const VoxelDouble3 originToPoint = this->point;
+
+	return otherPointToOtherOrigin + otherOriginToOrigin + originToPoint;
+}
diff --git a/OpenTESArena/src/World/Coord.h b/OpenTESArena/src/World/Coord.h
@@ -0,0 +1,85 @@
+#ifndef COORD_H
+#define COORD_H
+
+#include "../Math/Vector2.h"
+#include "../Math/Vector3.h"
+
+// Aliases for various coordinate systems. All of these are from a top-down perspective.
+using OriginalInt2 = Int2; // +X west, +Y south (original game, origin at top right).
+using NewInt2 = Int2; // +X south, +Y west (DEPRECATE THIS EVENTUALLY IN FAVOR OF ChunkInt2 + VoxelInt2).
+using LevelInt2 = Int2; // +X south, +Y west, used with level definitions (independent of chunks).
+using ChunkInt2 = Int2; // +X south, +Y west, [-inf, inf].
+using VoxelInt2 = Int2; // +X south, +Y west, used with chunk voxels, [0, CHUNK_DIM-1].
+
+using OriginalDouble2 = Double2; // +X west, +Y south.
+using NewDouble2 = Double2; // +X south, +Y west (DEPRECATE IN FAVOR OF VoxelDouble2).
+using LevelDouble2 = Double2; // +X south, +Y west, used with level definitions (independent of chunks).
+using VoxelDouble2 = Double2; // +X south, +Y west, in the space of chunk voxels.
+
+using NewInt3 = Int3; // +X south, +Y up, +Z west (DEPRECATE THIS EVENTUALLY IN FAVOR OF ChunkInt2 + VoxelInt3).
+using LevelInt3 = Int3; // +X south, +Y up, +Z west, used with level definitions (independent of chunks).
+using VoxelInt3 = Int3; // +X south, +Y up, +Z west, used with chunk voxels, [0, CHUNK_DIM-1].
+
+using NewDouble3 = Double3; // +X south, +Y up, +Z west (DEPRECATE THIS EVENTUALLY IN FAVOR OF ChunkInt2 + VoxelInt3).
+using LevelDouble3 = Double3; // +X south, +Y up, +Z west, used with level definitions (independent of chunks).
+using VoxelDouble3 = Double3; // +X south, +Y up, +Z west, used with chunk voxels, [0, CHUNK_DIM-1].
+
+// Various coordinate structs for representing a unique voxel or point in the game world.
+struct CoordInt2
+{
+	ChunkInt2 chunk;
+	VoxelInt2 voxel;
+
+	CoordInt2() = default;
+	CoordInt2(const ChunkInt2 &chunk, const VoxelInt2 &voxel)
+		: chunk(chunk), voxel(voxel) { }
+};
+
+struct CoordDouble2
+{
+	ChunkInt2 chunk;
+	VoxelDouble2 point;
+
+	CoordDouble2() = default;
+	CoordDouble2(const ChunkInt2 &chunk, const VoxelDouble2 &point)
+		: chunk(chunk), point(point) { }
+
+	CoordDouble2 operator+(const VoxelDouble2 &other) const;
+	CoordDouble2 operator-(const VoxelDouble2 &other) const;
+	VoxelDouble2 operator-(const CoordDouble2 &other) const;
+};
+
+struct CoordInt3
+{
+	ChunkInt2 chunk;
+	VoxelInt3 voxel;
+
+	CoordInt3() = default;
+	CoordInt3(const ChunkInt2 &chunk, const VoxelInt3 &voxel)
+		: chunk(chunk), voxel(voxel) { }
+};
+
+struct CoordDouble3
+{
+	ChunkInt2 chunk;
+	VoxelDouble3 point;
+
+	CoordDouble3() = default;
+	CoordDouble3(const ChunkInt2 &chunk, const VoxelDouble3 &point)
+		: chunk(chunk), point(point) { }
+
+	CoordDouble3 operator+(const VoxelDouble3 &other) const;
+	VoxelDouble3 operator-(const CoordDouble3 &other) const;
+};
+
+// These are here out of desperation after many months of confusing myself.
+//using NSInt = int; // + north, - south
+using SNInt = int; // + south, - north
+//using EWInt = int; // + east, - west
+using WEInt = int; // + west, - east
+//using NSDouble = double; // + north, - south
+using SNDouble = double; // + south, - north
+//using EWDouble = double; // + east, - west
+using WEDouble = double; // + west, - east
+
+#endif
diff --git a/OpenTESArena/src/World/VoxelUtils.cpp b/OpenTESArena/src/World/VoxelUtils.cpp
@@ -7,58 +7,6 @@
 
 #include "components/debug/Debug.h"
 
-CoordDouble2 CoordDouble2::operator+(const VoxelDouble2 &other) const
-{
-	return CoordDouble2(this->chunk, this->point + other);
-}
-
-CoordDouble2 CoordDouble2::operator-(const VoxelDouble2 &other) const
-{
-	return CoordDouble2(this->chunk, this->point - other);
-}
-
-VoxelDouble2 CoordDouble2::operator-(const CoordDouble2 &other) const
-{
-	// Combine three vectors:
-	// 1) Other chunk origin to other point.
-	// 2) Other chunk origin to chunk origin.
-	// 3) Point to chunk origin.
-	const VoxelDouble2 otherPointToOtherOrigin = -other.point;
-
-	const ChunkInt2 chunkDiff = this->chunk - other.chunk;
-	const VoxelDouble2 otherOriginToOrigin(
-		chunkDiff.x * static_cast<SNDouble>(ChunkUtils::CHUNK_DIM),
-		chunkDiff.y * static_cast<WEDouble>(ChunkUtils::CHUNK_DIM));
-
-	const VoxelDouble2 originToPoint = this->point;
-
-	return otherPointToOtherOrigin + otherOriginToOrigin + originToPoint;
-}
-
-CoordDouble3 CoordDouble3::operator+(const VoxelDouble3 &other) const
-{
-	return CoordDouble3(this->chunk, this->point + other);
-}
-
-VoxelDouble3 CoordDouble3::operator-(const CoordDouble3 &other) const
-{
-	// Combine three vectors:
-	// 1) Other chunk origin to other point.
-	// 2) Other chunk origin to chunk origin.
-	// 3) Point to chunk origin.
-	const VoxelDouble3 otherPointToOtherOrigin = -other.point;
-
-	const ChunkInt2 chunkDiff = this->chunk - other.chunk;
-	const VoxelDouble3 otherOriginToOrigin(
-		chunkDiff.x * static_cast<SNDouble>(ChunkUtils::CHUNK_DIM),
-		0.0,
-		chunkDiff.y * static_cast<WEDouble>(ChunkUtils::CHUNK_DIM));
-
-	const VoxelDouble3 originToPoint = this->point;
-
-	return otherPointToOtherOrigin + otherOriginToOrigin + originToPoint;
-}
-
 NewInt2 VoxelUtils::originalVoxelToNewVoxel(const OriginalInt2 &voxel)
 {
 	return NewInt2(voxel.y, voxel.x);

diff --git a/OpenTESArena/src/World/VoxelUtils.h b/OpenTESArena/src/World/VoxelUtils.h
@@ -3,87 +3,10 @@
 
 #include <optional>
 
+#include "Coord.h"
 #include "../Math/Vector2.h"
 #include "../Math/Vector3.h"
 
-// Aliases for various coordinate systems. All of these are from a top-down perspective.
-using OriginalInt2 = Int2; // +X west, +Y south (original game, origin at top right).
-using NewInt2 = Int2; // +X south, +Y west (DEPRECATE THIS EVENTUALLY IN FAVOR OF ChunkInt2 + VoxelInt2).
-using LevelInt2 = Int2; // +X south, +Y west, used with level definitions (independent of chunks).
-using ChunkInt2 = Int2; // +X south, +Y west, [-inf, inf].
-using VoxelInt2 = Int2; // +X south, +Y west, used with chunk voxels, [0, CHUNK_DIM-1].
-
-using OriginalDouble2 = Double2; // +X west, +Y south.
-using NewDouble2 = Double2; // +X south, +Y west (DEPRECATE IN FAVOR OF VoxelDouble2).
-using LevelDouble2 = Double2; // +X south, +Y west, used with level definitions (independent of chunks).
-using VoxelDouble2 = Double2; // +X south, +Y west, in the space of chunk voxels.
-
-using NewInt3 = Int3; // +X south, +Y up, +Z west (DEPRECATE THIS EVENTUALLY IN FAVOR OF ChunkInt2 + VoxelInt3).
-using LevelInt3 = Int3; // +X south, +Y up, +Z west, used with level definitions (independent of chunks).
-using VoxelInt3 = Int3; // +X south, +Y up, +Z west, used with chunk voxels, [0, CHUNK_DIM-1].
-
-using NewDouble3 = Double3; // +X south, +Y up, +Z west (DEPRECATE THIS EVENTUALLY IN FAVOR OF ChunkInt2 + VoxelInt3).
-using LevelDouble3 = Double3; // +X south, +Y up, +Z west, used with level definitions (independent of chunks).
-using VoxelDouble3 = Double3; // +X south, +Y up, +Z west, used with chunk voxels, [0, CHUNK_DIM-1].
-
-// Various coordinate structs for representing a unique voxel or point in the game world.
-struct CoordInt2
-{
-	ChunkInt2 chunk;
-	VoxelInt2 voxel;
-
-	CoordInt2() = default;
-	CoordInt2(const ChunkInt2 &chunk, const VoxelInt2 &voxel)
-		: chunk(chunk), voxel(voxel) { }
-};
-
-struct CoordDouble2
-{
-	ChunkInt2 chunk;
-	VoxelDouble2 point;
-
-	CoordDouble2() = default;
-	CoordDouble2(const ChunkInt2 &chunk, const VoxelDouble2 &point)
-		: chunk(chunk), point(point) { }
-
-	CoordDouble2 operator+(const VoxelDouble2 &other) const;
-	CoordDouble2 operator-(const VoxelDouble2 &other) const;
-	VoxelDouble2 operator-(const CoordDouble2 &other) const;
-};
-
-struct CoordInt3
-{
-	ChunkInt2 chunk;
-	VoxelInt3 voxel;
-
-	CoordInt3() = default;
-	CoordInt3(const ChunkInt2 &chunk, const VoxelInt3 &voxel)
-		: chunk(chunk), voxel(voxel) { }
-};
-
-struct CoordDouble3
-{
-	ChunkInt2 chunk;
-	VoxelDouble3 point;
-
-	CoordDouble3() = default;
-	CoordDouble3(const ChunkInt2 &chunk, const VoxelDouble3 &point)
-		: chunk(chunk), point(point) { }
-
-	CoordDouble3 operator+(const VoxelDouble3 &other) const;
-	VoxelDouble3 operator-(const CoordDouble3 &other) const;
-};
-
-// These are here out of desperation after many months of confusing myself.
-//using NSInt = int; // + north, - south
-using SNInt = int; // + south, - north
-//using EWInt = int; // + east, - west
-using WEInt = int; // + west, - east
-//using NSDouble = double; // + north, - south
-using SNDouble = double; // + south, - north
-//using EWDouble = double; // + east, - west
-using WEDouble = double; // + west, - east
-
 enum class VoxelFacing2D;
 enum class VoxelFacing3D;