Borrow CReadFile for tests

The method to load a mesh from a file was removed. This is not a good fix, but it will keep the tests working until a file loader can be properly exposed to the tests.
minetest · Nov 29, 2023 · a4d5ad9 · a4d5ad9
1 parent ba6fcd1
commit a4d5ad9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/source/Irrlicht/tests/CMakeLists.txt b/source/Irrlicht/tests/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_executable(tests
 	testCGLTFMeshFileLoader.cpp
+	"${PROJECT_SOURCE_DIR}/source/Irrlicht/CReadFile.cpp"
 )
 
 set_target_properties(tests PROPERTIES
@@ -13,6 +14,12 @@ target_compile_options(tests
 		"$<$<CXX_COMPILER_ID:GNU>:-Wall>"
 )
 
+target_include_directories(tests
+	PRIVATE
+		# For CReadFile
+		"${PROJECT_SOURCE_DIR}/source/Irrlicht"
+)
+
 target_link_libraries(tests
 	PRIVATE
 		Catch2::Catch

diff --git a/source/Irrlicht/tests/testCGLTFMeshFileLoader.cpp b/source/Irrlicht/tests/testCGLTFMeshFileLoader.cpp
@@ -1,3 +1,5 @@
+#include "CReadFile.h"
+
 #define CATCH_CONFIG_MAIN
 #include <catch.hpp>
 #include <irrlicht.h>
@@ -21,7 +23,8 @@ class ScopedMesh
 		, m_mesh { nullptr }
 	{
 		auto* smgr = m_device->getSceneManager();
-		m_mesh = smgr->getMesh(filepath, "");
+		irr::io::CReadFile f = irr::io::CReadFile(filepath);
+		m_mesh = smgr->getMesh(&f);
 	}
 
 	~ScopedMesh()
@@ -270,4 +273,4 @@ TEST_CASE("snow man") {
 		CHECK(vertices[20].TCoords == irr::core::vector2df{0.208333, 0.416667});
 		CHECK(vertices[22].TCoords == irr::core::vector2df{0.375, 0.416667});
 	}
-}
+}