Fix bug in vertex welder

Author: kevyuu

include/nbl/asset/utils/CVertexWelder.h

@@ -153,7 +153,7 @@ class CVertexWelder {
           if (!polygon->valid()) return false;
 
           const auto& positionView = polygon->getPositionView();
-          if (IGeometryBase::getMatchingAABBFormat(positionView.composed.format) == positionView.composed.rangeFormat) return false;
+          if (IGeometryBase::getMatchingAABBFormat(positionView.composed.format) != positionView.composed.rangeFormat) return false;
           m_positionViewContext = {
             .channelCount = getFormatChannelCount(positionView.composed.format),
             .byteSize = getTexelOrBlockBytesize(positionView.composed.format),
@@ -181,6 +181,8 @@ class CVertexWelder {
             m_auxAttributeViewContexts.push_back(getViewContext(auxAttributeView));
           }
 
+          return true;
+
         }
 
         inline bool operator()(const ICPUPolygonGeometry* polygon, uint32_t index1, uint32_t index2) const override
@@ -213,9 +215,11 @@ class CVertexWelder {
     };
 
     template <VertexWelderAccelerationStructure AccelStructureT>
-    static inline core::smart_refctd_ptr<ICPUPolygonGeometry> weldVertices(const ICPUPolygonGeometry* polygon, const AccelStructureT& as, const WeldPredicate& shouldWeldFn) {
+    static inline core::smart_refctd_ptr<ICPUPolygonGeometry> weldVertices(const ICPUPolygonGeometry* polygon, const AccelStructureT& as, WeldPredicate& shouldWeldFn) {
       auto outPolygon = core::move_and_static_cast<ICPUPolygonGeometry>(polygon->clone(0u));
 
+      if (!shouldWeldFn.init(polygon)) return nullptr;
+
       const auto& positionView = polygon->getPositionView();
       const auto vertexCount = positionView.getElementCount();
 

src/nbl/asset/utils/CPolygonGeometryManipulator.cpp

@@ -154,7 +154,8 @@ core::smart_refctd_ptr<ICPUPolygonGeometry> CPolygonGeometryManipulator::createS
 		auto result = CSmoothNormalGenerator::calculateNormals(inPolygon, epsilon, vxcmp);
 		if (enableWelding)
 		{
-			return CVertexWelder::weldVertices(result.geom.get(), result.vertexHashGrid, CVertexWelder::DefaultWeldPredicate(epsilon));
+			auto weldPredicate = CVertexWelder::DefaultWeldPredicate(epsilon);
+			return CVertexWelder::weldVertices(result.geom.get(), result.vertexHashGrid, weldPredicate);
 		}
 		return result.geom;
 }