6 files changed, 112 insertions, 89 deletions

diff --git a/game/network/link.h b/game/network/link.h
index b22d0d0..287ba14 100644
--- a/game/network/link.h
+++ b/game/network/link.h
@@ -37,14 +37,6 @@ public:
 	float length;
 };
 
-template<typename T> struct PtrSorter {
-	bool
-	operator()(const T & a, const T & b) const
-	{
-		return *a < *b;
-	}
-};
-
 bool operator<(const glm::vec3 & a, const glm::vec3 & b);
 bool operator<(const Node & a, const Node & b);
 
diff --git a/game/network/rail.cpp b/game/network/rail.cpp
index 0858b66..e66b5c8 100644
--- a/game/network/rail.cpp
+++ b/game/network/rail.cpp
@@ -3,27 +3,21 @@
 #include <GL/glew.h>
 #include <array>
 #include <cache.h>
-#include <cmath>
 #include <gfx/gl/shader.h>
 #include <gfx/models/texture.h>
 #include <gfx/models/vertex.hpp>
-#include <glm/gtc/constants.hpp>
-#include <glm/gtx/rotate_vector.hpp>
 #include <glm/gtx/transform.hpp>
-#include <glm/gtx/vector_angle.hpp>
-#include <numbers>
+#include <maths.h>
 #include <type_traits>
 #include <utility>
 
 RailLinks::RailLinks() : texture {Texture::cachedTexture.get("rails.jpg")} { }
 void RailLinks::tick(TickDuration) { }
 
-static const auto identityModel {glm::identity<glm::mat4>()};
-
 void
 RailLinks::render(const Shader & shader) const
 {
-	shader.setModel(identityModel);
+	shader.setModel(glm::identity<glm::mat4>());
 	texture->Bind();
 	links.apply(&RailLink::render, shader);
 }
@@ -43,44 +37,12 @@ constexpr const std::array<std::pair<glm::vec3, float>, 4> railCrossSection {{
 		{{.75F, .25F, 0.F}, 0.875F},
 		{{1.F, 0.F, 0.F}, 1.F},
 }};
-constexpr const glm::vec3 up {0, 1, 0};
-constexpr const glm::vec3 north {0, 0, 1};
-const auto oneeighty {glm::rotate(std::numbers::pi_v<float>, up)};
-constexpr auto half_pi {glm::half_pi<float>()};
-constexpr auto pi {glm::pi<float>()};
-constexpr auto two_pi {glm::two_pi<float>()};
 constexpr auto sleepers {5.F}; // There are 5 repetitions of sleepers in the texture
 
-template<typename V>
-auto
-flat_orientation(const V & diff)
-{
-	const auto flatdiff {glm::normalize(glm::vec3 {diff.x, 0, diff.z})};
-	auto e {glm::orientation(flatdiff, north)};
-	// Handle if diff is exactly opposite to north
-	return (std::isnan(e[0][0])) ? oneeighty : e;
-}
-
-template<typename V>
-auto
-flat_angle(const V & diff)
-{
-	const auto flatdiff {glm::normalize(glm::vec3 {diff.x, 0, diff.z})};
-	return glm::orientedAngle(flatdiff, north, up);
-}
-
-template<typename T>
-constexpr auto
-round_frac(const T & v, const T & frac)
-{
-	return std::round(v / frac) * frac;
-}
-
-template<typename T>
-constexpr auto
-round_sleepers(const T & v)
+inline auto
+round_sleepers(const float v)
 {
-	return std::round(v / sleepers) * sleepers;
+	return round_frac(v, sleepers);
 }
 
 RailLinkStraight::RailLinkStraight(const NodePtr & a, const NodePtr & b) : RailLinkStraight(a, b, b->pos - a->pos) { }
@@ -106,43 +68,6 @@ RailLinkStraight::RailLinkStraight(NodePtr a, NodePtr b, const glm::vec3 & diff)
 	meshes.create<Mesh>(vertices, indices, GL_TRIANGLE_STRIP);
 }
 
-constexpr inline glm::vec3
-operator!(const glm::vec2 & v)
-{
-	return {v.x, 0, v.y};
-}
-
-constexpr inline float
-arc_length(const Arc & arc)
-{
-	return arc.second - arc.first;
-}
-
-constexpr inline float
-normalize(float ang)
-{
-	while (ang > pi) {
-		ang -= two_pi;
-	}
-	while (ang <= -pi) {
-		ang += two_pi;
-	}
-	return ang;
-}
-
-inline Arc
-create_arc(const glm::vec3 centre3, glm::vec3 e0p, glm::vec3 e1p)
-{
-	const auto diffa = centre3 - e0p;
-	const auto diffb = centre3 - e1p;
-	const auto anga = flat_angle(diffa);
-	const auto angb = [&diffb, &anga]() {
-		const auto angb = flat_angle(diffb);
-		return (angb < anga) ? angb + two_pi : angb;
-	}();
-	return {anga, angb};
-}
-
 RailLinkCurve::RailLinkCurve(const NodePtr & a, const NodePtr & b, glm::vec2 c) :
 	RailLinkCurve(a, b, {c.x, a->pos.y, c.y}, create_arc(!c, a->pos, b->pos))
 {
diff --git a/game/network/rail.h b/game/network/rail.h
index 3ab0c83..8fee27f 100644
--- a/game/network/rail.h
+++ b/game/network/rail.h
@@ -8,10 +8,13 @@
 #include "gfx/renderable.h"
 #include "link.h"
 #include <glm/glm.hpp>
+#include <maths.h>
 #include <memory>
 #include <set>
+#include <sorting.hpp>
 #include <utility>
 #include <vector>
+
 class Shader;
 class Texture;
 
@@ -36,7 +39,6 @@ private:
 	RailLinkStraight(NodePtr, NodePtr, const glm::vec3 & diff);
 };
 
-using Arc = std::pair<float, float>;
 class RailLinkCurve : public RailLink {
 public:
 	RailLinkCurve(const NodePtr &, const NodePtr &, glm::vec2);
diff --git a/utility/maths.cpp b/utility/maths.cpp
new file mode 100644
index 0000000..a3315a3
--- /dev/null
+++ b/utility/maths.cpp
@@ -0,0 +1,54 @@
+#include "maths.h"
+#include <cmath>
+#include <glm/glm.hpp>
+#include <glm/gtx/rotate_vector.hpp>
+#include <glm/gtx/transform.hpp>
+#include <glm/gtx/vector_angle.hpp>
+
+glm::mat4
+flat_orientation(const glm::vec3 & diff)
+{
+	static const auto oneeighty {glm::rotate(pi, up)};
+	const auto flatdiff {glm::normalize(glm::vec3 {diff.x, 0, diff.z})};
+	auto e {glm::orientation(flatdiff, north)};
+	// Handle if diff is exactly opposite to north
+	return (std::isnan(e[0][0])) ? oneeighty : e;
+}
+
+float
+flat_angle(const glm::vec3 & diff)
+{
+	const auto flatdiff {glm::normalize(glm::vec3 {diff.x, 0, diff.z})};
+	return glm::orientedAngle(flatdiff, north, up);
+}
+
+float
+round_frac(const float & v, const float & frac)
+{
+	return std::round(v / frac) * frac;
+}
+
+float
+normalize(float ang)
+{
+	while (ang > pi) {
+		ang -= two_pi;
+	}
+	while (ang <= -pi) {
+		ang += two_pi;
+	}
+	return ang;
+}
+
+Arc
+create_arc(const glm::vec3 & centre3, const glm::vec3 & e0p, const glm::vec3 & e1p)
+{
+	const auto diffa = centre3 - e0p;
+	const auto diffb = centre3 - e1p;
+	const auto anga = flat_angle(diffa);
+	const auto angb = [&diffb, &anga]() {
+		const auto angb = flat_angle(diffb);
+		return (angb < anga) ? angb + two_pi : angb;
+	}();
+	return {anga, angb};
+}
diff --git a/utility/maths.h b/utility/maths.h
new file mode 100644
index 0000000..0b379d0
--- /dev/null
+++ b/utility/maths.h
@@ -0,0 +1,38 @@
+#ifndef MATH_H
+#define MATH_H
+
+#include <glm/glm.hpp>
+#include <glm/gtc/constants.hpp>
+#include <utility>
+
+using Arc = std::pair<float, float>;
+
+constexpr const glm::vec3 up {0, 1, 0};
+constexpr const glm::vec3 north {0, 0, 1};
+constexpr auto half_pi {glm::half_pi<float>()};
+constexpr auto pi {glm::pi<float>()};
+constexpr auto two_pi {glm::two_pi<float>()};
+
+glm::mat4 flat_orientation(const glm::vec3 & diff);
+
+float flat_angle(const glm::vec3 & diff);
+
+float round_frac(const float & v, const float & frac);
+
+constexpr inline glm::vec3
+operator!(const glm::vec2 & v)
+{
+	return {v.x, 0, v.y};
+}
+
+constexpr inline float
+arc_length(const Arc & arc)
+{
+	return arc.second - arc.first;
+}
+
+float normalize(float ang);
+
+Arc create_arc(const glm::vec3 & centre3, const glm::vec3 & e0p, const glm::vec3 & e1p);
+
+#endif
diff --git a/utility/sorting.hpp b/utility/sorting.hpp
new file mode 100644
index 0000000..0cb0eaf
--- /dev/null
+++ b/utility/sorting.hpp
@@ -0,0 +1,12 @@
+#ifndef SORTING_H
+#define SORTING_H
+
+template<typename T> struct PtrSorter {
+	bool
+	operator()(const T & a, const T & b) const
+	{
+		return *a < *b;
+	}
+};
+
+#endif