dqn
/
FBX2glTF
mirror of https://github.com/facebookincubator/FBX2glTF.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'blendshape-sparse'

This commit is contained in:
Gordon Chapman 2020-05-14 20:02:32 -07:00
parent 739ee5db94 6ca6d06f09
commit cf7b829b83
8 changed files with 241 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/FBX2glTF.cpp
View File

@ -142,6 +142,11 @@ int main(int argc, char* argv[]) {
gltfOptions.enableUserProperties,
"Transcribe FBX User Properties into glTF node and material 'extras'.");
app.add_flag(
"--blend-shape-sparse",
gltfOptions.enableSparseBlendShapes,
"Use sparse accessors to store blend shapes");
app.add_flag(
"--blend-shape-normals",
gltfOptions.useBlendShapeNormals,

2
src/FBX2glTF.h
View File

@ -112,6 +112,8 @@ struct GltfOptions {
/** Whether to include lights through the KHR_punctual_lights extension. */
bool useKHRLightsPunctual{true};
/** Whether to use sparse accessors in blend shapes */
bool enableSparseBlendShapes{false};
/** Whether to include blend shape normals, if present according to the SDK. */
bool useBlendShapeNormals{false};
/** Whether to include blend shape tangents, if present according to the SDK. */

44
src/gltf/GltfModel.hpp
View File

@ -69,6 +69,14 @@ class GltfModel {
BufferData& buffer,
const std::string& filename);
template <class T>
void CopyToBufferView(
BufferViewData& bufferView,
const std::vector<T>& source,
const GLType& type) {
bufferView.appendAsBinaryArray(source, *binary, type);
}
template <class T>
std::shared_ptr<AccessorData> AddAccessorWithView(
BufferViewData& bufferView,
@ -76,8 +84,40 @@ class GltfModel {
const std::vector<T>& source,
std::string name) {
auto accessor = accessors.hold(new AccessorData(bufferView, type, name));
accessor->appendAsBinaryArray(source, *binary);
bufferView.byteLength = accessor->byteLength();
bufferView.appendAsBinaryArray(source, *binary, type);
accessor->count = bufferView.count;
return accessor;
}
template <class T>
std::shared_ptr<AccessorData> AddSparseAccessorWithView(
AccessorData& baseAccessor,
BufferViewData& indexBufferView,
const GLType& indexBufferViewType,
BufferViewData& bufferView,
const GLType& type,
const std::vector<T>& source,
std::string name) {
auto accessor = accessors.hold(new AccessorData(baseAccessor, indexBufferView, bufferView, type, name));
bufferView.appendAsBinaryArray(source, *binary, type);
accessor->count = baseAccessor.count;
accessor->sparseIdxBufferViewType = indexBufferViewType.componentType.glType;
return accessor;
}
// template <class T>
std::shared_ptr<AccessorData> AddSparseAccessor(
AccessorData& baseAccessor,
BufferViewData& indexBufferView,
const GLType& indexBufferViewType,
BufferViewData& bufferView,
const GLType& type,
// const std::vector<T>& source,
std::string name) {
auto accessor = accessors.hold(new AccessorData(baseAccessor, indexBufferView, bufferView, type, name));
//bufferView.appendAsBinaryArray(source, *binary, type);
accessor->count = baseAccessor.count;
accessor->sparseIdxBufferViewType = indexBufferViewType.componentType.glType;
return accessor;
}

153
src/gltf/Raw2Gltf.cpp
View File

@ -418,6 +418,9 @@ ModelData* Raw2Gltf(
surfaceModel.GetMaterial(surfaceModel.GetTriangle(0).materialIndex);
const MaterialData& mData = require(materialsById, rawMaterial.id);
if (verboseOutput)
fmt::printf("\rMaterial Name: %s\n", mData.name);
MeshData* mesh = nullptr;
auto meshIter = meshBySurfaceId.find(surfaceId);
if (meshIter != meshBySurfaceId.end()) {
@ -470,6 +473,16 @@ ModelData* Raw2Gltf(
//
// surface vertices
//
// Base Accessors needed for Sparse Accessors
std::shared_ptr<AccessorData> pAccBase;
std::shared_ptr<AccessorData> nAccBase;
std::shared_ptr<AccessorData> tAccBase;
// Sparse accessors cannot be zero length, but morph targets can easily have
// no modified vertices in multiprim meshes. In order to utilise sparse accessors
// in this case, we need a couple of single element dummy buffer views to reference.
std::shared_ptr<BufferViewData> dummyIdxView;
std::shared_ptr<BufferViewData> dummyDataView;
{
if ((surfaceModel.GetVertexAttributes() & RAW_VERTEX_ATTRIBUTE_POSITION) != 0) {
const AttributeDefinition<Vec3f> ATTR_POSITION(
@ -483,6 +496,8 @@ ModelData* Raw2Gltf(
accessor->min = toStdVec(rawSurface.bounds.min);
accessor->max = toStdVec(rawSurface.bounds.max);
pAccBase = accessor;
}
if ((surfaceModel.GetVertexAttributes() & RAW_VERTEX_ATTRIBUTE_NORMAL) != 0) {
const AttributeDefinition<Vec3f> ATTR_NORMAL(
@ -493,11 +508,13 @@ ModelData* Raw2Gltf(
draco::DT_FLOAT32);
const auto _ =
gltf->AddAttributeToPrimitive<Vec3f>(buffer, surfaceModel, *primitive, ATTR_NORMAL);
nAccBase = _;
}
if ((surfaceModel.GetVertexAttributes() & RAW_VERTEX_ATTRIBUTE_TANGENT) != 0) {
const AttributeDefinition<Vec4f> ATTR_TANGENT("TANGENT", &RawVertex::tangent, GLT_VEC4F);
const auto _ = gltf->AddAttributeToPrimitive<Vec4f>(
buffer, surfaceModel, *primitive, ATTR_TANGENT);
tAccBase = _;
}
if ((surfaceModel.GetVertexAttributes() & RAW_VERTEX_ATTRIBUTE_COLOR) != 0) {
const AttributeDefinition<Vec4f> ATTR_COLOR(
@ -559,43 +576,129 @@ ModelData* Raw2Gltf(
std::vector<Vec3f> positions, normals;
std::vector<Vec4f> tangents;
std::vector<TriangleIndex> sparseIndices;
for (int jj = 0; jj < surfaceModel.GetVertexCount(); jj++) {
auto blendVertex = surfaceModel.GetVertex(jj).blends[channelIx];
shapeBounds.AddPoint(blendVertex.position);
positions.push_back(blendVertex.position);
if (options.useBlendShapeTangents && channel.hasNormals) {
normals.push_back(blendVertex.normal);
bool isSparseVertex = !options.enableSparseBlendShapes; // If sparse is off, add all vertices
// Check to see whether position, normal or tangent deviates from base mesh and flag as sparse.
if (blendVertex.position.Length()>0.00){
isSparseVertex = true;
}
if (options.useBlendShapeTangents && channel.hasTangents) {
tangents.push_back(blendVertex.tangent);
if (options.useBlendShapeNormals && channel.hasNormals && blendVertex.normal.Length()>0.00) {
isSparseVertex = true;
}
if (options.useBlendShapeTangents && channel.hasTangents && blendVertex.tangent.Length()>0.00) {
isSparseVertex = true;
}
if(isSparseVertex==true){
sparseIndices.push_back(jj);
positions.push_back(blendVertex.position);
if (options.useBlendShapeNormals && channel.hasNormals) {
normals.push_back(blendVertex.normal);
}
if (options.useBlendShapeTangents && channel.hasTangents) {
tangents.push_back(blendVertex.tangent);
}
}
}
std::shared_ptr<AccessorData> pAcc = gltf->AddAccessorWithView(
*gltf->GetAlignedBufferView(buffer, BufferViewData::GL_ARRAY_BUFFER),
GLT_VEC3F,
positions,
channel.name);
pAcc->min = toStdVec(shapeBounds.min);
pAcc->max = toStdVec(shapeBounds.max);
std::shared_ptr<AccessorData> pAcc;
std::shared_ptr<AccessorData> nAcc;
if (!normals.empty()) {
nAcc = gltf->AddAccessorWithView(
std::shared_ptr<AccessorData> tAcc;
if(options.enableSparseBlendShapes){
if (verboseOutput)
fmt::printf("\rChannel Name: %-50s Sparse Count: %d\n", channel.name,sparseIndices.size());
if(sparseIndices.size()==0){
// Initalize dummy bufferviews if needed
if(!dummyIdxView){
std::vector<TriangleIndex> dummyIndices;
dummyIndices.push_back(int(0));
dummyIdxView = gltf->GetAlignedBufferView(buffer, BufferViewData::GL_ARRAY_NONE);
gltf->CopyToBufferView(*dummyIdxView, dummyIndices, useLongIndices ? GLT_UINT : GLT_USHORT);
}
if(!dummyDataView){
std::vector<Vec3f> dummyData;
dummyData.push_back(Vec3f(0.0));
dummyDataView = gltf->GetAlignedBufferView(buffer, BufferViewData::GL_ARRAY_NONE);
dummyDataView->appendAsBinaryArray(dummyData, *gltf->binary, GLT_VEC3F);
}
// Set up sparse accessor with dummy buffer views
pAcc = gltf->AddSparseAccessor(
*pAccBase,
*dummyIdxView,
useLongIndices ? GLT_UINT : GLT_USHORT,
*dummyDataView,
GLT_VEC3F,
channel.name);
}else{
// Build Orphan Bufferview for Sparse Indices
std::shared_ptr<BufferViewData> indexBufferView =
gltf->GetAlignedBufferView(buffer, BufferViewData::GL_ARRAY_NONE);
gltf->CopyToBufferView(*indexBufferView, sparseIndices, useLongIndices ? GLT_UINT : GLT_USHORT);
pAcc = gltf->AddSparseAccessorWithView(
*pAccBase,
*indexBufferView,
useLongIndices ? GLT_UINT : GLT_USHORT,
*gltf->GetAlignedBufferView(buffer, BufferViewData::GL_ARRAY_NONE),
GLT_VEC3F,
positions,
channel.name);
if (!normals.empty()) {
nAcc = gltf->AddSparseAccessorWithView(
*nAccBase,
*indexBufferView,
useLongIndices ? GLT_UINT : GLT_USHORT,
*gltf->GetAlignedBufferView(buffer, BufferViewData::GL_ARRAY_NONE),
GLT_VEC3F,
normals,
channel.name);
}
if (!tangents.empty()) {
tAcc = gltf->AddSparseAccessorWithView(
*nAccBase,
*indexBufferView,
useLongIndices ? GLT_UINT : GLT_USHORT,
*gltf->GetAlignedBufferView(buffer, BufferViewData::GL_ARRAY_NONE),
GLT_VEC4F,
tangents,
channel.name);
}
}
}else{
pAcc = gltf->AddAccessorWithView(
*gltf->GetAlignedBufferView(buffer, BufferViewData::GL_ARRAY_BUFFER),
GLT_VEC3F,
normals,
positions,
channel.name);
if (!normals.empty()) {
nAcc = gltf->AddAccessorWithView(
*gltf->GetAlignedBufferView(buffer, BufferViewData::GL_ARRAY_BUFFER),
GLT_VEC3F,
normals,
channel.name);
}
if (!tangents.empty()) {
nAcc = gltf->AddAccessorWithView(
*gltf->GetAlignedBufferView(buffer, BufferViewData::GL_ARRAY_BUFFER),
GLT_VEC4F,
tangents,
channel.name);
}
}
std::shared_ptr<AccessorData> tAcc;
if (!tangents.empty()) {
nAcc = gltf->AddAccessorWithView(
*gltf->GetAlignedBufferView(buffer, BufferViewData::GL_ARRAY_BUFFER),
GLT_VEC4F,
tangents,
channel.name);
}
pAcc->min = toStdVec(shapeBounds.min);
pAcc->max = toStdVec(shapeBounds.max);
primitive->AddTarget(pAcc.get(), nAcc.get(), tAcc.get());
}
}

36
src/gltf/properties/AccessorData.cpp
View File

@ -15,15 +15,34 @@ AccessorData::AccessorData(const BufferViewData& bufferView, GLType type, std::s
type(std::move(type)),
byteOffset(0),
count(0),
name(name) {}
name(name),
sparse(false) {}
AccessorData::AccessorData(const AccessorData& baseAccessor,
const BufferViewData& sparseIdxBufferView,
const BufferViewData& sparseDataBufferView,
GLType type, std::string name)
: Holdable(),
bufferView(baseAccessor.bufferView),
type(std::move(type)),
byteOffset(baseAccessor.byteOffset),
count(baseAccessor.count),
name(name),
sparse(true),
sparseIdxCount(sparseIdxBufferView.count),
sparseIdxBufferView(sparseIdxBufferView.ix),
sparseIdxBufferViewOffset(0),
sparseIdxBufferViewType(0),
sparseDataBufferView(sparseDataBufferView.ix),
sparseDataBufferViewOffset(0) {}
AccessorData::AccessorData(GLType type)
: Holdable(), bufferView(-1), type(std::move(type)), byteOffset(0), count(0) {}
: Holdable(), bufferView(-1), type(std::move(type)), byteOffset(0), count(0), sparse(false){}
json AccessorData::serialize() const {
json result{
{"componentType", type.componentType.glType}, {"type", type.dataType}, {"count", count}};
if (bufferView >= 0) {
if (bufferView >= 0 && !sparse) {
result["bufferView"] = bufferView;
result["byteOffset"] = byteOffset;
}
@ -33,6 +52,17 @@ json AccessorData::serialize() const {
if (!max.empty()) {
result["max"] = max;
}
if (sparse) {
json sparseData = {{"count", sparseIdxCount}};
sparseData["indices"] = { {"bufferView", sparseIdxBufferView},
{"byteOffset", sparseIdxBufferViewOffset},
{"componentType", sparseIdxBufferViewType}};
sparseData["values"] = { {"bufferView", sparseDataBufferView},
{"byteOffset", sparseDataBufferViewOffset}};
result["sparse"] = sparseData;
}
if (name.length() > 0) {
result["name"] = name;
}

29
src/gltf/properties/AccessorData.hpp
View File

@ -11,25 +11,16 @@
#include "gltf/Raw2Gltf.hpp"
struct AccessorData : Holdable {
AccessorData(const BufferViewData& bufferView, GLType type, std::string name);
AccessorData(const BufferViewData& bufferView,
GLType type, std::string name);
explicit AccessorData(GLType type);
AccessorData(const AccessorData& baseAccessor,
const BufferViewData& sparseIdxBufferView,
const BufferViewData& sparseDataBufferView,
GLType type, std::string name);
json serialize() const override;
template <class T>
void appendAsBinaryArray(const std::vector<T>& in, std::vector<uint8_t>& out) {
const unsigned int stride = type.byteStride();
const size_t offset = out.size();
const size_t count = in.size();
this->count = (unsigned int)count;
out.resize(offset + count * stride);
for (int ii = 0; ii < count; ii++) {
type.write(&out[offset + ii * stride], in[ii]);
}
}
unsigned int byteLength() const {
return type.byteStride() * count;
}
@ -42,4 +33,12 @@ struct AccessorData : Holdable {
std::vector<float> min;
std::vector<float> max;
std::string name;
const bool sparse;
int sparseIdxCount;
int sparseIdxBufferView;
int sparseIdxBufferViewOffset;
int sparseIdxBufferViewType;
int sparseDataBufferView;
int sparseDataBufferViewOffset;
};

16
src/gltf/properties/BufferViewData.hpp
View File

@ -21,9 +21,25 @@ struct BufferViewData : Holdable {
json serialize() const override;
template <class T>
void appendAsBinaryArray(const std::vector<T>& in, std::vector<uint8_t>& out, GLType type) {
const unsigned int stride = type.byteStride();
const size_t offset = out.size();
const size_t count = in.size();
this->byteLength = stride * count;
this->count = count;
out.resize(offset + count * stride);
for (int ii = 0; ii < count; ii++) {
type.write(&out[offset + ii * stride], in[ii]);
}
}
const unsigned int buffer;
const unsigned int byteOffset;
const GL_ArrayType target;
unsigned int count=0;
unsigned int byteLength = 0;
};

2
src/gltf/properties/MeshData.cpp
View File

@ -17,7 +17,7 @@ json MeshData::serialize() const {
json jsonTargetNamesArray = json::array();
for (const auto& primitive : primitives) {
jsonPrimitivesArray.push_back(*primitive);
if (!primitive->targetNames.empty()) {
if (!primitive->targetNames.empty() && jsonTargetNamesArray.empty()) {
for (auto targetName : primitive->targetNames) {
jsonTargetNamesArray.push_back(targetName);
}