Revert "Fix for elalish#786 by setting numProps in GatherFaces method…

…. Added test for Decompose with properties, and ExpectProperties function in test_main in order to check properties in a mesh match those set by SetProperties."

This reverts commit 03848fa.

src/manifold/src/constructors.cpp

@@ -509,6 +509,7 @@ std::vector<Manifold> Manifold::Decompose() const {
 
     impl->GatherFaces(*pImpl_, faceNew2Old);
     impl->ReindexVerts(vertNew2Old, pImpl_->NumVert());
+
     impl->Finish();
 
     meshes.push_back(Manifold(impl));

src/manifold/src/sort.cpp

@@ -464,7 +464,6 @@ void Manifold::Impl::GatherFaces(const Impl& old, const Vec<int>& faceNew2Old) {
     gather(policy, faceNew2Old.begin(), faceNew2Old.end(),
            old.meshRelation_.triProperties.begin(),
            meshRelation_.triProperties.begin());
-    meshRelation_.numProp = old.meshRelation_.numProp;
     meshRelation_.properties = old.meshRelation_.properties;
   }
 

test/manifold_test.cpp

@@ -160,32 +160,6 @@ TEST(Manifold, Decompose) {
   RelatedGL(manifolds, input);
 }
 
-TEST(Manifold, DecomposeProps) {
-  auto posNorm = [](float* newProp, glm::vec3 pos,
-                           const float* oldProp) {
-    newProp[0] = hypotf(hypotf(pos.x, pos.y), pos.z);
-  };
-  std::vector<Manifold> manifoldList;
-  manifoldList.emplace_back(Manifold::Tetrahedron().SetProperties(1, posNorm));
-  manifoldList.emplace_back(Manifold::Cube().SetProperties(1, posNorm));
-  manifoldList.emplace_back(Manifold::Sphere(1, 4).SetProperties(1, posNorm));
-  Manifold manifolds = Manifold::Compose(manifoldList);
-
-  ExpectMeshes(manifolds, {{8, 12, 1}, {6, 8, 1}, {4, 4, 1}});
-  ExpectProperties(manifolds.GetMeshGL(), 1, posNorm);
-
-  std::vector<MeshGL> input;
-
-  for (const Manifold& manifold : manifoldList) {
-    EXPECT_GE(manifold.OriginalID(), 0);
-    auto mesh = manifold.GetMeshGL();
-    input.emplace_back(mesh);
-    ExpectProperties(mesh, 1, posNorm);
-  }
-
-  RelatedGL(manifolds, input);
-}
-
 /**
  * These tests check the various manifold constructors.
  */

test/test.h

@@ -60,9 +60,6 @@ float GetMinProperty(const MeshGL& mesh, int channel);
 void Identical(const Mesh& mesh1, const Mesh& mesh2);
 void RelatedGL(const Manifold& out, const std::vector<MeshGL>& originals,
                bool checkNormals = false, bool updateNormals = false);
-void ExpectProperties(const MeshGL& mesh, int numProp, std::function<void(float* newProp, glm::vec3 position,
-                                    const float* oldProp)>
-                     propFunc);
 void ExpectMeshes(const Manifold& manifold,
                   const std::vector<MeshSize>& meshSize);
 void CheckNormals(const Manifold& manifold);

test/test_main.cpp

@@ -404,28 +404,6 @@ void RelatedGL(const Manifold& out, const std::vector<MeshGL>& originals,
   }
 }
 
-void ExpectProperties(const MeshGL& mesh, int numProp, std::function<void(float* newProp, glm::vec3 position,
-                                    const float* oldProp)>
-                     propFunc) {
-  EXPECT_EQ(mesh.numProp, 3+numProp);
-  auto* prop = new float[numProp];
-  auto* propTarget = new float[numProp];
-  glm::vec3 pos;
-  for(int i=0;i<mesh.NumVert();i++) {
-    pos.x = mesh.vertProperties[i*(numProp+3)+0];
-    pos.y = mesh.vertProperties[i*(numProp+3)+1];
-    pos.z = mesh.vertProperties[i*(numProp+3)+2];
-    for(int j=0;j<numProp;j++) {
-      propTarget[j] = 0.0;
-      prop[j] = mesh.vertProperties[i*(numProp+3)+3+j];
-    }
-    propFunc(propTarget, pos, propTarget);
-    for(int j=0;j<numProp;j++) {
-      EXPECT_FLOAT_EQ(prop[j], propTarget[j]);
-    }
-  }
-}
-
 void ExpectMeshes(const Manifold& manifold,
                   const std::vector<MeshSize>& meshSize) {
   EXPECT_FALSE(manifold.IsEmpty());