summaryrefslogtreecommitdiff
path: root/game/network
diff options
context:
space:
mode:
Diffstat (limited to 'game/network')
-rw-r--r--game/network/network.h4
-rw-r--r--game/network/network.impl.h6
-rw-r--r--game/network/rail.cpp2
-rw-r--r--game/network/rail.h4
4 files changed, 8 insertions, 8 deletions
diff --git a/game/network/network.h b/game/network/network.h
index 4a2f56a..e7a65b5 100644
--- a/game/network/network.h
+++ b/game/network/network.h
@@ -12,7 +12,7 @@
#include <variant>
class Texture;
-class Shader;
+class SceneShader;
class Ray;
template<size_t... n> using GenDef = std::tuple<glm::vec<n, float>...>;
@@ -96,7 +96,7 @@ public:
float findNodeDirection(Node::AnyCPtr) const override;
- void render(const Shader &) const override;
+ void render(const SceneShader &) const override;
protected:
Link::CCollection addJoins();
diff --git a/game/network/network.impl.h b/game/network/network.impl.h
index 597e3aa..5f60c80 100644
--- a/game/network/network.impl.h
+++ b/game/network/network.impl.h
@@ -1,13 +1,13 @@
#include "network.h"
-#include <gfx/gl/shader.h>
+#include <gfx/gl/sceneShader.h>
#include <gfx/models/texture.h>
template<typename T>
void
-NetworkOf<T>::render(const Shader & shader) const
+NetworkOf<T>::render(const SceneShader & shader) const
{
if constexpr (std::is_base_of_v<Renderable, T>) {
- shader.setModel(Location {}, Shader::Program::StaticPos);
+ shader.setModel(Location {}, SceneShader::Program::StaticPos);
texture->bind();
links.apply(&Renderable::render, shader);
}
diff --git a/game/network/rail.cpp b/game/network/rail.cpp
index 2efa87a..2f09d88 100644
--- a/game/network/rail.cpp
+++ b/game/network/rail.cpp
@@ -94,7 +94,7 @@ RailLink::defaultMesh(const std::span<Vertex> vertices)
}
void
-RailLink::render(const Shader &) const
+RailLink::render(const SceneShader &) const
{
mesh->Draw();
}
diff --git a/game/network/rail.h b/game/network/rail.h
index 6850463..8edc363 100644
--- a/game/network/rail.h
+++ b/game/network/rail.h
@@ -11,7 +11,7 @@
#include <span>
#include <special_members.hpp>
-class Shader;
+class SceneShader;
class Vertex;
struct Arc;
@@ -26,7 +26,7 @@ public:
using StraightLink = RailLinkStraight;
using CurveLink = RailLinkCurve;
- void render(const Shader &) const override;
+ void render(const SceneShader &) const override;
NO_COPY(RailLink);
NO_MOVE(RailLink);