diff --git a/doc/python/pages/api-conventions.rst b/doc/python/pages/api-conventions.rst index 6f9d242..6427f19 100644 --- a/doc/python/pages/api-conventions.rst +++ b/doc/python/pages/api-conventions.rst @@ -90,7 +90,7 @@ C++ Python ============================================== ============================ C++ Python ============================================== ============================ -:dox:`PixelFormat::RGB8Unorm` `PixelFormat.RGB8UNORM` +:dox:`PixelFormat::RGB8Unorm` `PixelFormat.RGB8_UNORM` :dox:`MeshPrimitive::TriangleStrip` `MeshPrimitive.TRIANGLE_STRIP` ============================================== ============================ diff --git a/src/python/magnum/magnum.cpp b/src/python/magnum/magnum.cpp index 5aade8f..f8cda0f 100644 --- a/src/python/magnum/magnum.cpp +++ b/src/python/magnum/magnum.cpp @@ -148,18 +148,18 @@ void magnum(py::module& m) { .value("UNSIGNED_INT", MeshIndexType::UnsignedInt); py::enum_{m, "PixelFormat", "Format of pixel data"} - .value("R8UNORM", PixelFormat::R8Unorm) - .value("RG8UNORM", PixelFormat::RG8Unorm) - .value("RGB8UNORM", PixelFormat::RGB8Unorm) - .value("RGBA8UNORM", PixelFormat::RGBA8Unorm) - .value("R8SNORM", PixelFormat::R8Snorm) - .value("RG8SNORM", PixelFormat::RG8Snorm) - .value("RGB8SNORM", PixelFormat::RGB8Snorm) - .value("RGBA8SNORM", PixelFormat::RGBA8Snorm) - .value("R8SRGB", PixelFormat::R8Srgb) - .value("RG8SRGB", PixelFormat::RG8Srgb) - .value("RGB8SRGB", PixelFormat::RGB8Srgb) - .value("RGBA8SRGB", PixelFormat::RGBA8Srgb) + .value("R8_UNORM", PixelFormat::R8Unorm) + .value("RG8_UNORM", PixelFormat::RG8Unorm) + .value("RGB8_UNORM", PixelFormat::RGB8Unorm) + .value("RGBA8_UNORM", PixelFormat::RGBA8Unorm) + .value("R8_SNORM", PixelFormat::R8Snorm) + .value("RG8_SNORM", PixelFormat::RG8Snorm) + .value("RGB8_SNORM", PixelFormat::RGB8Snorm) + .value("RGBA8_SNORM", PixelFormat::RGBA8Snorm) + .value("R8_SRGB", PixelFormat::R8Srgb) + .value("RG8_SRGB", PixelFormat::RG8Srgb) + .value("RGB8_SRGB", PixelFormat::RGB8Srgb) + .value("RGBA8_SRGB", PixelFormat::RGBA8Srgb) .value("R8UI", PixelFormat::R8UI) .value("RG8UI", PixelFormat::RG8UI) .value("RGB8UI", PixelFormat::RGB8UI) @@ -168,14 +168,14 @@ void magnum(py::module& m) { .value("RG8I", PixelFormat::RG8I) .value("RGB8I", PixelFormat::RGB8I) .value("RGBA8I", PixelFormat::RGBA8I) - .value("R16UNORM", PixelFormat::R16Unorm) - .value("RG16UNORM", PixelFormat::RG16Unorm) - .value("RGB16UNORM", PixelFormat::RGB16Unorm) - .value("RGBA16UNORM", PixelFormat::RGBA16Unorm) - .value("R16SNORM", PixelFormat::R16Snorm) - .value("RG16SNORM", PixelFormat::RG16Snorm) - .value("RGB16SNORM", PixelFormat::RGB16Snorm) - .value("RGBA16SNORM", PixelFormat::RGBA16Snorm) + .value("R16_UNORM", PixelFormat::R16Unorm) + .value("RG16_UNORM", PixelFormat::RG16Unorm) + .value("RGB16_UNORM", PixelFormat::RGB16Unorm) + .value("RGBA16_UNORM", PixelFormat::RGBA16Unorm) + .value("R16_SNORM", PixelFormat::R16Snorm) + .value("RG16_SNORM", PixelFormat::RG16Snorm) + .value("RGB16_SNORM", PixelFormat::RGB16Snorm) + .value("RGBA16_SNORM", PixelFormat::RGBA16Snorm) .value("R16UI", PixelFormat::R16UI) .value("RG16UI", PixelFormat::RG16UI) .value("RGB16UI", PixelFormat::RGB16UI) diff --git a/src/python/magnum/test/test.py b/src/python/magnum/test/test.py index 2c6c437..8526d85 100644 --- a/src/python/magnum/test/test.py +++ b/src/python/magnum/test/test.py @@ -56,10 +56,10 @@ class ImageView(unittest.TestCase): b'ijkIJK ') data_refcount = sys.getrefcount(data) - a = ImageView2D(PixelFormat.RGB8UNORM, (2, 4), data) + a = ImageView2D(PixelFormat.RGB8_UNORM, (2, 4), data) self.assertEqual(a.storage, PixelStorage()) self.assertEqual(a.size, Vector2i(2, 4)) - self.assertEqual(a.format, PixelFormat.RGB8UNORM) + self.assertEqual(a.format, PixelFormat.RGB8_UNORM) self.assertEqual(a.pixel_size, 3) self.assertEqual(len(a.data), 32) self.assertIs(a.owner, data) @@ -82,7 +82,7 @@ class ImageView(unittest.TestCase): storage = PixelStorage() storage.alignment = 2 - a = ImageView3D(storage, PixelFormat.RGB8UNORM, (2, 2, 2), data) + a = ImageView3D(storage, PixelFormat.RGB8_UNORM, (2, 2, 2), data) self.assertEqual(a.storage.alignment, 2) self.assertEqual(a.size, Vector3i(2, 2, 2)) self.assertEqual(len(a.data), 24) @@ -113,7 +113,7 @@ class ImageView(unittest.TestCase): b'ijkIJK ') data_refcount = sys.getrefcount(data) - a = MutableImageView2D(PixelFormat.RGB8UNORM, (2, 4), data) + a = MutableImageView2D(PixelFormat.RGB8_UNORM, (2, 4), data) self.assertEqual(sys.getrefcount(data), data_refcount + 1) a.pixels[1, 1, 1] = '_' @@ -129,7 +129,7 @@ class ImageView(unittest.TestCase): # Back to immutable b = ImageView2D(a) self.assertEqual(b.size, Vector2i(2, 4)) - self.assertEqual(b.format, PixelFormat.RGB8UNORM) + self.assertEqual(b.format, PixelFormat.RGB8_UNORM) self.assertEqual(b.pixel_size, 3) self.assertEqual(len(b.data), 32) self.assertIs(b.owner, data) @@ -143,7 +143,7 @@ class ImageView(unittest.TestCase): b'ijkIJK ') data_refcount = sys.getrefcount(data) - a = ImageView2D(PixelFormat.RGB8UNORM, (2, 4), data) + a = ImageView2D(PixelFormat.RGB8_UNORM, (2, 4), data) self.assertIs(a.owner, data) self.assertEqual(sys.getrefcount(data), data_refcount + 1) diff --git a/src/python/magnum/test/test_gl_gl.py b/src/python/magnum/test/test_gl_gl.py index 4daf601..dd89ab2 100644 --- a/src/python/magnum/test/test_gl_gl.py +++ b/src/python/magnum/test/test_gl_gl.py @@ -84,7 +84,7 @@ class Framebuffer(GLTestCase): gl.Renderer.clear_color = Color4(1.0, 0.5, 0.75) framebuffer.clear(gl.FramebufferClear.COLOR) - a = MutableImageView2D(PixelFormat.RGBA8UNORM, (2, 2), bytearray(16)) + a = MutableImageView2D(PixelFormat.RGBA8_UNORM, (2, 2), bytearray(16)) framebuffer.read(Range2Di.from_size((1, 1), (2, 2)), a) self.assertEqual(a.size, Vector2i(2, 2)) self.assertEqual(ord(a.pixels[0, 0, 0]), 0xff)