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

Export extensions

pull/1423/head
Daniel Hritzkiv 2017-09-01 17:56:30 -04:00
parent d277995a97
commit 63ef19d9ad
No known key found for this signature in database
GPG Key ID: D1D19875679D5CBF
3 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
code/glTF2Exporter.cpp
View File

@ -107,10 +107,6 @@ glTF2Exporter::glTF2Exporter(const char* filename, IOSystem* pIOSystem, const ai
ExportMetadata(); ExportMetadata();
if (mScene->mRootNode) {
ExportExtensions(mScene->mRootNode);
}
ExportMaterials(); ExportMaterials();
if (mScene->mRootNode) { if (mScene->mRootNode) {
@ -789,20 +785,6 @@ void glTF2Exporter::ExportMetadata()
asset.generator = buffer; asset.generator = buffer;
} }
void glTF2Exporter::ExportExtensions(const aiNode* n)
{
aiMetadata* mMetaData = n->mMetaData;
if (mMetaData != nullptr) {
bool pbrSpecularGlossiness;
if (mMetaData->Get("extensionsUsed.pbrSpecularGlossiness", pbrSpecularGlossiness)) {
mAsset->extensionsUsed.KHR_materials_pbrSpecularGlossiness = pbrSpecularGlossiness;
}
}
}
inline void ExtractAnimationData(Asset& mAsset, std::string& animId, Ref<Animation>& animRef, Ref<Buffer>& buffer, const aiNodeAnim* nodeChannel, float ticksPerSecond) inline void ExtractAnimationData(Asset& mAsset, std::string& animId, Ref<Animation>& animRef, Ref<Buffer>& buffer, const aiNodeAnim* nodeChannel, float ticksPerSecond)
{ {
// Loop over the data and check to see if it exactly matches an existing buffer. // Loop over the data and check to see if it exactly matches an existing buffer.

1
code/glTF2Exporter.h
View File

@ -118,7 +118,6 @@ namespace Assimp
void GetMatColor(const aiMaterial* mat, glTF2::vec4& prop, const char* propName, int type, int idx); void GetMatColor(const aiMaterial* mat, glTF2::vec4& prop, const char* propName, int type, int idx);
void GetMatColor(const aiMaterial* mat, glTF2::vec3& prop, const char* propName, int type, int idx); void GetMatColor(const aiMaterial* mat, glTF2::vec3& prop, const char* propName, int type, int idx);
void ExportMetadata(); void ExportMetadata();
void ExportExtensions(const aiNode* n);
void ExportMaterials(); void ExportMaterials();
void ExportMeshes(); void ExportMeshes();
unsigned int ExportNodeHierarchy(const aiNode* n); unsigned int ExportNodeHierarchy(const aiNode* n);

7
code/glTF2Importer.cpp
View File

@ -546,13 +546,6 @@ void glTF2Importer::ImportNodes(glTF2::Asset& r)
//if (!mScene->mRootNode) { //if (!mScene->mRootNode) {
// mScene->mRootNode = new aiNode("EMPTY"); // mScene->mRootNode = new aiNode("EMPTY");
//} //}
//initialize mMetaData;
aiMetadata* mMetaData = new aiMetadata();
//store used glTF extensions on the root node, for a lack of a better place.
mMetaData->Add("extensionsUsed.pbrSpecularGlossiness", r.extensionsUsed.KHR_materials_pbrSpecularGlossiness);
mScene->mRootNode->mMetaData = mMetaData;
} }
void glTF2Importer::ImportEmbeddedTextures(glTF2::Asset& r) void glTF2Importer::ImportEmbeddedTextures(glTF2::Asset& r)