diff --git a/package/ci/appveyor-desktop-gles.bat b/package/ci/appveyor-desktop-gles.bat index db26164..cf16495 100644 --- a/package/ci/appveyor-desktop-gles.bat +++ b/package/ci/appveyor-desktop-gles.bat @@ -76,7 +76,7 @@ cmake .. ^ -DBUILD_STATIC=%BUILD_STATIC% ^ -DWITH_DDSIMPORTER=ON ^ -DWITH_STBIMAGEIMPORTER=ON ^ - -DWITH_TINYGLTFIMPORTER=ON ^ + -DWITH_CGLTFIMPORTER=ON ^ -G Ninja || exit /b cmake --build . || exit /b cmake --build . --target install || exit /b diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat index 307fb0d..03999b5 100644 --- a/package/ci/appveyor-desktop.bat +++ b/package/ci/appveyor-desktop.bat @@ -83,7 +83,7 @@ cmake .. ^ -DBUILD_STATIC=%BUILD_STATIC% ^ -DWITH_DDSIMPORTER=ON ^ -DWITH_STBIMAGEIMPORTER=ON ^ - -DWITH_TINYGLTFIMPORTER=ON ^ + -DWITH_CGLTFIMPORTER=ON ^ %COMPILER_EXTRA% -G Ninja || exit /b cmake --build . || exit /b cmake --build . --target install || exit /b diff --git a/package/ci/unix-desktop-gles.sh b/package/ci/unix-desktop-gles.sh index 60bd054..d4b7be3 100755 --- a/package/ci/unix-desktop-gles.sh +++ b/package/ci/unix-desktop-gles.sh @@ -59,7 +59,7 @@ cmake .. \ -DBUILD_STATIC=$BUILD_STATIC \ -DWITH_DDSIMPORTER=ON \ -DWITH_STBIMAGEIMPORTER=ON \ - -DWITH_TINYGLTFIMPORTER=ON \ + -DWITH_CGLTFIMPORTER=ON \ -G Ninja ninja install cd ../.. diff --git a/package/ci/unix-desktop.sh b/package/ci/unix-desktop.sh index 3cfd3eb..f7d2337 100755 --- a/package/ci/unix-desktop.sh +++ b/package/ci/unix-desktop.sh @@ -67,7 +67,7 @@ cmake .. \ -DBUILD_STATIC=$BUILD_STATIC \ -DWITH_DDSIMPORTER=ON \ -DWITH_STBIMAGEIMPORTER=ON \ - -DWITH_TINYGLTFIMPORTER=ON \ + -DWITH_CGLTFIMPORTER=ON \ -G Ninja ninja install cd ../.. diff --git a/src/python/magnum/test/test_trade.py b/src/python/magnum/test/test_trade.py index f2bb56b..c12b059 100644 --- a/src/python/magnum/test/test_trade.py +++ b/src/python/magnum/test/test_trade.py @@ -91,7 +91,7 @@ class ImageData(unittest.TestCase): class MeshData(unittest.TestCase): def test(self): # The only way to get a mesh instance is through a manager - importer = trade.ImporterManager().load_and_instantiate('TinyGltfImporter') + importer = trade.ImporterManager().load_and_instantiate('CgltfImporter') importer.open_file(os.path.join(os.path.dirname(__file__), 'mesh.glb')) mesh = importer.mesh(0) @@ -209,7 +209,7 @@ class Importer(unittest.TestCase): def test_mesh(self): # importer refcounting tested in image2d - importer = trade.ImporterManager().load_and_instantiate('TinyGltfImporter') + importer = trade.ImporterManager().load_and_instantiate('CgltfImporter') importer.open_file(os.path.join(os.path.dirname(__file__), 'mesh.glb')) self.assertEqual(importer.mesh_count, 3) self.assertEqual(importer.mesh_level_count(0), 1) @@ -221,7 +221,7 @@ class Importer(unittest.TestCase): def test_mesh_index_oob(self): # importer refcounting tested in image2d - importer = trade.ImporterManager().load_and_instantiate('TinyGltfImporter') + importer = trade.ImporterManager().load_and_instantiate('CgltfImporter') importer.open_file(os.path.join(os.path.dirname(__file__), 'mesh.glb')) with self.assertRaises(IndexError):