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

Merge branch 'x3d_pugi_migration' of https://github.com/assimp/assimp into x3d_pugi_migration

pull/3892/head
Kim Kulling 2021-06-03 22:21:10 +02:00
parent 3a32612b71 8cae8c5461
commit d600b45cd2
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -290,9 +290,6 @@ protected:
struct CX3DNodeElementGroup : X3DNodeElementBase { struct CX3DNodeElementGroup : X3DNodeElementBase {
aiMatrix4x4 Transformation; ///< Transformation matrix. aiMatrix4x4 Transformation; ///< Transformation matrix.
bool Static;
bool UseChoice; ///< Flag: if true then use number from \ref Choice to choose what the child will be kept.
int32_t Choice; ///< Number of the child which will be kept.
}; };
struct X3DNodeElementMeta : X3DNodeElementBase { struct X3DNodeElementMeta : X3DNodeElementBase {
@ -313,7 +310,7 @@ protected:
struct X3DNodeElementMetaBoolean : X3DNodeElementMeta { struct X3DNodeElementMetaBoolean : X3DNodeElementMeta {
std::vector<bool> Value; ///< Stored value. std::vector<bool> Value; ///< Stored value.
X3DNodeElementMetaBoolean(X3DNodeElementBase *pParent) : explicit X3DNodeElementMetaBoolean(X3DNodeElementBase *pParent) :
X3DNodeElementMeta(X3DElemType::ENET_MetaBoolean, pParent) { X3DNodeElementMeta(X3DElemType::ENET_MetaBoolean, pParent) {
// empty // empty
} }
@ -322,7 +319,7 @@ struct X3DNodeElementMetaBoolean : X3DNodeElementMeta {
struct X3DNodeElementMetaDouble : X3DNodeElementMeta { struct X3DNodeElementMetaDouble : X3DNodeElementMeta {
std::vector<double> Value; ///< Stored value. std::vector<double> Value; ///< Stored value.
X3DNodeElementMetaDouble(X3DNodeElementBase *pParent) : explicit X3DNodeElementMetaDouble(X3DNodeElementBase *pParent) :
X3DNodeElementMeta(X3DElemType::ENET_MetaDouble, pParent) { X3DNodeElementMeta(X3DElemType::ENET_MetaDouble, pParent) {
// empty // empty
} }
@ -331,7 +328,7 @@ struct X3DNodeElementMetaDouble : X3DNodeElementMeta {
struct X3DNodeElementMetaFloat : public X3DNodeElementMeta { struct X3DNodeElementMetaFloat : public X3DNodeElementMeta {
std::vector<float> Value; ///< Stored value. std::vector<float> Value; ///< Stored value.
X3DNodeElementMetaFloat(X3DNodeElementBase *pParent) : explicit X3DNodeElementMetaFloat(X3DNodeElementBase *pParent) :
X3DNodeElementMeta(X3DElemType::ENET_MetaFloat, pParent) { X3DNodeElementMeta(X3DElemType::ENET_MetaFloat, pParent) {
// empty // empty
} }
@ -340,7 +337,7 @@ struct X3DNodeElementMetaFloat : public X3DNodeElementMeta {
struct X3DNodeElementMetaInt : public X3DNodeElementMeta { struct X3DNodeElementMetaInt : public X3DNodeElementMeta {
std::vector<int32_t> Value; ///< Stored value. std::vector<int32_t> Value; ///< Stored value.
X3DNodeElementMetaInt(X3DNodeElementBase *pParent) : explicit X3DNodeElementMetaInt(X3DNodeElementBase *pParent) :
X3DNodeElementMeta(X3DElemType::ENET_MetaInteger, pParent) { X3DNodeElementMeta(X3DElemType::ENET_MetaInteger, pParent) {
// empty // empty
} }
@ -349,7 +346,7 @@ struct X3DNodeElementMetaInt : public X3DNodeElementMeta {
struct X3DNodeElementMetaSet : public X3DNodeElementMeta { struct X3DNodeElementMetaSet : public X3DNodeElementMeta {
std::list<X3DNodeElementMeta> Value; ///< Stored value. std::list<X3DNodeElementMeta> Value; ///< Stored value.
X3DNodeElementMetaSet(X3DNodeElementBase *pParent) : explicit X3DNodeElementMetaSet(X3DNodeElementBase *pParent) :
X3DNodeElementMeta(X3DElemType::ENET_MetaSet, pParent) { X3DNodeElementMeta(X3DElemType::ENET_MetaSet, pParent) {
// empty // empty
} }
@ -358,7 +355,7 @@ struct X3DNodeElementMetaSet : public X3DNodeElementMeta {
struct X3DNodeElementMetaString : public X3DNodeElementMeta { struct X3DNodeElementMetaString : public X3DNodeElementMeta {
std::list<std::string> Value; ///< Stored value. std::list<std::string> Value; ///< Stored value.
X3DNodeElementMetaString(X3DNodeElementBase *pParent) : explicit X3DNodeElementMetaString(X3DNodeElementBase *pParent) :
X3DNodeElementMeta(X3DElemType::ENET_MetaString, pParent) { X3DNodeElementMeta(X3DElemType::ENET_MetaString, pParent) {
// empty // empty
} }