Browse Source

fixed some compiling issues

René Martin 4 years ago
parent
commit
a8a6aa2bd8

+ 1 - 1
code/AssetLib/X3D/X3DImporter_Node.hpp

@@ -110,7 +110,7 @@ struct X3DNodeElementBase {
 
 
 protected:
 protected:
     X3DNodeElementBase(X3DElemType type, X3DNodeElementBase *pParent) :
     X3DNodeElementBase(X3DElemType type, X3DNodeElementBase *pParent) :
-            Type(type), Parent(pParent) {
+            Parent(pParent), Type(type) {
         // empty
         // empty
     }
     }
 };
 };

+ 1 - 1
code/AssetLib/X3D/X3DImporter_Postprocess.cpp

@@ -703,7 +703,7 @@ void X3DImporter::Postprocess_CollectMetadata(const X3DNodeElementBase &pNodeEle
             // Add an element according to its type.
             // Add an element according to its type.
             if ((*it)->Type == X3DElemType::ENET_MetaBoolean) {
             if ((*it)->Type == X3DElemType::ENET_MetaBoolean) {
                 if (((X3DNodeElementMetaBoolean *)cur_meta)->Value.size() > 0)
                 if (((X3DNodeElementMetaBoolean *)cur_meta)->Value.size() > 0)
-                    pSceneNode.mMetaData->Set(static_cast<unsigned int>(meta_idx), cur_meta->Name, *(((X3DNodeElementMetaBoolean *)cur_meta)->Value.begin()));
+                    pSceneNode.mMetaData->Set(static_cast<unsigned int>(meta_idx), cur_meta->Name, *(((X3DNodeElementMetaBoolean *)cur_meta)->Value.begin()) == true);
             } else if ((*it)->Type == X3DElemType::ENET_MetaDouble) {
             } else if ((*it)->Type == X3DElemType::ENET_MetaDouble) {
                 if (((X3DNodeElementMetaDouble *)cur_meta)->Value.size() > 0)
                 if (((X3DNodeElementMetaDouble *)cur_meta)->Value.size() > 0)
                     pSceneNode.mMetaData->Set(static_cast<unsigned int>(meta_idx), cur_meta->Name, (float)*(((X3DNodeElementMetaDouble *)cur_meta)->Value.begin()));
                     pSceneNode.mMetaData->Set(static_cast<unsigned int>(meta_idx), cur_meta->Name, (float)*(((X3DNodeElementMetaDouble *)cur_meta)->Value.begin()));