added GetTriangleList api to CTriangleSet

3MFConsortium · Dec 17, 2024 · f6266a5 · f6266a5
1 parent 3991d0f
commit f6266a5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/AutomaticComponentToolkit/lib3mf.xml b/AutomaticComponentToolkit/lib3mf.xml
@@ -793,7 +793,6 @@
 		<method name="GetTriangleList" description="Retrieves all the triangles in the TriangleSet">
 			<param name="TriangleIndices" type="basicarray" class="uint32" pass="out" description="retrieves the indices of the triangles in this TriangleSet"/>
 		</method>
-
 		<method name="AddTriangleList" description="Adds multiple triangles in the list. Duplicates will be merged.">
 			<param name="TriangleIndices" type="basicarray" class="uint32" pass="in" description="Triangle indices to add. Every element MUST be between 0 and TriangleCount - 1."/>
 		</method>

diff --git a/Include/API/lib3mf_triangleset.hpp b/Include/API/lib3mf_triangleset.hpp
@@ -82,6 +82,8 @@ class CTriangleSet : public virtual ITriangleSet, public virtual CBase {
 
 	void SetTriangleList(const Lib3MF_uint64 nTriangleIndicesBufferSize, const Lib3MF_uint32* pTriangleIndicesBuffer) override;
 
+	void GetTriangleList(Lib3MF_uint64 nTriangleIndicesBufferSize, Lib3MF_uint64 * pTriangleIndicesNeededCount, Lib3MF_uint32 * pTriangleIndicesBuffer) override;
+
 	void AddTriangleList(const Lib3MF_uint64 nTriangleIndicesBufferSize, const Lib3MF_uint32* pTriangleIndicesBuffer) override;
 
 	void Merge(ITriangleSet* pOtherTriangleSet, const bool bDeleteOther) override;

diff --git a/Source/API/lib3mf_triangleset.cpp b/Source/API/lib3mf_triangleset.cpp
@@ -100,6 +100,24 @@ void CTriangleSet::SetTriangleList(const Lib3MF_uint64 nTriangleIndicesBufferSiz
 	}
 }
 
+void CTriangleSet::GetTriangleList(Lib3MF_uint64 nTriangleIndicesBufferSize, Lib3MF_uint64 * pTriangleIndicesNeededCount, Lib3MF_uint32 * pTriangleIndicesBuffer)
+{
+	auto triangleIndicesSet = m_pTriangleSet->getTriangles();
+	Lib3MF_uint32 count = (Lib3MF_uint32)triangleIndicesSet.size();
+	if (pTriangleIndicesNeededCount)
+		*pTriangleIndicesNeededCount = count;
+
+	if (nTriangleIndicesBufferSize >= count && pTriangleIndicesBuffer)
+	{
+		Lib3MF_uint32* pIndex = pTriangleIndicesBuffer;
+		for (auto index : triangleIndicesSet)
+		{
+			*pIndex = index;
+			pIndex++;
+		}
+	}
+}
+
 void CTriangleSet::AddTriangleList(const Lib3MF_uint64 nTriangleIndicesBufferSize, const Lib3MF_uint32* pTriangleIndicesBuffer)
 {
 	if (pTriangleIndicesBuffer) {