From a0d97505e5a53a9aa3a734d6bd3ad790234e6e09 Mon Sep 17 00:00:00 2001
From: Daniel Hritzkiv <daniel.hritzkiv@gmail.com>
Date: Fri, 1 Sep 2017 17:56:13 -0400
Subject: [PATCH] store node mesh vs. meshes
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

glTF nodes can only hold one mesh. this simply assigns to and check’s a Node’s Mesh
---
 code/glTF2Asset.h         |  2 +-
 code/glTF2Asset.inl       |  9 +--------
 code/glTF2AssetWriter.inl |  4 +++-
 code/glTF2Exporter.cpp    | 19 +++++++++----------
 code/glTF2Importer.cpp    | 21 +++++++--------------
 5 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/code/glTF2Asset.h b/code/glTF2Asset.h
index 8e3a6dd..9facef6 100644
--- a/code/glTF2Asset.h
+++ b/code/glTF2Asset.h
@@ -767,7 +767,7 @@ namespace glTF2
     struct Node : public Object
     {
         std::vector< Ref<Node> > children;
-        std::vector< Ref<Mesh> > meshes;
+        Ref<Mesh> mesh;
 
         Nullable<mat4> matrix;
         Nullable<vec3> translation;
diff --git a/code/glTF2Asset.inl b/code/glTF2Asset.inl
index 5316b5e..bebaeba 100644
--- a/code/glTF2Asset.inl
+++ b/code/glTF2Asset.inl
@@ -954,16 +954,9 @@ inline void Node::Read(Value& obj, Asset& r)
     }
 
     if (Value* mesh = FindUInt(obj, "mesh")) {
-        //unsigned numMeshes = (unsigned)meshes->Size();
-        unsigned numMeshes = 1;
-
-        //std::vector<unsigned int> meshList;
-
-        this->meshes.reserve(numMeshes);
-
         Ref<Mesh> meshRef = r.meshes.Retrieve((*mesh).GetUint());
 
-        if (meshRef) this->meshes.push_back(meshRef);
+        if (meshRef) this->mesh = meshRef;
     }
 
     if (Value* camera = FindUInt(obj, "camera")) {
diff --git a/code/glTF2AssetWriter.inl b/code/glTF2AssetWriter.inl
index 9aa0072..4a2aa9f 100644
--- a/code/glTF2AssetWriter.inl
+++ b/code/glTF2AssetWriter.inl
@@ -441,7 +441,9 @@ namespace glTF2 {
 
         AddRefsVector(obj, "children", n.children, w.mAl);
 
-        AddRefsVector(obj, "meshes", n.meshes, w.mAl);
+        if (n.mesh) {
+            obj.AddMember("mesh", n.mesh->index, w.mAl);
+        }
 
         AddRefsVector(obj, "skeletons", n.skeletons, w.mAl);
 
diff --git a/code/glTF2Exporter.cpp b/code/glTF2Exporter.cpp
index 164b559..7daedd4 100644
--- a/code/glTF2Exporter.cpp
+++ b/code/glTF2Exporter.cpp
@@ -442,16 +442,15 @@ void glTF2Exporter::ExportMaterials()
  */
 bool FindMeshNode(Ref<Node>& nodeIn, Ref<Node>& meshNode, std::string meshID)
 {
-    for (unsigned int i = 0; i < nodeIn->meshes.size(); ++i) {
-        if (meshID.compare(nodeIn->meshes[i]->id) == 0) {
-          meshNode = nodeIn;
-          return true;
-        }
+
+    if (nodeIn->mesh && meshID.compare(nodeIn->mesh->id) == 0) {
+        meshNode = nodeIn;
+        return true;
     }
 
     for (unsigned int i = 0; i < nodeIn->children.size(); ++i) {
         if(FindMeshNode(nodeIn->children[i], meshNode, meshID)) {
-          return true;
+            return true;
         }
     }
 
@@ -722,8 +721,8 @@ unsigned int glTF2Exporter::ExportNodeHierarchy(const aiNode* n)
         CopyValue(n->mTransformation, node->matrix.value);
     }
 
-    for (unsigned int i = 0; i < n->mNumMeshes; ++i) {
-        node->meshes.push_back(mAsset->meshes.Get(n->mMeshes[i]));
+    if (n->mNumMeshes > 0) {
+        node->mesh = mAsset->meshes.Get(n->mMeshes[0]);
     }
 
     for (unsigned int i = 0; i < n->mNumChildren; ++i) {
@@ -751,8 +750,8 @@ unsigned int glTF2Exporter::ExportNode(const aiNode* n, Ref<Node>& parent)
         CopyValue(n->mTransformation, node->matrix.value);
     }
 
-    for (unsigned int i = 0; i < n->mNumMeshes; ++i) {
-        node->meshes.push_back(mAsset->meshes.Get(n->mMeshes[i]));
+    if (n->mNumMeshes > 0) {
+        node->mesh = mAsset->meshes.Get(n->mMeshes[0]);
     }
 
     for (unsigned int i = 0; i < n->mNumChildren; ++i) {
diff --git a/code/glTF2Importer.cpp b/code/glTF2Importer.cpp
index a2c0911..90ae849 100644
--- a/code/glTF2Importer.cpp
+++ b/code/glTF2Importer.cpp
@@ -502,22 +502,15 @@ aiNode* ImportNode(aiScene* pScene, glTF2::Asset& r, std::vector<unsigned int>&
         }
     }
 
-    if (!node.meshes.empty()) {
-        int count = 0;
-        for (size_t i = 0; i < node.meshes.size(); ++i) {
-            int idx = node.meshes[i].GetIndex();
-            count += meshOffsets[idx + 1] - meshOffsets[idx];
-        }
-
-        ainode->mNumMeshes = count;
-        ainode->mMeshes = new unsigned int[count];
+    if (node.mesh) {
+        ainode->mNumMeshes = 1;
+        ainode->mMeshes = new unsigned int[1];
 
         int k = 0;
-        for (size_t i = 0; i < node.meshes.size(); ++i) {
-            int idx = node.meshes[i].GetIndex();
-            for (unsigned int j = meshOffsets[idx]; j < meshOffsets[idx + 1]; ++j, ++k) {
-                ainode->mMeshes[k] = j;
-            }
+        int idx = node.mesh.GetIndex();
+
+        for (unsigned int j = meshOffsets[idx]; j < meshOffsets[idx + 1]; ++j, ++k) {
+            ainode->mMeshes[k] = j;
         }
     }
 
-- 
2.7.4