summaryrefslogtreecommitdiff
path: root/ui/gameMainSelector.h
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2024-01-07 13:23:27 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2024-01-07 13:23:27 +0000
commit108bf5b2424da06aa2e1735ffd10a2b713834db8 (patch)
treeaf0918a6a266aa7e6ee1d8129df6d5ef9fc4f8ab /ui/gameMainSelector.h
parentRemove more use of legacy types and unnecessary pointers from selectable inte... (diff)
parentRemove Position3D from RailVehicle (diff)
downloadilt-108bf5b2424da06aa2e1735ffd10a2b713834db8.tar.bz2
ilt-108bf5b2424da06aa2e1735ffd10a2b713834db8.tar.xz
ilt-108bf5b2424da06aa2e1735ffd10a2b713834db8.zip
Merge branch 'template-types'
Diffstat (limited to 'ui/gameMainSelector.h')
-rw-r--r--ui/gameMainSelector.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/gameMainSelector.h b/ui/gameMainSelector.h
index 88db34b..cc30707 100644
--- a/ui/gameMainSelector.h
+++ b/ui/gameMainSelector.h
@@ -10,7 +10,7 @@
#include <string>
class SceneShader;
-class Ray;
+template<typename> class Ray;
class UIShader;
class Camera;
@@ -20,8 +20,8 @@ public:
public:
virtual ~Component() = default;
- virtual bool click(const SDL_MouseButtonEvent &, const Ray &);
- virtual bool move(const SDL_MouseMotionEvent &, const Ray &);
+ virtual bool click(const SDL_MouseButtonEvent &, const Ray<GlobalPosition3D> &);
+ virtual bool move(const SDL_MouseMotionEvent &, const Ray<GlobalPosition3D> &);
virtual bool handleInput(const SDL_Event &, const Position & pos);
virtual void render(const UIShader & shader, const Position & pos) const;
virtual void render(const SceneShader &) const;
@@ -34,7 +34,7 @@ public:
bool handleInput(const SDL_Event & e, const Position &) override;
- void defaultClick(const Ray & ray);
+ void defaultClick(const Ray<GlobalPosition3D> & ray);
std::unique_ptr<Component> target;