From 25849d3e27485ae43bfaf4e710bb95e3dd5f3fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 18 Oct 2023 22:17:54 +0200 Subject: [PATCH] python: actually adapt to Text::AbstractGlyphCache changes, ugh. --- src/python/magnum/test/test_text_gl.py | 4 ++-- src/python/magnum/text.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/python/magnum/test/test_text_gl.py b/src/python/magnum/test/test_text_gl.py index 5067fdd..862d0a2 100644 --- a/src/python/magnum/test/test_text_gl.py +++ b/src/python/magnum/test/test_text_gl.py @@ -40,7 +40,7 @@ class GlyphCache(GLTestCase): def test(self): cache = text.GlyphCache((128, 128), (2, 2)) - self.assertEqual(cache.texture_size, (128, 128)) + self.assertEqual(cache.size, (128, 128, 1)) self.assertEqual(cache.padding, (2, 2)) cache_refcount = sys.getrefcount(cache) @@ -58,7 +58,7 @@ class DistanceFieldGlyphCache(GLTestCase): def test(self): cache = text.DistanceFieldGlyphCache((1024, 1024), (128, 128), 2) - self.assertEqual(cache.texture_size, (1024, 1024)) + self.assertEqual(cache.size, (1024, 1024, 1)) self.assertEqual(cache.padding, (2, 2)) class Renderer2D(GLTestCase): diff --git a/src/python/magnum/text.cpp b/src/python/magnum/text.cpp index bed14f0..b8def63 100644 --- a/src/python/magnum/text.cpp +++ b/src/python/magnum/text.cpp @@ -90,7 +90,7 @@ void text(py::module_& m) { py::class_ abstractGlyphCache{m, "AbstractGlyphCache", "Base for glyph caches"}; abstractGlyphCache /** @todo features */ - .def_property_readonly("texture_size", &Text::AbstractGlyphCache::size, "Glyph cache texture size") + .def_property_readonly("size", &Text::AbstractGlyphCache::size, "Glyph cache texture size") .def_property_readonly("padding", &Text::AbstractGlyphCache::padding, "Glyph padding") /** @todo glyph iteration and population */ ;