Browse Source

python: adapt to Trade::DataFlags changes.

next
Vladimír Vondruš 3 years ago
parent
commit
bc6b67e2f9
  1. 2
      src/python/magnum/test/test_meshtools.py
  2. 4
      src/python/magnum/test/test_trade.py
  3. 1
      src/python/magnum/trade.cpp

2
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)

4
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

1
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);

Loading…
Cancel
Save