added support for vertex merging with "sub-mesh per UV tile" turned off.

Chosko · Jul 5, 2017 · f575ddc · f575ddc
1 parent 1655568
commit f575ddc
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/AlembicImporter/Assets/UTJ/Alembic/Scripts/Importer/AbcAPI.cs b/AlembicImporter/Assets/UTJ/Alembic/Scripts/Importer/AbcAPI.cs
@@ -148,7 +148,7 @@ public void SetDefaults()
                 forceUpdate = false;
                 useThreads = true;
                 cacheSamples = 0;
-                submeshPerUVTile = true;
+                submeshPerUVTile = false;
             }
         }
 

diff --git a/AlembicImporter/Assets/UTJ/Alembic/Scripts/Importer/AlembicSettings.cs b/AlembicImporter/Assets/UTJ/Alembic/Scripts/Importer/AlembicSettings.cs
@@ -27,7 +27,7 @@ public class AlembicImportSettings
         [Tooltip("Should 'handedness' be swapped?")]
         [SerializeField] public bool m_swapHandedness = true;
         [SerializeField] public bool m_swapFaceWinding = false;
-        [SerializeField] public bool m_submeshPerUVTile = true;
+        [SerializeField] public bool m_submeshPerUVTile = false;
         [SerializeField] public bool m_importMeshes = true;
         [SerializeField] public AbcAPI.aiNormalsMode m_normalsMode = AbcAPI.aiNormalsMode.ComputeIfMissing;
         [SerializeField] public AbcAPI.aiTangentsMode m_tangentsMode = AbcAPI.aiTangentsMode.None;

diff --git a/Plugin/abci/Importer/aiPolyMesh.cpp b/Plugin/abci/Importer/aiPolyMesh.cpp
@@ -1706,12 +1706,25 @@ void aiPolyMeshSample::fillSubmeshIndices(const aiSubmeshSummary &summary, aiSub
                 int nv = counts[i];
 
                 int nt = nv - 2;
-                for (int ti=0; ti<nt; ++ti)
+                if (m_topology->m_FixedTopoPositionsIndexes.size() > 0)
                 {
-                    data.indices[offset + 0] = index;
-                    data.indices[offset + 1] = index + ti + i1;
-                    data.indices[offset + 2] = index + ti + i2;
-                    offset += 3;
+                    for (int ti = 0; ti<nt; ++ti)
+                    {
+                        data.indices[offset + 0] = m_topology->m_FaceIndexingReindexed[index];
+                        data.indices[offset + 1] = m_topology->m_FaceIndexingReindexed[index + ti + i1];
+                        data.indices[offset + 2] = m_topology->m_FaceIndexingReindexed[index + ti + i2];
+                        offset += 3;
+                    }
+                }
+                else
+                {
+                    for (int ti = 0; ti<nt; ++ti)
+                    {
+                        data.indices[offset + 0] = index;
+                        data.indices[offset + 1] = index + ti + i1;
+                        data.indices[offset + 2] = index + ti + i2;
+                        offset += 3;
+                    }
                 }
 
                 index += nv;
@@ -1950,7 +1963,7 @@ void aiPolyMesh::GenerateVerticesToFacesLookup(aiPolyMeshSample *sample)
     auto * facesIndices = sample->m_topology->m_indices->get();
     size_t totalFaces = faces->size();
 
-    // 1st, figure out which face uses wich vertices (for sharing identification)
+    // 1st, figure out which face uses which vertices (for sharing identification)
     std::unordered_map< size_t, std::vector<size_t>> indexesOfFacesValues;
     size_t facesIndicesCursor = 0;
     for (size_t faceIndex = 0; faceIndex < totalFaces; faceIndex++)
@@ -1962,8 +1975,6 @@ void aiPolyMesh::GenerateVerticesToFacesLookup(aiPolyMeshSample *sample)
 
     // 2nd, figure out which vertex can be merged, which cannot.
     // If all faces targetting a vertex give it the same normal and UV, then it can be shared.
-    std::unordered_map< size_t, std::vector<size_t>>::iterator itr = indexesOfFacesValues.begin();
-
     const abcV3 * normals = sample->m_normals.getVals()->get();
     bool normalsIndexed = (sample->m_normals.getScope() == AbcGeom::kFacevaryingScope);
     const Util::uint32_t *Nidxs = normalsIndexed ? sample->m_normals.getIndices()->get() : NULL;
@@ -1977,6 +1988,7 @@ void aiPolyMesh::GenerateVerticesToFacesLookup(aiPolyMeshSample *sample)
     sample->m_topology->m_FixedTopoPositionsIndexes.reserve(sample->m_positions->size());
     sample->m_topology->m_FreshlyReadTopologyData = true;
 
+    std::unordered_map< size_t, std::vector<size_t>>::iterator itr = indexesOfFacesValues.begin();
     while (itr != indexesOfFacesValues.end())
     {
         size_t faceValueIndex = itr->first;