v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use helloworld as X3D-Testcase

pull/4170/head
Kim Kulling 2021-11-10 20:40:05 +01:00
parent 8ed18621db
commit a31c979abc
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
code/AssetLib/X3D/X3DImporter_Macro.hpp
View File

@ -63,15 +63,12 @@ inline X3DNodeElementBase *X3DImporter::MACRO_USE_CHECKANDAPPLY(XmlNode &node, s
if (nullptr == mNodeElementCur) { if (nullptr == mNodeElementCur) {
printf("here\n"); printf("here\n");
} }
checkNodeMustBeEmpty(node);
//do { if (!pDEF.empty())
checkNodeMustBeEmpty(node); Assimp::Throw_DEF_And_USE(node.name());
if (!pDEF.empty()) if (!FindNodeElement(pUSE, pType, &pNE))
Assimp::Throw_DEF_And_USE(node.name()); Assimp::Throw_USE_NotFound(node.name(), pUSE);
if (!FindNodeElement(pUSE, pType, &pNE)) mNodeElementCur->Children.push_back(pNE); /* add found object as child to current element */
Assimp::Throw_USE_NotFound(node.name(), pUSE);
mNodeElementCur->Children.push_back(pNE); /* add found object as child to current element */
//} while (false);
return pNE; return pNE;
} }

2
test/unit/utX3DImportExport.cpp
View File

@ -51,7 +51,7 @@ class utX3DImportExport : public AbstractImportExportBase {
public: public:
bool importerTest() override { bool importerTest() override {
Assimp::Importer importer; Assimp::Importer importer;
const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/X3D/ComputerKeyboard.x3d", aiProcess_ValidateDataStructure); const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/X3D/HelloX3dTrademark.x3d", aiProcess_ValidateDataStructure);
return nullptr != scene; return nullptr != scene;
} }
}; };