From bc6b67e2f90d35435bf8f3ab502cf374e7f0faaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 13 Apr 2023 16:17:12 +0200 Subject: [PATCH] python: adapt to Trade::DataFlags changes. --- src/python/magnum/test/test_meshtools.py | 2 +- src/python/magnum/test/test_trade.py | 4 ++-- src/python/magnum/trade.cpp | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/python/magnum/test/test_meshtools.py b/src/python/magnum/test/test_meshtools.py index 8172c6d..8f20271 100644 --- a/src/python/magnum/test/test_meshtools.py +++ b/src/python/magnum/test/test_meshtools.py @@ -144,7 +144,7 @@ class Interleave(unittest.TestCase): class Owned(unittest.TestCase): def test(self): mesh = primitives.square_solid() - self.assertEqual(mesh.vertex_data_flags, trade.DataFlags.NONE) + self.assertEqual(mesh.vertex_data_flags, trade.DataFlags.GLOBAL) owned = meshtools.owned(mesh) self.assertEqual(owned.vertex_data_flags, trade.DataFlags.OWNED|trade.DataFlags.MUTABLE) diff --git a/src/python/magnum/test/test_trade.py b/src/python/magnum/test/test_trade.py index ce7e77c..c2e54e3 100644 --- a/src/python/magnum/test/test_trade.py +++ b/src/python/magnum/test/test_trade.py @@ -541,8 +541,8 @@ class MeshData(unittest.TestCase): mesh = primitives.cube_solid() # TODO split this once there's a mesh where only one or the other would # be true (maybe with zero-copy loading of PLYs / STLs?) - self.assertEqual(mesh.index_data_flags, trade.DataFlags.NONE) - self.assertEqual(mesh.vertex_data_flags, trade.DataFlags.NONE) + self.assertEqual(mesh.index_data_flags, trade.DataFlags.GLOBAL) + self.assertEqual(mesh.vertex_data_flags, trade.DataFlags.GLOBAL) with self.assertRaisesRegex(AttributeError, "mesh index data is not mutable"): mesh.mutable_index_data diff --git a/src/python/magnum/trade.cpp b/src/python/magnum/trade.cpp index 751c97b..7ce12b5 100644 --- a/src/python/magnum/trade.cpp +++ b/src/python/magnum/trade.cpp @@ -809,6 +809,7 @@ void trade(py::module_& m) { dataFlag .value("OWNED", Trade::DataFlag::Owned) .value("EXTERNALLY_OWNED", Trade::DataFlag::ExternallyOwned) + .value("GLOBAL", Trade::DataFlag::Global) .value("MUTABLE", Trade::DataFlag::Mutable) .value("NONE", Trade::DataFlag{}); corrade::enumOperators(dataFlag);