feat(UI): Rotate interface images (#9943)

endless-sky · Mar 24, 2024 · 59cfe45 · 59cfe45
1 parent d380112
commit 59cfe45
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/source/Interface.cpp b/source/Interface.cpp
@@ -496,14 +496,14 @@ void Interface::ImageElement::Draw(const Rectangle &rect, const Information &inf
 		return;
 
 	float frame = info.GetSpriteFrame(name);
+	Point unit = info.GetSpriteUnit(name);
 	if(isOutline)
 	{
 		Color color = (isColored ? info.GetOutlineColor() : Color(1.f, 1.f));
-		Point unit = info.GetSpriteUnit(name);
 		OutlineShader::Draw(sprite, rect.Center(), rect.Dimensions(), color, unit, frame);
 	}
 	else
-		SpriteShader::Draw(sprite, rect.Center(), rect.Width() / sprite->Width(), 0, frame);
+		SpriteShader::Draw(sprite, rect.Center(), rect.Width() / sprite->Width(), 0, frame, unit);
 }
 
 

diff --git a/source/SpriteShader.cpp b/source/SpriteShader.cpp
@@ -15,7 +15,6 @@ this program. If not, see <https://www.gnu.org/licenses/>.
 
 #include "SpriteShader.h"
 
-#include "Point.h"
 #include "Screen.h"
 #include "Shader.h"
 #include "Sprite.h"
@@ -293,20 +292,21 @@ void SpriteShader::Init()
 
 
 
-void SpriteShader::Draw(const Sprite *sprite, const Point &position, float zoom, int swizzle, float frame)
+void SpriteShader::Draw(const Sprite *sprite, const Point &position,
+	float zoom, int swizzle, float frame, const Point &unit)
 {
 	if(!sprite)
 		return;
 
 	Bind();
-	Add(Prepare(sprite, position, zoom, swizzle, frame));
+	Add(Prepare(sprite, position, zoom, swizzle, frame, unit));
 	Unbind();
 }
 
 
 
 SpriteShader::Item SpriteShader::Prepare(const Sprite *sprite, const Point &position,
-	float zoom, int swizzle, float frame)
+	float zoom, int swizzle, float frame, const Point &unit)
 {
 	if(!sprite)
 		return {};
@@ -319,9 +319,14 @@ SpriteShader::Item SpriteShader::Prepare(const Sprite *sprite, const Point &posi
 	// Position.
 	item.position[0] = static_cast<float>(position.X());
 	item.position[1] = static_cast<float>(position.Y());
-	// Rotation (none) and scale.
-	item.transform[0] = sprite->Width() * zoom;
-	item.transform[3] = sprite->Height() * zoom;
+	// Rotation and scale.
+	Point scaledUnit = unit * zoom;
+	Point uw = scaledUnit * sprite->Width();
+	Point uh = scaledUnit * sprite->Height();
+	item.transform[0] = static_cast<float>(-uw.Y());
+	item.transform[1] = static_cast<float>(uw.X());
+	item.transform[2] = static_cast<float>(-uh.X());
+	item.transform[3] = static_cast<float>(-uh.Y());
 	// Swizzle.
 	item.swizzle = swizzle;
 

diff --git a/source/SpriteShader.h b/source/SpriteShader.h
@@ -16,8 +16,9 @@ this program. If not, see <https://www.gnu.org/licenses/>.
 #ifndef SPRITE_SHADER_H_
 #define SPRITE_SHADER_H_
 
+#include "Point.h"
+
 class Sprite;
-class Point;
 
 #include <cstdint>
 
@@ -50,10 +51,10 @@ class SpriteShader {
 	static void Init();
 
 	// Draw a sprite.
-	static void Draw(const Sprite *sprite, const Point &position, float zoom = 1.f, int swizzle = 0,
-		float frame = 0.f);
-	static Item Prepare(const Sprite *sprite, const Point &position, float zoom = 1.f, int swizzle = 0,
-		float frame = 0.f);
+	static void Draw(const Sprite *sprite, const Point &position, float zoom = 1.f,
+		int swizzle = 0, float frame = 0.f, const Point &unit = Point(0., -1.));
+	static Item Prepare(const Sprite *sprite, const Point &position, float zoom = 1.f,
+		int swizzle = 0, float frame = 0.f, const Point &unit = Point(0., -1.));
 
 	static void Bind();
 	static void Add(const Item &item, bool withBlur = false);