From 9bf1d4c1bd778ff4b49ac1de9cc4ceb846e94593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 18 May 2021 22:00:59 +0200 Subject: [PATCH] Shaders: whoops, tested with a wrong shader here as well. But the output is the same because the default 3D projection is orthographic. --- src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp index 30d553444..92f0c2f4a 100644 --- a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp +++ b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp @@ -1109,7 +1109,7 @@ void MeshVisualizerGLTest::renderDefaultsVertexId3D() { if(!GL::Context::current().isExtensionSupported()) CORRADE_SKIP("gl_VertexID not supported"); - MeshVisualizerGL2D{MeshVisualizerGL2D::Flag::VertexId} + MeshVisualizerGL3D{MeshVisualizerGL3D::Flag::VertexId} .bindColorMapTexture(_colorMapTexture) .draw(MeshTools::compile(Primitives::icosphereSolid(0))); @@ -1121,6 +1121,7 @@ void MeshVisualizerGLTest::renderDefaultsVertexId3D() { Utility::Directory::join(_testDir, "MeshVisualizerTestFiles/defaults-vertexid3D.tga"), (DebugTools::CompareImageToFile{_manager, 1.0f, 0.012f})); } + void MeshVisualizerGLTest::renderDefaultsPrimitiveId2D() { if(!(_manager.loadState("AnyImageImporter") & PluginManager::LoadState::Loaded) || !(_manager.loadState("TgaImporter") & PluginManager::LoadState::Loaded)) @@ -1191,9 +1192,9 @@ void MeshVisualizerGLTest::renderDefaultsPrimitiveId3D() { ) CORRADE_SKIP("gl_VertexID not supported."); #endif - MeshVisualizerGL2D::Flags flags; + MeshVisualizerGL3D::Flags flags; #ifdef MAGNUM_TARGET_WEBGL - flags = MeshVisualizerGL2D::Flag::PrimitiveIdFromVertexId; + flags = MeshVisualizerGL3D::Flag::PrimitiveIdFromVertexId; #else #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isVersionSupported(GL::Version::GL320)) @@ -1202,16 +1203,16 @@ void MeshVisualizerGLTest::renderDefaultsPrimitiveId3D() { #endif { Debug{} << "Using primitive ID from vertex ID"; - flags = MeshVisualizerGL2D::Flag::PrimitiveIdFromVertexId; + flags = MeshVisualizerGL3D::Flag::PrimitiveIdFromVertexId; } - else flags = MeshVisualizerGL2D::Flag::PrimitiveId; + else flags = MeshVisualizerGL3D::Flag::PrimitiveId; #endif Trade::MeshData icosphereData = Primitives::icosphereSolid(0); - if(flags >= MeshVisualizerGL2D::Flag::PrimitiveIdFromVertexId) + if(flags >= MeshVisualizerGL3D::Flag::PrimitiveIdFromVertexId) icosphereData = MeshTools::duplicate(icosphereData); - MeshVisualizerGL2D{flags} + MeshVisualizerGL3D{flags} .bindColorMapTexture(_colorMapTexture) .draw(MeshTools::compile(icosphereData));