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

Merge branch 'bug-3177-dae-geo-id' into bug-3201-collada_root_meshes

pull/3205/head
RichardTea 2020-05-05 09:52:08 +01:00
parent 8e73984a11 d1ae6ac77a
commit 6e447b2c44
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/AssetLib/Collada/ColladaExporter.cpp
View File

@ -1227,8 +1227,8 @@ void ColladaExporter::WriteFloatArray(const std::string &pIdString, FloatDataTyp
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
// Writes the scene library // Writes the scene library
void ColladaExporter::WriteSceneLibrary() { void ColladaExporter::WriteSceneLibrary() {
const std::string sceneName = GetNodeUniqueId(mScene->mRootNode); const std::string sceneId = GetNodeUniqueId(mScene->mRootNode);
const std::string sceneId = GetNodeName(mScene->mRootNode); const std::string sceneName = GetNodeName(mScene->mRootNode);
mOutput << startstr << "<library_visual_scenes>" << endstr; mOutput << startstr << "<library_visual_scenes>" << endstr;
PushTag(); PushTag();

6
code/AssetLib/X3D/X3DImporter_Postprocess.cpp
View File

@ -787,8 +787,10 @@ void X3DImporter::Postprocess_CollectMetadata(const CX3DImporter_NodeElement& pN
// Add an element according to its type. // Add an element according to its type.
if((*it)->Type == CX3DImporter_NodeElement::ENET_MetaBoolean) if((*it)->Type == CX3DImporter_NodeElement::ENET_MetaBoolean)
{ {
if(((CX3DImporter_NodeElement_MetaBoolean*)cur_meta)->Value.size() > 0) if(((CX3DImporter_NodeElement_MetaBoolean*)cur_meta)->Value.size() > 0) {
pSceneNode.mMetaData->Set(static_cast<unsigned int>(meta_idx), cur_meta->Name, *(((CX3DImporter_NodeElement_MetaBoolean*)cur_meta)->Value.begin())); const bool v = (bool) *( ( (CX3DImporter_NodeElement_MetaBoolean*) cur_meta )->Value.begin());
pSceneNode.mMetaData->Set(static_cast<unsigned int>(meta_idx), cur_meta->Name, v);
}
} }
else if((*it)->Type == CX3DImporter_NodeElement::ENET_MetaDouble) else if((*it)->Type == CX3DImporter_NodeElement::ENET_MetaDouble)
{ {

15
include/assimp/metadata.h
View File

@ -86,6 +86,14 @@ typedef enum aiMetadataType {
struct aiMetadataEntry { struct aiMetadataEntry {
aiMetadataType mType; aiMetadataType mType;
void *mData; void *mData;
#ifdef __cplusplus
aiMetadataEntry() :
mType(AI_META_MAX),
mData( nullptr ) {
// empty
}
#endif
}; };
#ifdef __cplusplus #ifdef __cplusplus
@ -313,8 +321,13 @@ struct aiMetadata {
// Set metadata type // Set metadata type
mValues[index].mType = GetAiType(value); mValues[index].mType = GetAiType(value);
// Copy the given value to the dynamic storage // Copy the given value to the dynamic storage
mValues[index].mData = new T(value); if (nullptr != mValues[index].mData) {
::memcpy(mValues[index].mData, &value, sizeof(T));
} else {
mValues[index].mData = new T(value);
}
return true; return true;
} }