diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2025-04-02 23:22:12 +0100 | 
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2025-04-02 23:22:12 +0100 | 
| commit | 2245fc8a3bb521afc2e6dd575cd1757ecab23558 (patch) | |
| tree | c4565e14b2e9b01c970b3ee5816f6ec849b61e92 /ui/gameMainSelector.h | |
| parent | Merge remote-tracking branch 'origin/ptrs' (diff) | |
| parent | Remove the old unused network.png icon (diff) | |
| download | ilt-2245fc8a3bb521afc2e6dd575cd1757ecab23558.tar.bz2 ilt-2245fc8a3bb521afc2e6dd575cd1757ecab23558.tar.xz ilt-2245fc8a3bb521afc2e6dd575cd1757ecab23558.zip  | |
Merge branch 'imgui'
Diffstat (limited to 'ui/gameMainSelector.h')
| -rw-r--r-- | ui/gameMainSelector.h | 15 | 
1 files changed, 5 insertions, 10 deletions
diff --git a/ui/gameMainSelector.h b/ui/gameMainSelector.h index e715823..8c2be4b 100644 --- a/ui/gameMainSelector.h +++ b/ui/gameMainSelector.h @@ -2,16 +2,13 @@  #include "SDL_events.h"  #include "config/types.h" -#include "font.h"  #include "uiComponent.h"  #include "worldOverlay.h"  #include <glm/glm.hpp>  #include <memory> -#include <string>  class SceneShader;  template<typename> class Ray; -class UIShader;  class Camera;  class GameMainSelector : public UIComponent, public WorldOverlay { @@ -22,17 +19,17 @@ public:  		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 bool handleInput(const SDL_Event &); +		virtual void render(bool & open);  		virtual void render(const SceneShader &, const Frustum &) const;  	}; -	GameMainSelector(const Camera * c, ScreenAbsCoord size); +	GameMainSelector(const Camera * c); -	void render(const UIShader & shader, const Position & pos) const override; +	void render() override;  	void render(const SceneShader & shader, const Frustum &) const override; -	bool handleInput(const SDL_Event & e, const Position &) override; +	bool handleInput(const SDL_Event & e) override;  	void defaultClick(const Ray<GlobalPosition3D> & ray); @@ -40,6 +37,4 @@ public:  private:  	const Camera * camera; -	const Font font; -	std::string clicked;  };  | 
