#5785: Add IPatch::getTextureAspectRatio() and corresponding unit test

codereader · Oct 23, 2021 · 7089876 · 7089876
1 parent 5a8213b
commit 7089876
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 4 deletions.
diff --git a/include/ipatch.h b/include/ipatch.h
@@ -143,6 +143,9 @@ class IPatch
 	// greebo: returns true if the patch's shader is visible, false otherwise
 	virtual bool hasVisibleMaterial() const = 0;
 
+    // Returns the texture aspect ratio width/height
+    virtual float getTextureAspectRatio() const = 0;
+
 	/**
 	 * greebo: Sets/gets whether this patch is a patchDef3 (fixed tesselation)
 	 */

diff --git a/libs/SurfaceShader.h b/libs/SurfaceShader.h
@@ -128,6 +128,11 @@ class SurfaceShader :
         return 1;
     }
 
+    float getTextureAspectRatio() const
+    {
+        return static_cast<float>(getWidth()) / getHeight();
+    }
+
     void setRenderSystem(const RenderSystemPtr& renderSystem)
     {
         _renderSystem = renderSystem;

diff --git a/radiantcore/brush/Face.cpp b/radiantcore/brush/Face.cpp
@@ -495,10 +495,7 @@ Vector2 Face::getTexelScale() const
 
 float Face::getTextureAspectRatio() const
 {
-    auto imageWidth = _shader.getWidth();
-    auto imageHeight = _shader.getHeight();
-
-    return static_cast<float>(imageWidth) / imageHeight;
+    return _shader.getTextureAspectRatio();
 }
 
 // Returns the index pair forming an edge, keeping the winding direction intact

diff --git a/radiantcore/patch/Patch.cpp b/radiantcore/patch/Patch.cpp
@@ -387,6 +387,11 @@ bool Patch::hasVisibleMaterial() const
     return material && material->isVisible();
 }
 
+float Patch::getTextureAspectRatio() const
+{
+    return _shader.getTextureAspectRatio();
+}
+
 int Patch::getShaderFlags() const
 {
     if (_shader.getGLShader() != 0)

diff --git a/radiantcore/patch/Patch.h b/radiantcore/patch/Patch.h
@@ -171,6 +171,8 @@ class Patch :
 	// greebo: returns true if the patch's shader is visible, false otherwise
 	bool hasVisibleMaterial() const override;
 
+    float getTextureAspectRatio() const override;
+
 	// As the name states: get the shader flags of the m_state shader
 	int getShaderFlags() const;
 

diff --git a/test/TextureManipulation.cpp b/test/TextureManipulation.cpp
@@ -665,6 +665,26 @@ TEST_F(TextureManipulationTest, FaceGetTextureAspectRatio)
         << "Number texture aspect ratio should be 1.0";
 }
 
+TEST_F(TextureManipulationTest, PatchGetTextureAspectRatio)
+{
+    auto worldspawn = GlobalMapModule().findOrInsertWorldspawn();
+    auto patchNode = algorithm::createPatchFromBounds(worldspawn, AABB(Vector3(4, 50, 60), Vector3(64, 128, 256)), "textures/a_1024x512");
+    auto patch = Node_getIPatch(patchNode);
+
+    // Get the texture dimensions
+    auto editorImage = GlobalMaterialManager().getMaterial(patch->getShader())->getEditorImage();
+    auto textureWidth = editorImage->getWidth();
+    auto textureHeight = editorImage->getHeight();
+
+    EXPECT_NEAR(patch->getTextureAspectRatio(), static_cast<float>(textureWidth) / textureHeight, 0.01)
+        << "Wrong texture aspect ratio reported";
+
+    patchNode = algorithm::createPatchFromBounds(worldspawn, AABB(Vector3(4, 50, 60), Vector3(64, 128, 256)), "textures/numbers/0");
+    patch = Node_getIPatch(patchNode);
+
+    EXPECT_NEAR(patch->getTextureAspectRatio(), 1.0, 0.001) << "Number texture aspect ratio should be 1.0";
+}
+
 TEST_F(TextureManipulationTest, FaceTextureChangePreservesTexelScale)
 {
     auto largeTexture = "textures/a_1024x512";