chat state

[blank.git] / src / graphics / Viewport.hpp

diff --git a/src/graphics/Viewport.hpp b/src/graphics/Viewport.hpp
index 4d55d8893dadbe289bd3a9c835170c1709ba4906..96fbaa4deae54840efb53a1bb7fa2474a17d1b21 100644 (file)
--- a/src/graphics/Viewport.hpp
+++ b/src/graphics/Viewport.hpp
@@ -8,6 +8,7 @@
 #include "Canvas.hpp"
 #include "DirectionalLighting.hpp"
 #include "PlainColor.hpp"
+#include "SkyBoxShader.hpp"
 
 #include <glm/glm.hpp>
 
@@ -25,6 +26,7 @@ public:
        void VSync(bool b) noexcept;
 
        void EnableDepthTest() noexcept;
+       void EqualDepthTest() noexcept;
        void DisableDepthTest() noexcept;
 
        void EnableBackfaceCulling() noexcept;
@@ -42,16 +44,19 @@ public:
        void Clear() noexcept;
        void ClearDepth() noexcept;
 
-       void SetCursor(const glm::vec3 &);
-       void SetCursor(const glm::vec3 &, Gravity);
-       void MoveCursor(const glm::vec3 &);
+       glm::vec2 GetPosition(const glm::vec2 &off, Gravity grav) const noexcept;
+
+       void SetCursor(const glm::vec3 &) noexcept;
+       void SetCursor(const glm::vec3 &, Gravity) noexcept;
+       void MoveCursor(const glm::vec3 &) noexcept;
        const glm::mat4 &Cursor() const noexcept { return cursor; }
 
        BlockLighting &ChunkProgram() noexcept;
        DirectionalLighting &EntityProgram() noexcept;
        DirectionalLighting &HUDProgram() noexcept;
-       PlainColor &WorldOutlineProgram() noexcept;
-       PlainColor &HUDOutlineProgram() noexcept;
+       PlainColor &WorldColorProgram() noexcept;
+       PlainColor &HUDColorProgram() noexcept;
+       SkyBoxShader &SkyBoxProgram() noexcept;
        BlendedSprite &SpriteProgram() noexcept;
 
        void WorldPosition(const glm::mat4 &) noexcept;
@@ -67,7 +72,8 @@ private:
 
        BlockLighting chunk_prog;
        DirectionalLighting entity_prog;
-       PlainColor outline_prog;
+       PlainColor color_prog;
+       SkyBoxShader sky_prog;
        BlendedSprite sprite_prog;
 
        enum {
@@ -75,8 +81,9 @@ private:
                CHUNK,
                ENTITY,
                HUD,
-               OUTLINE_WORLD,
-               OUTLINE_HUD,
+               COLOR_WORLD,
+               COLOR_HUD,
+               SKY_BOX,
                SPRITE,
        } active_prog;