Commit 4141b295 authored by bitplane's avatar bitplane

Added mesh converter to codeblocks project, fixed filesystem tests

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2614 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 62442a52
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_workspace_file> <CodeBlocks_workspace_file>
<Workspace title="Build all examples"> <Workspace title="Build all examples">
<Project filename="01.HelloWorld/HelloWorld.cbp" /> <Project filename="01.HelloWorld/HelloWorld.cbp" active="1" />
<Project filename="02.Quake3Map/Quake3Map.cbp" /> <Project filename="02.Quake3Map/Quake3Map.cbp" />
<Project filename="03.CustomSceneNode/CustomSceneNode.cbp" /> <Project filename="03.CustomSceneNode/CustomSceneNode.cbp" />
<Project filename="04.Movement/Movement.cbp" /> <Project filename="04.Movement/Movement.cbp" />
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
<Project filename="21.Quake3Explorer/Quake3Explorer.cbp" /> <Project filename="21.Quake3Explorer/Quake3Explorer.cbp" />
<Project filename="Demo/demo.cbp" /> <Project filename="Demo/demo.cbp" />
<Project filename="../tools/GUIEditor/GUIEditor_gcc.cbp" /> <Project filename="../tools/GUIEditor/GUIEditor_gcc.cbp" />
<Project filename="../source/Irrlicht/Irrlicht-gcc.cbp" active="1" /> <Project filename="../tools/MeshConverter/MeshConverter.cbp" />
<Project filename="../source/Irrlicht/Irrlicht-gcc.cbp" />
</Workspace> </Workspace>
</CodeBlocks_workspace_file> </CodeBlocks_workspace_file>
...@@ -51,7 +51,7 @@ bool filesystem(void) ...@@ -51,7 +51,7 @@ bool filesystem(void)
} }
// remove it again to not affect other tests // remove it again to not affect other tests
device->getFileSystem()->unregisterFileArchive( device->getFileSystem()->getFileArchiveCount() ); device->getFileSystem()->removeFileArchive( device->getFileSystem()->getFileArchiveCount() );
return result; return result;
} }
...@@ -16,16 +16,16 @@ bool zipReader(void) ...@@ -16,16 +16,16 @@ bool zipReader(void)
if ( !fs ) if ( !fs )
return false; return false;
if ( !fs->registerFileArchive(core::string<c16>("media/file_with_path.zip"), /*bool ignoreCase=*/true, /*bool ignorePaths=*/false) ) if ( !fs->addFileArchive(core::string<c16>("media/file_with_path.zip"), /*bool ignoreCase=*/true, /*bool ignorePaths=*/false) )
return false; return false;
// log what we got // log what we got
io::IFileArchive* archive = fs->getFileArchive(fs->getFileArchiveCount()-1); io::IFileArchive* archive = fs->getFileArchive(fs->getFileArchiveCount()-1);
for ( u32 f=0; f < archive->getFileCount(); ++f) const io::IFileList* fileList = archive->getFileList();
for ( u32 f=0; f < fileList->getFileCount(); ++f)
{ {
const io::IFileArchiveEntry* entry = archive->getFileInfo(f); logTestString("File name: %s\n", fileList->getFileName(f).c_str());
logTestString("simpleFileName: %s\n", entry->simpleFileName.c_str()); logTestString("Full path: %s\n", fileList->getFullFileName(f).c_str());
logTestString("path: %s\n", entry->path.c_str());
} }
bool result = true; bool result = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment