#5740: Add IFace::getTextureAspectRatio() method plus unit tests.

codereader · Oct 12, 2021 · b1349f5 · b1349f5
1 parent ed0b027
commit b1349f5
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 0 deletions.
diff --git a/include/ibrush.h b/include/ibrush.h
@@ -146,6 +146,9 @@ class IFace
     // This is based on the image returned by the material, usually the editor image
     virtual Vector2 getTexelScale() const = 0;
 
+    // Returns the texture aspect ratio width/height
+    virtual float getTextureAspectRatio() const = 0;
+
 	// Fits the texture on this face
 	virtual void fitTexture(float s_repeat, float t_repeat) = 0;
 

diff --git a/radiantcore/brush/Face.cpp b/radiantcore/brush/Face.cpp
@@ -524,6 +524,14 @@ Vector2 Face::getTexelScale() const
     return Vector2(textureMatrix.xx() * imageWidth, textureMatrix.yy() * imageHeight);
 }
 
+float Face::getTextureAspectRatio() const
+{
+    auto imageWidth = _shader.getWidth();
+    auto imageHeight = _shader.getHeight();
+
+    return static_cast<float>(imageWidth) / imageHeight;
+}
+
 // Returns the index pair forming an edge, keeping the winding direction intact
 inline std::pair<std::size_t, std::size_t> getEdgeIndexPair(std::size_t first, std::size_t second, std::size_t windingSize)
 {

diff --git a/radiantcore/brush/Face.h b/radiantcore/brush/Face.h
@@ -165,6 +165,7 @@ class Face :
 	void rotateTexdef(float angle) override;
 
     Vector2 getTexelScale() const override;
+    float getTextureAspectRatio() const override;
 
 	void fitTexture(float s_repeat, float t_repeat) override;
 	void flipTexture(unsigned int flipAxis) override;

diff --git a/test/TextureManipulation.cpp b/test/TextureManipulation.cpp
@@ -644,6 +644,27 @@ TEST_F(TextureManipulationTest, FaceGetTexelScale)
     EXPECT_NEAR(texelScale.y(), expectedTexelScaleY, 0.01) << "Texel scale Y is off";
 }
 
+TEST_F(TextureManipulationTest, FaceGetTextureAspectRatio)
+{
+    auto brushNode = create512CubeTextured1x1("textures/a_1024x512");
+
+    // Get the texture dimensions
+    auto editorImage = GlobalMaterialManager().getMaterial("textures/a_1024x512")->getEditorImage();
+    auto textureWidth = editorImage->getWidth();
+    auto textureHeight = editorImage->getHeight();
+
+    // Get a face and check the texture bounds
+    auto& face = Node_getIBrush(brushNode)->getFace(0);
+
+    EXPECT_NEAR(face.getTextureAspectRatio(), static_cast<float>(textureWidth) / textureHeight, 0.01) 
+        << "Wrong texture aspect ratio reported";
+
+    brushNode = create512CubeTextured1x1("textures/numbers/0");
+    auto& anotherFace = Node_getIBrush(brushNode)->getFace(0);
+    EXPECT_NEAR(anotherFace.getTextureAspectRatio(), 1.0, 0.001)
+        << "Number texture aspect ratio should be 1.0";
+}
+
 TEST_F(TextureManipulationTest, FaceTextureChangePreservesTexelScale)
 {
     auto largeTexture = "textures/a_1024x512";