X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FViewport.hpp;h=96fbaa4deae54840efb53a1bb7fa2474a17d1b21;hb=54f3f1260b95a924fcb40d9d6de3fa2e2c382f6f;hp=03e0e0d05c247420387bdc5fc1c851a71b3f992b;hpb=8ab4ea13545cccbacbd1ed610968d3f481c1b3c8;p=blank.git

diff --git a/src/graphics/Viewport.hpp b/src/graphics/Viewport.hpp
index 03e0e0d..96fbaa4 100644
--- a/src/graphics/Viewport.hpp
+++ b/src/graphics/Viewport.hpp
@@ -44,16 +44,18 @@ 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;
 
@@ -70,7 +72,7 @@ private:
 
 	BlockLighting chunk_prog;
 	DirectionalLighting entity_prog;
-	PlainColor outline_prog;
+	PlainColor color_prog;
 	SkyBoxShader sky_prog;
 	BlendedSprite sprite_prog;
 
@@ -79,8 +81,8 @@ private:
 		CHUNK,
 		ENTITY,
 		HUD,
-		OUTLINE_WORLD,
-		OUTLINE_HUD,
+		COLOR_WORLD,
+		COLOR_HUD,
 		SKY_BOX,
 		SPRITE,
 	} active_prog;