Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-13 20:30:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

variables, cluster size

Browse source
This commit is contained in:
raveenajain 2019-04-01 21:09:14 +01:00
parent 269b910d24
commit 2920fdc966
2 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
libraries/fbx/src/GLTFSerializer.cpp
View file

@ -753,28 +753,26 @@ std::vector<std::vector<float>> GLTFSerializer::getSkinInverseBindMatrices() {
return inverseBindMatrixValues; return inverseBindMatrixValues;
} }
std::vector<int> GLTFSerializer::nodeDFS(int n, std::vector<int>& children, bool order) { std::vector<int> GLTFSerializer::nodeDFS(int n, std::vector<int>& children, int stride) {
std::vector<int> result; std::vector<int> result;
result.push_back(n); result.push_back(n);
int begin = 0; int rootDFS = 0;
int finish = (int)children.size(); int finalDFS = (int)children.size();
if (order) { if (stride == -1) {
begin = (int)children.size() - 1; rootDFS = (int)children.size() - 1;
finish = -1; finalDFS = -1;
} }
int index = begin; for (int index = rootDFS; index != finalDFS; index += stride) {
while (index != finish) {
int c = children[index]; int c = children[index];
std::vector<int> nested = _file.nodes[c].children.toStdVector(); std::vector<int> nested = _file.nodes[c].children.toStdVector();
if (nested.size() != 0) { if (nested.size() != 0) {
std::sort(nested.begin(), nested.end()); std::sort(nested.begin(), nested.end());
for (int n : nodeDFS(c, nested, order)) { for (int n : nodeDFS(c, nested, stride)) {
result.push_back(n); result.push_back(n);
} }
} else { } else {
result.push_back(c); result.push_back(c);
} }
begin < finish ? index++ : index--;
} }
return result; return result;
} }
@ -836,7 +834,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::URL& url) {
int i = initialSceneNodes[index]; int i = initialSceneNodes[index];
std::vector<int> children = _file.nodes[i].children.toStdVector(); std::vector<int> children = _file.nodes[i].children.toStdVector();
std::sort(children.begin(), children.end()); std::sort(children.begin(), children.end());
for (int n : nodeDFS(i, children, !rootAtStartOfList)) { for (int n : nodeDFS(i, children, nodeListStride)) {
nodeQueue.append(n); nodeQueue.append(n);
} }
} }
@ -856,14 +854,11 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::URL& url) {
joint.parentIndex = nodeQueue.indexOf(nodeDependencies[nodeIndex][0]); joint.parentIndex = nodeQueue.indexOf(nodeDependencies[nodeIndex][0]);
} }
joint.transform = node.transforms.first(); joint.transform = node.transforms.first();
joint.postTransform = glm::mat4();
glm::vec3 scale = extractScale(joint.transform);
joint.postTransform[0][0] = scale.x;
joint.postTransform[1][1] = scale.y;
joint.postTransform[2][2] = scale.z;
joint.rotation = glmExtractRotation(joint.transform);
joint.translation = extractTranslation(joint.transform); joint.translation = extractTranslation(joint.transform);
joint.rotation = glmExtractRotation(joint.transform);
glm::vec3 scale = extractScale(joint.transform);
joint.postTransform = glm::scale(glm::mat4(), scale);
joint.name = node.name; joint.name = node.name;
joint.isSkeletonJoint = false; joint.isSkeletonJoint = false;
hfmModel.joints.push_back(joint); hfmModel.joints.push_back(joint);
@ -1121,7 +1116,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::URL& url) {
const int WEIGHTS_PER_VERTEX = 4; const int WEIGHTS_PER_VERTEX = 4;
const float ALMOST_HALF = 0.499f; const float ALMOST_HALF = 0.499f;
int numVertices = mesh.vertices.size(); int numVertices = mesh.vertices.size();
mesh.clusterIndices.fill(0, numClusterIndices); mesh.clusterIndices.fill(mesh.clusters.size() - 1, numClusterIndices);
mesh.clusterWeights.fill(0, numClusterIndices); mesh.clusterWeights.fill(0, numClusterIndices);
for (int c = 0; c < clusterJoints.size(); c++) { for (int c = 0; c < clusterJoints.size(); c++) {

2
libraries/fbx/src/GLTFSerializer.h
View file

@ -713,7 +713,7 @@ private:
glm::mat4 getModelTransform(const GLTFNode& node); glm::mat4 getModelTransform(const GLTFNode& node);
std::vector<std::vector<float>> getSkinInverseBindMatrices(); std::vector<std::vector<float>> getSkinInverseBindMatrices();
std::vector<int> nodeDFS(int n, std::vector<int>& children, bool order); std::vector<int> nodeDFS(int n, std::vector<int>& children, int stride);
bool buildGeometry(HFMModel& hfmModel, const hifi::URL& url); bool buildGeometry(HFMModel& hfmModel, const hifi::URL& url);
bool parseGLTF(const hifi::ByteArray& data); bool parseGLTF(const hifi::ByteArray& data);