Add FrameBuffer::getPixelWidth/Height and ShaderProgram::Context::set…

…Uniform(int location, Rgb)

src/freetype.cpp

@@ -1,11 +1,12 @@
-// Copyright 2007-2024 Jan Niklas Hasse <[email protected]>
+// Copyright 2007-2025 Jan Niklas Hasse <[email protected]>
 // For conditions of distribution and use, see copyright notice in LICENSE.txt
 
 #define _LIBCPP_DISABLE_DEPRECATION_WARNINGS
 #include "freetype.hpp"
 
 #include "ShaderCache.hpp"
 #include "helper.hpp"
+#include "jngl/Finally.hpp"
 #include "jngl/ScaleablePixels.hpp"
 #include "jngl/matrix.hpp"
 #include "jngl/screen.hpp"

src/jngl/FrameBuffer.cpp

@@ -255,6 +255,14 @@ Vec2 FrameBuffer::getSize() const {
 		     impl->texture.getPreciseHeight() / getScaleFactor() };
 }
 
+Pixels FrameBuffer::getPixelWidth() const {
+	return static_cast<Pixels>(impl->width);
+}
+
+Pixels FrameBuffer::getPixelHeight() const {
+	return static_cast<Pixels>(impl->height);
+}
+
 GLuint FrameBuffer::getTextureID() const {
 	return impl->texture.getID();
 }

src/jngl/FrameBuffer.hpp

@@ -1,16 +1,16 @@
-// Copyright 2012-2023 Jan Niklas Hasse <[email protected]>
+// Copyright 2012-2025 Jan Niklas Hasse <[email protected]>
 // For conditions of distribution and use, see copyright notice in LICENSE.txt
 /// Contains jngl::FrameBuffer class
 /// @file
 #pragma once
 
-#include "Color.hpp"
-#include "Finally.hpp"
 #include "Mat3.hpp"
 #include "Pixels.hpp"
 #include "Vec2.hpp"
 #include "Vertex.hpp"
+#include "ShaderProgram.hpp"
 
+#include <functional>
 #include <memory>
 #include <vector>
 
@@ -93,6 +93,9 @@ class FrameBuffer {
 	/// Returns the size in screen pixels
 	Vec2 getSize() const;
 
+	Pixels getPixelWidth() const;
+	Pixels getPixelHeight() const;
+
 	/// Returns the OpenGL texture ID of the associated image buffer
 	///
 	/// While this is an implementation detail, it can be useful if you want to draw the

src/jngl/ShaderProgram.cpp

@@ -99,4 +99,9 @@ void ShaderProgram::Context::setUniform(const int location, const float v0, cons
 	glUniform4f(location, v0, v1, v2, v3);
 }
 
+void ShaderProgram::Context::setUniform(const int location, const Rgb color) {
+	assert(referenceCount >= 0);
+	glUniform3f(location, color.getRed(), color.getGreen(), color.getBlue());
+}
+
 } // namespace jngl

src/jngl/ShaderProgram.hpp

@@ -1,10 +1,10 @@
-// Copyright 2018-2020 Jan Niklas Hasse <[email protected]>
+// Copyright 2018-2025 Jan Niklas Hasse <[email protected]>
 // For conditions of distribution and use, see copyright notice in LICENSE.txt
 /// Contains jngl::ShaderProgram class
 /// @file
 #pragma once
 
-#include "Finally.hpp"
+#include "Rgb.hpp"
 
 #include <memory>
 #include <string>
@@ -39,6 +39,9 @@ class ShaderProgram {
 		static void setUniform(int location, float v0, float v1);
 		static void setUniform(int location, float v0, float v1, float v2, float v3);
 
+		/// sets a vec3 to the color of the Rgb object
+		static void setUniform(int location, Rgb);
+
 	private:
 		static int referenceCount;
 		static const Impl* activeImpl;

src/jngl/sprite.hpp

@@ -1,10 +1,11 @@
-// Copyright 2012-2024 Jan Niklas Hasse <[email protected]>
+// Copyright 2012-2025 Jan Niklas Hasse <[email protected]>
 // For conditions of distribution and use, see copyright notice in LICENSE.txt
 /// Contains jngl::Sprite class and related functions
 /// \file
 #pragma once
 
 #include "Drawable.hpp"
+#include "Finally.hpp"
 #include "Rgb.hpp"
 #include "Rgba.hpp"
 #include "ShaderProgram.hpp"