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

conditional export

pull/3227/head
Yingying Wang 2020-05-19 16:10:41 -07:00
parent c10e409a5d
commit 50f0a86798
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
code/AssetLib/glTF2/glTF2Exporter.cpp
View File

@ -969,10 +969,15 @@ void glTF2Exporter::ExportMeshes()
/*************** Targets for blendshapes ****************/ /*************** Targets for blendshapes ****************/
if (aim->mNumAnimMeshes > 0) { if (aim->mNumAnimMeshes > 0) {
//wangyi 0506
bool bUseSparse = this->mProperties->HasPropertyBool("GLTF2_SPARSE_ACCESSOR_EXP") &&
this->mProperties->GetPropertyBool("GLTF2_SPARSE_ACCESSOR_EXP");
bool bIncludeNormal = this->mProperties->HasPropertyBool("GLTF2_TARGET_NORMAL_EXP") &&
this->mProperties->GetPropertyBool("GLTF2_TARGET_NORMAL_EXP");
p.targets.resize(aim->mNumAnimMeshes); p.targets.resize(aim->mNumAnimMeshes);
for (unsigned int am = 0; am < aim->mNumAnimMeshes; ++am) { for (unsigned int am = 0; am < aim->mNumAnimMeshes; ++am) {
aiAnimMesh *pAnimMesh = aim->mAnimMeshes[am]; aiAnimMesh *pAnimMesh = aim->mAnimMeshes[am];
// position // position
if (pAnimMesh->HasPositions()) { if (pAnimMesh->HasPositions()) {
// NOTE: in gltf it is the diff stored // NOTE: in gltf it is the diff stored
@ -980,13 +985,17 @@ void glTF2Exporter::ExportMeshes()
for (unsigned int vt = 0; vt < pAnimMesh->mNumVertices; ++vt) { for (unsigned int vt = 0; vt < pAnimMesh->mNumVertices; ++vt) {
pPositionDiff[vt] = pAnimMesh->mVertices[vt] - aim->mVertices[vt]; pPositionDiff[vt] = pAnimMesh->mVertices[vt] - aim->mVertices[vt];
} }
Ref<Accessor> vec = ExportData(*mAsset, meshId, b, //wangyi 0506
pAnimMesh->mNumVertices, pPositionDiff, Ref<Accessor> vec;
AttribType::VEC3, AttribType::VEC3, ComponentType_FLOAT); if (bUseSparse) {
/* sparse vec = ExportDataSparse(*mAsset, meshId, b,
Ref<Accessor> vec = ExportDataSparse(*mAsset, meshId, b, pAnimMesh->mNumVertices, pPositionDiff,
pAnimMesh->mNumVertices, pPositionDiff, AttribType::VEC3, AttribType::VEC3, ComponentType_FLOAT);
AttribType::VEC3, AttribType::VEC3, ComponentType_FLOAT);*/ } else {
vec = ExportData(*mAsset, meshId, b,
pAnimMesh->mNumVertices, pPositionDiff,
AttribType::VEC3, AttribType::VEC3, ComponentType_FLOAT);
}
if (vec) { if (vec) {
p.targets[am].position.push_back(vec); p.targets[am].position.push_back(vec);
} }
@ -994,18 +1003,22 @@ void glTF2Exporter::ExportMeshes()
} }
// normal // normal
if (pAnimMesh->HasNormals()) { if (pAnimMesh->HasNormals() && bIncludeNormal) {
aiVector3D *pNormalDiff = new aiVector3D[pAnimMesh->mNumVertices]; aiVector3D *pNormalDiff = new aiVector3D[pAnimMesh->mNumVertices];
for (unsigned int vt = 0; vt < pAnimMesh->mNumVertices; ++vt) { for (unsigned int vt = 0; vt < pAnimMesh->mNumVertices; ++vt) {
pNormalDiff[vt] = pAnimMesh->mNormals[vt] - aim->mNormals[vt]; pNormalDiff[vt] = pAnimMesh->mNormals[vt] - aim->mNormals[vt];
} }
Ref<Accessor> vec = ExportData(*mAsset, meshId, b, //wangyi 0506
pAnimMesh->mNumVertices, pNormalDiff, Ref<Accessor> vec;
AttribType::VEC3, AttribType::VEC3, ComponentType_FLOAT); if (bUseSparse) {
/* sparse vec = ExportDataSparse(*mAsset, meshId, b,
Ref<Accessor> vec = ExportDataSparse(*mAsset, meshId, b, pAnimMesh->mNumVertices, pNormalDiff,
pAnimMesh->mNumVertices, pNormalDiff, AttribType::VEC3, AttribType::VEC3, ComponentType_FLOAT);
AttribType::VEC3, AttribType::VEC3, ComponentType_FLOAT);*/ } else {
vec = ExportData(*mAsset, meshId, b,
pAnimMesh->mNumVertices, pNormalDiff,
AttribType::VEC3, AttribType::VEC3, ComponentType_FLOAT);
}
if (vec) { if (vec) {
p.targets[am].normal.push_back(vec); p.targets[am].normal.push_back(vec);
} }