From e40b6bfe346bb93a2d3b38745b8fddba40e759c6 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 5 Feb 2021 18:53:45 +0000
Subject: Initial commit adding curved rail pieces

---
 application/main.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'application/main.cpp')

diff --git a/application/main.cpp b/application/main.cpp
index 2b62953..a723b20 100644
--- a/application/main.cpp
+++ b/application/main.cpp
@@ -14,7 +14,6 @@
 #include <gfx/manualCameraController.h>
 #include <gfx/renderable.h>
 #include <gfx/window.h>
-#include <glm/glm.hpp>
 #include <memory>
 #include <special_members.hpp>
 #include <utility>
@@ -69,9 +68,9 @@ public:
 		world.create<Terrain>();
 		auto rl = world.create<RailLinks>();
 		auto a = rl->addLink<RailLinkStraight>({-1190, 5, -1190}, {-1190, 6, -1180});
-		auto b = rl->addLink<RailLinkStraight>(a->ends.back().first->pos, glm::vec3 {-1180, 5, -1180});
-		auto c = rl->addLink<RailLinkStraight>(b->ends.back().first->pos, glm::vec3 {-1180, 4, -1190});
-		rl->addLink<RailLinkStraight>(c->ends.back().first->pos, a->ends.front().first->pos);
+		auto b = rl->addLink<RailLinkCurve>(a->ends.back().first->pos, {-1180, 5, -1180}, {-1185, -1180});
+		auto c = rl->addLink<RailLinkStraight>(b->ends.back().first->pos, {-1180, 4, -1190});
+		rl->addLink<RailLinkCurve>(c->ends.back().first->pos, a->ends.front().first->pos, {-1185, -1190});
 
 		Shader shader;
 		Camera camera({-1250.0F, 35.0F, -1250.0F}, 70.0F, (float)DISPLAY_WIDTH / (float)DISPLAY_HEIGHT, 0.1F, 10000.0F);
-- 
cgit v1.2.3