From c7fa73e5b25e26b62c98e54adc435e62bd3f4e1b Mon Sep 17 00:00:00 2001 From: Jan Orend <56254096+3dJan@users.noreply.github.com> Date: Fri, 10 Nov 2023 09:39:45 +0100 Subject: [PATCH] Updating accroding to spec: UnsignedMesh, vectorfroamscalar, matrixfromrows, matrixfromcolumns --- Autogenerated/Bindings/C/lib3mf.h | 137 ++++- Autogenerated/Bindings/C/lib3mf_types.h | 14 +- .../Bindings/CDynamic/lib3mf_dynamic.cc | 168 ++++-- .../Bindings/CDynamic/lib3mf_dynamic.h | 167 ++++-- .../Bindings/CDynamic/lib3mf_types.h | 14 +- Autogenerated/Bindings/CSharp/Lib3MF.cs | 205 +++++-- Autogenerated/Bindings/Cpp/lib3mf_abi.hpp | 137 ++++- .../Bindings/Cpp/lib3mf_implicit.hpp | 303 ++++++++-- Autogenerated/Bindings/Cpp/lib3mf_types.hpp | 14 +- .../Bindings/CppDynamic/lib3mf_dynamic.h | 167 ++++-- .../Bindings/CppDynamic/lib3mf_dynamic.hpp | 547 ++++++++++++++---- .../Bindings/CppDynamic/lib3mf_types.hpp | 14 +- Autogenerated/Bindings/Go/lib3mf.go | 288 +++++++-- Autogenerated/Bindings/Go/lib3mf_dynamic.cc | 168 ++++-- Autogenerated/Bindings/Go/lib3mf_dynamic.h | 167 ++++-- Autogenerated/Bindings/Go/lib3mf_types.h | 14 +- .../Bindings/NodeJS/lib3mf_dynamic.cc | 168 ++++-- .../Bindings/NodeJS/lib3mf_dynamic.h | 167 ++++-- .../Bindings/NodeJS/lib3mf_nodeaddon.cc | 6 +- .../Bindings/NodeJS/lib3mf_nodewrapper.cc | 493 +++++++++++++--- .../Bindings/NodeJS/lib3mf_nodewrapper.h | 60 +- Autogenerated/Bindings/NodeJS/lib3mf_types.h | 14 +- Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas | 543 +++++++++++++---- Autogenerated/Bindings/Python/Lib3MF.py | 343 ++++++++--- Autogenerated/Source/lib3mf_abi.hpp | 137 ++++- Autogenerated/Source/lib3mf_interfaces.hpp | 147 ++++- .../Source/lib3mf_interfacewrapper.cpp | 522 ++++++++++++++--- Autogenerated/Source/lib3mf_types.hpp | 14 +- AutomaticComponentToolkit/lib3mf.xml | 82 ++- Include/API/lib3mf_implicitfunction.hpp | 43 +- ...s.hpp => lib3mf_matrixfromcolumnsnode.hpp} | 24 +- ...node.hpp => lib3mf_matrixfromrowsnode.hpp} | 24 +- Include/API/lib3mf_unsignedmeshnode.hpp | 105 ++++ Include/API/lib3mf_vectorfromscalarnode.hpp | 100 ++++ Source/API/lib3mf_implicitfunction.cpp | 60 +- ...e.cpp => lib3mf_matrixfromcolumnsnode.cpp} | 21 +- ...tors.cpp => lib3mf_matrixfromrowsnode.cpp} | 20 +- Source/API/lib3mf_nodeiterator.cpp | 88 +-- Source/API/lib3mf_unsignedmeshnode.cpp | 63 ++ Source/API/lib3mf_vectorfromscalarnode.cpp | 59 ++ .../Model/Classes/NMR_ImplicitNodeTypes.cpp | 8 +- 41 files changed, 4673 insertions(+), 1162 deletions(-) rename Include/API/{lib3mf_composematrixfromcolumnvectors.hpp => lib3mf_matrixfromcolumnsnode.hpp} (74%) rename Include/API/{lib3mf_composematrixfromrowvectorsnode.hpp => lib3mf_matrixfromrowsnode.hpp} (73%) create mode 100644 Include/API/lib3mf_unsignedmeshnode.hpp create mode 100644 Include/API/lib3mf_vectorfromscalarnode.hpp rename Source/API/{lib3mf_composematrixfromrowvectorsnode.cpp => lib3mf_matrixfromcolumnsnode.cpp} (76%) rename Source/API/{lib3mf_composematrixfromcolumnvectors.cpp => lib3mf_matrixfromrowsnode.cpp} (77%) create mode 100644 Source/API/lib3mf_unsignedmeshnode.cpp create mode 100644 Source/API/lib3mf_vectorfromscalarnode.cpp diff --git a/Autogenerated/Bindings/C/lib3mf.h b/Autogenerated/Bindings/C/lib3mf.h index bbc2a044e..40fb8ab7b 100644 --- a/Autogenerated/Bindings/C/lib3mf.h +++ b/Autogenerated/Bindings/C/lib3mf.h @@ -3239,6 +3239,28 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composevectornode_getinputz(Lib3MF_ComposeVe */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composevectornode_getoutputresult(Lib3MF_ComposeVectorNode pComposeVectorNode, Lib3MF_ImplicitPort * pResult); +/************************************************************************************************************************* + Class definition for VectorFromScalarNode +**************************************************************************************************************************/ + +/** +* Retrieves the input +* +* @param[in] pVectorFromScalarNode - VectorFromScalarNode instance. +* @param[out] pA - the input for the x component +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_vectorfromscalarnode_getinputa(Lib3MF_VectorFromScalarNode pVectorFromScalarNode, Lib3MF_ImplicitPort * pA); + +/** +* Retrieves the output +* +* @param[in] pVectorFromScalarNode - VectorFromScalarNode instance. +* @param[out] pResult - the output +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_vectorfromscalarnode_getoutputresult(Lib3MF_VectorFromScalarNode pVectorFromScalarNode, Lib3MF_ImplicitPort * pResult); + /************************************************************************************************************************* Class definition for DecomposeVectorNode **************************************************************************************************************************/ @@ -3437,102 +3459,102 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getinputm33(Lib3MF_Compose LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getoutputresult(Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* - Class definition for ComposeMatrixFromRowVectorsNode + Class definition for MatrixFromRowsNode **************************************************************************************************************************/ /** * Retrieves the input for the first row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow0 - the input for the first row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputa(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromrowsnode_getinputa(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow0); /** * Retrieves the input for the second row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow1 - the input for the second row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputb(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromrowsnode_getinputb(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow1); /** * Retrieves the input for the third row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow2 - the input for the third row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputc(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromrowsnode_getinputc(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow2); /** * Retrieves the input for the fourth row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow3 - the input for the fourth row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputd(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromrowsnode_getinputd(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow3); /** * Retrieves the output * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pResult - the output * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getoutputresult(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pResult); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromrowsnode_getoutputresult(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* - Class definition for ComposeMatrixFromColumnVectors + Class definition for MatrixFromColumnsNode **************************************************************************************************************************/ /** * Retrieves the input for the first column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn0 - the input for the first column * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputa(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn0); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromcolumnsnode_getinputa(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn0); /** * Retrieves the input for the second column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn1 - the input for the second column * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputb(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn1); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromcolumnsnode_getinputb(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn1); /** * Retrieves the input for the third column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn2 - the input for the third column * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputc(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn2); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromcolumnsnode_getinputc(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn2); /** * Retrieves the input for the fourth column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn3 - the input for the fourth column * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputd(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn3); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromcolumnsnode_getinputd(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn3); /** * Retrieves the output * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pResult - the output * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromcolumnvectors_getoutputresult(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pResult); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromcolumnsnode_getoutputresult(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* Class definition for ConstantNode @@ -3658,6 +3680,37 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_meshnode_getinputpos(Lib3MF_MeshNode pMeshNo */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_meshnode_getoutputdistance(Lib3MF_MeshNode pMeshNode, Lib3MF_ImplicitPort * pDistance); +/************************************************************************************************************************* + Class definition for UnsignedMeshNode +**************************************************************************************************************************/ + +/** +* Retrieves the input for the model resource id of the mesh +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pMesh - the input port for the model resource id of the mesh +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_unsignedmeshnode_getinputmesh(Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pMesh); + +/** +* Retrieves the input for the position +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pPos - the input port for the position +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_unsignedmeshnode_getinputpos(Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pPos); + +/** +* Retrieves the output +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pDistance - the output port for the unsigned distance to the mesh +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_unsignedmeshnode_getoutputdistance(Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pDistance); + /************************************************************************************************************************* Class definition for FunctionCallNode **************************************************************************************************************************/ @@ -4313,6 +4366,18 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addclampnode(Lib3MF_Implici */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addcomposevectornode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeVectorNode * pNode); +/** +* Add a VectorFromScalar +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addvectorfromscalarnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_VectorFromScalarNode * pNode); + /** * Add a DecomposeVectorNode * @@ -4338,7 +4403,19 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_adddecomposevectornode(Lib3 LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addcomposematrixnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeMatrixNode * pNode); /** -* Add a ComposeMatrixFromRowVectorsNode +* Add a MatrixFromRowsNode +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addmatrixfromrowsnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MatrixFromRowsNode * pNode); + +/** +* Add a MatrixFromColumnsNode * * @param[in] pImplicitFunction - ImplicitFunction instance. * @param[in] pIdentifier - the identifier of the node @@ -4347,7 +4424,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addcomposematrixnode(Lib3MF * @param[out] pNode - the added node * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeMatrixFromRowVectorsNode * pNode); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addmatrixfromcolumnsnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MatrixFromColumnsNode * pNode); /** * Add a ConstantNode @@ -4397,6 +4474,18 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addconstmatnode(Lib3MF_Impl */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addmeshnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MeshNode * pNode); +/** +* Add a UnsignedMeshNode +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addunsignedmeshnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_UnsignedMeshNode * pNode); + /** * Add a FunctionCallNode * diff --git a/Autogenerated/Bindings/C/lib3mf_types.h b/Autogenerated/Bindings/C/lib3mf_types.h index a43ce9619..ca186c77a 100644 --- a/Autogenerated/Bindings/C/lib3mf_types.h +++ b/Autogenerated/Bindings/C/lib3mf_types.h @@ -291,14 +291,16 @@ typedef Lib3MFHandle Lib3MF_PowNode; typedef Lib3MFHandle Lib3MF_SelectNode; typedef Lib3MFHandle Lib3MF_ClampNode; typedef Lib3MFHandle Lib3MF_ComposeVectorNode; +typedef Lib3MFHandle Lib3MF_VectorFromScalarNode; typedef Lib3MFHandle Lib3MF_DecomposeVectorNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixNode; -typedef Lib3MFHandle Lib3MF_ComposeMatrixFromRowVectorsNode; -typedef Lib3MFHandle Lib3MF_ComposeMatrixFromColumnVectors; +typedef Lib3MFHandle Lib3MF_MatrixFromRowsNode; +typedef Lib3MFHandle Lib3MF_MatrixFromColumnsNode; typedef Lib3MFHandle Lib3MF_ConstantNode; typedef Lib3MFHandle Lib3MF_ConstVecNode; typedef Lib3MFHandle Lib3MF_ConstMatNode; typedef Lib3MFHandle Lib3MF_MeshNode; +typedef Lib3MFHandle Lib3MF_UnsignedMeshNode; typedef Lib3MFHandle Lib3MF_FunctionCallNode; typedef Lib3MFHandle Lib3MF_NodeIterator; typedef Lib3MFHandle Lib3MF_Function; @@ -454,8 +456,8 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeComposeVector = 8, /** Creates a vector from three scalar values */ eImplicitNodeTypeDecomposeVector = 9, /** Decomposes a vector into three scalar values */ eImplicitNodeTypeComposeMatrix = 10, /** Creates a matrix from nine scalar values */ - eImplicitNodeTypeComposeMatrixFromColumnVectors = 11, /** Creates a matrix from three column vector values */ - eImplicitNodeTypeComposeMatrixFromRowVectors = 12, /** Creates a matrix from three row vector values */ + eImplicitNodeTypeMatrixFromColumns = 11, /** Creates a matrix from three column vector values */ + eImplicitNodeTypeMatrixFromRows = 12, /** Creates a matrix from three row vector values */ eImplicitNodeTypeDot = 13, /** Calculates the dot product of two vector values */ eImplicitNodeTypeCross = 14, /** Calculates the cross product of two vector values */ eImplicitNodeTypeMatVecMultiplication = 15, /** Multiplies a matrix with a vector */ @@ -491,7 +493,9 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeFunctionCall = 45, /** Calls a function */ eImplicitNodeTypeMesh = 46, /** Calculates the signed distance to a mesh */ eImplicitNodeTypeLength = 47, /** Calculates the length of a vector */ - eImplicitNodeTypeResource = 48 /** Selects a resource (function, mesh etc.) */ + eImplicitNodeTypeResource = 48, /** Selects a resource (function, mesh etc.) */ + eImplicitNodeTypeVectorFromScalar = 49, /** Creates a vector from one scalar values */ + eImplicitNodeTypeUnsignedMesh = 50 /** Calculates the unsigned distance to a mesh */ } eLib3MFImplicitNodeType; /** diff --git a/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.cc b/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.cc index faff3f8bc..c22fb1f38 100644 --- a/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.cc +++ b/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.cc @@ -342,6 +342,8 @@ Lib3MFResult InitLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable) pWrapperTable->m_ComposeVectorNode_GetInputY = NULL; pWrapperTable->m_ComposeVectorNode_GetInputZ = NULL; pWrapperTable->m_ComposeVectorNode_GetOutputResult = NULL; + pWrapperTable->m_VectorFromScalarNode_GetInputA = NULL; + pWrapperTable->m_VectorFromScalarNode_GetOutputResult = NULL; pWrapperTable->m_DecomposeVectorNode_GetInputA = NULL; pWrapperTable->m_DecomposeVectorNode_GetOutputX = NULL; pWrapperTable->m_DecomposeVectorNode_GetOutputY = NULL; @@ -363,16 +365,16 @@ Lib3MFResult InitLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable) pWrapperTable->m_ComposeMatrixNode_GetInputM32 = NULL; pWrapperTable->m_ComposeMatrixNode_GetInputM33 = NULL; pWrapperTable->m_ComposeMatrixNode_GetOutputResult = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult = NULL; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = NULL; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = NULL; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = NULL; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = NULL; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = NULL; + pWrapperTable->m_MatrixFromRowsNode_GetInputA = NULL; + pWrapperTable->m_MatrixFromRowsNode_GetInputB = NULL; + pWrapperTable->m_MatrixFromRowsNode_GetInputC = NULL; + pWrapperTable->m_MatrixFromRowsNode_GetInputD = NULL; + pWrapperTable->m_MatrixFromRowsNode_GetOutputResult = NULL; + pWrapperTable->m_MatrixFromColumnsNode_GetInputA = NULL; + pWrapperTable->m_MatrixFromColumnsNode_GetInputB = NULL; + pWrapperTable->m_MatrixFromColumnsNode_GetInputC = NULL; + pWrapperTable->m_MatrixFromColumnsNode_GetInputD = NULL; + pWrapperTable->m_MatrixFromColumnsNode_GetOutputResult = NULL; pWrapperTable->m_ConstantNode_SetConstant = NULL; pWrapperTable->m_ConstantNode_GetConstant = NULL; pWrapperTable->m_ConstantNode_GetOutputValue = NULL; @@ -385,6 +387,9 @@ Lib3MFResult InitLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable) pWrapperTable->m_MeshNode_GetInputMesh = NULL; pWrapperTable->m_MeshNode_GetInputPos = NULL; pWrapperTable->m_MeshNode_GetOutputDistance = NULL; + pWrapperTable->m_UnsignedMeshNode_GetInputMesh = NULL; + pWrapperTable->m_UnsignedMeshNode_GetInputPos = NULL; + pWrapperTable->m_UnsignedMeshNode_GetOutputDistance = NULL; pWrapperTable->m_FunctionCallNode_GetInputFunctionID = NULL; pWrapperTable->m_NodeIterator_GetCurrent = NULL; pWrapperTable->m_Function_GetDisplayName = NULL; @@ -438,13 +443,16 @@ Lib3MFResult InitLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable) pWrapperTable->m_ImplicitFunction_AddSelectNode = NULL; pWrapperTable->m_ImplicitFunction_AddClampNode = NULL; pWrapperTable->m_ImplicitFunction_AddComposeVectorNode = NULL; + pWrapperTable->m_ImplicitFunction_AddVectorFromScalarNode = NULL; pWrapperTable->m_ImplicitFunction_AddDecomposeVectorNode = NULL; pWrapperTable->m_ImplicitFunction_AddComposeMatrixNode = NULL; - pWrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode = NULL; + pWrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode = NULL; + pWrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode = NULL; pWrapperTable->m_ImplicitFunction_AddConstantNode = NULL; pWrapperTable->m_ImplicitFunction_AddConstVecNode = NULL; pWrapperTable->m_ImplicitFunction_AddConstMatNode = NULL; pWrapperTable->m_ImplicitFunction_AddMeshNode = NULL; + pWrapperTable->m_ImplicitFunction_AddUnsignedMeshNode = NULL; pWrapperTable->m_ImplicitFunction_AddFunctionCallNode = NULL; pWrapperTable->m_ImplicitFunction_GetNodes = NULL; pWrapperTable->m_ImplicitFunction_RemoveNode = NULL; @@ -3323,6 +3331,24 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, if (pWrapperTable->m_ComposeVectorNode_GetOutputResult == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_VectorFromScalarNode_GetInputA = (PLib3MFVectorFromScalarNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_vectorfromscalarnode_getinputa"); + #else // _WIN32 + pWrapperTable->m_VectorFromScalarNode_GetInputA = (PLib3MFVectorFromScalarNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_vectorfromscalarnode_getinputa"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_VectorFromScalarNode_GetInputA == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_VectorFromScalarNode_GetOutputResult = (PLib3MFVectorFromScalarNode_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_vectorfromscalarnode_getoutputresult"); + #else // _WIN32 + pWrapperTable->m_VectorFromScalarNode_GetOutputResult = (PLib3MFVectorFromScalarNode_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_vectorfromscalarnode_getoutputresult"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_VectorFromScalarNode_GetOutputResult == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_DecomposeVectorNode_GetInputA = (PLib3MFDecomposeVectorNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_decomposevectornode_getinputa"); #else // _WIN32 @@ -3513,93 +3539,93 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputa"); + pWrapperTable->m_MatrixFromRowsNode_GetInputA = (PLib3MFMatrixFromRowsNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getinputa"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputa"); + pWrapperTable->m_MatrixFromRowsNode_GetInputA = (PLib3MFMatrixFromRowsNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getinputa"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA == NULL) + if (pWrapperTable->m_MatrixFromRowsNode_GetInputA == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputb"); + pWrapperTable->m_MatrixFromRowsNode_GetInputB = (PLib3MFMatrixFromRowsNode_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getinputb"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputb"); + pWrapperTable->m_MatrixFromRowsNode_GetInputB = (PLib3MFMatrixFromRowsNode_GetInputBPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getinputb"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB == NULL) + if (pWrapperTable->m_MatrixFromRowsNode_GetInputB == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputc"); + pWrapperTable->m_MatrixFromRowsNode_GetInputC = (PLib3MFMatrixFromRowsNode_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getinputc"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputc"); + pWrapperTable->m_MatrixFromRowsNode_GetInputC = (PLib3MFMatrixFromRowsNode_GetInputCPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getinputc"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC == NULL) + if (pWrapperTable->m_MatrixFromRowsNode_GetInputC == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputd"); + pWrapperTable->m_MatrixFromRowsNode_GetInputD = (PLib3MFMatrixFromRowsNode_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getinputd"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputd"); + pWrapperTable->m_MatrixFromRowsNode_GetInputD = (PLib3MFMatrixFromRowsNode_GetInputDPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getinputd"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD == NULL) + if (pWrapperTable->m_MatrixFromRowsNode_GetInputD == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult = (PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getoutputresult"); + pWrapperTable->m_MatrixFromRowsNode_GetOutputResult = (PLib3MFMatrixFromRowsNode_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getoutputresult"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult = (PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getoutputresult"); + pWrapperTable->m_MatrixFromRowsNode_GetOutputResult = (PLib3MFMatrixFromRowsNode_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getoutputresult"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult == NULL) + if (pWrapperTable->m_MatrixFromRowsNode_GetOutputResult == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = (PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputa"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputA = (PLib3MFMatrixFromColumnsNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputa"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = (PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputa"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputA = (PLib3MFMatrixFromColumnsNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputa"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA == NULL) + if (pWrapperTable->m_MatrixFromColumnsNode_GetInputA == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = (PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputb"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputB = (PLib3MFMatrixFromColumnsNode_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputb"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = (PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputb"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputB = (PLib3MFMatrixFromColumnsNode_GetInputBPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputb"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB == NULL) + if (pWrapperTable->m_MatrixFromColumnsNode_GetInputB == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = (PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputc"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputC = (PLib3MFMatrixFromColumnsNode_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputc"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = (PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputc"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputC = (PLib3MFMatrixFromColumnsNode_GetInputCPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputc"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC == NULL) + if (pWrapperTable->m_MatrixFromColumnsNode_GetInputC == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = (PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputd"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputD = (PLib3MFMatrixFromColumnsNode_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputd"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = (PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputd"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputD = (PLib3MFMatrixFromColumnsNode_GetInputDPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputd"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD == NULL) + if (pWrapperTable->m_MatrixFromColumnsNode_GetInputD == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = (PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getoutputresult"); + pWrapperTable->m_MatrixFromColumnsNode_GetOutputResult = (PLib3MFMatrixFromColumnsNode_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getoutputresult"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = (PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getoutputresult"); + pWrapperTable->m_MatrixFromColumnsNode_GetOutputResult = (PLib3MFMatrixFromColumnsNode_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getoutputresult"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult == NULL) + if (pWrapperTable->m_MatrixFromColumnsNode_GetOutputResult == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 @@ -3710,6 +3736,33 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, if (pWrapperTable->m_MeshNode_GetOutputDistance == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetInputMesh = (PLib3MFUnsignedMeshNode_GetInputMeshPtr) GetProcAddress(hLibrary, "lib3mf_unsignedmeshnode_getinputmesh"); + #else // _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetInputMesh = (PLib3MFUnsignedMeshNode_GetInputMeshPtr) dlsym(hLibrary, "lib3mf_unsignedmeshnode_getinputmesh"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_UnsignedMeshNode_GetInputMesh == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetInputPos = (PLib3MFUnsignedMeshNode_GetInputPosPtr) GetProcAddress(hLibrary, "lib3mf_unsignedmeshnode_getinputpos"); + #else // _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetInputPos = (PLib3MFUnsignedMeshNode_GetInputPosPtr) dlsym(hLibrary, "lib3mf_unsignedmeshnode_getinputpos"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_UnsignedMeshNode_GetInputPos == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetOutputDistance = (PLib3MFUnsignedMeshNode_GetOutputDistancePtr) GetProcAddress(hLibrary, "lib3mf_unsignedmeshnode_getoutputdistance"); + #else // _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetOutputDistance = (PLib3MFUnsignedMeshNode_GetOutputDistancePtr) dlsym(hLibrary, "lib3mf_unsignedmeshnode_getoutputdistance"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_UnsignedMeshNode_GetOutputDistance == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_FunctionCallNode_GetInputFunctionID = (PLib3MFFunctionCallNode_GetInputFunctionIDPtr) GetProcAddress(hLibrary, "lib3mf_functioncallnode_getinputfunctionid"); #else // _WIN32 @@ -4187,6 +4240,15 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, if (pWrapperTable->m_ImplicitFunction_AddComposeVectorNode == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_ImplicitFunction_AddVectorFromScalarNode = (PLib3MFImplicitFunction_AddVectorFromScalarNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addvectorfromscalarnode"); + #else // _WIN32 + pWrapperTable->m_ImplicitFunction_AddVectorFromScalarNode = (PLib3MFImplicitFunction_AddVectorFromScalarNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addvectorfromscalarnode"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ImplicitFunction_AddVectorFromScalarNode == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_ImplicitFunction_AddDecomposeVectorNode = (PLib3MFImplicitFunction_AddDecomposeVectorNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_adddecomposevectornode"); #else // _WIN32 @@ -4206,12 +4268,21 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode = (PLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode"); + pWrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode = (PLib3MFImplicitFunction_AddMatrixFromRowsNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addmatrixfromrowsnode"); #else // _WIN32 - pWrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode = (PLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode"); + pWrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode = (PLib3MFImplicitFunction_AddMatrixFromRowsNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addmatrixfromrowsnode"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode == NULL) + if (pWrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode = (PLib3MFImplicitFunction_AddMatrixFromColumnsNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addmatrixfromcolumnsnode"); + #else // _WIN32 + pWrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode = (PLib3MFImplicitFunction_AddMatrixFromColumnsNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addmatrixfromcolumnsnode"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 @@ -4250,6 +4321,15 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, if (pWrapperTable->m_ImplicitFunction_AddMeshNode == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_ImplicitFunction_AddUnsignedMeshNode = (PLib3MFImplicitFunction_AddUnsignedMeshNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addunsignedmeshnode"); + #else // _WIN32 + pWrapperTable->m_ImplicitFunction_AddUnsignedMeshNode = (PLib3MFImplicitFunction_AddUnsignedMeshNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addunsignedmeshnode"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ImplicitFunction_AddUnsignedMeshNode == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_ImplicitFunction_AddFunctionCallNode = (PLib3MFImplicitFunction_AddFunctionCallNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addfunctioncallnode"); #else // _WIN32 diff --git a/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.h b/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.h index d48fed69c..061af9888 100644 --- a/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.h +++ b/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.h @@ -3226,6 +3226,28 @@ typedef Lib3MFResult (*PLib3MFComposeVectorNode_GetInputZPtr) (Lib3MF_ComposeVec */ typedef Lib3MFResult (*PLib3MFComposeVectorNode_GetOutputResultPtr) (Lib3MF_ComposeVectorNode pComposeVectorNode, Lib3MF_ImplicitPort * pResult); +/************************************************************************************************************************* + Class definition for VectorFromScalarNode +**************************************************************************************************************************/ + +/** +* Retrieves the input +* +* @param[in] pVectorFromScalarNode - VectorFromScalarNode instance. +* @param[out] pA - the input for the x component +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFVectorFromScalarNode_GetInputAPtr) (Lib3MF_VectorFromScalarNode pVectorFromScalarNode, Lib3MF_ImplicitPort * pA); + +/** +* Retrieves the output +* +* @param[in] pVectorFromScalarNode - VectorFromScalarNode instance. +* @param[out] pResult - the output +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFVectorFromScalarNode_GetOutputResultPtr) (Lib3MF_VectorFromScalarNode pVectorFromScalarNode, Lib3MF_ImplicitPort * pResult); + /************************************************************************************************************************* Class definition for DecomposeVectorNode **************************************************************************************************************************/ @@ -3424,102 +3446,102 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM33Ptr) (Lib3MF_ComposeM typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetOutputResultPtr) (Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* - Class definition for ComposeMatrixFromRowVectorsNode + Class definition for MatrixFromRowsNode **************************************************************************************************************************/ /** * Retrieves the input for the first row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow0 - the input for the first row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetInputAPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow0); /** * Retrieves the input for the second row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow1 - the input for the second row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetInputBPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow1); /** * Retrieves the input for the third row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow2 - the input for the third row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetInputCPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow2); /** * Retrieves the input for the fourth row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow3 - the input for the fourth row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetInputDPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow3); /** * Retrieves the output * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pResult - the output * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pResult); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetOutputResultPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* - Class definition for ComposeMatrixFromColumnVectors + Class definition for MatrixFromColumnsNode **************************************************************************************************************************/ /** * Retrieves the input for the first column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn0 - the input for the first column * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn0); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetInputAPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn0); /** * Retrieves the input for the second column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn1 - the input for the second column * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn1); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetInputBPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn1); /** * Retrieves the input for the third column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn2 - the input for the third column * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn2); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetInputCPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn2); /** * Retrieves the input for the fourth column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn3 - the input for the fourth column * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn3); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetInputDPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn3); /** * Retrieves the output * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pResult - the output * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pResult); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetOutputResultPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* Class definition for ConstantNode @@ -3645,6 +3667,37 @@ typedef Lib3MFResult (*PLib3MFMeshNode_GetInputPosPtr) (Lib3MF_MeshNode pMeshNod */ typedef Lib3MFResult (*PLib3MFMeshNode_GetOutputDistancePtr) (Lib3MF_MeshNode pMeshNode, Lib3MF_ImplicitPort * pDistance); +/************************************************************************************************************************* + Class definition for UnsignedMeshNode +**************************************************************************************************************************/ + +/** +* Retrieves the input for the model resource id of the mesh +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pMesh - the input port for the model resource id of the mesh +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFUnsignedMeshNode_GetInputMeshPtr) (Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pMesh); + +/** +* Retrieves the input for the position +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pPos - the input port for the position +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFUnsignedMeshNode_GetInputPosPtr) (Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pPos); + +/** +* Retrieves the output +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pDistance - the output port for the unsigned distance to the mesh +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFUnsignedMeshNode_GetOutputDistancePtr) (Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pDistance); + /************************************************************************************************************************* Class definition for FunctionCallNode **************************************************************************************************************************/ @@ -4300,6 +4353,18 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddClampNodePtr) (Lib3MF_Implicit */ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddComposeVectorNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeVectorNode * pNode); +/** +* Add a VectorFromScalar +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddVectorFromScalarNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_VectorFromScalarNode * pNode); + /** * Add a DecomposeVectorNode * @@ -4325,7 +4390,19 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddDecomposeVectorNodePtr) (Lib3M typedef Lib3MFResult (*PLib3MFImplicitFunction_AddComposeMatrixNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeMatrixNode * pNode); /** -* Add a ComposeMatrixFromRowVectorsNode +* Add a MatrixFromRowsNode +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddMatrixFromRowsNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MatrixFromRowsNode * pNode); + +/** +* Add a MatrixFromColumnsNode * * @param[in] pImplicitFunction - ImplicitFunction instance. * @param[in] pIdentifier - the identifier of the node @@ -4334,7 +4411,7 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddComposeMatrixNodePtr) (Lib3MF_ * @param[out] pNode - the added node * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeMatrixFromRowVectorsNode * pNode); +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddMatrixFromColumnsNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MatrixFromColumnsNode * pNode); /** * Add a ConstantNode @@ -4384,6 +4461,18 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddConstMatNodePtr) (Lib3MF_Impli */ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddMeshNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MeshNode * pNode); +/** +* Add a UnsignedMeshNode +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddUnsignedMeshNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_UnsignedMeshNode * pNode); + /** * Add a FunctionCallNode * @@ -6467,6 +6556,8 @@ typedef struct { PLib3MFComposeVectorNode_GetInputYPtr m_ComposeVectorNode_GetInputY; PLib3MFComposeVectorNode_GetInputZPtr m_ComposeVectorNode_GetInputZ; PLib3MFComposeVectorNode_GetOutputResultPtr m_ComposeVectorNode_GetOutputResult; + PLib3MFVectorFromScalarNode_GetInputAPtr m_VectorFromScalarNode_GetInputA; + PLib3MFVectorFromScalarNode_GetOutputResultPtr m_VectorFromScalarNode_GetOutputResult; PLib3MFDecomposeVectorNode_GetInputAPtr m_DecomposeVectorNode_GetInputA; PLib3MFDecomposeVectorNode_GetOutputXPtr m_DecomposeVectorNode_GetOutputX; PLib3MFDecomposeVectorNode_GetOutputYPtr m_DecomposeVectorNode_GetOutputY; @@ -6488,16 +6579,16 @@ typedef struct { PLib3MFComposeMatrixNode_GetInputM32Ptr m_ComposeMatrixNode_GetInputM32; PLib3MFComposeMatrixNode_GetInputM33Ptr m_ComposeMatrixNode_GetInputM33; PLib3MFComposeMatrixNode_GetOutputResultPtr m_ComposeMatrixNode_GetOutputResult; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr m_ComposeMatrixFromRowVectorsNode_GetInputA; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr m_ComposeMatrixFromRowVectorsNode_GetInputB; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr m_ComposeMatrixFromRowVectorsNode_GetInputC; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr m_ComposeMatrixFromRowVectorsNode_GetInputD; - PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr m_ComposeMatrixFromRowVectorsNode_GetOutputResult; - PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr m_ComposeMatrixFromColumnVectors_GetInputA; - PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr m_ComposeMatrixFromColumnVectors_GetInputB; - PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr m_ComposeMatrixFromColumnVectors_GetInputC; - PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr m_ComposeMatrixFromColumnVectors_GetInputD; - PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr m_ComposeMatrixFromColumnVectors_GetOutputResult; + PLib3MFMatrixFromRowsNode_GetInputAPtr m_MatrixFromRowsNode_GetInputA; + PLib3MFMatrixFromRowsNode_GetInputBPtr m_MatrixFromRowsNode_GetInputB; + PLib3MFMatrixFromRowsNode_GetInputCPtr m_MatrixFromRowsNode_GetInputC; + PLib3MFMatrixFromRowsNode_GetInputDPtr m_MatrixFromRowsNode_GetInputD; + PLib3MFMatrixFromRowsNode_GetOutputResultPtr m_MatrixFromRowsNode_GetOutputResult; + PLib3MFMatrixFromColumnsNode_GetInputAPtr m_MatrixFromColumnsNode_GetInputA; + PLib3MFMatrixFromColumnsNode_GetInputBPtr m_MatrixFromColumnsNode_GetInputB; + PLib3MFMatrixFromColumnsNode_GetInputCPtr m_MatrixFromColumnsNode_GetInputC; + PLib3MFMatrixFromColumnsNode_GetInputDPtr m_MatrixFromColumnsNode_GetInputD; + PLib3MFMatrixFromColumnsNode_GetOutputResultPtr m_MatrixFromColumnsNode_GetOutputResult; PLib3MFConstantNode_SetConstantPtr m_ConstantNode_SetConstant; PLib3MFConstantNode_GetConstantPtr m_ConstantNode_GetConstant; PLib3MFConstantNode_GetOutputValuePtr m_ConstantNode_GetOutputValue; @@ -6510,6 +6601,9 @@ typedef struct { PLib3MFMeshNode_GetInputMeshPtr m_MeshNode_GetInputMesh; PLib3MFMeshNode_GetInputPosPtr m_MeshNode_GetInputPos; PLib3MFMeshNode_GetOutputDistancePtr m_MeshNode_GetOutputDistance; + PLib3MFUnsignedMeshNode_GetInputMeshPtr m_UnsignedMeshNode_GetInputMesh; + PLib3MFUnsignedMeshNode_GetInputPosPtr m_UnsignedMeshNode_GetInputPos; + PLib3MFUnsignedMeshNode_GetOutputDistancePtr m_UnsignedMeshNode_GetOutputDistance; PLib3MFFunctionCallNode_GetInputFunctionIDPtr m_FunctionCallNode_GetInputFunctionID; PLib3MFNodeIterator_GetCurrentPtr m_NodeIterator_GetCurrent; PLib3MFFunction_GetDisplayNamePtr m_Function_GetDisplayName; @@ -6563,13 +6657,16 @@ typedef struct { PLib3MFImplicitFunction_AddSelectNodePtr m_ImplicitFunction_AddSelectNode; PLib3MFImplicitFunction_AddClampNodePtr m_ImplicitFunction_AddClampNode; PLib3MFImplicitFunction_AddComposeVectorNodePtr m_ImplicitFunction_AddComposeVectorNode; + PLib3MFImplicitFunction_AddVectorFromScalarNodePtr m_ImplicitFunction_AddVectorFromScalarNode; PLib3MFImplicitFunction_AddDecomposeVectorNodePtr m_ImplicitFunction_AddDecomposeVectorNode; PLib3MFImplicitFunction_AddComposeMatrixNodePtr m_ImplicitFunction_AddComposeMatrixNode; - PLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodePtr m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode; + PLib3MFImplicitFunction_AddMatrixFromRowsNodePtr m_ImplicitFunction_AddMatrixFromRowsNode; + PLib3MFImplicitFunction_AddMatrixFromColumnsNodePtr m_ImplicitFunction_AddMatrixFromColumnsNode; PLib3MFImplicitFunction_AddConstantNodePtr m_ImplicitFunction_AddConstantNode; PLib3MFImplicitFunction_AddConstVecNodePtr m_ImplicitFunction_AddConstVecNode; PLib3MFImplicitFunction_AddConstMatNodePtr m_ImplicitFunction_AddConstMatNode; PLib3MFImplicitFunction_AddMeshNodePtr m_ImplicitFunction_AddMeshNode; + PLib3MFImplicitFunction_AddUnsignedMeshNodePtr m_ImplicitFunction_AddUnsignedMeshNode; PLib3MFImplicitFunction_AddFunctionCallNodePtr m_ImplicitFunction_AddFunctionCallNode; PLib3MFImplicitFunction_GetNodesPtr m_ImplicitFunction_GetNodes; PLib3MFImplicitFunction_RemoveNodePtr m_ImplicitFunction_RemoveNode; diff --git a/Autogenerated/Bindings/CDynamic/lib3mf_types.h b/Autogenerated/Bindings/CDynamic/lib3mf_types.h index a43ce9619..ca186c77a 100644 --- a/Autogenerated/Bindings/CDynamic/lib3mf_types.h +++ b/Autogenerated/Bindings/CDynamic/lib3mf_types.h @@ -291,14 +291,16 @@ typedef Lib3MFHandle Lib3MF_PowNode; typedef Lib3MFHandle Lib3MF_SelectNode; typedef Lib3MFHandle Lib3MF_ClampNode; typedef Lib3MFHandle Lib3MF_ComposeVectorNode; +typedef Lib3MFHandle Lib3MF_VectorFromScalarNode; typedef Lib3MFHandle Lib3MF_DecomposeVectorNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixNode; -typedef Lib3MFHandle Lib3MF_ComposeMatrixFromRowVectorsNode; -typedef Lib3MFHandle Lib3MF_ComposeMatrixFromColumnVectors; +typedef Lib3MFHandle Lib3MF_MatrixFromRowsNode; +typedef Lib3MFHandle Lib3MF_MatrixFromColumnsNode; typedef Lib3MFHandle Lib3MF_ConstantNode; typedef Lib3MFHandle Lib3MF_ConstVecNode; typedef Lib3MFHandle Lib3MF_ConstMatNode; typedef Lib3MFHandle Lib3MF_MeshNode; +typedef Lib3MFHandle Lib3MF_UnsignedMeshNode; typedef Lib3MFHandle Lib3MF_FunctionCallNode; typedef Lib3MFHandle Lib3MF_NodeIterator; typedef Lib3MFHandle Lib3MF_Function; @@ -454,8 +456,8 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeComposeVector = 8, /** Creates a vector from three scalar values */ eImplicitNodeTypeDecomposeVector = 9, /** Decomposes a vector into three scalar values */ eImplicitNodeTypeComposeMatrix = 10, /** Creates a matrix from nine scalar values */ - eImplicitNodeTypeComposeMatrixFromColumnVectors = 11, /** Creates a matrix from three column vector values */ - eImplicitNodeTypeComposeMatrixFromRowVectors = 12, /** Creates a matrix from three row vector values */ + eImplicitNodeTypeMatrixFromColumns = 11, /** Creates a matrix from three column vector values */ + eImplicitNodeTypeMatrixFromRows = 12, /** Creates a matrix from three row vector values */ eImplicitNodeTypeDot = 13, /** Calculates the dot product of two vector values */ eImplicitNodeTypeCross = 14, /** Calculates the cross product of two vector values */ eImplicitNodeTypeMatVecMultiplication = 15, /** Multiplies a matrix with a vector */ @@ -491,7 +493,9 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeFunctionCall = 45, /** Calls a function */ eImplicitNodeTypeMesh = 46, /** Calculates the signed distance to a mesh */ eImplicitNodeTypeLength = 47, /** Calculates the length of a vector */ - eImplicitNodeTypeResource = 48 /** Selects a resource (function, mesh etc.) */ + eImplicitNodeTypeResource = 48, /** Selects a resource (function, mesh etc.) */ + eImplicitNodeTypeVectorFromScalar = 49, /** Creates a vector from one scalar values */ + eImplicitNodeTypeUnsignedMesh = 50 /** Calculates the unsigned distance to a mesh */ } eLib3MFImplicitNodeType; /** diff --git a/Autogenerated/Bindings/CSharp/Lib3MF.cs b/Autogenerated/Bindings/CSharp/Lib3MF.cs index 5460d4a45..72c25017b 100644 --- a/Autogenerated/Bindings/CSharp/Lib3MF.cs +++ b/Autogenerated/Bindings/CSharp/Lib3MF.cs @@ -170,8 +170,8 @@ public enum eImplicitNodeType { ComposeVector = 8, DecomposeVector = 9, ComposeMatrix = 10, - ComposeMatrixFromColumnVectors = 11, - ComposeMatrixFromRowVectors = 12, + MatrixFromColumns = 11, + MatrixFromRows = 12, Dot = 13, Cross = 14, MatVecMultiplication = 15, @@ -207,7 +207,9 @@ public enum eImplicitNodeType { FunctionCall = 45, Mesh = 46, Length = 47, - Resource = 48 + Resource = 48, + VectorFromScalar = 49, + UnsignedMesh = 50 }; public enum eImplicitPortType { @@ -1314,6 +1316,12 @@ public class Lib3MFWrapper [DllImport("lib3mf.dll", EntryPoint = "lib3mf_composevectornode_getoutputresult", CallingConvention=CallingConvention.Cdecl)] public unsafe extern static Int32 ComposeVectorNode_GetOutputResult (IntPtr Handle, out IntPtr AResult); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_vectorfromscalarnode_getinputa", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 VectorFromScalarNode_GetInputA (IntPtr Handle, out IntPtr AA); + + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_vectorfromscalarnode_getoutputresult", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 VectorFromScalarNode_GetOutputResult (IntPtr Handle, out IntPtr AResult); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_decomposevectornode_getinputa", CallingConvention=CallingConvention.Cdecl)] public unsafe extern static Int32 DecomposeVectorNode_GetInputA (IntPtr Handle, out IntPtr AA); @@ -1377,35 +1385,35 @@ public class Lib3MFWrapper [DllImport("lib3mf.dll", EntryPoint = "lib3mf_composematrixnode_getoutputresult", CallingConvention=CallingConvention.Cdecl)] public unsafe extern static Int32 ComposeMatrixNode_GetOutputResult (IntPtr Handle, out IntPtr AResult); - [DllImport("lib3mf.dll", EntryPoint = "lib3mf_composematrixfromrowvectorsnode_getinputa", CallingConvention=CallingConvention.Cdecl)] - public unsafe extern static Int32 ComposeMatrixFromRowVectorsNode_GetInputA (IntPtr Handle, out IntPtr ARow0); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_matrixfromrowsnode_getinputa", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 MatrixFromRowsNode_GetInputA (IntPtr Handle, out IntPtr ARow0); - [DllImport("lib3mf.dll", EntryPoint = "lib3mf_composematrixfromrowvectorsnode_getinputb", CallingConvention=CallingConvention.Cdecl)] - public unsafe extern static Int32 ComposeMatrixFromRowVectorsNode_GetInputB (IntPtr Handle, out IntPtr ARow1); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_matrixfromrowsnode_getinputb", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 MatrixFromRowsNode_GetInputB (IntPtr Handle, out IntPtr ARow1); - [DllImport("lib3mf.dll", EntryPoint = "lib3mf_composematrixfromrowvectorsnode_getinputc", CallingConvention=CallingConvention.Cdecl)] - public unsafe extern static Int32 ComposeMatrixFromRowVectorsNode_GetInputC (IntPtr Handle, out IntPtr ARow2); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_matrixfromrowsnode_getinputc", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 MatrixFromRowsNode_GetInputC (IntPtr Handle, out IntPtr ARow2); - [DllImport("lib3mf.dll", EntryPoint = "lib3mf_composematrixfromrowvectorsnode_getinputd", CallingConvention=CallingConvention.Cdecl)] - public unsafe extern static Int32 ComposeMatrixFromRowVectorsNode_GetInputD (IntPtr Handle, out IntPtr ARow3); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_matrixfromrowsnode_getinputd", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 MatrixFromRowsNode_GetInputD (IntPtr Handle, out IntPtr ARow3); - [DllImport("lib3mf.dll", EntryPoint = "lib3mf_composematrixfromrowvectorsnode_getoutputresult", CallingConvention=CallingConvention.Cdecl)] - public unsafe extern static Int32 ComposeMatrixFromRowVectorsNode_GetOutputResult (IntPtr Handle, out IntPtr AResult); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_matrixfromrowsnode_getoutputresult", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 MatrixFromRowsNode_GetOutputResult (IntPtr Handle, out IntPtr AResult); - [DllImport("lib3mf.dll", EntryPoint = "lib3mf_composematrixfromcolumnvectors_getinputa", CallingConvention=CallingConvention.Cdecl)] - public unsafe extern static Int32 ComposeMatrixFromColumnVectors_GetInputA (IntPtr Handle, out IntPtr AColumn0); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_matrixfromcolumnsnode_getinputa", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 MatrixFromColumnsNode_GetInputA (IntPtr Handle, out IntPtr AColumn0); - [DllImport("lib3mf.dll", EntryPoint = "lib3mf_composematrixfromcolumnvectors_getinputb", CallingConvention=CallingConvention.Cdecl)] - public unsafe extern static Int32 ComposeMatrixFromColumnVectors_GetInputB (IntPtr Handle, out IntPtr AColumn1); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_matrixfromcolumnsnode_getinputb", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 MatrixFromColumnsNode_GetInputB (IntPtr Handle, out IntPtr AColumn1); - [DllImport("lib3mf.dll", EntryPoint = "lib3mf_composematrixfromcolumnvectors_getinputc", CallingConvention=CallingConvention.Cdecl)] - public unsafe extern static Int32 ComposeMatrixFromColumnVectors_GetInputC (IntPtr Handle, out IntPtr AColumn2); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_matrixfromcolumnsnode_getinputc", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 MatrixFromColumnsNode_GetInputC (IntPtr Handle, out IntPtr AColumn2); - [DllImport("lib3mf.dll", EntryPoint = "lib3mf_composematrixfromcolumnvectors_getinputd", CallingConvention=CallingConvention.Cdecl)] - public unsafe extern static Int32 ComposeMatrixFromColumnVectors_GetInputD (IntPtr Handle, out IntPtr AColumn3); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_matrixfromcolumnsnode_getinputd", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 MatrixFromColumnsNode_GetInputD (IntPtr Handle, out IntPtr AColumn3); - [DllImport("lib3mf.dll", EntryPoint = "lib3mf_composematrixfromcolumnvectors_getoutputresult", CallingConvention=CallingConvention.Cdecl)] - public unsafe extern static Int32 ComposeMatrixFromColumnVectors_GetOutputResult (IntPtr Handle, out IntPtr AResult); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_matrixfromcolumnsnode_getoutputresult", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 MatrixFromColumnsNode_GetOutputResult (IntPtr Handle, out IntPtr AResult); [DllImport("lib3mf.dll", EntryPoint = "lib3mf_constantnode_setconstant", CallingConvention=CallingConvention.Cdecl)] public unsafe extern static Int32 ConstantNode_SetConstant (IntPtr Handle, Double AValue); @@ -1443,6 +1451,15 @@ public class Lib3MFWrapper [DllImport("lib3mf.dll", EntryPoint = "lib3mf_meshnode_getoutputdistance", CallingConvention=CallingConvention.Cdecl)] public unsafe extern static Int32 MeshNode_GetOutputDistance (IntPtr Handle, out IntPtr ADistance); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_unsignedmeshnode_getinputmesh", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 UnsignedMeshNode_GetInputMesh (IntPtr Handle, out IntPtr AMesh); + + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_unsignedmeshnode_getinputpos", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 UnsignedMeshNode_GetInputPos (IntPtr Handle, out IntPtr APos); + + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_unsignedmeshnode_getoutputdistance", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 UnsignedMeshNode_GetOutputDistance (IntPtr Handle, out IntPtr ADistance); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_functioncallnode_getinputfunctionid", CallingConvention=CallingConvention.Cdecl)] public unsafe extern static Int32 FunctionCallNode_GetInputFunctionID (IntPtr Handle, out IntPtr AFunction); @@ -1602,14 +1619,20 @@ public class Lib3MFWrapper [DllImport("lib3mf.dll", EntryPoint = "lib3mf_implicitfunction_addcomposevectornode", CallingConvention=CallingConvention.Cdecl)] public unsafe extern static Int32 ImplicitFunction_AddComposeVectorNode (IntPtr Handle, byte[] AIdentifier, byte[] ADisplayName, byte[] ATag, out IntPtr ANode); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_implicitfunction_addvectorfromscalarnode", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 ImplicitFunction_AddVectorFromScalarNode (IntPtr Handle, byte[] AIdentifier, byte[] ADisplayName, byte[] ATag, out IntPtr ANode); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_implicitfunction_adddecomposevectornode", CallingConvention=CallingConvention.Cdecl)] public unsafe extern static Int32 ImplicitFunction_AddDecomposeVectorNode (IntPtr Handle, byte[] AIdentifier, byte[] ADisplayName, byte[] ATag, out IntPtr ANode); [DllImport("lib3mf.dll", EntryPoint = "lib3mf_implicitfunction_addcomposematrixnode", CallingConvention=CallingConvention.Cdecl)] public unsafe extern static Int32 ImplicitFunction_AddComposeMatrixNode (IntPtr Handle, byte[] AIdentifier, byte[] ADisplayName, byte[] ATag, out IntPtr ANode); - [DllImport("lib3mf.dll", EntryPoint = "lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode", CallingConvention=CallingConvention.Cdecl)] - public unsafe extern static Int32 ImplicitFunction_AddComposeMatrixFromRowVectorsNode (IntPtr Handle, byte[] AIdentifier, byte[] ADisplayName, byte[] ATag, out IntPtr ANode); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_implicitfunction_addmatrixfromrowsnode", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 ImplicitFunction_AddMatrixFromRowsNode (IntPtr Handle, byte[] AIdentifier, byte[] ADisplayName, byte[] ATag, out IntPtr ANode); + + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_implicitfunction_addmatrixfromcolumnsnode", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 ImplicitFunction_AddMatrixFromColumnsNode (IntPtr Handle, byte[] AIdentifier, byte[] ADisplayName, byte[] ATag, out IntPtr ANode); [DllImport("lib3mf.dll", EntryPoint = "lib3mf_implicitfunction_addconstantnode", CallingConvention=CallingConvention.Cdecl)] public unsafe extern static Int32 ImplicitFunction_AddConstantNode (IntPtr Handle, byte[] AIdentifier, byte[] ADisplayName, byte[] ATag, out IntPtr ANode); @@ -1623,6 +1646,9 @@ public class Lib3MFWrapper [DllImport("lib3mf.dll", EntryPoint = "lib3mf_implicitfunction_addmeshnode", CallingConvention=CallingConvention.Cdecl)] public unsafe extern static Int32 ImplicitFunction_AddMeshNode (IntPtr Handle, byte[] AIdentifier, byte[] ADisplayName, byte[] ATag, out IntPtr ANode); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_implicitfunction_addunsignedmeshnode", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 ImplicitFunction_AddUnsignedMeshNode (IntPtr Handle, byte[] AIdentifier, byte[] ADisplayName, byte[] ATag, out IntPtr ANode); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_implicitfunction_addfunctioncallnode", CallingConvention=CallingConvention.Cdecl)] public unsafe extern static Int32 ImplicitFunction_AddFunctionCallNode (IntPtr Handle, byte[] AIdentifier, byte[] ADisplayName, byte[] ATag, out IntPtr ANode); @@ -2599,14 +2625,16 @@ public static T PolymorphicFactory(IntPtr Handle) where T : class case 0x1127ED71E05A9BD4: Object = new CSelectNode(Handle) as T; break; // First 64 bits of SHA1 of a string: "Lib3MF::SelectNode" case 0x77AF68C971B1485F: Object = new CClampNode(Handle) as T; break; // First 64 bits of SHA1 of a string: "Lib3MF::ClampNode" case 0x49C24B8840C01F7E: Object = new CComposeVectorNode(Handle) as T; break; // First 64 bits of SHA1 of a string: "Lib3MF::ComposeVectorNode" + case 0x2E417B93351375E2: Object = new CVectorFromScalarNode(Handle) as T; break; // First 64 bits of SHA1 of a string: "Lib3MF::VectorFromScalarNode" case 0xCC4F8D561CCE35D4: Object = new CDecomposeVectorNode(Handle) as T; break; // First 64 bits of SHA1 of a string: "Lib3MF::DecomposeVectorNode" case 0x9EF9EB54A53AA40D: Object = new CComposeMatrixNode(Handle) as T; break; // First 64 bits of SHA1 of a string: "Lib3MF::ComposeMatrixNode" - case 0x5F89513A9B5FC583: Object = new CComposeMatrixFromRowVectorsNode(Handle) as T; break; // First 64 bits of SHA1 of a string: "Lib3MF::ComposeMatrixFromRowVectorsNode" - case 0x1A740A1E16230053: Object = new CComposeMatrixFromColumnVectors(Handle) as T; break; // First 64 bits of SHA1 of a string: "Lib3MF::ComposeMatrixFromColumnVectors" + case 0xD6DFD0A7EB64AC33: Object = new CMatrixFromRowsNode(Handle) as T; break; // First 64 bits of SHA1 of a string: "Lib3MF::MatrixFromRowsNode" + case 0x0DCBEAFCF83F3AAC: Object = new CMatrixFromColumnsNode(Handle) as T; break; // First 64 bits of SHA1 of a string: "Lib3MF::MatrixFromColumnsNode" case 0x3F8E5D082F966B1B: Object = new CConstantNode(Handle) as T; break; // First 64 bits of SHA1 of a string: "Lib3MF::ConstantNode" case 0x9C9363B3F708D556: Object = new CConstVecNode(Handle) as T; break; // First 64 bits of SHA1 of a string: "Lib3MF::ConstVecNode" case 0xF85C90EDCE6F90A4: Object = new CConstMatNode(Handle) as T; break; // First 64 bits of SHA1 of a string: "Lib3MF::ConstMatNode" case 0x53601FD432E3DEF4: Object = new CMeshNode(Handle) as T; break; // First 64 bits of SHA1 of a string: "Lib3MF::MeshNode" + case 0x29985A628251A9CD: Object = new CUnsignedMeshNode(Handle) as T; break; // First 64 bits of SHA1 of a string: "Lib3MF::UnsignedMeshNode" case 0x0765C17C952F24E3: Object = new CFunctionCallNode(Handle) as T; break; // First 64 bits of SHA1 of a string: "Lib3MF::FunctionCallNode" case 0xFC006BC888CAB4D0: Object = new CNodeIterator(Handle) as T; break; // First 64 bits of SHA1 of a string: "Lib3MF::NodeIterator" case 0x9EFB2757CA1A5231: Object = new CFunction(Handle) as T; break; // First 64 bits of SHA1 of a string: "Lib3MF::Function" @@ -5935,6 +5963,30 @@ public CImplicitPort GetOutputResult () } + public class CVectorFromScalarNode : CImplicitNode + { + public CVectorFromScalarNode (IntPtr NewHandle) : base (NewHandle) + { + } + + public CImplicitPort GetInputA () + { + IntPtr newA = IntPtr.Zero; + + CheckError(Internal.Lib3MFWrapper.VectorFromScalarNode_GetInputA (Handle, out newA)); + return Internal.Lib3MFWrapper.PolymorphicFactory(newA); + } + + public CImplicitPort GetOutputResult () + { + IntPtr newResult = IntPtr.Zero; + + CheckError(Internal.Lib3MFWrapper.VectorFromScalarNode_GetOutputResult (Handle, out newResult)); + return Internal.Lib3MFWrapper.PolymorphicFactory(newResult); + } + + } + public class CDecomposeVectorNode : CImplicitNode { public CDecomposeVectorNode (IntPtr NewHandle) : base (NewHandle) @@ -6119,9 +6171,9 @@ public CImplicitPort GetOutputResult () } - public class CComposeMatrixFromRowVectorsNode : CImplicitNode + public class CMatrixFromRowsNode : CImplicitNode { - public CComposeMatrixFromRowVectorsNode (IntPtr NewHandle) : base (NewHandle) + public CMatrixFromRowsNode (IntPtr NewHandle) : base (NewHandle) { } @@ -6129,7 +6181,7 @@ public CImplicitPort GetInputA () { IntPtr newRow0 = IntPtr.Zero; - CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromRowVectorsNode_GetInputA (Handle, out newRow0)); + CheckError(Internal.Lib3MFWrapper.MatrixFromRowsNode_GetInputA (Handle, out newRow0)); return Internal.Lib3MFWrapper.PolymorphicFactory(newRow0); } @@ -6137,7 +6189,7 @@ public CImplicitPort GetInputB () { IntPtr newRow1 = IntPtr.Zero; - CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromRowVectorsNode_GetInputB (Handle, out newRow1)); + CheckError(Internal.Lib3MFWrapper.MatrixFromRowsNode_GetInputB (Handle, out newRow1)); return Internal.Lib3MFWrapper.PolymorphicFactory(newRow1); } @@ -6145,7 +6197,7 @@ public CImplicitPort GetInputC () { IntPtr newRow2 = IntPtr.Zero; - CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromRowVectorsNode_GetInputC (Handle, out newRow2)); + CheckError(Internal.Lib3MFWrapper.MatrixFromRowsNode_GetInputC (Handle, out newRow2)); return Internal.Lib3MFWrapper.PolymorphicFactory(newRow2); } @@ -6153,7 +6205,7 @@ public CImplicitPort GetInputD () { IntPtr newRow3 = IntPtr.Zero; - CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromRowVectorsNode_GetInputD (Handle, out newRow3)); + CheckError(Internal.Lib3MFWrapper.MatrixFromRowsNode_GetInputD (Handle, out newRow3)); return Internal.Lib3MFWrapper.PolymorphicFactory(newRow3); } @@ -6161,15 +6213,15 @@ public CImplicitPort GetOutputResult () { IntPtr newResult = IntPtr.Zero; - CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromRowVectorsNode_GetOutputResult (Handle, out newResult)); + CheckError(Internal.Lib3MFWrapper.MatrixFromRowsNode_GetOutputResult (Handle, out newResult)); return Internal.Lib3MFWrapper.PolymorphicFactory(newResult); } } - public class CComposeMatrixFromColumnVectors : CImplicitNode + public class CMatrixFromColumnsNode : CImplicitNode { - public CComposeMatrixFromColumnVectors (IntPtr NewHandle) : base (NewHandle) + public CMatrixFromColumnsNode (IntPtr NewHandle) : base (NewHandle) { } @@ -6177,7 +6229,7 @@ public CImplicitPort GetInputA () { IntPtr newColumn0 = IntPtr.Zero; - CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromColumnVectors_GetInputA (Handle, out newColumn0)); + CheckError(Internal.Lib3MFWrapper.MatrixFromColumnsNode_GetInputA (Handle, out newColumn0)); return Internal.Lib3MFWrapper.PolymorphicFactory(newColumn0); } @@ -6185,7 +6237,7 @@ public CImplicitPort GetInputB () { IntPtr newColumn1 = IntPtr.Zero; - CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromColumnVectors_GetInputB (Handle, out newColumn1)); + CheckError(Internal.Lib3MFWrapper.MatrixFromColumnsNode_GetInputB (Handle, out newColumn1)); return Internal.Lib3MFWrapper.PolymorphicFactory(newColumn1); } @@ -6193,7 +6245,7 @@ public CImplicitPort GetInputC () { IntPtr newColumn2 = IntPtr.Zero; - CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromColumnVectors_GetInputC (Handle, out newColumn2)); + CheckError(Internal.Lib3MFWrapper.MatrixFromColumnsNode_GetInputC (Handle, out newColumn2)); return Internal.Lib3MFWrapper.PolymorphicFactory(newColumn2); } @@ -6201,7 +6253,7 @@ public CImplicitPort GetInputD () { IntPtr newColumn3 = IntPtr.Zero; - CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromColumnVectors_GetInputD (Handle, out newColumn3)); + CheckError(Internal.Lib3MFWrapper.MatrixFromColumnsNode_GetInputD (Handle, out newColumn3)); return Internal.Lib3MFWrapper.PolymorphicFactory(newColumn3); } @@ -6209,7 +6261,7 @@ public CImplicitPort GetOutputResult () { IntPtr newResult = IntPtr.Zero; - CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromColumnVectors_GetOutputResult (Handle, out newResult)); + CheckError(Internal.Lib3MFWrapper.MatrixFromColumnsNode_GetOutputResult (Handle, out newResult)); return Internal.Lib3MFWrapper.PolymorphicFactory(newResult); } @@ -6339,6 +6391,38 @@ public CImplicitPort GetOutputDistance () } + public class CUnsignedMeshNode : CImplicitNode + { + public CUnsignedMeshNode (IntPtr NewHandle) : base (NewHandle) + { + } + + public CImplicitPort GetInputMesh () + { + IntPtr newMesh = IntPtr.Zero; + + CheckError(Internal.Lib3MFWrapper.UnsignedMeshNode_GetInputMesh (Handle, out newMesh)); + return Internal.Lib3MFWrapper.PolymorphicFactory(newMesh); + } + + public CImplicitPort GetInputPos () + { + IntPtr newPos = IntPtr.Zero; + + CheckError(Internal.Lib3MFWrapper.UnsignedMeshNode_GetInputPos (Handle, out newPos)); + return Internal.Lib3MFWrapper.PolymorphicFactory(newPos); + } + + public CImplicitPort GetOutputDistance () + { + IntPtr newDistance = IntPtr.Zero; + + CheckError(Internal.Lib3MFWrapper.UnsignedMeshNode_GetOutputDistance (Handle, out newDistance)); + return Internal.Lib3MFWrapper.PolymorphicFactory(newDistance); + } + + } + public class CFunctionCallNode : CImplicitNode { public CFunctionCallNode (IntPtr NewHandle) : base (NewHandle) @@ -6963,6 +7047,17 @@ public CComposeVectorNode AddComposeVectorNode (String AIdentifier, String ADisp return Internal.Lib3MFWrapper.PolymorphicFactory(newNode); } + public CVectorFromScalarNode AddVectorFromScalarNode (String AIdentifier, String ADisplayName, String ATag) + { + byte[] byteIdentifier = Encoding.UTF8.GetBytes(AIdentifier + char.MinValue); + byte[] byteDisplayName = Encoding.UTF8.GetBytes(ADisplayName + char.MinValue); + byte[] byteTag = Encoding.UTF8.GetBytes(ATag + char.MinValue); + IntPtr newNode = IntPtr.Zero; + + CheckError(Internal.Lib3MFWrapper.ImplicitFunction_AddVectorFromScalarNode (Handle, byteIdentifier, byteDisplayName, byteTag, out newNode)); + return Internal.Lib3MFWrapper.PolymorphicFactory(newNode); + } + public CDecomposeVectorNode AddDecomposeVectorNode (String AIdentifier, String ADisplayName, String ATag) { byte[] byteIdentifier = Encoding.UTF8.GetBytes(AIdentifier + char.MinValue); @@ -6985,15 +7080,26 @@ public CComposeMatrixNode AddComposeMatrixNode (String AIdentifier, String ADisp return Internal.Lib3MFWrapper.PolymorphicFactory(newNode); } - public CComposeMatrixFromRowVectorsNode AddComposeMatrixFromRowVectorsNode (String AIdentifier, String ADisplayName, String ATag) + public CMatrixFromRowsNode AddMatrixFromRowsNode (String AIdentifier, String ADisplayName, String ATag) { byte[] byteIdentifier = Encoding.UTF8.GetBytes(AIdentifier + char.MinValue); byte[] byteDisplayName = Encoding.UTF8.GetBytes(ADisplayName + char.MinValue); byte[] byteTag = Encoding.UTF8.GetBytes(ATag + char.MinValue); IntPtr newNode = IntPtr.Zero; - CheckError(Internal.Lib3MFWrapper.ImplicitFunction_AddComposeMatrixFromRowVectorsNode (Handle, byteIdentifier, byteDisplayName, byteTag, out newNode)); - return Internal.Lib3MFWrapper.PolymorphicFactory(newNode); + CheckError(Internal.Lib3MFWrapper.ImplicitFunction_AddMatrixFromRowsNode (Handle, byteIdentifier, byteDisplayName, byteTag, out newNode)); + return Internal.Lib3MFWrapper.PolymorphicFactory(newNode); + } + + public CMatrixFromColumnsNode AddMatrixFromColumnsNode (String AIdentifier, String ADisplayName, String ATag) + { + byte[] byteIdentifier = Encoding.UTF8.GetBytes(AIdentifier + char.MinValue); + byte[] byteDisplayName = Encoding.UTF8.GetBytes(ADisplayName + char.MinValue); + byte[] byteTag = Encoding.UTF8.GetBytes(ATag + char.MinValue); + IntPtr newNode = IntPtr.Zero; + + CheckError(Internal.Lib3MFWrapper.ImplicitFunction_AddMatrixFromColumnsNode (Handle, byteIdentifier, byteDisplayName, byteTag, out newNode)); + return Internal.Lib3MFWrapper.PolymorphicFactory(newNode); } public CConstantNode AddConstantNode (String AIdentifier, String ADisplayName, String ATag) @@ -7040,6 +7146,17 @@ public CMeshNode AddMeshNode (String AIdentifier, String ADisplayName, String AT return Internal.Lib3MFWrapper.PolymorphicFactory(newNode); } + public CUnsignedMeshNode AddUnsignedMeshNode (String AIdentifier, String ADisplayName, String ATag) + { + byte[] byteIdentifier = Encoding.UTF8.GetBytes(AIdentifier + char.MinValue); + byte[] byteDisplayName = Encoding.UTF8.GetBytes(ADisplayName + char.MinValue); + byte[] byteTag = Encoding.UTF8.GetBytes(ATag + char.MinValue); + IntPtr newNode = IntPtr.Zero; + + CheckError(Internal.Lib3MFWrapper.ImplicitFunction_AddUnsignedMeshNode (Handle, byteIdentifier, byteDisplayName, byteTag, out newNode)); + return Internal.Lib3MFWrapper.PolymorphicFactory(newNode); + } + public CFunctionCallNode AddFunctionCallNode (String AIdentifier, String ADisplayName, String ATag) { byte[] byteIdentifier = Encoding.UTF8.GetBytes(AIdentifier + char.MinValue); diff --git a/Autogenerated/Bindings/Cpp/lib3mf_abi.hpp b/Autogenerated/Bindings/Cpp/lib3mf_abi.hpp index 1671c3d43..dbd09dfb2 100644 --- a/Autogenerated/Bindings/Cpp/lib3mf_abi.hpp +++ b/Autogenerated/Bindings/Cpp/lib3mf_abi.hpp @@ -3239,6 +3239,28 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composevectornode_getinputz(Lib3MF_ComposeVe */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composevectornode_getoutputresult(Lib3MF_ComposeVectorNode pComposeVectorNode, Lib3MF_ImplicitPort * pResult); +/************************************************************************************************************************* + Class definition for VectorFromScalarNode +**************************************************************************************************************************/ + +/** +* Retrieves the input +* +* @param[in] pVectorFromScalarNode - VectorFromScalarNode instance. +* @param[out] pA - the input for the x component +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_vectorfromscalarnode_getinputa(Lib3MF_VectorFromScalarNode pVectorFromScalarNode, Lib3MF_ImplicitPort * pA); + +/** +* Retrieves the output +* +* @param[in] pVectorFromScalarNode - VectorFromScalarNode instance. +* @param[out] pResult - the output +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_vectorfromscalarnode_getoutputresult(Lib3MF_VectorFromScalarNode pVectorFromScalarNode, Lib3MF_ImplicitPort * pResult); + /************************************************************************************************************************* Class definition for DecomposeVectorNode **************************************************************************************************************************/ @@ -3437,102 +3459,102 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getinputm33(Lib3MF_Compose LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getoutputresult(Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* - Class definition for ComposeMatrixFromRowVectorsNode + Class definition for MatrixFromRowsNode **************************************************************************************************************************/ /** * Retrieves the input for the first row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow0 - the input for the first row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputa(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromrowsnode_getinputa(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow0); /** * Retrieves the input for the second row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow1 - the input for the second row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputb(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromrowsnode_getinputb(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow1); /** * Retrieves the input for the third row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow2 - the input for the third row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputc(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromrowsnode_getinputc(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow2); /** * Retrieves the input for the fourth row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow3 - the input for the fourth row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputd(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromrowsnode_getinputd(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow3); /** * Retrieves the output * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pResult - the output * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getoutputresult(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pResult); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromrowsnode_getoutputresult(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* - Class definition for ComposeMatrixFromColumnVectors + Class definition for MatrixFromColumnsNode **************************************************************************************************************************/ /** * Retrieves the input for the first column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn0 - the input for the first column * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputa(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn0); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromcolumnsnode_getinputa(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn0); /** * Retrieves the input for the second column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn1 - the input for the second column * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputb(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn1); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromcolumnsnode_getinputb(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn1); /** * Retrieves the input for the third column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn2 - the input for the third column * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputc(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn2); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromcolumnsnode_getinputc(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn2); /** * Retrieves the input for the fourth column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn3 - the input for the fourth column * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputd(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn3); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromcolumnsnode_getinputd(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn3); /** * Retrieves the output * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pResult - the output * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromcolumnvectors_getoutputresult(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pResult); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromcolumnsnode_getoutputresult(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* Class definition for ConstantNode @@ -3658,6 +3680,37 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_meshnode_getinputpos(Lib3MF_MeshNode pMeshNo */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_meshnode_getoutputdistance(Lib3MF_MeshNode pMeshNode, Lib3MF_ImplicitPort * pDistance); +/************************************************************************************************************************* + Class definition for UnsignedMeshNode +**************************************************************************************************************************/ + +/** +* Retrieves the input for the model resource id of the mesh +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pMesh - the input port for the model resource id of the mesh +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_unsignedmeshnode_getinputmesh(Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pMesh); + +/** +* Retrieves the input for the position +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pPos - the input port for the position +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_unsignedmeshnode_getinputpos(Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pPos); + +/** +* Retrieves the output +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pDistance - the output port for the unsigned distance to the mesh +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_unsignedmeshnode_getoutputdistance(Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pDistance); + /************************************************************************************************************************* Class definition for FunctionCallNode **************************************************************************************************************************/ @@ -4313,6 +4366,18 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addclampnode(Lib3MF_Implici */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addcomposevectornode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeVectorNode * pNode); +/** +* Add a VectorFromScalar +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addvectorfromscalarnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_VectorFromScalarNode * pNode); + /** * Add a DecomposeVectorNode * @@ -4338,7 +4403,19 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_adddecomposevectornode(Lib3 LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addcomposematrixnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeMatrixNode * pNode); /** -* Add a ComposeMatrixFromRowVectorsNode +* Add a MatrixFromRowsNode +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addmatrixfromrowsnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MatrixFromRowsNode * pNode); + +/** +* Add a MatrixFromColumnsNode * * @param[in] pImplicitFunction - ImplicitFunction instance. * @param[in] pIdentifier - the identifier of the node @@ -4347,7 +4424,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addcomposematrixnode(Lib3MF * @param[out] pNode - the added node * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeMatrixFromRowVectorsNode * pNode); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addmatrixfromcolumnsnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MatrixFromColumnsNode * pNode); /** * Add a ConstantNode @@ -4397,6 +4474,18 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addconstmatnode(Lib3MF_Impl */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addmeshnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MeshNode * pNode); +/** +* Add a UnsignedMeshNode +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addunsignedmeshnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_UnsignedMeshNode * pNode); + /** * Add a FunctionCallNode * diff --git a/Autogenerated/Bindings/Cpp/lib3mf_implicit.hpp b/Autogenerated/Bindings/Cpp/lib3mf_implicit.hpp index 680dd143f..f6d231065 100644 --- a/Autogenerated/Bindings/Cpp/lib3mf_implicit.hpp +++ b/Autogenerated/Bindings/Cpp/lib3mf_implicit.hpp @@ -144,14 +144,16 @@ class CPowNode; class CSelectNode; class CClampNode; class CComposeVectorNode; +class CVectorFromScalarNode; class CDecomposeVectorNode; class CComposeMatrixNode; -class CComposeMatrixFromRowVectorsNode; -class CComposeMatrixFromColumnVectors; +class CMatrixFromRowsNode; +class CMatrixFromColumnsNode; class CConstantNode; class CConstVecNode; class CConstMatNode; class CMeshNode; +class CUnsignedMeshNode; class CFunctionCallNode; class CNodeIterator; class CFunction; @@ -260,14 +262,16 @@ typedef CPowNode CLib3MFPowNode; typedef CSelectNode CLib3MFSelectNode; typedef CClampNode CLib3MFClampNode; typedef CComposeVectorNode CLib3MFComposeVectorNode; +typedef CVectorFromScalarNode CLib3MFVectorFromScalarNode; typedef CDecomposeVectorNode CLib3MFDecomposeVectorNode; typedef CComposeMatrixNode CLib3MFComposeMatrixNode; -typedef CComposeMatrixFromRowVectorsNode CLib3MFComposeMatrixFromRowVectorsNode; -typedef CComposeMatrixFromColumnVectors CLib3MFComposeMatrixFromColumnVectors; +typedef CMatrixFromRowsNode CLib3MFMatrixFromRowsNode; +typedef CMatrixFromColumnsNode CLib3MFMatrixFromColumnsNode; typedef CConstantNode CLib3MFConstantNode; typedef CConstVecNode CLib3MFConstVecNode; typedef CConstMatNode CLib3MFConstMatNode; typedef CMeshNode CLib3MFMeshNode; +typedef CUnsignedMeshNode CLib3MFUnsignedMeshNode; typedef CFunctionCallNode CLib3MFFunctionCallNode; typedef CNodeIterator CLib3MFNodeIterator; typedef CFunction CLib3MFFunction; @@ -376,14 +380,16 @@ typedef std::shared_ptr PPowNode; typedef std::shared_ptr PSelectNode; typedef std::shared_ptr PClampNode; typedef std::shared_ptr PComposeVectorNode; +typedef std::shared_ptr PVectorFromScalarNode; typedef std::shared_ptr PDecomposeVectorNode; typedef std::shared_ptr PComposeMatrixNode; -typedef std::shared_ptr PComposeMatrixFromRowVectorsNode; -typedef std::shared_ptr PComposeMatrixFromColumnVectors; +typedef std::shared_ptr PMatrixFromRowsNode; +typedef std::shared_ptr PMatrixFromColumnsNode; typedef std::shared_ptr PConstantNode; typedef std::shared_ptr PConstVecNode; typedef std::shared_ptr PConstMatNode; typedef std::shared_ptr PMeshNode; +typedef std::shared_ptr PUnsignedMeshNode; typedef std::shared_ptr PFunctionCallNode; typedef std::shared_ptr PNodeIterator; typedef std::shared_ptr PFunction; @@ -492,14 +498,16 @@ typedef PPowNode PLib3MFPowNode; typedef PSelectNode PLib3MFSelectNode; typedef PClampNode PLib3MFClampNode; typedef PComposeVectorNode PLib3MFComposeVectorNode; +typedef PVectorFromScalarNode PLib3MFVectorFromScalarNode; typedef PDecomposeVectorNode PLib3MFDecomposeVectorNode; typedef PComposeMatrixNode PLib3MFComposeMatrixNode; -typedef PComposeMatrixFromRowVectorsNode PLib3MFComposeMatrixFromRowVectorsNode; -typedef PComposeMatrixFromColumnVectors PLib3MFComposeMatrixFromColumnVectors; +typedef PMatrixFromRowsNode PLib3MFMatrixFromRowsNode; +typedef PMatrixFromColumnsNode PLib3MFMatrixFromColumnsNode; typedef PConstantNode PLib3MFConstantNode; typedef PConstVecNode PLib3MFConstVecNode; typedef PConstMatNode PLib3MFConstMatNode; typedef PMeshNode PLib3MFMeshNode; +typedef PUnsignedMeshNode PLib3MFUnsignedMeshNode; typedef PFunctionCallNode PLib3MFFunctionCallNode; typedef PNodeIterator PLib3MFNodeIterator; typedef PFunction PLib3MFFunction; @@ -892,14 +900,16 @@ class CWrapper { friend class CSelectNode; friend class CClampNode; friend class CComposeVectorNode; + friend class CVectorFromScalarNode; friend class CDecomposeVectorNode; friend class CComposeMatrixNode; - friend class CComposeMatrixFromRowVectorsNode; - friend class CComposeMatrixFromColumnVectors; + friend class CMatrixFromRowsNode; + friend class CMatrixFromColumnsNode; friend class CConstantNode; friend class CConstVecNode; friend class CConstMatNode; friend class CMeshNode; + friend class CUnsignedMeshNode; friend class CFunctionCallNode; friend class CNodeIterator; friend class CFunction; @@ -2646,6 +2656,24 @@ class CComposeVectorNode : public CImplicitNode { inline PImplicitPort GetOutputResult(); }; +/************************************************************************************************************************* + Class CVectorFromScalarNode +**************************************************************************************************************************/ +class CVectorFromScalarNode : public CImplicitNode { +public: + + /** + * CVectorFromScalarNode::CVectorFromScalarNode - Constructor for VectorFromScalarNode class. + */ + CVectorFromScalarNode(CWrapper* pWrapper, Lib3MFHandle pHandle) + : CImplicitNode(pWrapper, pHandle) + { + } + + inline PImplicitPort GetInputA(); + inline PImplicitPort GetOutputResult(); +}; + /************************************************************************************************************************* Class CDecomposeVectorNode **************************************************************************************************************************/ @@ -2700,15 +2728,15 @@ class CComposeMatrixNode : public CImplicitNode { }; /************************************************************************************************************************* - Class CComposeMatrixFromRowVectorsNode + Class CMatrixFromRowsNode **************************************************************************************************************************/ -class CComposeMatrixFromRowVectorsNode : public CImplicitNode { +class CMatrixFromRowsNode : public CImplicitNode { public: /** - * CComposeMatrixFromRowVectorsNode::CComposeMatrixFromRowVectorsNode - Constructor for ComposeMatrixFromRowVectorsNode class. + * CMatrixFromRowsNode::CMatrixFromRowsNode - Constructor for MatrixFromRowsNode class. */ - CComposeMatrixFromRowVectorsNode(CWrapper* pWrapper, Lib3MFHandle pHandle) + CMatrixFromRowsNode(CWrapper* pWrapper, Lib3MFHandle pHandle) : CImplicitNode(pWrapper, pHandle) { } @@ -2721,15 +2749,15 @@ class CComposeMatrixFromRowVectorsNode : public CImplicitNode { }; /************************************************************************************************************************* - Class CComposeMatrixFromColumnVectors + Class CMatrixFromColumnsNode **************************************************************************************************************************/ -class CComposeMatrixFromColumnVectors : public CImplicitNode { +class CMatrixFromColumnsNode : public CImplicitNode { public: /** - * CComposeMatrixFromColumnVectors::CComposeMatrixFromColumnVectors - Constructor for ComposeMatrixFromColumnVectors class. + * CMatrixFromColumnsNode::CMatrixFromColumnsNode - Constructor for MatrixFromColumnsNode class. */ - CComposeMatrixFromColumnVectors(CWrapper* pWrapper, Lib3MFHandle pHandle) + CMatrixFromColumnsNode(CWrapper* pWrapper, Lib3MFHandle pHandle) : CImplicitNode(pWrapper, pHandle) { } @@ -2817,6 +2845,25 @@ class CMeshNode : public CImplicitNode { inline PImplicitPort GetOutputDistance(); }; +/************************************************************************************************************************* + Class CUnsignedMeshNode +**************************************************************************************************************************/ +class CUnsignedMeshNode : public CImplicitNode { +public: + + /** + * CUnsignedMeshNode::CUnsignedMeshNode - Constructor for UnsignedMeshNode class. + */ + CUnsignedMeshNode(CWrapper* pWrapper, Lib3MFHandle pHandle) + : CImplicitNode(pWrapper, pHandle) + { + } + + inline PImplicitPort GetInputMesh(); + inline PImplicitPort GetInputPos(); + inline PImplicitPort GetOutputDistance(); +}; + /************************************************************************************************************************* Class CFunctionCallNode **************************************************************************************************************************/ @@ -2932,13 +2979,16 @@ class CImplicitFunction : public CFunction { inline PSelectNode AddSelectNode(const std::string & sIdentifier, const eImplicitNodeConfiguration eConfiguration, const std::string & sDisplayName, const std::string & sTag); inline PClampNode AddClampNode(const std::string & sIdentifier, const eImplicitNodeConfiguration eConfiguration, const std::string & sDisplayName, const std::string & sTag); inline PComposeVectorNode AddComposeVectorNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); + inline PVectorFromScalarNode AddVectorFromScalarNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PDecomposeVectorNode AddDecomposeVectorNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PComposeMatrixNode AddComposeMatrixNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); - inline PComposeMatrixFromRowVectorsNode AddComposeMatrixFromRowVectorsNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); + inline PMatrixFromRowsNode AddMatrixFromRowsNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); + inline PMatrixFromColumnsNode AddMatrixFromColumnsNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PConstantNode AddConstantNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PConstVecNode AddConstVecNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PConstMatNode AddConstMatNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PMeshNode AddMeshNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); + inline PUnsignedMeshNode AddUnsignedMeshNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PFunctionCallNode AddFunctionCallNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PNodeIterator GetNodes(); inline void RemoveNode(classParam pNode); @@ -3395,14 +3445,16 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) case 0x1127ED71E05A9BD4UL: return new CSelectNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::SelectNode" case 0x77AF68C971B1485FUL: return new CClampNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::ClampNode" case 0x49C24B8840C01F7EUL: return new CComposeVectorNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::ComposeVectorNode" + case 0x2E417B93351375E2UL: return new CVectorFromScalarNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::VectorFromScalarNode" case 0xCC4F8D561CCE35D4UL: return new CDecomposeVectorNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::DecomposeVectorNode" case 0x9EF9EB54A53AA40DUL: return new CComposeMatrixNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::ComposeMatrixNode" - case 0x5F89513A9B5FC583UL: return new CComposeMatrixFromRowVectorsNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::ComposeMatrixFromRowVectorsNode" - case 0x1A740A1E16230053UL: return new CComposeMatrixFromColumnVectors(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::ComposeMatrixFromColumnVectors" + case 0xD6DFD0A7EB64AC33UL: return new CMatrixFromRowsNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::MatrixFromRowsNode" + case 0x0DCBEAFCF83F3AACUL: return new CMatrixFromColumnsNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::MatrixFromColumnsNode" case 0x3F8E5D082F966B1BUL: return new CConstantNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::ConstantNode" case 0x9C9363B3F708D556UL: return new CConstVecNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::ConstVecNode" case 0xF85C90EDCE6F90A4UL: return new CConstMatNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::ConstMatNode" case 0x53601FD432E3DEF4UL: return new CMeshNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::MeshNode" + case 0x29985A628251A9CDUL: return new CUnsignedMeshNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::UnsignedMeshNode" case 0x0765C17C952F24E3UL: return new CFunctionCallNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::FunctionCallNode" case 0xFC006BC888CAB4D0UL: return new CNodeIterator(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::NodeIterator" case 0x9EFB2757CA1A5231UL: return new CFunction(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::Function" @@ -7678,6 +7730,40 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hResult))); } + /** + * Method definitions for class CVectorFromScalarNode + */ + + /** + * CVectorFromScalarNode::GetInputA - Retrieves the input + * @return the input for the x component + */ + PImplicitPort CVectorFromScalarNode::GetInputA() + { + Lib3MFHandle hA = nullptr; + CheckError(lib3mf_vectorfromscalarnode_getinputa(m_pHandle, &hA)); + + if (!hA) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hA))); + } + + /** + * CVectorFromScalarNode::GetOutputResult - Retrieves the output + * @return the output + */ + PImplicitPort CVectorFromScalarNode::GetOutputResult() + { + Lib3MFHandle hResult = nullptr; + CheckError(lib3mf_vectorfromscalarnode_getoutputresult(m_pHandle, &hResult)); + + if (!hResult) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hResult))); + } + /** * Method definitions for class CDecomposeVectorNode */ @@ -8002,17 +8088,17 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * Method definitions for class CComposeMatrixFromRowVectorsNode + * Method definitions for class CMatrixFromRowsNode */ /** - * CComposeMatrixFromRowVectorsNode::GetInputA - Retrieves the input for the first row + * CMatrixFromRowsNode::GetInputA - Retrieves the input for the first row * @return the input for the first row */ - PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputA() + PImplicitPort CMatrixFromRowsNode::GetInputA() { Lib3MFHandle hRow0 = nullptr; - CheckError(lib3mf_composematrixfromrowvectorsnode_getinputa(m_pHandle, &hRow0)); + CheckError(lib3mf_matrixfromrowsnode_getinputa(m_pHandle, &hRow0)); if (!hRow0) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -8021,13 +8107,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromRowVectorsNode::GetInputB - Retrieves the input for the second row + * CMatrixFromRowsNode::GetInputB - Retrieves the input for the second row * @return the input for the second row */ - PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputB() + PImplicitPort CMatrixFromRowsNode::GetInputB() { Lib3MFHandle hRow1 = nullptr; - CheckError(lib3mf_composematrixfromrowvectorsnode_getinputb(m_pHandle, &hRow1)); + CheckError(lib3mf_matrixfromrowsnode_getinputb(m_pHandle, &hRow1)); if (!hRow1) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -8036,13 +8122,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromRowVectorsNode::GetInputC - Retrieves the input for the third row + * CMatrixFromRowsNode::GetInputC - Retrieves the input for the third row * @return the input for the third row */ - PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputC() + PImplicitPort CMatrixFromRowsNode::GetInputC() { Lib3MFHandle hRow2 = nullptr; - CheckError(lib3mf_composematrixfromrowvectorsnode_getinputc(m_pHandle, &hRow2)); + CheckError(lib3mf_matrixfromrowsnode_getinputc(m_pHandle, &hRow2)); if (!hRow2) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -8051,13 +8137,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromRowVectorsNode::GetInputD - Retrieves the input for the fourth row + * CMatrixFromRowsNode::GetInputD - Retrieves the input for the fourth row * @return the input for the fourth row */ - PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputD() + PImplicitPort CMatrixFromRowsNode::GetInputD() { Lib3MFHandle hRow3 = nullptr; - CheckError(lib3mf_composematrixfromrowvectorsnode_getinputd(m_pHandle, &hRow3)); + CheckError(lib3mf_matrixfromrowsnode_getinputd(m_pHandle, &hRow3)); if (!hRow3) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -8066,13 +8152,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromRowVectorsNode::GetOutputResult - Retrieves the output + * CMatrixFromRowsNode::GetOutputResult - Retrieves the output * @return the output */ - PImplicitPort CComposeMatrixFromRowVectorsNode::GetOutputResult() + PImplicitPort CMatrixFromRowsNode::GetOutputResult() { Lib3MFHandle hResult = nullptr; - CheckError(lib3mf_composematrixfromrowvectorsnode_getoutputresult(m_pHandle, &hResult)); + CheckError(lib3mf_matrixfromrowsnode_getoutputresult(m_pHandle, &hResult)); if (!hResult) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -8081,17 +8167,17 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * Method definitions for class CComposeMatrixFromColumnVectors + * Method definitions for class CMatrixFromColumnsNode */ /** - * CComposeMatrixFromColumnVectors::GetInputA - Retrieves the input for the first column + * CMatrixFromColumnsNode::GetInputA - Retrieves the input for the first column * @return the input for the first column */ - PImplicitPort CComposeMatrixFromColumnVectors::GetInputA() + PImplicitPort CMatrixFromColumnsNode::GetInputA() { Lib3MFHandle hColumn0 = nullptr; - CheckError(lib3mf_composematrixfromcolumnvectors_getinputa(m_pHandle, &hColumn0)); + CheckError(lib3mf_matrixfromcolumnsnode_getinputa(m_pHandle, &hColumn0)); if (!hColumn0) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -8100,13 +8186,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromColumnVectors::GetInputB - Retrieves the input for the second column + * CMatrixFromColumnsNode::GetInputB - Retrieves the input for the second column * @return the input for the second column */ - PImplicitPort CComposeMatrixFromColumnVectors::GetInputB() + PImplicitPort CMatrixFromColumnsNode::GetInputB() { Lib3MFHandle hColumn1 = nullptr; - CheckError(lib3mf_composematrixfromcolumnvectors_getinputb(m_pHandle, &hColumn1)); + CheckError(lib3mf_matrixfromcolumnsnode_getinputb(m_pHandle, &hColumn1)); if (!hColumn1) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -8115,13 +8201,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromColumnVectors::GetInputC - Retrieves the input for the third column + * CMatrixFromColumnsNode::GetInputC - Retrieves the input for the third column * @return the input for the third column */ - PImplicitPort CComposeMatrixFromColumnVectors::GetInputC() + PImplicitPort CMatrixFromColumnsNode::GetInputC() { Lib3MFHandle hColumn2 = nullptr; - CheckError(lib3mf_composematrixfromcolumnvectors_getinputc(m_pHandle, &hColumn2)); + CheckError(lib3mf_matrixfromcolumnsnode_getinputc(m_pHandle, &hColumn2)); if (!hColumn2) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -8130,13 +8216,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromColumnVectors::GetInputD - Retrieves the input for the fourth column + * CMatrixFromColumnsNode::GetInputD - Retrieves the input for the fourth column * @return the input for the fourth column */ - PImplicitPort CComposeMatrixFromColumnVectors::GetInputD() + PImplicitPort CMatrixFromColumnsNode::GetInputD() { Lib3MFHandle hColumn3 = nullptr; - CheckError(lib3mf_composematrixfromcolumnvectors_getinputd(m_pHandle, &hColumn3)); + CheckError(lib3mf_matrixfromcolumnsnode_getinputd(m_pHandle, &hColumn3)); if (!hColumn3) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -8145,13 +8231,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromColumnVectors::GetOutputResult - Retrieves the output + * CMatrixFromColumnsNode::GetOutputResult - Retrieves the output * @return the output */ - PImplicitPort CComposeMatrixFromColumnVectors::GetOutputResult() + PImplicitPort CMatrixFromColumnsNode::GetOutputResult() { Lib3MFHandle hResult = nullptr; - CheckError(lib3mf_composematrixfromcolumnvectors_getoutputresult(m_pHandle, &hResult)); + CheckError(lib3mf_matrixfromcolumnsnode_getoutputresult(m_pHandle, &hResult)); if (!hResult) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -8328,6 +8414,55 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hDistance))); } + /** + * Method definitions for class CUnsignedMeshNode + */ + + /** + * CUnsignedMeshNode::GetInputMesh - Retrieves the input for the model resource id of the mesh + * @return the input port for the model resource id of the mesh + */ + PImplicitPort CUnsignedMeshNode::GetInputMesh() + { + Lib3MFHandle hMesh = nullptr; + CheckError(lib3mf_unsignedmeshnode_getinputmesh(m_pHandle, &hMesh)); + + if (!hMesh) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hMesh))); + } + + /** + * CUnsignedMeshNode::GetInputPos - Retrieves the input for the position + * @return the input port for the position + */ + PImplicitPort CUnsignedMeshNode::GetInputPos() + { + Lib3MFHandle hPos = nullptr; + CheckError(lib3mf_unsignedmeshnode_getinputpos(m_pHandle, &hPos)); + + if (!hPos) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hPos))); + } + + /** + * CUnsignedMeshNode::GetOutputDistance - Retrieves the output + * @return the output port for the unsigned distance to the mesh + */ + PImplicitPort CUnsignedMeshNode::GetOutputDistance() + { + Lib3MFHandle hDistance = nullptr; + CheckError(lib3mf_unsignedmeshnode_getoutputdistance(m_pHandle, &hDistance)); + + if (!hDistance) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hDistance))); + } + /** * Method definitions for class CFunctionCallNode */ @@ -9275,6 +9410,24 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hNode))); } + /** + * CImplicitFunction::AddVectorFromScalarNode - Add a VectorFromScalar + * @param[in] sIdentifier - the identifier of the node + * @param[in] sDisplayName - the display name of the node + * @param[in] sTag - the tag of the node + * @return the added node + */ + PVectorFromScalarNode CImplicitFunction::AddVectorFromScalarNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) + { + Lib3MFHandle hNode = nullptr; + CheckError(lib3mf_implicitfunction_addvectorfromscalarnode(m_pHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hNode)); + + if (!hNode) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hNode))); + } + /** * CImplicitFunction::AddDecomposeVectorNode - Add a DecomposeVectorNode * @param[in] sIdentifier - the identifier of the node @@ -9312,21 +9465,39 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CImplicitFunction::AddComposeMatrixFromRowVectorsNode - Add a ComposeMatrixFromRowVectorsNode + * CImplicitFunction::AddMatrixFromRowsNode - Add a MatrixFromRowsNode + * @param[in] sIdentifier - the identifier of the node + * @param[in] sDisplayName - the display name of the node + * @param[in] sTag - the tag of the node + * @return the added node + */ + PMatrixFromRowsNode CImplicitFunction::AddMatrixFromRowsNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) + { + Lib3MFHandle hNode = nullptr; + CheckError(lib3mf_implicitfunction_addmatrixfromrowsnode(m_pHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hNode)); + + if (!hNode) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hNode))); + } + + /** + * CImplicitFunction::AddMatrixFromColumnsNode - Add a MatrixFromColumnsNode * @param[in] sIdentifier - the identifier of the node * @param[in] sDisplayName - the display name of the node * @param[in] sTag - the tag of the node * @return the added node */ - PComposeMatrixFromRowVectorsNode CImplicitFunction::AddComposeMatrixFromRowVectorsNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) + PMatrixFromColumnsNode CImplicitFunction::AddMatrixFromColumnsNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) { Lib3MFHandle hNode = nullptr; - CheckError(lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode(m_pHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hNode)); + CheckError(lib3mf_implicitfunction_addmatrixfromcolumnsnode(m_pHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hNode)); if (!hNode) { CheckError(LIB3MF_ERROR_INVALIDPARAM); } - return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hNode))); + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hNode))); } /** @@ -9401,6 +9572,24 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hNode))); } + /** + * CImplicitFunction::AddUnsignedMeshNode - Add a UnsignedMeshNode + * @param[in] sIdentifier - the identifier of the node + * @param[in] sDisplayName - the display name of the node + * @param[in] sTag - the tag of the node + * @return the added node + */ + PUnsignedMeshNode CImplicitFunction::AddUnsignedMeshNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) + { + Lib3MFHandle hNode = nullptr; + CheckError(lib3mf_implicitfunction_addunsignedmeshnode(m_pHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hNode)); + + if (!hNode) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hNode))); + } + /** * CImplicitFunction::AddFunctionCallNode - Add a FunctionCallNode * @param[in] sIdentifier - the identifier of the node diff --git a/Autogenerated/Bindings/Cpp/lib3mf_types.hpp b/Autogenerated/Bindings/Cpp/lib3mf_types.hpp index 1b0d9bd95..4d1b8125a 100644 --- a/Autogenerated/Bindings/Cpp/lib3mf_types.hpp +++ b/Autogenerated/Bindings/Cpp/lib3mf_types.hpp @@ -290,14 +290,16 @@ typedef Lib3MFHandle Lib3MF_PowNode; typedef Lib3MFHandle Lib3MF_SelectNode; typedef Lib3MFHandle Lib3MF_ClampNode; typedef Lib3MFHandle Lib3MF_ComposeVectorNode; +typedef Lib3MFHandle Lib3MF_VectorFromScalarNode; typedef Lib3MFHandle Lib3MF_DecomposeVectorNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixNode; -typedef Lib3MFHandle Lib3MF_ComposeMatrixFromRowVectorsNode; -typedef Lib3MFHandle Lib3MF_ComposeMatrixFromColumnVectors; +typedef Lib3MFHandle Lib3MF_MatrixFromRowsNode; +typedef Lib3MFHandle Lib3MF_MatrixFromColumnsNode; typedef Lib3MFHandle Lib3MF_ConstantNode; typedef Lib3MFHandle Lib3MF_ConstVecNode; typedef Lib3MFHandle Lib3MF_ConstMatNode; typedef Lib3MFHandle Lib3MF_MeshNode; +typedef Lib3MFHandle Lib3MF_UnsignedMeshNode; typedef Lib3MFHandle Lib3MF_FunctionCallNode; typedef Lib3MFHandle Lib3MF_NodeIterator; typedef Lib3MFHandle Lib3MF_Function; @@ -455,8 +457,8 @@ namespace Lib3MF { ComposeVector = 8, /** Creates a vector from three scalar values */ DecomposeVector = 9, /** Decomposes a vector into three scalar values */ ComposeMatrix = 10, /** Creates a matrix from nine scalar values */ - ComposeMatrixFromColumnVectors = 11, /** Creates a matrix from three column vector values */ - ComposeMatrixFromRowVectors = 12, /** Creates a matrix from three row vector values */ + MatrixFromColumns = 11, /** Creates a matrix from three column vector values */ + MatrixFromRows = 12, /** Creates a matrix from three row vector values */ Dot = 13, /** Calculates the dot product of two vector values */ Cross = 14, /** Calculates the cross product of two vector values */ MatVecMultiplication = 15, /** Multiplies a matrix with a vector */ @@ -492,7 +494,9 @@ namespace Lib3MF { FunctionCall = 45, /** Calls a function */ Mesh = 46, /** Calculates the signed distance to a mesh */ Length = 47, /** Calculates the length of a vector */ - Resource = 48 /** Selects a resource (function, mesh etc.) */ + Resource = 48, /** Selects a resource (function, mesh etc.) */ + VectorFromScalar = 49, /** Creates a vector from one scalar values */ + UnsignedMesh = 50 /** Calculates the unsigned distance to a mesh */ }; /** diff --git a/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.h b/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.h index 18ed1c638..ec4000333 100644 --- a/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.h +++ b/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.h @@ -3226,6 +3226,28 @@ typedef Lib3MFResult (*PLib3MFComposeVectorNode_GetInputZPtr) (Lib3MF_ComposeVec */ typedef Lib3MFResult (*PLib3MFComposeVectorNode_GetOutputResultPtr) (Lib3MF_ComposeVectorNode pComposeVectorNode, Lib3MF_ImplicitPort * pResult); +/************************************************************************************************************************* + Class definition for VectorFromScalarNode +**************************************************************************************************************************/ + +/** +* Retrieves the input +* +* @param[in] pVectorFromScalarNode - VectorFromScalarNode instance. +* @param[out] pA - the input for the x component +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFVectorFromScalarNode_GetInputAPtr) (Lib3MF_VectorFromScalarNode pVectorFromScalarNode, Lib3MF_ImplicitPort * pA); + +/** +* Retrieves the output +* +* @param[in] pVectorFromScalarNode - VectorFromScalarNode instance. +* @param[out] pResult - the output +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFVectorFromScalarNode_GetOutputResultPtr) (Lib3MF_VectorFromScalarNode pVectorFromScalarNode, Lib3MF_ImplicitPort * pResult); + /************************************************************************************************************************* Class definition for DecomposeVectorNode **************************************************************************************************************************/ @@ -3424,102 +3446,102 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM33Ptr) (Lib3MF_ComposeM typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetOutputResultPtr) (Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* - Class definition for ComposeMatrixFromRowVectorsNode + Class definition for MatrixFromRowsNode **************************************************************************************************************************/ /** * Retrieves the input for the first row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow0 - the input for the first row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetInputAPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow0); /** * Retrieves the input for the second row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow1 - the input for the second row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetInputBPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow1); /** * Retrieves the input for the third row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow2 - the input for the third row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetInputCPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow2); /** * Retrieves the input for the fourth row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow3 - the input for the fourth row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetInputDPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow3); /** * Retrieves the output * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pResult - the output * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pResult); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetOutputResultPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* - Class definition for ComposeMatrixFromColumnVectors + Class definition for MatrixFromColumnsNode **************************************************************************************************************************/ /** * Retrieves the input for the first column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn0 - the input for the first column * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn0); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetInputAPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn0); /** * Retrieves the input for the second column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn1 - the input for the second column * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn1); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetInputBPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn1); /** * Retrieves the input for the third column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn2 - the input for the third column * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn2); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetInputCPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn2); /** * Retrieves the input for the fourth column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn3 - the input for the fourth column * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn3); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetInputDPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn3); /** * Retrieves the output * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pResult - the output * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pResult); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetOutputResultPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* Class definition for ConstantNode @@ -3645,6 +3667,37 @@ typedef Lib3MFResult (*PLib3MFMeshNode_GetInputPosPtr) (Lib3MF_MeshNode pMeshNod */ typedef Lib3MFResult (*PLib3MFMeshNode_GetOutputDistancePtr) (Lib3MF_MeshNode pMeshNode, Lib3MF_ImplicitPort * pDistance); +/************************************************************************************************************************* + Class definition for UnsignedMeshNode +**************************************************************************************************************************/ + +/** +* Retrieves the input for the model resource id of the mesh +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pMesh - the input port for the model resource id of the mesh +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFUnsignedMeshNode_GetInputMeshPtr) (Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pMesh); + +/** +* Retrieves the input for the position +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pPos - the input port for the position +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFUnsignedMeshNode_GetInputPosPtr) (Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pPos); + +/** +* Retrieves the output +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pDistance - the output port for the unsigned distance to the mesh +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFUnsignedMeshNode_GetOutputDistancePtr) (Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pDistance); + /************************************************************************************************************************* Class definition for FunctionCallNode **************************************************************************************************************************/ @@ -4300,6 +4353,18 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddClampNodePtr) (Lib3MF_Implicit */ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddComposeVectorNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeVectorNode * pNode); +/** +* Add a VectorFromScalar +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddVectorFromScalarNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_VectorFromScalarNode * pNode); + /** * Add a DecomposeVectorNode * @@ -4325,7 +4390,19 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddDecomposeVectorNodePtr) (Lib3M typedef Lib3MFResult (*PLib3MFImplicitFunction_AddComposeMatrixNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeMatrixNode * pNode); /** -* Add a ComposeMatrixFromRowVectorsNode +* Add a MatrixFromRowsNode +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddMatrixFromRowsNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MatrixFromRowsNode * pNode); + +/** +* Add a MatrixFromColumnsNode * * @param[in] pImplicitFunction - ImplicitFunction instance. * @param[in] pIdentifier - the identifier of the node @@ -4334,7 +4411,7 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddComposeMatrixNodePtr) (Lib3MF_ * @param[out] pNode - the added node * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeMatrixFromRowVectorsNode * pNode); +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddMatrixFromColumnsNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MatrixFromColumnsNode * pNode); /** * Add a ConstantNode @@ -4384,6 +4461,18 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddConstMatNodePtr) (Lib3MF_Impli */ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddMeshNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MeshNode * pNode); +/** +* Add a UnsignedMeshNode +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddUnsignedMeshNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_UnsignedMeshNode * pNode); + /** * Add a FunctionCallNode * @@ -6467,6 +6556,8 @@ typedef struct { PLib3MFComposeVectorNode_GetInputYPtr m_ComposeVectorNode_GetInputY; PLib3MFComposeVectorNode_GetInputZPtr m_ComposeVectorNode_GetInputZ; PLib3MFComposeVectorNode_GetOutputResultPtr m_ComposeVectorNode_GetOutputResult; + PLib3MFVectorFromScalarNode_GetInputAPtr m_VectorFromScalarNode_GetInputA; + PLib3MFVectorFromScalarNode_GetOutputResultPtr m_VectorFromScalarNode_GetOutputResult; PLib3MFDecomposeVectorNode_GetInputAPtr m_DecomposeVectorNode_GetInputA; PLib3MFDecomposeVectorNode_GetOutputXPtr m_DecomposeVectorNode_GetOutputX; PLib3MFDecomposeVectorNode_GetOutputYPtr m_DecomposeVectorNode_GetOutputY; @@ -6488,16 +6579,16 @@ typedef struct { PLib3MFComposeMatrixNode_GetInputM32Ptr m_ComposeMatrixNode_GetInputM32; PLib3MFComposeMatrixNode_GetInputM33Ptr m_ComposeMatrixNode_GetInputM33; PLib3MFComposeMatrixNode_GetOutputResultPtr m_ComposeMatrixNode_GetOutputResult; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr m_ComposeMatrixFromRowVectorsNode_GetInputA; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr m_ComposeMatrixFromRowVectorsNode_GetInputB; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr m_ComposeMatrixFromRowVectorsNode_GetInputC; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr m_ComposeMatrixFromRowVectorsNode_GetInputD; - PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr m_ComposeMatrixFromRowVectorsNode_GetOutputResult; - PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr m_ComposeMatrixFromColumnVectors_GetInputA; - PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr m_ComposeMatrixFromColumnVectors_GetInputB; - PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr m_ComposeMatrixFromColumnVectors_GetInputC; - PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr m_ComposeMatrixFromColumnVectors_GetInputD; - PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr m_ComposeMatrixFromColumnVectors_GetOutputResult; + PLib3MFMatrixFromRowsNode_GetInputAPtr m_MatrixFromRowsNode_GetInputA; + PLib3MFMatrixFromRowsNode_GetInputBPtr m_MatrixFromRowsNode_GetInputB; + PLib3MFMatrixFromRowsNode_GetInputCPtr m_MatrixFromRowsNode_GetInputC; + PLib3MFMatrixFromRowsNode_GetInputDPtr m_MatrixFromRowsNode_GetInputD; + PLib3MFMatrixFromRowsNode_GetOutputResultPtr m_MatrixFromRowsNode_GetOutputResult; + PLib3MFMatrixFromColumnsNode_GetInputAPtr m_MatrixFromColumnsNode_GetInputA; + PLib3MFMatrixFromColumnsNode_GetInputBPtr m_MatrixFromColumnsNode_GetInputB; + PLib3MFMatrixFromColumnsNode_GetInputCPtr m_MatrixFromColumnsNode_GetInputC; + PLib3MFMatrixFromColumnsNode_GetInputDPtr m_MatrixFromColumnsNode_GetInputD; + PLib3MFMatrixFromColumnsNode_GetOutputResultPtr m_MatrixFromColumnsNode_GetOutputResult; PLib3MFConstantNode_SetConstantPtr m_ConstantNode_SetConstant; PLib3MFConstantNode_GetConstantPtr m_ConstantNode_GetConstant; PLib3MFConstantNode_GetOutputValuePtr m_ConstantNode_GetOutputValue; @@ -6510,6 +6601,9 @@ typedef struct { PLib3MFMeshNode_GetInputMeshPtr m_MeshNode_GetInputMesh; PLib3MFMeshNode_GetInputPosPtr m_MeshNode_GetInputPos; PLib3MFMeshNode_GetOutputDistancePtr m_MeshNode_GetOutputDistance; + PLib3MFUnsignedMeshNode_GetInputMeshPtr m_UnsignedMeshNode_GetInputMesh; + PLib3MFUnsignedMeshNode_GetInputPosPtr m_UnsignedMeshNode_GetInputPos; + PLib3MFUnsignedMeshNode_GetOutputDistancePtr m_UnsignedMeshNode_GetOutputDistance; PLib3MFFunctionCallNode_GetInputFunctionIDPtr m_FunctionCallNode_GetInputFunctionID; PLib3MFNodeIterator_GetCurrentPtr m_NodeIterator_GetCurrent; PLib3MFFunction_GetDisplayNamePtr m_Function_GetDisplayName; @@ -6563,13 +6657,16 @@ typedef struct { PLib3MFImplicitFunction_AddSelectNodePtr m_ImplicitFunction_AddSelectNode; PLib3MFImplicitFunction_AddClampNodePtr m_ImplicitFunction_AddClampNode; PLib3MFImplicitFunction_AddComposeVectorNodePtr m_ImplicitFunction_AddComposeVectorNode; + PLib3MFImplicitFunction_AddVectorFromScalarNodePtr m_ImplicitFunction_AddVectorFromScalarNode; PLib3MFImplicitFunction_AddDecomposeVectorNodePtr m_ImplicitFunction_AddDecomposeVectorNode; PLib3MFImplicitFunction_AddComposeMatrixNodePtr m_ImplicitFunction_AddComposeMatrixNode; - PLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodePtr m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode; + PLib3MFImplicitFunction_AddMatrixFromRowsNodePtr m_ImplicitFunction_AddMatrixFromRowsNode; + PLib3MFImplicitFunction_AddMatrixFromColumnsNodePtr m_ImplicitFunction_AddMatrixFromColumnsNode; PLib3MFImplicitFunction_AddConstantNodePtr m_ImplicitFunction_AddConstantNode; PLib3MFImplicitFunction_AddConstVecNodePtr m_ImplicitFunction_AddConstVecNode; PLib3MFImplicitFunction_AddConstMatNodePtr m_ImplicitFunction_AddConstMatNode; PLib3MFImplicitFunction_AddMeshNodePtr m_ImplicitFunction_AddMeshNode; + PLib3MFImplicitFunction_AddUnsignedMeshNodePtr m_ImplicitFunction_AddUnsignedMeshNode; PLib3MFImplicitFunction_AddFunctionCallNodePtr m_ImplicitFunction_AddFunctionCallNode; PLib3MFImplicitFunction_GetNodesPtr m_ImplicitFunction_GetNodes; PLib3MFImplicitFunction_RemoveNodePtr m_ImplicitFunction_RemoveNode; diff --git a/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.hpp b/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.hpp index 132664582..3247296a3 100644 --- a/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.hpp +++ b/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.hpp @@ -144,14 +144,16 @@ class CPowNode; class CSelectNode; class CClampNode; class CComposeVectorNode; +class CVectorFromScalarNode; class CDecomposeVectorNode; class CComposeMatrixNode; -class CComposeMatrixFromRowVectorsNode; -class CComposeMatrixFromColumnVectors; +class CMatrixFromRowsNode; +class CMatrixFromColumnsNode; class CConstantNode; class CConstVecNode; class CConstMatNode; class CMeshNode; +class CUnsignedMeshNode; class CFunctionCallNode; class CNodeIterator; class CFunction; @@ -260,14 +262,16 @@ typedef CPowNode CLib3MFPowNode; typedef CSelectNode CLib3MFSelectNode; typedef CClampNode CLib3MFClampNode; typedef CComposeVectorNode CLib3MFComposeVectorNode; +typedef CVectorFromScalarNode CLib3MFVectorFromScalarNode; typedef CDecomposeVectorNode CLib3MFDecomposeVectorNode; typedef CComposeMatrixNode CLib3MFComposeMatrixNode; -typedef CComposeMatrixFromRowVectorsNode CLib3MFComposeMatrixFromRowVectorsNode; -typedef CComposeMatrixFromColumnVectors CLib3MFComposeMatrixFromColumnVectors; +typedef CMatrixFromRowsNode CLib3MFMatrixFromRowsNode; +typedef CMatrixFromColumnsNode CLib3MFMatrixFromColumnsNode; typedef CConstantNode CLib3MFConstantNode; typedef CConstVecNode CLib3MFConstVecNode; typedef CConstMatNode CLib3MFConstMatNode; typedef CMeshNode CLib3MFMeshNode; +typedef CUnsignedMeshNode CLib3MFUnsignedMeshNode; typedef CFunctionCallNode CLib3MFFunctionCallNode; typedef CNodeIterator CLib3MFNodeIterator; typedef CFunction CLib3MFFunction; @@ -376,14 +380,16 @@ typedef std::shared_ptr PPowNode; typedef std::shared_ptr PSelectNode; typedef std::shared_ptr PClampNode; typedef std::shared_ptr PComposeVectorNode; +typedef std::shared_ptr PVectorFromScalarNode; typedef std::shared_ptr PDecomposeVectorNode; typedef std::shared_ptr PComposeMatrixNode; -typedef std::shared_ptr PComposeMatrixFromRowVectorsNode; -typedef std::shared_ptr PComposeMatrixFromColumnVectors; +typedef std::shared_ptr PMatrixFromRowsNode; +typedef std::shared_ptr PMatrixFromColumnsNode; typedef std::shared_ptr PConstantNode; typedef std::shared_ptr PConstVecNode; typedef std::shared_ptr PConstMatNode; typedef std::shared_ptr PMeshNode; +typedef std::shared_ptr PUnsignedMeshNode; typedef std::shared_ptr PFunctionCallNode; typedef std::shared_ptr PNodeIterator; typedef std::shared_ptr PFunction; @@ -492,14 +498,16 @@ typedef PPowNode PLib3MFPowNode; typedef PSelectNode PLib3MFSelectNode; typedef PClampNode PLib3MFClampNode; typedef PComposeVectorNode PLib3MFComposeVectorNode; +typedef PVectorFromScalarNode PLib3MFVectorFromScalarNode; typedef PDecomposeVectorNode PLib3MFDecomposeVectorNode; typedef PComposeMatrixNode PLib3MFComposeMatrixNode; -typedef PComposeMatrixFromRowVectorsNode PLib3MFComposeMatrixFromRowVectorsNode; -typedef PComposeMatrixFromColumnVectors PLib3MFComposeMatrixFromColumnVectors; +typedef PMatrixFromRowsNode PLib3MFMatrixFromRowsNode; +typedef PMatrixFromColumnsNode PLib3MFMatrixFromColumnsNode; typedef PConstantNode PLib3MFConstantNode; typedef PConstVecNode PLib3MFConstVecNode; typedef PConstMatNode PLib3MFConstMatNode; typedef PMeshNode PLib3MFMeshNode; +typedef PUnsignedMeshNode PLib3MFUnsignedMeshNode; typedef PFunctionCallNode PLib3MFFunctionCallNode; typedef PNodeIterator PLib3MFNodeIterator; typedef PFunction PLib3MFFunction; @@ -916,14 +924,16 @@ class CWrapper { friend class CSelectNode; friend class CClampNode; friend class CComposeVectorNode; + friend class CVectorFromScalarNode; friend class CDecomposeVectorNode; friend class CComposeMatrixNode; - friend class CComposeMatrixFromRowVectorsNode; - friend class CComposeMatrixFromColumnVectors; + friend class CMatrixFromRowsNode; + friend class CMatrixFromColumnsNode; friend class CConstantNode; friend class CConstVecNode; friend class CConstMatNode; friend class CMeshNode; + friend class CUnsignedMeshNode; friend class CFunctionCallNode; friend class CNodeIterator; friend class CFunction; @@ -2670,6 +2680,24 @@ class CComposeVectorNode : public CImplicitNode { inline PImplicitPort GetOutputResult(); }; +/************************************************************************************************************************* + Class CVectorFromScalarNode +**************************************************************************************************************************/ +class CVectorFromScalarNode : public CImplicitNode { +public: + + /** + * CVectorFromScalarNode::CVectorFromScalarNode - Constructor for VectorFromScalarNode class. + */ + CVectorFromScalarNode(CWrapper* pWrapper, Lib3MFHandle pHandle) + : CImplicitNode(pWrapper, pHandle) + { + } + + inline PImplicitPort GetInputA(); + inline PImplicitPort GetOutputResult(); +}; + /************************************************************************************************************************* Class CDecomposeVectorNode **************************************************************************************************************************/ @@ -2724,15 +2752,15 @@ class CComposeMatrixNode : public CImplicitNode { }; /************************************************************************************************************************* - Class CComposeMatrixFromRowVectorsNode + Class CMatrixFromRowsNode **************************************************************************************************************************/ -class CComposeMatrixFromRowVectorsNode : public CImplicitNode { +class CMatrixFromRowsNode : public CImplicitNode { public: /** - * CComposeMatrixFromRowVectorsNode::CComposeMatrixFromRowVectorsNode - Constructor for ComposeMatrixFromRowVectorsNode class. + * CMatrixFromRowsNode::CMatrixFromRowsNode - Constructor for MatrixFromRowsNode class. */ - CComposeMatrixFromRowVectorsNode(CWrapper* pWrapper, Lib3MFHandle pHandle) + CMatrixFromRowsNode(CWrapper* pWrapper, Lib3MFHandle pHandle) : CImplicitNode(pWrapper, pHandle) { } @@ -2745,15 +2773,15 @@ class CComposeMatrixFromRowVectorsNode : public CImplicitNode { }; /************************************************************************************************************************* - Class CComposeMatrixFromColumnVectors + Class CMatrixFromColumnsNode **************************************************************************************************************************/ -class CComposeMatrixFromColumnVectors : public CImplicitNode { +class CMatrixFromColumnsNode : public CImplicitNode { public: /** - * CComposeMatrixFromColumnVectors::CComposeMatrixFromColumnVectors - Constructor for ComposeMatrixFromColumnVectors class. + * CMatrixFromColumnsNode::CMatrixFromColumnsNode - Constructor for MatrixFromColumnsNode class. */ - CComposeMatrixFromColumnVectors(CWrapper* pWrapper, Lib3MFHandle pHandle) + CMatrixFromColumnsNode(CWrapper* pWrapper, Lib3MFHandle pHandle) : CImplicitNode(pWrapper, pHandle) { } @@ -2841,6 +2869,25 @@ class CMeshNode : public CImplicitNode { inline PImplicitPort GetOutputDistance(); }; +/************************************************************************************************************************* + Class CUnsignedMeshNode +**************************************************************************************************************************/ +class CUnsignedMeshNode : public CImplicitNode { +public: + + /** + * CUnsignedMeshNode::CUnsignedMeshNode - Constructor for UnsignedMeshNode class. + */ + CUnsignedMeshNode(CWrapper* pWrapper, Lib3MFHandle pHandle) + : CImplicitNode(pWrapper, pHandle) + { + } + + inline PImplicitPort GetInputMesh(); + inline PImplicitPort GetInputPos(); + inline PImplicitPort GetOutputDistance(); +}; + /************************************************************************************************************************* Class CFunctionCallNode **************************************************************************************************************************/ @@ -2956,13 +3003,16 @@ class CImplicitFunction : public CFunction { inline PSelectNode AddSelectNode(const std::string & sIdentifier, const eImplicitNodeConfiguration eConfiguration, const std::string & sDisplayName, const std::string & sTag); inline PClampNode AddClampNode(const std::string & sIdentifier, const eImplicitNodeConfiguration eConfiguration, const std::string & sDisplayName, const std::string & sTag); inline PComposeVectorNode AddComposeVectorNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); + inline PVectorFromScalarNode AddVectorFromScalarNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PDecomposeVectorNode AddDecomposeVectorNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PComposeMatrixNode AddComposeMatrixNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); - inline PComposeMatrixFromRowVectorsNode AddComposeMatrixFromRowVectorsNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); + inline PMatrixFromRowsNode AddMatrixFromRowsNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); + inline PMatrixFromColumnsNode AddMatrixFromColumnsNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PConstantNode AddConstantNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PConstVecNode AddConstVecNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PConstMatNode AddConstMatNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PMeshNode AddMeshNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); + inline PUnsignedMeshNode AddUnsignedMeshNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PFunctionCallNode AddFunctionCallNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PNodeIterator GetNodes(); inline void RemoveNode(classParam pNode); @@ -3419,14 +3469,16 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) case 0x1127ED71E05A9BD4UL: return new CSelectNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::SelectNode" case 0x77AF68C971B1485FUL: return new CClampNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::ClampNode" case 0x49C24B8840C01F7EUL: return new CComposeVectorNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::ComposeVectorNode" + case 0x2E417B93351375E2UL: return new CVectorFromScalarNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::VectorFromScalarNode" case 0xCC4F8D561CCE35D4UL: return new CDecomposeVectorNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::DecomposeVectorNode" case 0x9EF9EB54A53AA40DUL: return new CComposeMatrixNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::ComposeMatrixNode" - case 0x5F89513A9B5FC583UL: return new CComposeMatrixFromRowVectorsNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::ComposeMatrixFromRowVectorsNode" - case 0x1A740A1E16230053UL: return new CComposeMatrixFromColumnVectors(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::ComposeMatrixFromColumnVectors" + case 0xD6DFD0A7EB64AC33UL: return new CMatrixFromRowsNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::MatrixFromRowsNode" + case 0x0DCBEAFCF83F3AACUL: return new CMatrixFromColumnsNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::MatrixFromColumnsNode" case 0x3F8E5D082F966B1BUL: return new CConstantNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::ConstantNode" case 0x9C9363B3F708D556UL: return new CConstVecNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::ConstVecNode" case 0xF85C90EDCE6F90A4UL: return new CConstMatNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::ConstMatNode" case 0x53601FD432E3DEF4UL: return new CMeshNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::MeshNode" + case 0x29985A628251A9CDUL: return new CUnsignedMeshNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::UnsignedMeshNode" case 0x0765C17C952F24E3UL: return new CFunctionCallNode(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::FunctionCallNode" case 0xFC006BC888CAB4D0UL: return new CNodeIterator(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::NodeIterator" case 0x9EFB2757CA1A5231UL: return new CFunction(this, pHandle); break; // First 64 bits of SHA1 of a string: "Lib3MF::Function" @@ -4023,6 +4075,8 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) pWrapperTable->m_ComposeVectorNode_GetInputY = nullptr; pWrapperTable->m_ComposeVectorNode_GetInputZ = nullptr; pWrapperTable->m_ComposeVectorNode_GetOutputResult = nullptr; + pWrapperTable->m_VectorFromScalarNode_GetInputA = nullptr; + pWrapperTable->m_VectorFromScalarNode_GetOutputResult = nullptr; pWrapperTable->m_DecomposeVectorNode_GetInputA = nullptr; pWrapperTable->m_DecomposeVectorNode_GetOutputX = nullptr; pWrapperTable->m_DecomposeVectorNode_GetOutputY = nullptr; @@ -4044,16 +4098,16 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) pWrapperTable->m_ComposeMatrixNode_GetInputM32 = nullptr; pWrapperTable->m_ComposeMatrixNode_GetInputM33 = nullptr; pWrapperTable->m_ComposeMatrixNode_GetOutputResult = nullptr; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = nullptr; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = nullptr; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = nullptr; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = nullptr; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult = nullptr; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = nullptr; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = nullptr; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = nullptr; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = nullptr; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = nullptr; + pWrapperTable->m_MatrixFromRowsNode_GetInputA = nullptr; + pWrapperTable->m_MatrixFromRowsNode_GetInputB = nullptr; + pWrapperTable->m_MatrixFromRowsNode_GetInputC = nullptr; + pWrapperTable->m_MatrixFromRowsNode_GetInputD = nullptr; + pWrapperTable->m_MatrixFromRowsNode_GetOutputResult = nullptr; + pWrapperTable->m_MatrixFromColumnsNode_GetInputA = nullptr; + pWrapperTable->m_MatrixFromColumnsNode_GetInputB = nullptr; + pWrapperTable->m_MatrixFromColumnsNode_GetInputC = nullptr; + pWrapperTable->m_MatrixFromColumnsNode_GetInputD = nullptr; + pWrapperTable->m_MatrixFromColumnsNode_GetOutputResult = nullptr; pWrapperTable->m_ConstantNode_SetConstant = nullptr; pWrapperTable->m_ConstantNode_GetConstant = nullptr; pWrapperTable->m_ConstantNode_GetOutputValue = nullptr; @@ -4066,6 +4120,9 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) pWrapperTable->m_MeshNode_GetInputMesh = nullptr; pWrapperTable->m_MeshNode_GetInputPos = nullptr; pWrapperTable->m_MeshNode_GetOutputDistance = nullptr; + pWrapperTable->m_UnsignedMeshNode_GetInputMesh = nullptr; + pWrapperTable->m_UnsignedMeshNode_GetInputPos = nullptr; + pWrapperTable->m_UnsignedMeshNode_GetOutputDistance = nullptr; pWrapperTable->m_FunctionCallNode_GetInputFunctionID = nullptr; pWrapperTable->m_NodeIterator_GetCurrent = nullptr; pWrapperTable->m_Function_GetDisplayName = nullptr; @@ -4119,13 +4176,16 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) pWrapperTable->m_ImplicitFunction_AddSelectNode = nullptr; pWrapperTable->m_ImplicitFunction_AddClampNode = nullptr; pWrapperTable->m_ImplicitFunction_AddComposeVectorNode = nullptr; + pWrapperTable->m_ImplicitFunction_AddVectorFromScalarNode = nullptr; pWrapperTable->m_ImplicitFunction_AddDecomposeVectorNode = nullptr; pWrapperTable->m_ImplicitFunction_AddComposeMatrixNode = nullptr; - pWrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode = nullptr; + pWrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode = nullptr; + pWrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode = nullptr; pWrapperTable->m_ImplicitFunction_AddConstantNode = nullptr; pWrapperTable->m_ImplicitFunction_AddConstVecNode = nullptr; pWrapperTable->m_ImplicitFunction_AddConstMatNode = nullptr; pWrapperTable->m_ImplicitFunction_AddMeshNode = nullptr; + pWrapperTable->m_ImplicitFunction_AddUnsignedMeshNode = nullptr; pWrapperTable->m_ImplicitFunction_AddFunctionCallNode = nullptr; pWrapperTable->m_ImplicitFunction_GetNodes = nullptr; pWrapperTable->m_ImplicitFunction_RemoveNode = nullptr; @@ -7000,6 +7060,24 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) if (pWrapperTable->m_ComposeVectorNode_GetOutputResult == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_VectorFromScalarNode_GetInputA = (PLib3MFVectorFromScalarNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_vectorfromscalarnode_getinputa"); + #else // _WIN32 + pWrapperTable->m_VectorFromScalarNode_GetInputA = (PLib3MFVectorFromScalarNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_vectorfromscalarnode_getinputa"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_VectorFromScalarNode_GetInputA == nullptr) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_VectorFromScalarNode_GetOutputResult = (PLib3MFVectorFromScalarNode_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_vectorfromscalarnode_getoutputresult"); + #else // _WIN32 + pWrapperTable->m_VectorFromScalarNode_GetOutputResult = (PLib3MFVectorFromScalarNode_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_vectorfromscalarnode_getoutputresult"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_VectorFromScalarNode_GetOutputResult == nullptr) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_DecomposeVectorNode_GetInputA = (PLib3MFDecomposeVectorNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_decomposevectornode_getinputa"); #else // _WIN32 @@ -7190,93 +7268,93 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputa"); + pWrapperTable->m_MatrixFromRowsNode_GetInputA = (PLib3MFMatrixFromRowsNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getinputa"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputa"); + pWrapperTable->m_MatrixFromRowsNode_GetInputA = (PLib3MFMatrixFromRowsNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getinputa"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA == nullptr) + if (pWrapperTable->m_MatrixFromRowsNode_GetInputA == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputb"); + pWrapperTable->m_MatrixFromRowsNode_GetInputB = (PLib3MFMatrixFromRowsNode_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getinputb"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputb"); + pWrapperTable->m_MatrixFromRowsNode_GetInputB = (PLib3MFMatrixFromRowsNode_GetInputBPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getinputb"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB == nullptr) + if (pWrapperTable->m_MatrixFromRowsNode_GetInputB == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputc"); + pWrapperTable->m_MatrixFromRowsNode_GetInputC = (PLib3MFMatrixFromRowsNode_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getinputc"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputc"); + pWrapperTable->m_MatrixFromRowsNode_GetInputC = (PLib3MFMatrixFromRowsNode_GetInputCPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getinputc"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC == nullptr) + if (pWrapperTable->m_MatrixFromRowsNode_GetInputC == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputd"); + pWrapperTable->m_MatrixFromRowsNode_GetInputD = (PLib3MFMatrixFromRowsNode_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getinputd"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputd"); + pWrapperTable->m_MatrixFromRowsNode_GetInputD = (PLib3MFMatrixFromRowsNode_GetInputDPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getinputd"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD == nullptr) + if (pWrapperTable->m_MatrixFromRowsNode_GetInputD == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult = (PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getoutputresult"); + pWrapperTable->m_MatrixFromRowsNode_GetOutputResult = (PLib3MFMatrixFromRowsNode_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getoutputresult"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult = (PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getoutputresult"); + pWrapperTable->m_MatrixFromRowsNode_GetOutputResult = (PLib3MFMatrixFromRowsNode_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getoutputresult"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult == nullptr) + if (pWrapperTable->m_MatrixFromRowsNode_GetOutputResult == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = (PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputa"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputA = (PLib3MFMatrixFromColumnsNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputa"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = (PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputa"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputA = (PLib3MFMatrixFromColumnsNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputa"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA == nullptr) + if (pWrapperTable->m_MatrixFromColumnsNode_GetInputA == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = (PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputb"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputB = (PLib3MFMatrixFromColumnsNode_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputb"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = (PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputb"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputB = (PLib3MFMatrixFromColumnsNode_GetInputBPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputb"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB == nullptr) + if (pWrapperTable->m_MatrixFromColumnsNode_GetInputB == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = (PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputc"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputC = (PLib3MFMatrixFromColumnsNode_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputc"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = (PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputc"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputC = (PLib3MFMatrixFromColumnsNode_GetInputCPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputc"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC == nullptr) + if (pWrapperTable->m_MatrixFromColumnsNode_GetInputC == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = (PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputd"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputD = (PLib3MFMatrixFromColumnsNode_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputd"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = (PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputd"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputD = (PLib3MFMatrixFromColumnsNode_GetInputDPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputd"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD == nullptr) + if (pWrapperTable->m_MatrixFromColumnsNode_GetInputD == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = (PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getoutputresult"); + pWrapperTable->m_MatrixFromColumnsNode_GetOutputResult = (PLib3MFMatrixFromColumnsNode_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getoutputresult"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = (PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getoutputresult"); + pWrapperTable->m_MatrixFromColumnsNode_GetOutputResult = (PLib3MFMatrixFromColumnsNode_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getoutputresult"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult == nullptr) + if (pWrapperTable->m_MatrixFromColumnsNode_GetOutputResult == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 @@ -7387,6 +7465,33 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) if (pWrapperTable->m_MeshNode_GetOutputDistance == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetInputMesh = (PLib3MFUnsignedMeshNode_GetInputMeshPtr) GetProcAddress(hLibrary, "lib3mf_unsignedmeshnode_getinputmesh"); + #else // _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetInputMesh = (PLib3MFUnsignedMeshNode_GetInputMeshPtr) dlsym(hLibrary, "lib3mf_unsignedmeshnode_getinputmesh"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_UnsignedMeshNode_GetInputMesh == nullptr) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetInputPos = (PLib3MFUnsignedMeshNode_GetInputPosPtr) GetProcAddress(hLibrary, "lib3mf_unsignedmeshnode_getinputpos"); + #else // _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetInputPos = (PLib3MFUnsignedMeshNode_GetInputPosPtr) dlsym(hLibrary, "lib3mf_unsignedmeshnode_getinputpos"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_UnsignedMeshNode_GetInputPos == nullptr) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetOutputDistance = (PLib3MFUnsignedMeshNode_GetOutputDistancePtr) GetProcAddress(hLibrary, "lib3mf_unsignedmeshnode_getoutputdistance"); + #else // _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetOutputDistance = (PLib3MFUnsignedMeshNode_GetOutputDistancePtr) dlsym(hLibrary, "lib3mf_unsignedmeshnode_getoutputdistance"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_UnsignedMeshNode_GetOutputDistance == nullptr) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_FunctionCallNode_GetInputFunctionID = (PLib3MFFunctionCallNode_GetInputFunctionIDPtr) GetProcAddress(hLibrary, "lib3mf_functioncallnode_getinputfunctionid"); #else // _WIN32 @@ -7864,6 +7969,15 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) if (pWrapperTable->m_ImplicitFunction_AddComposeVectorNode == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_ImplicitFunction_AddVectorFromScalarNode = (PLib3MFImplicitFunction_AddVectorFromScalarNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addvectorfromscalarnode"); + #else // _WIN32 + pWrapperTable->m_ImplicitFunction_AddVectorFromScalarNode = (PLib3MFImplicitFunction_AddVectorFromScalarNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addvectorfromscalarnode"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ImplicitFunction_AddVectorFromScalarNode == nullptr) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_ImplicitFunction_AddDecomposeVectorNode = (PLib3MFImplicitFunction_AddDecomposeVectorNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_adddecomposevectornode"); #else // _WIN32 @@ -7883,12 +7997,21 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode = (PLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode"); + pWrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode = (PLib3MFImplicitFunction_AddMatrixFromRowsNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addmatrixfromrowsnode"); + #else // _WIN32 + pWrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode = (PLib3MFImplicitFunction_AddMatrixFromRowsNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addmatrixfromrowsnode"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode == nullptr) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode = (PLib3MFImplicitFunction_AddMatrixFromColumnsNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addmatrixfromcolumnsnode"); #else // _WIN32 - pWrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode = (PLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode"); + pWrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode = (PLib3MFImplicitFunction_AddMatrixFromColumnsNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addmatrixfromcolumnsnode"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode == nullptr) + if (pWrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 @@ -7927,6 +8050,15 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) if (pWrapperTable->m_ImplicitFunction_AddMeshNode == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_ImplicitFunction_AddUnsignedMeshNode = (PLib3MFImplicitFunction_AddUnsignedMeshNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addunsignedmeshnode"); + #else // _WIN32 + pWrapperTable->m_ImplicitFunction_AddUnsignedMeshNode = (PLib3MFImplicitFunction_AddUnsignedMeshNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addunsignedmeshnode"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ImplicitFunction_AddUnsignedMeshNode == nullptr) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_ImplicitFunction_AddFunctionCallNode = (PLib3MFImplicitFunction_AddFunctionCallNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addfunctioncallnode"); #else // _WIN32 @@ -10721,6 +10853,14 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) if ( (eLookupError != 0) || (pWrapperTable->m_ComposeVectorNode_GetOutputResult == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + eLookupError = (*pLookup)("lib3mf_vectorfromscalarnode_getinputa", (void**)&(pWrapperTable->m_VectorFromScalarNode_GetInputA)); + if ( (eLookupError != 0) || (pWrapperTable->m_VectorFromScalarNode_GetInputA == nullptr) ) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + eLookupError = (*pLookup)("lib3mf_vectorfromscalarnode_getoutputresult", (void**)&(pWrapperTable->m_VectorFromScalarNode_GetOutputResult)); + if ( (eLookupError != 0) || (pWrapperTable->m_VectorFromScalarNode_GetOutputResult == nullptr) ) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + eLookupError = (*pLookup)("lib3mf_decomposevectornode_getinputa", (void**)&(pWrapperTable->m_DecomposeVectorNode_GetInputA)); if ( (eLookupError != 0) || (pWrapperTable->m_DecomposeVectorNode_GetInputA == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; @@ -10805,44 +10945,44 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixNode_GetOutputResult == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; - eLookupError = (*pLookup)("lib3mf_composematrixfromrowvectorsnode_getinputa", (void**)&(pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA)); - if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA == nullptr) ) + eLookupError = (*pLookup)("lib3mf_matrixfromrowsnode_getinputa", (void**)&(pWrapperTable->m_MatrixFromRowsNode_GetInputA)); + if ( (eLookupError != 0) || (pWrapperTable->m_MatrixFromRowsNode_GetInputA == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; - eLookupError = (*pLookup)("lib3mf_composematrixfromrowvectorsnode_getinputb", (void**)&(pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB)); - if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB == nullptr) ) + eLookupError = (*pLookup)("lib3mf_matrixfromrowsnode_getinputb", (void**)&(pWrapperTable->m_MatrixFromRowsNode_GetInputB)); + if ( (eLookupError != 0) || (pWrapperTable->m_MatrixFromRowsNode_GetInputB == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; - eLookupError = (*pLookup)("lib3mf_composematrixfromrowvectorsnode_getinputc", (void**)&(pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC)); - if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC == nullptr) ) + eLookupError = (*pLookup)("lib3mf_matrixfromrowsnode_getinputc", (void**)&(pWrapperTable->m_MatrixFromRowsNode_GetInputC)); + if ( (eLookupError != 0) || (pWrapperTable->m_MatrixFromRowsNode_GetInputC == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; - eLookupError = (*pLookup)("lib3mf_composematrixfromrowvectorsnode_getinputd", (void**)&(pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD)); - if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD == nullptr) ) + eLookupError = (*pLookup)("lib3mf_matrixfromrowsnode_getinputd", (void**)&(pWrapperTable->m_MatrixFromRowsNode_GetInputD)); + if ( (eLookupError != 0) || (pWrapperTable->m_MatrixFromRowsNode_GetInputD == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; - eLookupError = (*pLookup)("lib3mf_composematrixfromrowvectorsnode_getoutputresult", (void**)&(pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult)); - if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult == nullptr) ) + eLookupError = (*pLookup)("lib3mf_matrixfromrowsnode_getoutputresult", (void**)&(pWrapperTable->m_MatrixFromRowsNode_GetOutputResult)); + if ( (eLookupError != 0) || (pWrapperTable->m_MatrixFromRowsNode_GetOutputResult == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; - eLookupError = (*pLookup)("lib3mf_composematrixfromcolumnvectors_getinputa", (void**)&(pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA)); - if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA == nullptr) ) + eLookupError = (*pLookup)("lib3mf_matrixfromcolumnsnode_getinputa", (void**)&(pWrapperTable->m_MatrixFromColumnsNode_GetInputA)); + if ( (eLookupError != 0) || (pWrapperTable->m_MatrixFromColumnsNode_GetInputA == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; - eLookupError = (*pLookup)("lib3mf_composematrixfromcolumnvectors_getinputb", (void**)&(pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB)); - if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB == nullptr) ) + eLookupError = (*pLookup)("lib3mf_matrixfromcolumnsnode_getinputb", (void**)&(pWrapperTable->m_MatrixFromColumnsNode_GetInputB)); + if ( (eLookupError != 0) || (pWrapperTable->m_MatrixFromColumnsNode_GetInputB == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; - eLookupError = (*pLookup)("lib3mf_composematrixfromcolumnvectors_getinputc", (void**)&(pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC)); - if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC == nullptr) ) + eLookupError = (*pLookup)("lib3mf_matrixfromcolumnsnode_getinputc", (void**)&(pWrapperTable->m_MatrixFromColumnsNode_GetInputC)); + if ( (eLookupError != 0) || (pWrapperTable->m_MatrixFromColumnsNode_GetInputC == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; - eLookupError = (*pLookup)("lib3mf_composematrixfromcolumnvectors_getinputd", (void**)&(pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD)); - if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD == nullptr) ) + eLookupError = (*pLookup)("lib3mf_matrixfromcolumnsnode_getinputd", (void**)&(pWrapperTable->m_MatrixFromColumnsNode_GetInputD)); + if ( (eLookupError != 0) || (pWrapperTable->m_MatrixFromColumnsNode_GetInputD == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; - eLookupError = (*pLookup)("lib3mf_composematrixfromcolumnvectors_getoutputresult", (void**)&(pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult)); - if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult == nullptr) ) + eLookupError = (*pLookup)("lib3mf_matrixfromcolumnsnode_getoutputresult", (void**)&(pWrapperTable->m_MatrixFromColumnsNode_GetOutputResult)); + if ( (eLookupError != 0) || (pWrapperTable->m_MatrixFromColumnsNode_GetOutputResult == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; eLookupError = (*pLookup)("lib3mf_constantnode_setconstant", (void**)&(pWrapperTable->m_ConstantNode_SetConstant)); @@ -10893,6 +11033,18 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) if ( (eLookupError != 0) || (pWrapperTable->m_MeshNode_GetOutputDistance == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + eLookupError = (*pLookup)("lib3mf_unsignedmeshnode_getinputmesh", (void**)&(pWrapperTable->m_UnsignedMeshNode_GetInputMesh)); + if ( (eLookupError != 0) || (pWrapperTable->m_UnsignedMeshNode_GetInputMesh == nullptr) ) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + eLookupError = (*pLookup)("lib3mf_unsignedmeshnode_getinputpos", (void**)&(pWrapperTable->m_UnsignedMeshNode_GetInputPos)); + if ( (eLookupError != 0) || (pWrapperTable->m_UnsignedMeshNode_GetInputPos == nullptr) ) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + eLookupError = (*pLookup)("lib3mf_unsignedmeshnode_getoutputdistance", (void**)&(pWrapperTable->m_UnsignedMeshNode_GetOutputDistance)); + if ( (eLookupError != 0) || (pWrapperTable->m_UnsignedMeshNode_GetOutputDistance == nullptr) ) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + eLookupError = (*pLookup)("lib3mf_functioncallnode_getinputfunctionid", (void**)&(pWrapperTable->m_FunctionCallNode_GetInputFunctionID)); if ( (eLookupError != 0) || (pWrapperTable->m_FunctionCallNode_GetInputFunctionID == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; @@ -11105,6 +11257,10 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) if ( (eLookupError != 0) || (pWrapperTable->m_ImplicitFunction_AddComposeVectorNode == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + eLookupError = (*pLookup)("lib3mf_implicitfunction_addvectorfromscalarnode", (void**)&(pWrapperTable->m_ImplicitFunction_AddVectorFromScalarNode)); + if ( (eLookupError != 0) || (pWrapperTable->m_ImplicitFunction_AddVectorFromScalarNode == nullptr) ) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + eLookupError = (*pLookup)("lib3mf_implicitfunction_adddecomposevectornode", (void**)&(pWrapperTable->m_ImplicitFunction_AddDecomposeVectorNode)); if ( (eLookupError != 0) || (pWrapperTable->m_ImplicitFunction_AddDecomposeVectorNode == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; @@ -11113,8 +11269,12 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) if ( (eLookupError != 0) || (pWrapperTable->m_ImplicitFunction_AddComposeMatrixNode == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; - eLookupError = (*pLookup)("lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode", (void**)&(pWrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode)); - if ( (eLookupError != 0) || (pWrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode == nullptr) ) + eLookupError = (*pLookup)("lib3mf_implicitfunction_addmatrixfromrowsnode", (void**)&(pWrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode)); + if ( (eLookupError != 0) || (pWrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode == nullptr) ) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + eLookupError = (*pLookup)("lib3mf_implicitfunction_addmatrixfromcolumnsnode", (void**)&(pWrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode)); + if ( (eLookupError != 0) || (pWrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; eLookupError = (*pLookup)("lib3mf_implicitfunction_addconstantnode", (void**)&(pWrapperTable->m_ImplicitFunction_AddConstantNode)); @@ -11133,6 +11293,10 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) if ( (eLookupError != 0) || (pWrapperTable->m_ImplicitFunction_AddMeshNode == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + eLookupError = (*pLookup)("lib3mf_implicitfunction_addunsignedmeshnode", (void**)&(pWrapperTable->m_ImplicitFunction_AddUnsignedMeshNode)); + if ( (eLookupError != 0) || (pWrapperTable->m_ImplicitFunction_AddUnsignedMeshNode == nullptr) ) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + eLookupError = (*pLookup)("lib3mf_implicitfunction_addfunctioncallnode", (void**)&(pWrapperTable->m_ImplicitFunction_AddFunctionCallNode)); if ( (eLookupError != 0) || (pWrapperTable->m_ImplicitFunction_AddFunctionCallNode == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; @@ -15828,6 +15992,40 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hResult))); } + /** + * Method definitions for class CVectorFromScalarNode + */ + + /** + * CVectorFromScalarNode::GetInputA - Retrieves the input + * @return the input for the x component + */ + PImplicitPort CVectorFromScalarNode::GetInputA() + { + Lib3MFHandle hA = nullptr; + CheckError(m_pWrapper->m_WrapperTable.m_VectorFromScalarNode_GetInputA(m_pHandle, &hA)); + + if (!hA) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hA))); + } + + /** + * CVectorFromScalarNode::GetOutputResult - Retrieves the output + * @return the output + */ + PImplicitPort CVectorFromScalarNode::GetOutputResult() + { + Lib3MFHandle hResult = nullptr; + CheckError(m_pWrapper->m_WrapperTable.m_VectorFromScalarNode_GetOutputResult(m_pHandle, &hResult)); + + if (!hResult) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hResult))); + } + /** * Method definitions for class CDecomposeVectorNode */ @@ -16152,17 +16350,17 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * Method definitions for class CComposeMatrixFromRowVectorsNode + * Method definitions for class CMatrixFromRowsNode */ /** - * CComposeMatrixFromRowVectorsNode::GetInputA - Retrieves the input for the first row + * CMatrixFromRowsNode::GetInputA - Retrieves the input for the first row * @return the input for the first row */ - PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputA() + PImplicitPort CMatrixFromRowsNode::GetInputA() { Lib3MFHandle hRow0 = nullptr; - CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromRowVectorsNode_GetInputA(m_pHandle, &hRow0)); + CheckError(m_pWrapper->m_WrapperTable.m_MatrixFromRowsNode_GetInputA(m_pHandle, &hRow0)); if (!hRow0) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -16171,13 +16369,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromRowVectorsNode::GetInputB - Retrieves the input for the second row + * CMatrixFromRowsNode::GetInputB - Retrieves the input for the second row * @return the input for the second row */ - PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputB() + PImplicitPort CMatrixFromRowsNode::GetInputB() { Lib3MFHandle hRow1 = nullptr; - CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromRowVectorsNode_GetInputB(m_pHandle, &hRow1)); + CheckError(m_pWrapper->m_WrapperTable.m_MatrixFromRowsNode_GetInputB(m_pHandle, &hRow1)); if (!hRow1) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -16186,13 +16384,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromRowVectorsNode::GetInputC - Retrieves the input for the third row + * CMatrixFromRowsNode::GetInputC - Retrieves the input for the third row * @return the input for the third row */ - PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputC() + PImplicitPort CMatrixFromRowsNode::GetInputC() { Lib3MFHandle hRow2 = nullptr; - CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromRowVectorsNode_GetInputC(m_pHandle, &hRow2)); + CheckError(m_pWrapper->m_WrapperTable.m_MatrixFromRowsNode_GetInputC(m_pHandle, &hRow2)); if (!hRow2) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -16201,13 +16399,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromRowVectorsNode::GetInputD - Retrieves the input for the fourth row + * CMatrixFromRowsNode::GetInputD - Retrieves the input for the fourth row * @return the input for the fourth row */ - PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputD() + PImplicitPort CMatrixFromRowsNode::GetInputD() { Lib3MFHandle hRow3 = nullptr; - CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromRowVectorsNode_GetInputD(m_pHandle, &hRow3)); + CheckError(m_pWrapper->m_WrapperTable.m_MatrixFromRowsNode_GetInputD(m_pHandle, &hRow3)); if (!hRow3) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -16216,13 +16414,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromRowVectorsNode::GetOutputResult - Retrieves the output + * CMatrixFromRowsNode::GetOutputResult - Retrieves the output * @return the output */ - PImplicitPort CComposeMatrixFromRowVectorsNode::GetOutputResult() + PImplicitPort CMatrixFromRowsNode::GetOutputResult() { Lib3MFHandle hResult = nullptr; - CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromRowVectorsNode_GetOutputResult(m_pHandle, &hResult)); + CheckError(m_pWrapper->m_WrapperTable.m_MatrixFromRowsNode_GetOutputResult(m_pHandle, &hResult)); if (!hResult) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -16231,17 +16429,17 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * Method definitions for class CComposeMatrixFromColumnVectors + * Method definitions for class CMatrixFromColumnsNode */ /** - * CComposeMatrixFromColumnVectors::GetInputA - Retrieves the input for the first column + * CMatrixFromColumnsNode::GetInputA - Retrieves the input for the first column * @return the input for the first column */ - PImplicitPort CComposeMatrixFromColumnVectors::GetInputA() + PImplicitPort CMatrixFromColumnsNode::GetInputA() { Lib3MFHandle hColumn0 = nullptr; - CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromColumnVectors_GetInputA(m_pHandle, &hColumn0)); + CheckError(m_pWrapper->m_WrapperTable.m_MatrixFromColumnsNode_GetInputA(m_pHandle, &hColumn0)); if (!hColumn0) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -16250,13 +16448,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromColumnVectors::GetInputB - Retrieves the input for the second column + * CMatrixFromColumnsNode::GetInputB - Retrieves the input for the second column * @return the input for the second column */ - PImplicitPort CComposeMatrixFromColumnVectors::GetInputB() + PImplicitPort CMatrixFromColumnsNode::GetInputB() { Lib3MFHandle hColumn1 = nullptr; - CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromColumnVectors_GetInputB(m_pHandle, &hColumn1)); + CheckError(m_pWrapper->m_WrapperTable.m_MatrixFromColumnsNode_GetInputB(m_pHandle, &hColumn1)); if (!hColumn1) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -16265,13 +16463,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromColumnVectors::GetInputC - Retrieves the input for the third column + * CMatrixFromColumnsNode::GetInputC - Retrieves the input for the third column * @return the input for the third column */ - PImplicitPort CComposeMatrixFromColumnVectors::GetInputC() + PImplicitPort CMatrixFromColumnsNode::GetInputC() { Lib3MFHandle hColumn2 = nullptr; - CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromColumnVectors_GetInputC(m_pHandle, &hColumn2)); + CheckError(m_pWrapper->m_WrapperTable.m_MatrixFromColumnsNode_GetInputC(m_pHandle, &hColumn2)); if (!hColumn2) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -16280,13 +16478,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromColumnVectors::GetInputD - Retrieves the input for the fourth column + * CMatrixFromColumnsNode::GetInputD - Retrieves the input for the fourth column * @return the input for the fourth column */ - PImplicitPort CComposeMatrixFromColumnVectors::GetInputD() + PImplicitPort CMatrixFromColumnsNode::GetInputD() { Lib3MFHandle hColumn3 = nullptr; - CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromColumnVectors_GetInputD(m_pHandle, &hColumn3)); + CheckError(m_pWrapper->m_WrapperTable.m_MatrixFromColumnsNode_GetInputD(m_pHandle, &hColumn3)); if (!hColumn3) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -16295,13 +16493,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromColumnVectors::GetOutputResult - Retrieves the output + * CMatrixFromColumnsNode::GetOutputResult - Retrieves the output * @return the output */ - PImplicitPort CComposeMatrixFromColumnVectors::GetOutputResult() + PImplicitPort CMatrixFromColumnsNode::GetOutputResult() { Lib3MFHandle hResult = nullptr; - CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromColumnVectors_GetOutputResult(m_pHandle, &hResult)); + CheckError(m_pWrapper->m_WrapperTable.m_MatrixFromColumnsNode_GetOutputResult(m_pHandle, &hResult)); if (!hResult) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -16478,6 +16676,55 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hDistance))); } + /** + * Method definitions for class CUnsignedMeshNode + */ + + /** + * CUnsignedMeshNode::GetInputMesh - Retrieves the input for the model resource id of the mesh + * @return the input port for the model resource id of the mesh + */ + PImplicitPort CUnsignedMeshNode::GetInputMesh() + { + Lib3MFHandle hMesh = nullptr; + CheckError(m_pWrapper->m_WrapperTable.m_UnsignedMeshNode_GetInputMesh(m_pHandle, &hMesh)); + + if (!hMesh) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hMesh))); + } + + /** + * CUnsignedMeshNode::GetInputPos - Retrieves the input for the position + * @return the input port for the position + */ + PImplicitPort CUnsignedMeshNode::GetInputPos() + { + Lib3MFHandle hPos = nullptr; + CheckError(m_pWrapper->m_WrapperTable.m_UnsignedMeshNode_GetInputPos(m_pHandle, &hPos)); + + if (!hPos) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hPos))); + } + + /** + * CUnsignedMeshNode::GetOutputDistance - Retrieves the output + * @return the output port for the unsigned distance to the mesh + */ + PImplicitPort CUnsignedMeshNode::GetOutputDistance() + { + Lib3MFHandle hDistance = nullptr; + CheckError(m_pWrapper->m_WrapperTable.m_UnsignedMeshNode_GetOutputDistance(m_pHandle, &hDistance)); + + if (!hDistance) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hDistance))); + } + /** * Method definitions for class CFunctionCallNode */ @@ -17425,6 +17672,24 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hNode))); } + /** + * CImplicitFunction::AddVectorFromScalarNode - Add a VectorFromScalar + * @param[in] sIdentifier - the identifier of the node + * @param[in] sDisplayName - the display name of the node + * @param[in] sTag - the tag of the node + * @return the added node + */ + PVectorFromScalarNode CImplicitFunction::AddVectorFromScalarNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) + { + Lib3MFHandle hNode = nullptr; + CheckError(m_pWrapper->m_WrapperTable.m_ImplicitFunction_AddVectorFromScalarNode(m_pHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hNode)); + + if (!hNode) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hNode))); + } + /** * CImplicitFunction::AddDecomposeVectorNode - Add a DecomposeVectorNode * @param[in] sIdentifier - the identifier of the node @@ -17462,21 +17727,39 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CImplicitFunction::AddComposeMatrixFromRowVectorsNode - Add a ComposeMatrixFromRowVectorsNode + * CImplicitFunction::AddMatrixFromRowsNode - Add a MatrixFromRowsNode + * @param[in] sIdentifier - the identifier of the node + * @param[in] sDisplayName - the display name of the node + * @param[in] sTag - the tag of the node + * @return the added node + */ + PMatrixFromRowsNode CImplicitFunction::AddMatrixFromRowsNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) + { + Lib3MFHandle hNode = nullptr; + CheckError(m_pWrapper->m_WrapperTable.m_ImplicitFunction_AddMatrixFromRowsNode(m_pHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hNode)); + + if (!hNode) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hNode))); + } + + /** + * CImplicitFunction::AddMatrixFromColumnsNode - Add a MatrixFromColumnsNode * @param[in] sIdentifier - the identifier of the node * @param[in] sDisplayName - the display name of the node * @param[in] sTag - the tag of the node * @return the added node */ - PComposeMatrixFromRowVectorsNode CImplicitFunction::AddComposeMatrixFromRowVectorsNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) + PMatrixFromColumnsNode CImplicitFunction::AddMatrixFromColumnsNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) { Lib3MFHandle hNode = nullptr; - CheckError(m_pWrapper->m_WrapperTable.m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode(m_pHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hNode)); + CheckError(m_pWrapper->m_WrapperTable.m_ImplicitFunction_AddMatrixFromColumnsNode(m_pHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hNode)); if (!hNode) { CheckError(LIB3MF_ERROR_INVALIDPARAM); } - return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hNode))); + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hNode))); } /** @@ -17551,6 +17834,24 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hNode))); } + /** + * CImplicitFunction::AddUnsignedMeshNode - Add a UnsignedMeshNode + * @param[in] sIdentifier - the identifier of the node + * @param[in] sDisplayName - the display name of the node + * @param[in] sTag - the tag of the node + * @return the added node + */ + PUnsignedMeshNode CImplicitFunction::AddUnsignedMeshNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) + { + Lib3MFHandle hNode = nullptr; + CheckError(m_pWrapper->m_WrapperTable.m_ImplicitFunction_AddUnsignedMeshNode(m_pHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hNode)); + + if (!hNode) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hNode))); + } + /** * CImplicitFunction::AddFunctionCallNode - Add a FunctionCallNode * @param[in] sIdentifier - the identifier of the node diff --git a/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp b/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp index 1b0d9bd95..4d1b8125a 100644 --- a/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp +++ b/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp @@ -290,14 +290,16 @@ typedef Lib3MFHandle Lib3MF_PowNode; typedef Lib3MFHandle Lib3MF_SelectNode; typedef Lib3MFHandle Lib3MF_ClampNode; typedef Lib3MFHandle Lib3MF_ComposeVectorNode; +typedef Lib3MFHandle Lib3MF_VectorFromScalarNode; typedef Lib3MFHandle Lib3MF_DecomposeVectorNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixNode; -typedef Lib3MFHandle Lib3MF_ComposeMatrixFromRowVectorsNode; -typedef Lib3MFHandle Lib3MF_ComposeMatrixFromColumnVectors; +typedef Lib3MFHandle Lib3MF_MatrixFromRowsNode; +typedef Lib3MFHandle Lib3MF_MatrixFromColumnsNode; typedef Lib3MFHandle Lib3MF_ConstantNode; typedef Lib3MFHandle Lib3MF_ConstVecNode; typedef Lib3MFHandle Lib3MF_ConstMatNode; typedef Lib3MFHandle Lib3MF_MeshNode; +typedef Lib3MFHandle Lib3MF_UnsignedMeshNode; typedef Lib3MFHandle Lib3MF_FunctionCallNode; typedef Lib3MFHandle Lib3MF_NodeIterator; typedef Lib3MFHandle Lib3MF_Function; @@ -455,8 +457,8 @@ namespace Lib3MF { ComposeVector = 8, /** Creates a vector from three scalar values */ DecomposeVector = 9, /** Decomposes a vector into three scalar values */ ComposeMatrix = 10, /** Creates a matrix from nine scalar values */ - ComposeMatrixFromColumnVectors = 11, /** Creates a matrix from three column vector values */ - ComposeMatrixFromRowVectors = 12, /** Creates a matrix from three row vector values */ + MatrixFromColumns = 11, /** Creates a matrix from three column vector values */ + MatrixFromRows = 12, /** Creates a matrix from three row vector values */ Dot = 13, /** Calculates the dot product of two vector values */ Cross = 14, /** Calculates the cross product of two vector values */ MatVecMultiplication = 15, /** Multiplies a matrix with a vector */ @@ -492,7 +494,9 @@ namespace Lib3MF { FunctionCall = 45, /** Calls a function */ Mesh = 46, /** Calculates the signed distance to a mesh */ Length = 47, /** Calculates the length of a vector */ - Resource = 48 /** Selects a resource (function, mesh etc.) */ + Resource = 48, /** Selects a resource (function, mesh etc.) */ + VectorFromScalar = 49, /** Creates a vector from one scalar values */ + UnsignedMesh = 50 /** Calculates the unsigned distance to a mesh */ }; /** diff --git a/Autogenerated/Bindings/Go/lib3mf.go b/Autogenerated/Bindings/Go/lib3mf.go index ad1d884ae..fa42af467 100644 --- a/Autogenerated/Bindings/Go/lib3mf.go +++ b/Autogenerated/Bindings/Go/lib3mf.go @@ -2718,6 +2718,24 @@ Lib3MFResult CCall_lib3mf_composevectornode_getoutputresult(Lib3MFHandle library } +Lib3MFResult CCall_lib3mf_vectorfromscalarnode_getinputa(Lib3MFHandle libraryHandle, Lib3MF_VectorFromScalarNode pVectorFromScalarNode, Lib3MF_ImplicitPort * pA) +{ + if (libraryHandle == 0) + return LIB3MF_ERROR_INVALIDCAST; + sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; + return wrapperTable->m_VectorFromScalarNode_GetInputA (pVectorFromScalarNode, pA); +} + + +Lib3MFResult CCall_lib3mf_vectorfromscalarnode_getoutputresult(Lib3MFHandle libraryHandle, Lib3MF_VectorFromScalarNode pVectorFromScalarNode, Lib3MF_ImplicitPort * pResult) +{ + if (libraryHandle == 0) + return LIB3MF_ERROR_INVALIDCAST; + sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; + return wrapperTable->m_VectorFromScalarNode_GetOutputResult (pVectorFromScalarNode, pResult); +} + + Lib3MFResult CCall_lib3mf_decomposevectornode_getinputa(Lib3MFHandle libraryHandle, Lib3MF_DecomposeVectorNode pDecomposeVectorNode, Lib3MF_ImplicitPort * pA) { if (libraryHandle == 0) @@ -2907,93 +2925,93 @@ Lib3MFResult CCall_lib3mf_composematrixnode_getoutputresult(Lib3MFHandle library } -Lib3MFResult CCall_lib3mf_composematrixfromrowvectorsnode_getinputa(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0) +Lib3MFResult CCall_lib3mf_matrixfromrowsnode_getinputa(Lib3MFHandle libraryHandle, Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow0) { if (libraryHandle == 0) return LIB3MF_ERROR_INVALIDCAST; sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; - return wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA (pComposeMatrixFromRowVectorsNode, pRow0); + return wrapperTable->m_MatrixFromRowsNode_GetInputA (pMatrixFromRowsNode, pRow0); } -Lib3MFResult CCall_lib3mf_composematrixfromrowvectorsnode_getinputb(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1) +Lib3MFResult CCall_lib3mf_matrixfromrowsnode_getinputb(Lib3MFHandle libraryHandle, Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow1) { if (libraryHandle == 0) return LIB3MF_ERROR_INVALIDCAST; sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; - return wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB (pComposeMatrixFromRowVectorsNode, pRow1); + return wrapperTable->m_MatrixFromRowsNode_GetInputB (pMatrixFromRowsNode, pRow1); } -Lib3MFResult CCall_lib3mf_composematrixfromrowvectorsnode_getinputc(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2) +Lib3MFResult CCall_lib3mf_matrixfromrowsnode_getinputc(Lib3MFHandle libraryHandle, Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow2) { if (libraryHandle == 0) return LIB3MF_ERROR_INVALIDCAST; sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; - return wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC (pComposeMatrixFromRowVectorsNode, pRow2); + return wrapperTable->m_MatrixFromRowsNode_GetInputC (pMatrixFromRowsNode, pRow2); } -Lib3MFResult CCall_lib3mf_composematrixfromrowvectorsnode_getinputd(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3) +Lib3MFResult CCall_lib3mf_matrixfromrowsnode_getinputd(Lib3MFHandle libraryHandle, Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow3) { if (libraryHandle == 0) return LIB3MF_ERROR_INVALIDCAST; sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; - return wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD (pComposeMatrixFromRowVectorsNode, pRow3); + return wrapperTable->m_MatrixFromRowsNode_GetInputD (pMatrixFromRowsNode, pRow3); } -Lib3MFResult CCall_lib3mf_composematrixfromrowvectorsnode_getoutputresult(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pResult) +Lib3MFResult CCall_lib3mf_matrixfromrowsnode_getoutputresult(Lib3MFHandle libraryHandle, Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pResult) { if (libraryHandle == 0) return LIB3MF_ERROR_INVALIDCAST; sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; - return wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult (pComposeMatrixFromRowVectorsNode, pResult); + return wrapperTable->m_MatrixFromRowsNode_GetOutputResult (pMatrixFromRowsNode, pResult); } -Lib3MFResult CCall_lib3mf_composematrixfromcolumnvectors_getinputa(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn0) +Lib3MFResult CCall_lib3mf_matrixfromcolumnsnode_getinputa(Lib3MFHandle libraryHandle, Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn0) { if (libraryHandle == 0) return LIB3MF_ERROR_INVALIDCAST; sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; - return wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA (pComposeMatrixFromColumnVectors, pColumn0); + return wrapperTable->m_MatrixFromColumnsNode_GetInputA (pMatrixFromColumnsNode, pColumn0); } -Lib3MFResult CCall_lib3mf_composematrixfromcolumnvectors_getinputb(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn1) +Lib3MFResult CCall_lib3mf_matrixfromcolumnsnode_getinputb(Lib3MFHandle libraryHandle, Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn1) { if (libraryHandle == 0) return LIB3MF_ERROR_INVALIDCAST; sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; - return wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB (pComposeMatrixFromColumnVectors, pColumn1); + return wrapperTable->m_MatrixFromColumnsNode_GetInputB (pMatrixFromColumnsNode, pColumn1); } -Lib3MFResult CCall_lib3mf_composematrixfromcolumnvectors_getinputc(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn2) +Lib3MFResult CCall_lib3mf_matrixfromcolumnsnode_getinputc(Lib3MFHandle libraryHandle, Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn2) { if (libraryHandle == 0) return LIB3MF_ERROR_INVALIDCAST; sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; - return wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC (pComposeMatrixFromColumnVectors, pColumn2); + return wrapperTable->m_MatrixFromColumnsNode_GetInputC (pMatrixFromColumnsNode, pColumn2); } -Lib3MFResult CCall_lib3mf_composematrixfromcolumnvectors_getinputd(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn3) +Lib3MFResult CCall_lib3mf_matrixfromcolumnsnode_getinputd(Lib3MFHandle libraryHandle, Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn3) { if (libraryHandle == 0) return LIB3MF_ERROR_INVALIDCAST; sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; - return wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD (pComposeMatrixFromColumnVectors, pColumn3); + return wrapperTable->m_MatrixFromColumnsNode_GetInputD (pMatrixFromColumnsNode, pColumn3); } -Lib3MFResult CCall_lib3mf_composematrixfromcolumnvectors_getoutputresult(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pResult) +Lib3MFResult CCall_lib3mf_matrixfromcolumnsnode_getoutputresult(Lib3MFHandle libraryHandle, Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pResult) { if (libraryHandle == 0) return LIB3MF_ERROR_INVALIDCAST; sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; - return wrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult (pComposeMatrixFromColumnVectors, pResult); + return wrapperTable->m_MatrixFromColumnsNode_GetOutputResult (pMatrixFromColumnsNode, pResult); } @@ -3105,6 +3123,33 @@ Lib3MFResult CCall_lib3mf_meshnode_getoutputdistance(Lib3MFHandle libraryHandle, } +Lib3MFResult CCall_lib3mf_unsignedmeshnode_getinputmesh(Lib3MFHandle libraryHandle, Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pMesh) +{ + if (libraryHandle == 0) + return LIB3MF_ERROR_INVALIDCAST; + sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; + return wrapperTable->m_UnsignedMeshNode_GetInputMesh (pUnsignedMeshNode, pMesh); +} + + +Lib3MFResult CCall_lib3mf_unsignedmeshnode_getinputpos(Lib3MFHandle libraryHandle, Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pPos) +{ + if (libraryHandle == 0) + return LIB3MF_ERROR_INVALIDCAST; + sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; + return wrapperTable->m_UnsignedMeshNode_GetInputPos (pUnsignedMeshNode, pPos); +} + + +Lib3MFResult CCall_lib3mf_unsignedmeshnode_getoutputdistance(Lib3MFHandle libraryHandle, Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pDistance) +{ + if (libraryHandle == 0) + return LIB3MF_ERROR_INVALIDCAST; + sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; + return wrapperTable->m_UnsignedMeshNode_GetOutputDistance (pUnsignedMeshNode, pDistance); +} + + Lib3MFResult CCall_lib3mf_functioncallnode_getinputfunctionid(Lib3MFHandle libraryHandle, Lib3MF_FunctionCallNode pFunctionCallNode, Lib3MF_ImplicitPort * pFunction) { if (libraryHandle == 0) @@ -3582,6 +3627,15 @@ Lib3MFResult CCall_lib3mf_implicitfunction_addcomposevectornode(Lib3MFHandle lib } +Lib3MFResult CCall_lib3mf_implicitfunction_addvectorfromscalarnode(Lib3MFHandle libraryHandle, Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_VectorFromScalarNode * pNode) +{ + if (libraryHandle == 0) + return LIB3MF_ERROR_INVALIDCAST; + sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; + return wrapperTable->m_ImplicitFunction_AddVectorFromScalarNode (pImplicitFunction, pIdentifier, pDisplayName, pTag, pNode); +} + + Lib3MFResult CCall_lib3mf_implicitfunction_adddecomposevectornode(Lib3MFHandle libraryHandle, Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_DecomposeVectorNode * pNode) { if (libraryHandle == 0) @@ -3600,12 +3654,21 @@ Lib3MFResult CCall_lib3mf_implicitfunction_addcomposematrixnode(Lib3MFHandle lib } -Lib3MFResult CCall_lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode(Lib3MFHandle libraryHandle, Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeMatrixFromRowVectorsNode * pNode) +Lib3MFResult CCall_lib3mf_implicitfunction_addmatrixfromrowsnode(Lib3MFHandle libraryHandle, Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MatrixFromRowsNode * pNode) { if (libraryHandle == 0) return LIB3MF_ERROR_INVALIDCAST; sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; - return wrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode (pImplicitFunction, pIdentifier, pDisplayName, pTag, pNode); + return wrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode (pImplicitFunction, pIdentifier, pDisplayName, pTag, pNode); +} + + +Lib3MFResult CCall_lib3mf_implicitfunction_addmatrixfromcolumnsnode(Lib3MFHandle libraryHandle, Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MatrixFromColumnsNode * pNode) +{ + if (libraryHandle == 0) + return LIB3MF_ERROR_INVALIDCAST; + sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; + return wrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode (pImplicitFunction, pIdentifier, pDisplayName, pTag, pNode); } @@ -3645,6 +3708,15 @@ Lib3MFResult CCall_lib3mf_implicitfunction_addmeshnode(Lib3MFHandle libraryHandl } +Lib3MFResult CCall_lib3mf_implicitfunction_addunsignedmeshnode(Lib3MFHandle libraryHandle, Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_UnsignedMeshNode * pNode) +{ + if (libraryHandle == 0) + return LIB3MF_ERROR_INVALIDCAST; + sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; + return wrapperTable->m_ImplicitFunction_AddUnsignedMeshNode (pImplicitFunction, pIdentifier, pDisplayName, pTag, pNode); +} + + Lib3MFResult CCall_lib3mf_implicitfunction_addfunctioncallnode(Lib3MFHandle libraryHandle, Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_FunctionCallNode * pNode) { if (libraryHandle == 0) @@ -5437,8 +5509,8 @@ const ( ImplicitNodeType_ComposeVector = 8 ImplicitNodeType_DecomposeVector = 9 ImplicitNodeType_ComposeMatrix = 10 - ImplicitNodeType_ComposeMatrixFromColumnVectors = 11 - ImplicitNodeType_ComposeMatrixFromRowVectors = 12 + ImplicitNodeType_MatrixFromColumns = 11 + ImplicitNodeType_MatrixFromRows = 12 ImplicitNodeType_Dot = 13 ImplicitNodeType_Cross = 14 ImplicitNodeType_MatVecMultiplication = 15 @@ -5475,6 +5547,8 @@ const ( ImplicitNodeType_Mesh = 46 ImplicitNodeType_Length = 47 ImplicitNodeType_Resource = 48 + ImplicitNodeType_VectorFromScalar = 49 + ImplicitNodeType_UnsignedMesh = 50 ) // ImplicitPortType represents a Lib3MF enum. @@ -9957,6 +10031,36 @@ func (inst ComposeVectorNode) GetOutputResult() (ImplicitPort, error) { } +// VectorFromScalarNode represents a Lib3MF class. +type VectorFromScalarNode struct { + ImplicitNode +} + +func (wrapper Wrapper) NewVectorFromScalarNode(r ref) VectorFromScalarNode { + return VectorFromScalarNode{wrapper.NewImplicitNode(r)} +} + +// GetInputA retrieves the input. +func (inst VectorFromScalarNode) GetInputA() (ImplicitPort, error) { + var a ref + ret := C.CCall_lib3mf_vectorfromscalarnode_getinputa(inst.wrapperRef.LibraryHandle, inst.Ref, &a) + if ret != 0 { + return ImplicitPort{}, makeError(uint32(ret)) + } + return inst.wrapperRef.NewImplicitPort(a), nil +} + +// GetOutputResult retrieves the output. +func (inst VectorFromScalarNode) GetOutputResult() (ImplicitPort, error) { + var result ref + ret := C.CCall_lib3mf_vectorfromscalarnode_getoutputresult(inst.wrapperRef.LibraryHandle, inst.Ref, &result) + if ret != 0 { + return ImplicitPort{}, makeError(uint32(ret)) + } + return inst.wrapperRef.NewImplicitPort(result), nil +} + + // DecomposeVectorNode represents a Lib3MF class. type DecomposeVectorNode struct { ImplicitNode @@ -10187,19 +10291,19 @@ func (inst ComposeMatrixNode) GetOutputResult() (ImplicitPort, error) { } -// ComposeMatrixFromRowVectorsNode represents a Lib3MF class. -type ComposeMatrixFromRowVectorsNode struct { +// MatrixFromRowsNode represents a Lib3MF class. +type MatrixFromRowsNode struct { ImplicitNode } -func (wrapper Wrapper) NewComposeMatrixFromRowVectorsNode(r ref) ComposeMatrixFromRowVectorsNode { - return ComposeMatrixFromRowVectorsNode{wrapper.NewImplicitNode(r)} +func (wrapper Wrapper) NewMatrixFromRowsNode(r ref) MatrixFromRowsNode { + return MatrixFromRowsNode{wrapper.NewImplicitNode(r)} } // GetInputA retrieves the input for the first row. -func (inst ComposeMatrixFromRowVectorsNode) GetInputA() (ImplicitPort, error) { +func (inst MatrixFromRowsNode) GetInputA() (ImplicitPort, error) { var row0 ref - ret := C.CCall_lib3mf_composematrixfromrowvectorsnode_getinputa(inst.wrapperRef.LibraryHandle, inst.Ref, &row0) + ret := C.CCall_lib3mf_matrixfromrowsnode_getinputa(inst.wrapperRef.LibraryHandle, inst.Ref, &row0) if ret != 0 { return ImplicitPort{}, makeError(uint32(ret)) } @@ -10207,9 +10311,9 @@ func (inst ComposeMatrixFromRowVectorsNode) GetInputA() (ImplicitPort, error) { } // GetInputB retrieves the input for the second row. -func (inst ComposeMatrixFromRowVectorsNode) GetInputB() (ImplicitPort, error) { +func (inst MatrixFromRowsNode) GetInputB() (ImplicitPort, error) { var row1 ref - ret := C.CCall_lib3mf_composematrixfromrowvectorsnode_getinputb(inst.wrapperRef.LibraryHandle, inst.Ref, &row1) + ret := C.CCall_lib3mf_matrixfromrowsnode_getinputb(inst.wrapperRef.LibraryHandle, inst.Ref, &row1) if ret != 0 { return ImplicitPort{}, makeError(uint32(ret)) } @@ -10217,9 +10321,9 @@ func (inst ComposeMatrixFromRowVectorsNode) GetInputB() (ImplicitPort, error) { } // GetInputC retrieves the input for the third row. -func (inst ComposeMatrixFromRowVectorsNode) GetInputC() (ImplicitPort, error) { +func (inst MatrixFromRowsNode) GetInputC() (ImplicitPort, error) { var row2 ref - ret := C.CCall_lib3mf_composematrixfromrowvectorsnode_getinputc(inst.wrapperRef.LibraryHandle, inst.Ref, &row2) + ret := C.CCall_lib3mf_matrixfromrowsnode_getinputc(inst.wrapperRef.LibraryHandle, inst.Ref, &row2) if ret != 0 { return ImplicitPort{}, makeError(uint32(ret)) } @@ -10227,9 +10331,9 @@ func (inst ComposeMatrixFromRowVectorsNode) GetInputC() (ImplicitPort, error) { } // GetInputD retrieves the input for the fourth row. -func (inst ComposeMatrixFromRowVectorsNode) GetInputD() (ImplicitPort, error) { +func (inst MatrixFromRowsNode) GetInputD() (ImplicitPort, error) { var row3 ref - ret := C.CCall_lib3mf_composematrixfromrowvectorsnode_getinputd(inst.wrapperRef.LibraryHandle, inst.Ref, &row3) + ret := C.CCall_lib3mf_matrixfromrowsnode_getinputd(inst.wrapperRef.LibraryHandle, inst.Ref, &row3) if ret != 0 { return ImplicitPort{}, makeError(uint32(ret)) } @@ -10237,9 +10341,9 @@ func (inst ComposeMatrixFromRowVectorsNode) GetInputD() (ImplicitPort, error) { } // GetOutputResult retrieves the output. -func (inst ComposeMatrixFromRowVectorsNode) GetOutputResult() (ImplicitPort, error) { +func (inst MatrixFromRowsNode) GetOutputResult() (ImplicitPort, error) { var result ref - ret := C.CCall_lib3mf_composematrixfromrowvectorsnode_getoutputresult(inst.wrapperRef.LibraryHandle, inst.Ref, &result) + ret := C.CCall_lib3mf_matrixfromrowsnode_getoutputresult(inst.wrapperRef.LibraryHandle, inst.Ref, &result) if ret != 0 { return ImplicitPort{}, makeError(uint32(ret)) } @@ -10247,19 +10351,19 @@ func (inst ComposeMatrixFromRowVectorsNode) GetOutputResult() (ImplicitPort, err } -// ComposeMatrixFromColumnVectors represents a Lib3MF class. -type ComposeMatrixFromColumnVectors struct { +// MatrixFromColumnsNode represents a Lib3MF class. +type MatrixFromColumnsNode struct { ImplicitNode } -func (wrapper Wrapper) NewComposeMatrixFromColumnVectors(r ref) ComposeMatrixFromColumnVectors { - return ComposeMatrixFromColumnVectors{wrapper.NewImplicitNode(r)} +func (wrapper Wrapper) NewMatrixFromColumnsNode(r ref) MatrixFromColumnsNode { + return MatrixFromColumnsNode{wrapper.NewImplicitNode(r)} } // GetInputA retrieves the input for the first column. -func (inst ComposeMatrixFromColumnVectors) GetInputA() (ImplicitPort, error) { +func (inst MatrixFromColumnsNode) GetInputA() (ImplicitPort, error) { var column0 ref - ret := C.CCall_lib3mf_composematrixfromcolumnvectors_getinputa(inst.wrapperRef.LibraryHandle, inst.Ref, &column0) + ret := C.CCall_lib3mf_matrixfromcolumnsnode_getinputa(inst.wrapperRef.LibraryHandle, inst.Ref, &column0) if ret != 0 { return ImplicitPort{}, makeError(uint32(ret)) } @@ -10267,9 +10371,9 @@ func (inst ComposeMatrixFromColumnVectors) GetInputA() (ImplicitPort, error) { } // GetInputB retrieves the input for the second column. -func (inst ComposeMatrixFromColumnVectors) GetInputB() (ImplicitPort, error) { +func (inst MatrixFromColumnsNode) GetInputB() (ImplicitPort, error) { var column1 ref - ret := C.CCall_lib3mf_composematrixfromcolumnvectors_getinputb(inst.wrapperRef.LibraryHandle, inst.Ref, &column1) + ret := C.CCall_lib3mf_matrixfromcolumnsnode_getinputb(inst.wrapperRef.LibraryHandle, inst.Ref, &column1) if ret != 0 { return ImplicitPort{}, makeError(uint32(ret)) } @@ -10277,9 +10381,9 @@ func (inst ComposeMatrixFromColumnVectors) GetInputB() (ImplicitPort, error) { } // GetInputC retrieves the input for the third column. -func (inst ComposeMatrixFromColumnVectors) GetInputC() (ImplicitPort, error) { +func (inst MatrixFromColumnsNode) GetInputC() (ImplicitPort, error) { var column2 ref - ret := C.CCall_lib3mf_composematrixfromcolumnvectors_getinputc(inst.wrapperRef.LibraryHandle, inst.Ref, &column2) + ret := C.CCall_lib3mf_matrixfromcolumnsnode_getinputc(inst.wrapperRef.LibraryHandle, inst.Ref, &column2) if ret != 0 { return ImplicitPort{}, makeError(uint32(ret)) } @@ -10287,9 +10391,9 @@ func (inst ComposeMatrixFromColumnVectors) GetInputC() (ImplicitPort, error) { } // GetInputD retrieves the input for the fourth column. -func (inst ComposeMatrixFromColumnVectors) GetInputD() (ImplicitPort, error) { +func (inst MatrixFromColumnsNode) GetInputD() (ImplicitPort, error) { var column3 ref - ret := C.CCall_lib3mf_composematrixfromcolumnvectors_getinputd(inst.wrapperRef.LibraryHandle, inst.Ref, &column3) + ret := C.CCall_lib3mf_matrixfromcolumnsnode_getinputd(inst.wrapperRef.LibraryHandle, inst.Ref, &column3) if ret != 0 { return ImplicitPort{}, makeError(uint32(ret)) } @@ -10297,9 +10401,9 @@ func (inst ComposeMatrixFromColumnVectors) GetInputD() (ImplicitPort, error) { } // GetOutputResult retrieves the output. -func (inst ComposeMatrixFromColumnVectors) GetOutputResult() (ImplicitPort, error) { +func (inst MatrixFromColumnsNode) GetOutputResult() (ImplicitPort, error) { var result ref - ret := C.CCall_lib3mf_composematrixfromcolumnvectors_getoutputresult(inst.wrapperRef.LibraryHandle, inst.Ref, &result) + ret := C.CCall_lib3mf_matrixfromcolumnsnode_getoutputresult(inst.wrapperRef.LibraryHandle, inst.Ref, &result) if ret != 0 { return ImplicitPort{}, makeError(uint32(ret)) } @@ -10464,6 +10568,46 @@ func (inst MeshNode) GetOutputDistance() (ImplicitPort, error) { } +// UnsignedMeshNode represents a Lib3MF class. +type UnsignedMeshNode struct { + ImplicitNode +} + +func (wrapper Wrapper) NewUnsignedMeshNode(r ref) UnsignedMeshNode { + return UnsignedMeshNode{wrapper.NewImplicitNode(r)} +} + +// GetInputMesh retrieves the input for the model resource id of the mesh. +func (inst UnsignedMeshNode) GetInputMesh() (ImplicitPort, error) { + var mesh ref + ret := C.CCall_lib3mf_unsignedmeshnode_getinputmesh(inst.wrapperRef.LibraryHandle, inst.Ref, &mesh) + if ret != 0 { + return ImplicitPort{}, makeError(uint32(ret)) + } + return inst.wrapperRef.NewImplicitPort(mesh), nil +} + +// GetInputPos retrieves the input for the position. +func (inst UnsignedMeshNode) GetInputPos() (ImplicitPort, error) { + var pos ref + ret := C.CCall_lib3mf_unsignedmeshnode_getinputpos(inst.wrapperRef.LibraryHandle, inst.Ref, &pos) + if ret != 0 { + return ImplicitPort{}, makeError(uint32(ret)) + } + return inst.wrapperRef.NewImplicitPort(pos), nil +} + +// GetOutputDistance retrieves the output. +func (inst UnsignedMeshNode) GetOutputDistance() (ImplicitPort, error) { + var distance ref + ret := C.CCall_lib3mf_unsignedmeshnode_getoutputdistance(inst.wrapperRef.LibraryHandle, inst.Ref, &distance) + if ret != 0 { + return ImplicitPort{}, makeError(uint32(ret)) + } + return inst.wrapperRef.NewImplicitPort(distance), nil +} + + // FunctionCallNode represents a Lib3MF class. type FunctionCallNode struct { ImplicitNode @@ -11043,6 +11187,16 @@ func (inst ImplicitFunction) AddComposeVectorNode(identifier string, displayName return inst.wrapperRef.NewComposeVectorNode(node), nil } +// AddVectorFromScalarNode add a VectorFromScalar. +func (inst ImplicitFunction) AddVectorFromScalarNode(identifier string, displayName string, tag string) (VectorFromScalarNode, error) { + var node ref + ret := C.CCall_lib3mf_implicitfunction_addvectorfromscalarnode(inst.wrapperRef.LibraryHandle, inst.Ref, (*C.char)(unsafe.Pointer(&[]byte(identifier)[0])), (*C.char)(unsafe.Pointer(&[]byte(displayName)[0])), (*C.char)(unsafe.Pointer(&[]byte(tag)[0])), &node) + if ret != 0 { + return VectorFromScalarNode{}, makeError(uint32(ret)) + } + return inst.wrapperRef.NewVectorFromScalarNode(node), nil +} + // AddDecomposeVectorNode add a DecomposeVectorNode. func (inst ImplicitFunction) AddDecomposeVectorNode(identifier string, displayName string, tag string) (DecomposeVectorNode, error) { var node ref @@ -11063,14 +11217,24 @@ func (inst ImplicitFunction) AddComposeMatrixNode(identifier string, displayName return inst.wrapperRef.NewComposeMatrixNode(node), nil } -// AddComposeMatrixFromRowVectorsNode add a ComposeMatrixFromRowVectorsNode. -func (inst ImplicitFunction) AddComposeMatrixFromRowVectorsNode(identifier string, displayName string, tag string) (ComposeMatrixFromRowVectorsNode, error) { +// AddMatrixFromRowsNode add a MatrixFromRowsNode. +func (inst ImplicitFunction) AddMatrixFromRowsNode(identifier string, displayName string, tag string) (MatrixFromRowsNode, error) { var node ref - ret := C.CCall_lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode(inst.wrapperRef.LibraryHandle, inst.Ref, (*C.char)(unsafe.Pointer(&[]byte(identifier)[0])), (*C.char)(unsafe.Pointer(&[]byte(displayName)[0])), (*C.char)(unsafe.Pointer(&[]byte(tag)[0])), &node) + ret := C.CCall_lib3mf_implicitfunction_addmatrixfromrowsnode(inst.wrapperRef.LibraryHandle, inst.Ref, (*C.char)(unsafe.Pointer(&[]byte(identifier)[0])), (*C.char)(unsafe.Pointer(&[]byte(displayName)[0])), (*C.char)(unsafe.Pointer(&[]byte(tag)[0])), &node) if ret != 0 { - return ComposeMatrixFromRowVectorsNode{}, makeError(uint32(ret)) + return MatrixFromRowsNode{}, makeError(uint32(ret)) } - return inst.wrapperRef.NewComposeMatrixFromRowVectorsNode(node), nil + return inst.wrapperRef.NewMatrixFromRowsNode(node), nil +} + +// AddMatrixFromColumnsNode add a MatrixFromColumnsNode. +func (inst ImplicitFunction) AddMatrixFromColumnsNode(identifier string, displayName string, tag string) (MatrixFromColumnsNode, error) { + var node ref + ret := C.CCall_lib3mf_implicitfunction_addmatrixfromcolumnsnode(inst.wrapperRef.LibraryHandle, inst.Ref, (*C.char)(unsafe.Pointer(&[]byte(identifier)[0])), (*C.char)(unsafe.Pointer(&[]byte(displayName)[0])), (*C.char)(unsafe.Pointer(&[]byte(tag)[0])), &node) + if ret != 0 { + return MatrixFromColumnsNode{}, makeError(uint32(ret)) + } + return inst.wrapperRef.NewMatrixFromColumnsNode(node), nil } // AddConstantNode add a ConstantNode. @@ -11113,6 +11277,16 @@ func (inst ImplicitFunction) AddMeshNode(identifier string, displayName string, return inst.wrapperRef.NewMeshNode(node), nil } +// AddUnsignedMeshNode add a UnsignedMeshNode. +func (inst ImplicitFunction) AddUnsignedMeshNode(identifier string, displayName string, tag string) (UnsignedMeshNode, error) { + var node ref + ret := C.CCall_lib3mf_implicitfunction_addunsignedmeshnode(inst.wrapperRef.LibraryHandle, inst.Ref, (*C.char)(unsafe.Pointer(&[]byte(identifier)[0])), (*C.char)(unsafe.Pointer(&[]byte(displayName)[0])), (*C.char)(unsafe.Pointer(&[]byte(tag)[0])), &node) + if ret != 0 { + return UnsignedMeshNode{}, makeError(uint32(ret)) + } + return inst.wrapperRef.NewUnsignedMeshNode(node), nil +} + // AddFunctionCallNode add a FunctionCallNode. func (inst ImplicitFunction) AddFunctionCallNode(identifier string, displayName string, tag string) (FunctionCallNode, error) { var node ref diff --git a/Autogenerated/Bindings/Go/lib3mf_dynamic.cc b/Autogenerated/Bindings/Go/lib3mf_dynamic.cc index faff3f8bc..c22fb1f38 100644 --- a/Autogenerated/Bindings/Go/lib3mf_dynamic.cc +++ b/Autogenerated/Bindings/Go/lib3mf_dynamic.cc @@ -342,6 +342,8 @@ Lib3MFResult InitLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable) pWrapperTable->m_ComposeVectorNode_GetInputY = NULL; pWrapperTable->m_ComposeVectorNode_GetInputZ = NULL; pWrapperTable->m_ComposeVectorNode_GetOutputResult = NULL; + pWrapperTable->m_VectorFromScalarNode_GetInputA = NULL; + pWrapperTable->m_VectorFromScalarNode_GetOutputResult = NULL; pWrapperTable->m_DecomposeVectorNode_GetInputA = NULL; pWrapperTable->m_DecomposeVectorNode_GetOutputX = NULL; pWrapperTable->m_DecomposeVectorNode_GetOutputY = NULL; @@ -363,16 +365,16 @@ Lib3MFResult InitLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable) pWrapperTable->m_ComposeMatrixNode_GetInputM32 = NULL; pWrapperTable->m_ComposeMatrixNode_GetInputM33 = NULL; pWrapperTable->m_ComposeMatrixNode_GetOutputResult = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult = NULL; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = NULL; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = NULL; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = NULL; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = NULL; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = NULL; + pWrapperTable->m_MatrixFromRowsNode_GetInputA = NULL; + pWrapperTable->m_MatrixFromRowsNode_GetInputB = NULL; + pWrapperTable->m_MatrixFromRowsNode_GetInputC = NULL; + pWrapperTable->m_MatrixFromRowsNode_GetInputD = NULL; + pWrapperTable->m_MatrixFromRowsNode_GetOutputResult = NULL; + pWrapperTable->m_MatrixFromColumnsNode_GetInputA = NULL; + pWrapperTable->m_MatrixFromColumnsNode_GetInputB = NULL; + pWrapperTable->m_MatrixFromColumnsNode_GetInputC = NULL; + pWrapperTable->m_MatrixFromColumnsNode_GetInputD = NULL; + pWrapperTable->m_MatrixFromColumnsNode_GetOutputResult = NULL; pWrapperTable->m_ConstantNode_SetConstant = NULL; pWrapperTable->m_ConstantNode_GetConstant = NULL; pWrapperTable->m_ConstantNode_GetOutputValue = NULL; @@ -385,6 +387,9 @@ Lib3MFResult InitLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable) pWrapperTable->m_MeshNode_GetInputMesh = NULL; pWrapperTable->m_MeshNode_GetInputPos = NULL; pWrapperTable->m_MeshNode_GetOutputDistance = NULL; + pWrapperTable->m_UnsignedMeshNode_GetInputMesh = NULL; + pWrapperTable->m_UnsignedMeshNode_GetInputPos = NULL; + pWrapperTable->m_UnsignedMeshNode_GetOutputDistance = NULL; pWrapperTable->m_FunctionCallNode_GetInputFunctionID = NULL; pWrapperTable->m_NodeIterator_GetCurrent = NULL; pWrapperTable->m_Function_GetDisplayName = NULL; @@ -438,13 +443,16 @@ Lib3MFResult InitLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable) pWrapperTable->m_ImplicitFunction_AddSelectNode = NULL; pWrapperTable->m_ImplicitFunction_AddClampNode = NULL; pWrapperTable->m_ImplicitFunction_AddComposeVectorNode = NULL; + pWrapperTable->m_ImplicitFunction_AddVectorFromScalarNode = NULL; pWrapperTable->m_ImplicitFunction_AddDecomposeVectorNode = NULL; pWrapperTable->m_ImplicitFunction_AddComposeMatrixNode = NULL; - pWrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode = NULL; + pWrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode = NULL; + pWrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode = NULL; pWrapperTable->m_ImplicitFunction_AddConstantNode = NULL; pWrapperTable->m_ImplicitFunction_AddConstVecNode = NULL; pWrapperTable->m_ImplicitFunction_AddConstMatNode = NULL; pWrapperTable->m_ImplicitFunction_AddMeshNode = NULL; + pWrapperTable->m_ImplicitFunction_AddUnsignedMeshNode = NULL; pWrapperTable->m_ImplicitFunction_AddFunctionCallNode = NULL; pWrapperTable->m_ImplicitFunction_GetNodes = NULL; pWrapperTable->m_ImplicitFunction_RemoveNode = NULL; @@ -3323,6 +3331,24 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, if (pWrapperTable->m_ComposeVectorNode_GetOutputResult == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_VectorFromScalarNode_GetInputA = (PLib3MFVectorFromScalarNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_vectorfromscalarnode_getinputa"); + #else // _WIN32 + pWrapperTable->m_VectorFromScalarNode_GetInputA = (PLib3MFVectorFromScalarNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_vectorfromscalarnode_getinputa"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_VectorFromScalarNode_GetInputA == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_VectorFromScalarNode_GetOutputResult = (PLib3MFVectorFromScalarNode_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_vectorfromscalarnode_getoutputresult"); + #else // _WIN32 + pWrapperTable->m_VectorFromScalarNode_GetOutputResult = (PLib3MFVectorFromScalarNode_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_vectorfromscalarnode_getoutputresult"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_VectorFromScalarNode_GetOutputResult == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_DecomposeVectorNode_GetInputA = (PLib3MFDecomposeVectorNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_decomposevectornode_getinputa"); #else // _WIN32 @@ -3513,93 +3539,93 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputa"); + pWrapperTable->m_MatrixFromRowsNode_GetInputA = (PLib3MFMatrixFromRowsNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getinputa"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputa"); + pWrapperTable->m_MatrixFromRowsNode_GetInputA = (PLib3MFMatrixFromRowsNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getinputa"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA == NULL) + if (pWrapperTable->m_MatrixFromRowsNode_GetInputA == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputb"); + pWrapperTable->m_MatrixFromRowsNode_GetInputB = (PLib3MFMatrixFromRowsNode_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getinputb"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputb"); + pWrapperTable->m_MatrixFromRowsNode_GetInputB = (PLib3MFMatrixFromRowsNode_GetInputBPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getinputb"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB == NULL) + if (pWrapperTable->m_MatrixFromRowsNode_GetInputB == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputc"); + pWrapperTable->m_MatrixFromRowsNode_GetInputC = (PLib3MFMatrixFromRowsNode_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getinputc"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputc"); + pWrapperTable->m_MatrixFromRowsNode_GetInputC = (PLib3MFMatrixFromRowsNode_GetInputCPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getinputc"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC == NULL) + if (pWrapperTable->m_MatrixFromRowsNode_GetInputC == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputd"); + pWrapperTable->m_MatrixFromRowsNode_GetInputD = (PLib3MFMatrixFromRowsNode_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getinputd"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputd"); + pWrapperTable->m_MatrixFromRowsNode_GetInputD = (PLib3MFMatrixFromRowsNode_GetInputDPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getinputd"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD == NULL) + if (pWrapperTable->m_MatrixFromRowsNode_GetInputD == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult = (PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getoutputresult"); + pWrapperTable->m_MatrixFromRowsNode_GetOutputResult = (PLib3MFMatrixFromRowsNode_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getoutputresult"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult = (PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getoutputresult"); + pWrapperTable->m_MatrixFromRowsNode_GetOutputResult = (PLib3MFMatrixFromRowsNode_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getoutputresult"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult == NULL) + if (pWrapperTable->m_MatrixFromRowsNode_GetOutputResult == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = (PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputa"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputA = (PLib3MFMatrixFromColumnsNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputa"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = (PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputa"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputA = (PLib3MFMatrixFromColumnsNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputa"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA == NULL) + if (pWrapperTable->m_MatrixFromColumnsNode_GetInputA == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = (PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputb"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputB = (PLib3MFMatrixFromColumnsNode_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputb"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = (PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputb"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputB = (PLib3MFMatrixFromColumnsNode_GetInputBPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputb"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB == NULL) + if (pWrapperTable->m_MatrixFromColumnsNode_GetInputB == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = (PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputc"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputC = (PLib3MFMatrixFromColumnsNode_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputc"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = (PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputc"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputC = (PLib3MFMatrixFromColumnsNode_GetInputCPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputc"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC == NULL) + if (pWrapperTable->m_MatrixFromColumnsNode_GetInputC == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = (PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputd"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputD = (PLib3MFMatrixFromColumnsNode_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputd"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = (PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputd"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputD = (PLib3MFMatrixFromColumnsNode_GetInputDPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputd"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD == NULL) + if (pWrapperTable->m_MatrixFromColumnsNode_GetInputD == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = (PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getoutputresult"); + pWrapperTable->m_MatrixFromColumnsNode_GetOutputResult = (PLib3MFMatrixFromColumnsNode_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getoutputresult"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = (PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getoutputresult"); + pWrapperTable->m_MatrixFromColumnsNode_GetOutputResult = (PLib3MFMatrixFromColumnsNode_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getoutputresult"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult == NULL) + if (pWrapperTable->m_MatrixFromColumnsNode_GetOutputResult == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 @@ -3710,6 +3736,33 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, if (pWrapperTable->m_MeshNode_GetOutputDistance == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetInputMesh = (PLib3MFUnsignedMeshNode_GetInputMeshPtr) GetProcAddress(hLibrary, "lib3mf_unsignedmeshnode_getinputmesh"); + #else // _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetInputMesh = (PLib3MFUnsignedMeshNode_GetInputMeshPtr) dlsym(hLibrary, "lib3mf_unsignedmeshnode_getinputmesh"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_UnsignedMeshNode_GetInputMesh == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetInputPos = (PLib3MFUnsignedMeshNode_GetInputPosPtr) GetProcAddress(hLibrary, "lib3mf_unsignedmeshnode_getinputpos"); + #else // _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetInputPos = (PLib3MFUnsignedMeshNode_GetInputPosPtr) dlsym(hLibrary, "lib3mf_unsignedmeshnode_getinputpos"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_UnsignedMeshNode_GetInputPos == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetOutputDistance = (PLib3MFUnsignedMeshNode_GetOutputDistancePtr) GetProcAddress(hLibrary, "lib3mf_unsignedmeshnode_getoutputdistance"); + #else // _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetOutputDistance = (PLib3MFUnsignedMeshNode_GetOutputDistancePtr) dlsym(hLibrary, "lib3mf_unsignedmeshnode_getoutputdistance"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_UnsignedMeshNode_GetOutputDistance == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_FunctionCallNode_GetInputFunctionID = (PLib3MFFunctionCallNode_GetInputFunctionIDPtr) GetProcAddress(hLibrary, "lib3mf_functioncallnode_getinputfunctionid"); #else // _WIN32 @@ -4187,6 +4240,15 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, if (pWrapperTable->m_ImplicitFunction_AddComposeVectorNode == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_ImplicitFunction_AddVectorFromScalarNode = (PLib3MFImplicitFunction_AddVectorFromScalarNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addvectorfromscalarnode"); + #else // _WIN32 + pWrapperTable->m_ImplicitFunction_AddVectorFromScalarNode = (PLib3MFImplicitFunction_AddVectorFromScalarNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addvectorfromscalarnode"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ImplicitFunction_AddVectorFromScalarNode == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_ImplicitFunction_AddDecomposeVectorNode = (PLib3MFImplicitFunction_AddDecomposeVectorNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_adddecomposevectornode"); #else // _WIN32 @@ -4206,12 +4268,21 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode = (PLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode"); + pWrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode = (PLib3MFImplicitFunction_AddMatrixFromRowsNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addmatrixfromrowsnode"); #else // _WIN32 - pWrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode = (PLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode"); + pWrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode = (PLib3MFImplicitFunction_AddMatrixFromRowsNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addmatrixfromrowsnode"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode == NULL) + if (pWrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode = (PLib3MFImplicitFunction_AddMatrixFromColumnsNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addmatrixfromcolumnsnode"); + #else // _WIN32 + pWrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode = (PLib3MFImplicitFunction_AddMatrixFromColumnsNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addmatrixfromcolumnsnode"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 @@ -4250,6 +4321,15 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, if (pWrapperTable->m_ImplicitFunction_AddMeshNode == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_ImplicitFunction_AddUnsignedMeshNode = (PLib3MFImplicitFunction_AddUnsignedMeshNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addunsignedmeshnode"); + #else // _WIN32 + pWrapperTable->m_ImplicitFunction_AddUnsignedMeshNode = (PLib3MFImplicitFunction_AddUnsignedMeshNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addunsignedmeshnode"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ImplicitFunction_AddUnsignedMeshNode == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_ImplicitFunction_AddFunctionCallNode = (PLib3MFImplicitFunction_AddFunctionCallNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addfunctioncallnode"); #else // _WIN32 diff --git a/Autogenerated/Bindings/Go/lib3mf_dynamic.h b/Autogenerated/Bindings/Go/lib3mf_dynamic.h index d48fed69c..061af9888 100644 --- a/Autogenerated/Bindings/Go/lib3mf_dynamic.h +++ b/Autogenerated/Bindings/Go/lib3mf_dynamic.h @@ -3226,6 +3226,28 @@ typedef Lib3MFResult (*PLib3MFComposeVectorNode_GetInputZPtr) (Lib3MF_ComposeVec */ typedef Lib3MFResult (*PLib3MFComposeVectorNode_GetOutputResultPtr) (Lib3MF_ComposeVectorNode pComposeVectorNode, Lib3MF_ImplicitPort * pResult); +/************************************************************************************************************************* + Class definition for VectorFromScalarNode +**************************************************************************************************************************/ + +/** +* Retrieves the input +* +* @param[in] pVectorFromScalarNode - VectorFromScalarNode instance. +* @param[out] pA - the input for the x component +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFVectorFromScalarNode_GetInputAPtr) (Lib3MF_VectorFromScalarNode pVectorFromScalarNode, Lib3MF_ImplicitPort * pA); + +/** +* Retrieves the output +* +* @param[in] pVectorFromScalarNode - VectorFromScalarNode instance. +* @param[out] pResult - the output +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFVectorFromScalarNode_GetOutputResultPtr) (Lib3MF_VectorFromScalarNode pVectorFromScalarNode, Lib3MF_ImplicitPort * pResult); + /************************************************************************************************************************* Class definition for DecomposeVectorNode **************************************************************************************************************************/ @@ -3424,102 +3446,102 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM33Ptr) (Lib3MF_ComposeM typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetOutputResultPtr) (Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* - Class definition for ComposeMatrixFromRowVectorsNode + Class definition for MatrixFromRowsNode **************************************************************************************************************************/ /** * Retrieves the input for the first row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow0 - the input for the first row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetInputAPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow0); /** * Retrieves the input for the second row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow1 - the input for the second row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetInputBPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow1); /** * Retrieves the input for the third row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow2 - the input for the third row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetInputCPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow2); /** * Retrieves the input for the fourth row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow3 - the input for the fourth row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetInputDPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow3); /** * Retrieves the output * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pResult - the output * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pResult); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetOutputResultPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* - Class definition for ComposeMatrixFromColumnVectors + Class definition for MatrixFromColumnsNode **************************************************************************************************************************/ /** * Retrieves the input for the first column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn0 - the input for the first column * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn0); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetInputAPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn0); /** * Retrieves the input for the second column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn1 - the input for the second column * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn1); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetInputBPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn1); /** * Retrieves the input for the third column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn2 - the input for the third column * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn2); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetInputCPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn2); /** * Retrieves the input for the fourth column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn3 - the input for the fourth column * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn3); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetInputDPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn3); /** * Retrieves the output * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pResult - the output * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pResult); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetOutputResultPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* Class definition for ConstantNode @@ -3645,6 +3667,37 @@ typedef Lib3MFResult (*PLib3MFMeshNode_GetInputPosPtr) (Lib3MF_MeshNode pMeshNod */ typedef Lib3MFResult (*PLib3MFMeshNode_GetOutputDistancePtr) (Lib3MF_MeshNode pMeshNode, Lib3MF_ImplicitPort * pDistance); +/************************************************************************************************************************* + Class definition for UnsignedMeshNode +**************************************************************************************************************************/ + +/** +* Retrieves the input for the model resource id of the mesh +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pMesh - the input port for the model resource id of the mesh +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFUnsignedMeshNode_GetInputMeshPtr) (Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pMesh); + +/** +* Retrieves the input for the position +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pPos - the input port for the position +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFUnsignedMeshNode_GetInputPosPtr) (Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pPos); + +/** +* Retrieves the output +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pDistance - the output port for the unsigned distance to the mesh +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFUnsignedMeshNode_GetOutputDistancePtr) (Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pDistance); + /************************************************************************************************************************* Class definition for FunctionCallNode **************************************************************************************************************************/ @@ -4300,6 +4353,18 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddClampNodePtr) (Lib3MF_Implicit */ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddComposeVectorNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeVectorNode * pNode); +/** +* Add a VectorFromScalar +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddVectorFromScalarNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_VectorFromScalarNode * pNode); + /** * Add a DecomposeVectorNode * @@ -4325,7 +4390,19 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddDecomposeVectorNodePtr) (Lib3M typedef Lib3MFResult (*PLib3MFImplicitFunction_AddComposeMatrixNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeMatrixNode * pNode); /** -* Add a ComposeMatrixFromRowVectorsNode +* Add a MatrixFromRowsNode +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddMatrixFromRowsNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MatrixFromRowsNode * pNode); + +/** +* Add a MatrixFromColumnsNode * * @param[in] pImplicitFunction - ImplicitFunction instance. * @param[in] pIdentifier - the identifier of the node @@ -4334,7 +4411,7 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddComposeMatrixNodePtr) (Lib3MF_ * @param[out] pNode - the added node * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeMatrixFromRowVectorsNode * pNode); +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddMatrixFromColumnsNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MatrixFromColumnsNode * pNode); /** * Add a ConstantNode @@ -4384,6 +4461,18 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddConstMatNodePtr) (Lib3MF_Impli */ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddMeshNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MeshNode * pNode); +/** +* Add a UnsignedMeshNode +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddUnsignedMeshNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_UnsignedMeshNode * pNode); + /** * Add a FunctionCallNode * @@ -6467,6 +6556,8 @@ typedef struct { PLib3MFComposeVectorNode_GetInputYPtr m_ComposeVectorNode_GetInputY; PLib3MFComposeVectorNode_GetInputZPtr m_ComposeVectorNode_GetInputZ; PLib3MFComposeVectorNode_GetOutputResultPtr m_ComposeVectorNode_GetOutputResult; + PLib3MFVectorFromScalarNode_GetInputAPtr m_VectorFromScalarNode_GetInputA; + PLib3MFVectorFromScalarNode_GetOutputResultPtr m_VectorFromScalarNode_GetOutputResult; PLib3MFDecomposeVectorNode_GetInputAPtr m_DecomposeVectorNode_GetInputA; PLib3MFDecomposeVectorNode_GetOutputXPtr m_DecomposeVectorNode_GetOutputX; PLib3MFDecomposeVectorNode_GetOutputYPtr m_DecomposeVectorNode_GetOutputY; @@ -6488,16 +6579,16 @@ typedef struct { PLib3MFComposeMatrixNode_GetInputM32Ptr m_ComposeMatrixNode_GetInputM32; PLib3MFComposeMatrixNode_GetInputM33Ptr m_ComposeMatrixNode_GetInputM33; PLib3MFComposeMatrixNode_GetOutputResultPtr m_ComposeMatrixNode_GetOutputResult; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr m_ComposeMatrixFromRowVectorsNode_GetInputA; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr m_ComposeMatrixFromRowVectorsNode_GetInputB; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr m_ComposeMatrixFromRowVectorsNode_GetInputC; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr m_ComposeMatrixFromRowVectorsNode_GetInputD; - PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr m_ComposeMatrixFromRowVectorsNode_GetOutputResult; - PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr m_ComposeMatrixFromColumnVectors_GetInputA; - PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr m_ComposeMatrixFromColumnVectors_GetInputB; - PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr m_ComposeMatrixFromColumnVectors_GetInputC; - PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr m_ComposeMatrixFromColumnVectors_GetInputD; - PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr m_ComposeMatrixFromColumnVectors_GetOutputResult; + PLib3MFMatrixFromRowsNode_GetInputAPtr m_MatrixFromRowsNode_GetInputA; + PLib3MFMatrixFromRowsNode_GetInputBPtr m_MatrixFromRowsNode_GetInputB; + PLib3MFMatrixFromRowsNode_GetInputCPtr m_MatrixFromRowsNode_GetInputC; + PLib3MFMatrixFromRowsNode_GetInputDPtr m_MatrixFromRowsNode_GetInputD; + PLib3MFMatrixFromRowsNode_GetOutputResultPtr m_MatrixFromRowsNode_GetOutputResult; + PLib3MFMatrixFromColumnsNode_GetInputAPtr m_MatrixFromColumnsNode_GetInputA; + PLib3MFMatrixFromColumnsNode_GetInputBPtr m_MatrixFromColumnsNode_GetInputB; + PLib3MFMatrixFromColumnsNode_GetInputCPtr m_MatrixFromColumnsNode_GetInputC; + PLib3MFMatrixFromColumnsNode_GetInputDPtr m_MatrixFromColumnsNode_GetInputD; + PLib3MFMatrixFromColumnsNode_GetOutputResultPtr m_MatrixFromColumnsNode_GetOutputResult; PLib3MFConstantNode_SetConstantPtr m_ConstantNode_SetConstant; PLib3MFConstantNode_GetConstantPtr m_ConstantNode_GetConstant; PLib3MFConstantNode_GetOutputValuePtr m_ConstantNode_GetOutputValue; @@ -6510,6 +6601,9 @@ typedef struct { PLib3MFMeshNode_GetInputMeshPtr m_MeshNode_GetInputMesh; PLib3MFMeshNode_GetInputPosPtr m_MeshNode_GetInputPos; PLib3MFMeshNode_GetOutputDistancePtr m_MeshNode_GetOutputDistance; + PLib3MFUnsignedMeshNode_GetInputMeshPtr m_UnsignedMeshNode_GetInputMesh; + PLib3MFUnsignedMeshNode_GetInputPosPtr m_UnsignedMeshNode_GetInputPos; + PLib3MFUnsignedMeshNode_GetOutputDistancePtr m_UnsignedMeshNode_GetOutputDistance; PLib3MFFunctionCallNode_GetInputFunctionIDPtr m_FunctionCallNode_GetInputFunctionID; PLib3MFNodeIterator_GetCurrentPtr m_NodeIterator_GetCurrent; PLib3MFFunction_GetDisplayNamePtr m_Function_GetDisplayName; @@ -6563,13 +6657,16 @@ typedef struct { PLib3MFImplicitFunction_AddSelectNodePtr m_ImplicitFunction_AddSelectNode; PLib3MFImplicitFunction_AddClampNodePtr m_ImplicitFunction_AddClampNode; PLib3MFImplicitFunction_AddComposeVectorNodePtr m_ImplicitFunction_AddComposeVectorNode; + PLib3MFImplicitFunction_AddVectorFromScalarNodePtr m_ImplicitFunction_AddVectorFromScalarNode; PLib3MFImplicitFunction_AddDecomposeVectorNodePtr m_ImplicitFunction_AddDecomposeVectorNode; PLib3MFImplicitFunction_AddComposeMatrixNodePtr m_ImplicitFunction_AddComposeMatrixNode; - PLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodePtr m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode; + PLib3MFImplicitFunction_AddMatrixFromRowsNodePtr m_ImplicitFunction_AddMatrixFromRowsNode; + PLib3MFImplicitFunction_AddMatrixFromColumnsNodePtr m_ImplicitFunction_AddMatrixFromColumnsNode; PLib3MFImplicitFunction_AddConstantNodePtr m_ImplicitFunction_AddConstantNode; PLib3MFImplicitFunction_AddConstVecNodePtr m_ImplicitFunction_AddConstVecNode; PLib3MFImplicitFunction_AddConstMatNodePtr m_ImplicitFunction_AddConstMatNode; PLib3MFImplicitFunction_AddMeshNodePtr m_ImplicitFunction_AddMeshNode; + PLib3MFImplicitFunction_AddUnsignedMeshNodePtr m_ImplicitFunction_AddUnsignedMeshNode; PLib3MFImplicitFunction_AddFunctionCallNodePtr m_ImplicitFunction_AddFunctionCallNode; PLib3MFImplicitFunction_GetNodesPtr m_ImplicitFunction_GetNodes; PLib3MFImplicitFunction_RemoveNodePtr m_ImplicitFunction_RemoveNode; diff --git a/Autogenerated/Bindings/Go/lib3mf_types.h b/Autogenerated/Bindings/Go/lib3mf_types.h index a43ce9619..ca186c77a 100644 --- a/Autogenerated/Bindings/Go/lib3mf_types.h +++ b/Autogenerated/Bindings/Go/lib3mf_types.h @@ -291,14 +291,16 @@ typedef Lib3MFHandle Lib3MF_PowNode; typedef Lib3MFHandle Lib3MF_SelectNode; typedef Lib3MFHandle Lib3MF_ClampNode; typedef Lib3MFHandle Lib3MF_ComposeVectorNode; +typedef Lib3MFHandle Lib3MF_VectorFromScalarNode; typedef Lib3MFHandle Lib3MF_DecomposeVectorNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixNode; -typedef Lib3MFHandle Lib3MF_ComposeMatrixFromRowVectorsNode; -typedef Lib3MFHandle Lib3MF_ComposeMatrixFromColumnVectors; +typedef Lib3MFHandle Lib3MF_MatrixFromRowsNode; +typedef Lib3MFHandle Lib3MF_MatrixFromColumnsNode; typedef Lib3MFHandle Lib3MF_ConstantNode; typedef Lib3MFHandle Lib3MF_ConstVecNode; typedef Lib3MFHandle Lib3MF_ConstMatNode; typedef Lib3MFHandle Lib3MF_MeshNode; +typedef Lib3MFHandle Lib3MF_UnsignedMeshNode; typedef Lib3MFHandle Lib3MF_FunctionCallNode; typedef Lib3MFHandle Lib3MF_NodeIterator; typedef Lib3MFHandle Lib3MF_Function; @@ -454,8 +456,8 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeComposeVector = 8, /** Creates a vector from three scalar values */ eImplicitNodeTypeDecomposeVector = 9, /** Decomposes a vector into three scalar values */ eImplicitNodeTypeComposeMatrix = 10, /** Creates a matrix from nine scalar values */ - eImplicitNodeTypeComposeMatrixFromColumnVectors = 11, /** Creates a matrix from three column vector values */ - eImplicitNodeTypeComposeMatrixFromRowVectors = 12, /** Creates a matrix from three row vector values */ + eImplicitNodeTypeMatrixFromColumns = 11, /** Creates a matrix from three column vector values */ + eImplicitNodeTypeMatrixFromRows = 12, /** Creates a matrix from three row vector values */ eImplicitNodeTypeDot = 13, /** Calculates the dot product of two vector values */ eImplicitNodeTypeCross = 14, /** Calculates the cross product of two vector values */ eImplicitNodeTypeMatVecMultiplication = 15, /** Multiplies a matrix with a vector */ @@ -491,7 +493,9 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeFunctionCall = 45, /** Calls a function */ eImplicitNodeTypeMesh = 46, /** Calculates the signed distance to a mesh */ eImplicitNodeTypeLength = 47, /** Calculates the length of a vector */ - eImplicitNodeTypeResource = 48 /** Selects a resource (function, mesh etc.) */ + eImplicitNodeTypeResource = 48, /** Selects a resource (function, mesh etc.) */ + eImplicitNodeTypeVectorFromScalar = 49, /** Creates a vector from one scalar values */ + eImplicitNodeTypeUnsignedMesh = 50 /** Calculates the unsigned distance to a mesh */ } eLib3MFImplicitNodeType; /** diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.cc b/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.cc index faff3f8bc..c22fb1f38 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.cc +++ b/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.cc @@ -342,6 +342,8 @@ Lib3MFResult InitLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable) pWrapperTable->m_ComposeVectorNode_GetInputY = NULL; pWrapperTable->m_ComposeVectorNode_GetInputZ = NULL; pWrapperTable->m_ComposeVectorNode_GetOutputResult = NULL; + pWrapperTable->m_VectorFromScalarNode_GetInputA = NULL; + pWrapperTable->m_VectorFromScalarNode_GetOutputResult = NULL; pWrapperTable->m_DecomposeVectorNode_GetInputA = NULL; pWrapperTable->m_DecomposeVectorNode_GetOutputX = NULL; pWrapperTable->m_DecomposeVectorNode_GetOutputY = NULL; @@ -363,16 +365,16 @@ Lib3MFResult InitLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable) pWrapperTable->m_ComposeMatrixNode_GetInputM32 = NULL; pWrapperTable->m_ComposeMatrixNode_GetInputM33 = NULL; pWrapperTable->m_ComposeMatrixNode_GetOutputResult = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult = NULL; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = NULL; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = NULL; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = NULL; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = NULL; - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = NULL; + pWrapperTable->m_MatrixFromRowsNode_GetInputA = NULL; + pWrapperTable->m_MatrixFromRowsNode_GetInputB = NULL; + pWrapperTable->m_MatrixFromRowsNode_GetInputC = NULL; + pWrapperTable->m_MatrixFromRowsNode_GetInputD = NULL; + pWrapperTable->m_MatrixFromRowsNode_GetOutputResult = NULL; + pWrapperTable->m_MatrixFromColumnsNode_GetInputA = NULL; + pWrapperTable->m_MatrixFromColumnsNode_GetInputB = NULL; + pWrapperTable->m_MatrixFromColumnsNode_GetInputC = NULL; + pWrapperTable->m_MatrixFromColumnsNode_GetInputD = NULL; + pWrapperTable->m_MatrixFromColumnsNode_GetOutputResult = NULL; pWrapperTable->m_ConstantNode_SetConstant = NULL; pWrapperTable->m_ConstantNode_GetConstant = NULL; pWrapperTable->m_ConstantNode_GetOutputValue = NULL; @@ -385,6 +387,9 @@ Lib3MFResult InitLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable) pWrapperTable->m_MeshNode_GetInputMesh = NULL; pWrapperTable->m_MeshNode_GetInputPos = NULL; pWrapperTable->m_MeshNode_GetOutputDistance = NULL; + pWrapperTable->m_UnsignedMeshNode_GetInputMesh = NULL; + pWrapperTable->m_UnsignedMeshNode_GetInputPos = NULL; + pWrapperTable->m_UnsignedMeshNode_GetOutputDistance = NULL; pWrapperTable->m_FunctionCallNode_GetInputFunctionID = NULL; pWrapperTable->m_NodeIterator_GetCurrent = NULL; pWrapperTable->m_Function_GetDisplayName = NULL; @@ -438,13 +443,16 @@ Lib3MFResult InitLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable) pWrapperTable->m_ImplicitFunction_AddSelectNode = NULL; pWrapperTable->m_ImplicitFunction_AddClampNode = NULL; pWrapperTable->m_ImplicitFunction_AddComposeVectorNode = NULL; + pWrapperTable->m_ImplicitFunction_AddVectorFromScalarNode = NULL; pWrapperTable->m_ImplicitFunction_AddDecomposeVectorNode = NULL; pWrapperTable->m_ImplicitFunction_AddComposeMatrixNode = NULL; - pWrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode = NULL; + pWrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode = NULL; + pWrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode = NULL; pWrapperTable->m_ImplicitFunction_AddConstantNode = NULL; pWrapperTable->m_ImplicitFunction_AddConstVecNode = NULL; pWrapperTable->m_ImplicitFunction_AddConstMatNode = NULL; pWrapperTable->m_ImplicitFunction_AddMeshNode = NULL; + pWrapperTable->m_ImplicitFunction_AddUnsignedMeshNode = NULL; pWrapperTable->m_ImplicitFunction_AddFunctionCallNode = NULL; pWrapperTable->m_ImplicitFunction_GetNodes = NULL; pWrapperTable->m_ImplicitFunction_RemoveNode = NULL; @@ -3323,6 +3331,24 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, if (pWrapperTable->m_ComposeVectorNode_GetOutputResult == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_VectorFromScalarNode_GetInputA = (PLib3MFVectorFromScalarNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_vectorfromscalarnode_getinputa"); + #else // _WIN32 + pWrapperTable->m_VectorFromScalarNode_GetInputA = (PLib3MFVectorFromScalarNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_vectorfromscalarnode_getinputa"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_VectorFromScalarNode_GetInputA == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_VectorFromScalarNode_GetOutputResult = (PLib3MFVectorFromScalarNode_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_vectorfromscalarnode_getoutputresult"); + #else // _WIN32 + pWrapperTable->m_VectorFromScalarNode_GetOutputResult = (PLib3MFVectorFromScalarNode_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_vectorfromscalarnode_getoutputresult"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_VectorFromScalarNode_GetOutputResult == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_DecomposeVectorNode_GetInputA = (PLib3MFDecomposeVectorNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_decomposevectornode_getinputa"); #else // _WIN32 @@ -3513,93 +3539,93 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputa"); + pWrapperTable->m_MatrixFromRowsNode_GetInputA = (PLib3MFMatrixFromRowsNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getinputa"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputa"); + pWrapperTable->m_MatrixFromRowsNode_GetInputA = (PLib3MFMatrixFromRowsNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getinputa"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA == NULL) + if (pWrapperTable->m_MatrixFromRowsNode_GetInputA == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputb"); + pWrapperTable->m_MatrixFromRowsNode_GetInputB = (PLib3MFMatrixFromRowsNode_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getinputb"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputb"); + pWrapperTable->m_MatrixFromRowsNode_GetInputB = (PLib3MFMatrixFromRowsNode_GetInputBPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getinputb"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB == NULL) + if (pWrapperTable->m_MatrixFromRowsNode_GetInputB == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputc"); + pWrapperTable->m_MatrixFromRowsNode_GetInputC = (PLib3MFMatrixFromRowsNode_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getinputc"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputc"); + pWrapperTable->m_MatrixFromRowsNode_GetInputC = (PLib3MFMatrixFromRowsNode_GetInputCPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getinputc"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC == NULL) + if (pWrapperTable->m_MatrixFromRowsNode_GetInputC == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputd"); + pWrapperTable->m_MatrixFromRowsNode_GetInputD = (PLib3MFMatrixFromRowsNode_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getinputd"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputd"); + pWrapperTable->m_MatrixFromRowsNode_GetInputD = (PLib3MFMatrixFromRowsNode_GetInputDPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getinputd"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD == NULL) + if (pWrapperTable->m_MatrixFromRowsNode_GetInputD == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult = (PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getoutputresult"); + pWrapperTable->m_MatrixFromRowsNode_GetOutputResult = (PLib3MFMatrixFromRowsNode_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromrowsnode_getoutputresult"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult = (PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getoutputresult"); + pWrapperTable->m_MatrixFromRowsNode_GetOutputResult = (PLib3MFMatrixFromRowsNode_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_matrixfromrowsnode_getoutputresult"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult == NULL) + if (pWrapperTable->m_MatrixFromRowsNode_GetOutputResult == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = (PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputa"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputA = (PLib3MFMatrixFromColumnsNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputa"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = (PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputa"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputA = (PLib3MFMatrixFromColumnsNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputa"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA == NULL) + if (pWrapperTable->m_MatrixFromColumnsNode_GetInputA == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = (PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputb"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputB = (PLib3MFMatrixFromColumnsNode_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputb"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = (PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputb"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputB = (PLib3MFMatrixFromColumnsNode_GetInputBPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputb"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB == NULL) + if (pWrapperTable->m_MatrixFromColumnsNode_GetInputB == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = (PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputc"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputC = (PLib3MFMatrixFromColumnsNode_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputc"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = (PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputc"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputC = (PLib3MFMatrixFromColumnsNode_GetInputCPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputc"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC == NULL) + if (pWrapperTable->m_MatrixFromColumnsNode_GetInputC == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = (PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputd"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputD = (PLib3MFMatrixFromColumnsNode_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputd"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = (PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputd"); + pWrapperTable->m_MatrixFromColumnsNode_GetInputD = (PLib3MFMatrixFromColumnsNode_GetInputDPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getinputd"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD == NULL) + if (pWrapperTable->m_MatrixFromColumnsNode_GetInputD == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = (PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getoutputresult"); + pWrapperTable->m_MatrixFromColumnsNode_GetOutputResult = (PLib3MFMatrixFromColumnsNode_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_matrixfromcolumnsnode_getoutputresult"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = (PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getoutputresult"); + pWrapperTable->m_MatrixFromColumnsNode_GetOutputResult = (PLib3MFMatrixFromColumnsNode_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_matrixfromcolumnsnode_getoutputresult"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult == NULL) + if (pWrapperTable->m_MatrixFromColumnsNode_GetOutputResult == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 @@ -3710,6 +3736,33 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, if (pWrapperTable->m_MeshNode_GetOutputDistance == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetInputMesh = (PLib3MFUnsignedMeshNode_GetInputMeshPtr) GetProcAddress(hLibrary, "lib3mf_unsignedmeshnode_getinputmesh"); + #else // _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetInputMesh = (PLib3MFUnsignedMeshNode_GetInputMeshPtr) dlsym(hLibrary, "lib3mf_unsignedmeshnode_getinputmesh"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_UnsignedMeshNode_GetInputMesh == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetInputPos = (PLib3MFUnsignedMeshNode_GetInputPosPtr) GetProcAddress(hLibrary, "lib3mf_unsignedmeshnode_getinputpos"); + #else // _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetInputPos = (PLib3MFUnsignedMeshNode_GetInputPosPtr) dlsym(hLibrary, "lib3mf_unsignedmeshnode_getinputpos"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_UnsignedMeshNode_GetInputPos == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetOutputDistance = (PLib3MFUnsignedMeshNode_GetOutputDistancePtr) GetProcAddress(hLibrary, "lib3mf_unsignedmeshnode_getoutputdistance"); + #else // _WIN32 + pWrapperTable->m_UnsignedMeshNode_GetOutputDistance = (PLib3MFUnsignedMeshNode_GetOutputDistancePtr) dlsym(hLibrary, "lib3mf_unsignedmeshnode_getoutputdistance"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_UnsignedMeshNode_GetOutputDistance == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_FunctionCallNode_GetInputFunctionID = (PLib3MFFunctionCallNode_GetInputFunctionIDPtr) GetProcAddress(hLibrary, "lib3mf_functioncallnode_getinputfunctionid"); #else // _WIN32 @@ -4187,6 +4240,15 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, if (pWrapperTable->m_ImplicitFunction_AddComposeVectorNode == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_ImplicitFunction_AddVectorFromScalarNode = (PLib3MFImplicitFunction_AddVectorFromScalarNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addvectorfromscalarnode"); + #else // _WIN32 + pWrapperTable->m_ImplicitFunction_AddVectorFromScalarNode = (PLib3MFImplicitFunction_AddVectorFromScalarNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addvectorfromscalarnode"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ImplicitFunction_AddVectorFromScalarNode == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_ImplicitFunction_AddDecomposeVectorNode = (PLib3MFImplicitFunction_AddDecomposeVectorNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_adddecomposevectornode"); #else // _WIN32 @@ -4206,12 +4268,21 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode = (PLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode"); + pWrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode = (PLib3MFImplicitFunction_AddMatrixFromRowsNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addmatrixfromrowsnode"); #else // _WIN32 - pWrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode = (PLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode"); + pWrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode = (PLib3MFImplicitFunction_AddMatrixFromRowsNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addmatrixfromrowsnode"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode == NULL) + if (pWrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode = (PLib3MFImplicitFunction_AddMatrixFromColumnsNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addmatrixfromcolumnsnode"); + #else // _WIN32 + pWrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode = (PLib3MFImplicitFunction_AddMatrixFromColumnsNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addmatrixfromcolumnsnode"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 @@ -4250,6 +4321,15 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, if (pWrapperTable->m_ImplicitFunction_AddMeshNode == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_ImplicitFunction_AddUnsignedMeshNode = (PLib3MFImplicitFunction_AddUnsignedMeshNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addunsignedmeshnode"); + #else // _WIN32 + pWrapperTable->m_ImplicitFunction_AddUnsignedMeshNode = (PLib3MFImplicitFunction_AddUnsignedMeshNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addunsignedmeshnode"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ImplicitFunction_AddUnsignedMeshNode == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_ImplicitFunction_AddFunctionCallNode = (PLib3MFImplicitFunction_AddFunctionCallNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addfunctioncallnode"); #else // _WIN32 diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.h b/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.h index d48fed69c..061af9888 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.h +++ b/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.h @@ -3226,6 +3226,28 @@ typedef Lib3MFResult (*PLib3MFComposeVectorNode_GetInputZPtr) (Lib3MF_ComposeVec */ typedef Lib3MFResult (*PLib3MFComposeVectorNode_GetOutputResultPtr) (Lib3MF_ComposeVectorNode pComposeVectorNode, Lib3MF_ImplicitPort * pResult); +/************************************************************************************************************************* + Class definition for VectorFromScalarNode +**************************************************************************************************************************/ + +/** +* Retrieves the input +* +* @param[in] pVectorFromScalarNode - VectorFromScalarNode instance. +* @param[out] pA - the input for the x component +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFVectorFromScalarNode_GetInputAPtr) (Lib3MF_VectorFromScalarNode pVectorFromScalarNode, Lib3MF_ImplicitPort * pA); + +/** +* Retrieves the output +* +* @param[in] pVectorFromScalarNode - VectorFromScalarNode instance. +* @param[out] pResult - the output +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFVectorFromScalarNode_GetOutputResultPtr) (Lib3MF_VectorFromScalarNode pVectorFromScalarNode, Lib3MF_ImplicitPort * pResult); + /************************************************************************************************************************* Class definition for DecomposeVectorNode **************************************************************************************************************************/ @@ -3424,102 +3446,102 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM33Ptr) (Lib3MF_ComposeM typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetOutputResultPtr) (Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* - Class definition for ComposeMatrixFromRowVectorsNode + Class definition for MatrixFromRowsNode **************************************************************************************************************************/ /** * Retrieves the input for the first row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow0 - the input for the first row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetInputAPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow0); /** * Retrieves the input for the second row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow1 - the input for the second row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetInputBPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow1); /** * Retrieves the input for the third row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow2 - the input for the third row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetInputCPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow2); /** * Retrieves the input for the fourth row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow3 - the input for the fourth row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetInputDPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow3); /** * Retrieves the output * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pResult - the output * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pResult); +typedef Lib3MFResult (*PLib3MFMatrixFromRowsNode_GetOutputResultPtr) (Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* - Class definition for ComposeMatrixFromColumnVectors + Class definition for MatrixFromColumnsNode **************************************************************************************************************************/ /** * Retrieves the input for the first column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn0 - the input for the first column * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn0); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetInputAPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn0); /** * Retrieves the input for the second column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn1 - the input for the second column * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn1); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetInputBPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn1); /** * Retrieves the input for the third column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn2 - the input for the third column * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn2); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetInputCPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn2); /** * Retrieves the input for the fourth column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn3 - the input for the fourth column * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn3); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetInputDPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn3); /** * Retrieves the output * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pResult - the output * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pResult); +typedef Lib3MFResult (*PLib3MFMatrixFromColumnsNode_GetOutputResultPtr) (Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* Class definition for ConstantNode @@ -3645,6 +3667,37 @@ typedef Lib3MFResult (*PLib3MFMeshNode_GetInputPosPtr) (Lib3MF_MeshNode pMeshNod */ typedef Lib3MFResult (*PLib3MFMeshNode_GetOutputDistancePtr) (Lib3MF_MeshNode pMeshNode, Lib3MF_ImplicitPort * pDistance); +/************************************************************************************************************************* + Class definition for UnsignedMeshNode +**************************************************************************************************************************/ + +/** +* Retrieves the input for the model resource id of the mesh +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pMesh - the input port for the model resource id of the mesh +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFUnsignedMeshNode_GetInputMeshPtr) (Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pMesh); + +/** +* Retrieves the input for the position +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pPos - the input port for the position +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFUnsignedMeshNode_GetInputPosPtr) (Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pPos); + +/** +* Retrieves the output +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pDistance - the output port for the unsigned distance to the mesh +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFUnsignedMeshNode_GetOutputDistancePtr) (Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pDistance); + /************************************************************************************************************************* Class definition for FunctionCallNode **************************************************************************************************************************/ @@ -4300,6 +4353,18 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddClampNodePtr) (Lib3MF_Implicit */ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddComposeVectorNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeVectorNode * pNode); +/** +* Add a VectorFromScalar +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddVectorFromScalarNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_VectorFromScalarNode * pNode); + /** * Add a DecomposeVectorNode * @@ -4325,7 +4390,19 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddDecomposeVectorNodePtr) (Lib3M typedef Lib3MFResult (*PLib3MFImplicitFunction_AddComposeMatrixNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeMatrixNode * pNode); /** -* Add a ComposeMatrixFromRowVectorsNode +* Add a MatrixFromRowsNode +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddMatrixFromRowsNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MatrixFromRowsNode * pNode); + +/** +* Add a MatrixFromColumnsNode * * @param[in] pImplicitFunction - ImplicitFunction instance. * @param[in] pIdentifier - the identifier of the node @@ -4334,7 +4411,7 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddComposeMatrixNodePtr) (Lib3MF_ * @param[out] pNode - the added node * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeMatrixFromRowVectorsNode * pNode); +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddMatrixFromColumnsNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MatrixFromColumnsNode * pNode); /** * Add a ConstantNode @@ -4384,6 +4461,18 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddConstMatNodePtr) (Lib3MF_Impli */ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddMeshNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MeshNode * pNode); +/** +* Add a UnsignedMeshNode +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddUnsignedMeshNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_UnsignedMeshNode * pNode); + /** * Add a FunctionCallNode * @@ -6467,6 +6556,8 @@ typedef struct { PLib3MFComposeVectorNode_GetInputYPtr m_ComposeVectorNode_GetInputY; PLib3MFComposeVectorNode_GetInputZPtr m_ComposeVectorNode_GetInputZ; PLib3MFComposeVectorNode_GetOutputResultPtr m_ComposeVectorNode_GetOutputResult; + PLib3MFVectorFromScalarNode_GetInputAPtr m_VectorFromScalarNode_GetInputA; + PLib3MFVectorFromScalarNode_GetOutputResultPtr m_VectorFromScalarNode_GetOutputResult; PLib3MFDecomposeVectorNode_GetInputAPtr m_DecomposeVectorNode_GetInputA; PLib3MFDecomposeVectorNode_GetOutputXPtr m_DecomposeVectorNode_GetOutputX; PLib3MFDecomposeVectorNode_GetOutputYPtr m_DecomposeVectorNode_GetOutputY; @@ -6488,16 +6579,16 @@ typedef struct { PLib3MFComposeMatrixNode_GetInputM32Ptr m_ComposeMatrixNode_GetInputM32; PLib3MFComposeMatrixNode_GetInputM33Ptr m_ComposeMatrixNode_GetInputM33; PLib3MFComposeMatrixNode_GetOutputResultPtr m_ComposeMatrixNode_GetOutputResult; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr m_ComposeMatrixFromRowVectorsNode_GetInputA; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr m_ComposeMatrixFromRowVectorsNode_GetInputB; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr m_ComposeMatrixFromRowVectorsNode_GetInputC; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr m_ComposeMatrixFromRowVectorsNode_GetInputD; - PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr m_ComposeMatrixFromRowVectorsNode_GetOutputResult; - PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr m_ComposeMatrixFromColumnVectors_GetInputA; - PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr m_ComposeMatrixFromColumnVectors_GetInputB; - PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr m_ComposeMatrixFromColumnVectors_GetInputC; - PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr m_ComposeMatrixFromColumnVectors_GetInputD; - PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr m_ComposeMatrixFromColumnVectors_GetOutputResult; + PLib3MFMatrixFromRowsNode_GetInputAPtr m_MatrixFromRowsNode_GetInputA; + PLib3MFMatrixFromRowsNode_GetInputBPtr m_MatrixFromRowsNode_GetInputB; + PLib3MFMatrixFromRowsNode_GetInputCPtr m_MatrixFromRowsNode_GetInputC; + PLib3MFMatrixFromRowsNode_GetInputDPtr m_MatrixFromRowsNode_GetInputD; + PLib3MFMatrixFromRowsNode_GetOutputResultPtr m_MatrixFromRowsNode_GetOutputResult; + PLib3MFMatrixFromColumnsNode_GetInputAPtr m_MatrixFromColumnsNode_GetInputA; + PLib3MFMatrixFromColumnsNode_GetInputBPtr m_MatrixFromColumnsNode_GetInputB; + PLib3MFMatrixFromColumnsNode_GetInputCPtr m_MatrixFromColumnsNode_GetInputC; + PLib3MFMatrixFromColumnsNode_GetInputDPtr m_MatrixFromColumnsNode_GetInputD; + PLib3MFMatrixFromColumnsNode_GetOutputResultPtr m_MatrixFromColumnsNode_GetOutputResult; PLib3MFConstantNode_SetConstantPtr m_ConstantNode_SetConstant; PLib3MFConstantNode_GetConstantPtr m_ConstantNode_GetConstant; PLib3MFConstantNode_GetOutputValuePtr m_ConstantNode_GetOutputValue; @@ -6510,6 +6601,9 @@ typedef struct { PLib3MFMeshNode_GetInputMeshPtr m_MeshNode_GetInputMesh; PLib3MFMeshNode_GetInputPosPtr m_MeshNode_GetInputPos; PLib3MFMeshNode_GetOutputDistancePtr m_MeshNode_GetOutputDistance; + PLib3MFUnsignedMeshNode_GetInputMeshPtr m_UnsignedMeshNode_GetInputMesh; + PLib3MFUnsignedMeshNode_GetInputPosPtr m_UnsignedMeshNode_GetInputPos; + PLib3MFUnsignedMeshNode_GetOutputDistancePtr m_UnsignedMeshNode_GetOutputDistance; PLib3MFFunctionCallNode_GetInputFunctionIDPtr m_FunctionCallNode_GetInputFunctionID; PLib3MFNodeIterator_GetCurrentPtr m_NodeIterator_GetCurrent; PLib3MFFunction_GetDisplayNamePtr m_Function_GetDisplayName; @@ -6563,13 +6657,16 @@ typedef struct { PLib3MFImplicitFunction_AddSelectNodePtr m_ImplicitFunction_AddSelectNode; PLib3MFImplicitFunction_AddClampNodePtr m_ImplicitFunction_AddClampNode; PLib3MFImplicitFunction_AddComposeVectorNodePtr m_ImplicitFunction_AddComposeVectorNode; + PLib3MFImplicitFunction_AddVectorFromScalarNodePtr m_ImplicitFunction_AddVectorFromScalarNode; PLib3MFImplicitFunction_AddDecomposeVectorNodePtr m_ImplicitFunction_AddDecomposeVectorNode; PLib3MFImplicitFunction_AddComposeMatrixNodePtr m_ImplicitFunction_AddComposeMatrixNode; - PLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodePtr m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode; + PLib3MFImplicitFunction_AddMatrixFromRowsNodePtr m_ImplicitFunction_AddMatrixFromRowsNode; + PLib3MFImplicitFunction_AddMatrixFromColumnsNodePtr m_ImplicitFunction_AddMatrixFromColumnsNode; PLib3MFImplicitFunction_AddConstantNodePtr m_ImplicitFunction_AddConstantNode; PLib3MFImplicitFunction_AddConstVecNodePtr m_ImplicitFunction_AddConstVecNode; PLib3MFImplicitFunction_AddConstMatNodePtr m_ImplicitFunction_AddConstMatNode; PLib3MFImplicitFunction_AddMeshNodePtr m_ImplicitFunction_AddMeshNode; + PLib3MFImplicitFunction_AddUnsignedMeshNodePtr m_ImplicitFunction_AddUnsignedMeshNode; PLib3MFImplicitFunction_AddFunctionCallNodePtr m_ImplicitFunction_AddFunctionCallNode; PLib3MFImplicitFunction_GetNodesPtr m_ImplicitFunction_GetNodes; PLib3MFImplicitFunction_RemoveNodePtr m_ImplicitFunction_RemoveNode; diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_nodeaddon.cc b/Autogenerated/Bindings/NodeJS/lib3mf_nodeaddon.cc index ab6080716..8aae9dc11 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_nodeaddon.cc +++ b/Autogenerated/Bindings/NodeJS/lib3mf_nodeaddon.cc @@ -135,14 +135,16 @@ void InitAll(v8::Local exports, v8::Local module) CLib3MFSelectNode::Init(); CLib3MFClampNode::Init(); CLib3MFComposeVectorNode::Init(); + CLib3MFVectorFromScalarNode::Init(); CLib3MFDecomposeVectorNode::Init(); CLib3MFComposeMatrixNode::Init(); - CLib3MFComposeMatrixFromRowVectorsNode::Init(); - CLib3MFComposeMatrixFromColumnVectors::Init(); + CLib3MFMatrixFromRowsNode::Init(); + CLib3MFMatrixFromColumnsNode::Init(); CLib3MFConstantNode::Init(); CLib3MFConstVecNode::Init(); CLib3MFConstMatNode::Init(); CLib3MFMeshNode::Init(); + CLib3MFUnsignedMeshNode::Init(); CLib3MFFunctionCallNode::Init(); CLib3MFNodeIterator::Init(); CLib3MFFunction::Init(); diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc b/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc index e10ddbb32..c0a01f4d2 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc +++ b/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc @@ -128,14 +128,16 @@ Persistent CLib3MFPowNode::constructor; Persistent CLib3MFSelectNode::constructor; Persistent CLib3MFClampNode::constructor; Persistent CLib3MFComposeVectorNode::constructor; +Persistent CLib3MFVectorFromScalarNode::constructor; Persistent CLib3MFDecomposeVectorNode::constructor; Persistent CLib3MFComposeMatrixNode::constructor; -Persistent CLib3MFComposeMatrixFromRowVectorsNode::constructor; -Persistent CLib3MFComposeMatrixFromColumnVectors::constructor; +Persistent CLib3MFMatrixFromRowsNode::constructor; +Persistent CLib3MFMatrixFromColumnsNode::constructor; Persistent CLib3MFConstantNode::constructor; Persistent CLib3MFConstVecNode::constructor; Persistent CLib3MFConstMatNode::constructor; Persistent CLib3MFMeshNode::constructor; +Persistent CLib3MFUnsignedMeshNode::constructor; Persistent CLib3MFFunctionCallNode::constructor; Persistent CLib3MFNodeIterator::constructor; Persistent CLib3MFFunction::constructor; @@ -13685,6 +13687,109 @@ void CLib3MFComposeVectorNode::GetOutputResult(const FunctionCallbackInfo } } +/************************************************************************************************************************* + Class CLib3MFVectorFromScalarNode Implementation +**************************************************************************************************************************/ + +CLib3MFVectorFromScalarNode::CLib3MFVectorFromScalarNode() + : CLib3MFBaseClass() +{ +} + +CLib3MFVectorFromScalarNode::~CLib3MFVectorFromScalarNode() +{ +} + +void CLib3MFVectorFromScalarNode::Init() +{ + Isolate* isolate = Isolate::GetCurrent(); + + // Prepare constructor template + Local tpl = FunctionTemplate::New(isolate, New); + tpl->SetClassName(String::NewFromUtf8(isolate, "Lib3MFVectorFromScalarNode")); + tpl->InstanceTemplate()->SetInternalFieldCount(NODEWRAPPER_FIELDCOUNT); + + // Prototype + NODE_SET_PROTOTYPE_METHOD(tpl, "GetInputA", GetInputA); + NODE_SET_PROTOTYPE_METHOD(tpl, "GetOutputResult", GetOutputResult); + constructor.Reset(isolate, tpl->GetFunction(isolate->GetCurrentContext()).ToLocalChecked()); + +} + +void CLib3MFVectorFromScalarNode::New(const FunctionCallbackInfo& args) +{ + Isolate* isolate = args.GetIsolate(); + HandleScope scope(isolate); + + if (args.IsConstructCall()) { + CLib3MFBaseClass * holderObj = ObjectWrap::Unwrap(args.Holder()); + CLib3MFVectorFromScalarNode * vectorfromscalarnodeInstance = new CLib3MFVectorFromScalarNode(); + vectorfromscalarnodeInstance->Wrap(args.This()); + args.GetReturnValue().Set(args.This()); + } else { + RaiseError(isolate, "Lib3MFVectorFromScalarNode: Invalid call to Constructor"); + } +} + +Local CLib3MFVectorFromScalarNode::NewInstance(Local pParent, Lib3MFHandle pHandle) +{ + Isolate* isolate = Isolate::GetCurrent(); + HandleScope scope(isolate); + Local cons = Local::New(isolate, constructor); + Local instance; + if (cons->NewInstance(isolate->GetCurrentContext()).ToLocal(&instance)) { + instance->SetInternalField(NODEWRAPPER_TABLEINDEX, External::New(isolate, CLib3MFBaseClass::getDynamicWrapperTable(pParent))); + instance->SetInternalField(NODEWRAPPER_HANDLEINDEX, External::New(isolate, pHandle)); + } + return instance; +} + + +void CLib3MFVectorFromScalarNode::GetInputA(const FunctionCallbackInfo& args) +{ + Isolate* isolate = args.GetIsolate(); + HandleScope scope(isolate); + try { + Lib3MFHandle hReturnA = nullptr; + sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); + if (wrapperTable == nullptr) + throw std::runtime_error("Could not get wrapper table for Lib3MF method GetInputA."); + if (wrapperTable->m_VectorFromScalarNode_GetInputA == nullptr) + throw std::runtime_error("Could not call Lib3MF method VectorFromScalarNode::GetInputA."); + Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); + Lib3MFResult errorCode = wrapperTable->m_VectorFromScalarNode_GetInputA(instanceHandle, &hReturnA); + CheckError(isolate, wrapperTable, instanceHandle, errorCode); + Local instanceObjA = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnA); + args.GetReturnValue().Set(instanceObjA); + + } catch (std::exception & E) { + RaiseError(isolate, E.what()); + } +} + + +void CLib3MFVectorFromScalarNode::GetOutputResult(const FunctionCallbackInfo& args) +{ + Isolate* isolate = args.GetIsolate(); + HandleScope scope(isolate); + try { + Lib3MFHandle hReturnResult = nullptr; + sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); + if (wrapperTable == nullptr) + throw std::runtime_error("Could not get wrapper table for Lib3MF method GetOutputResult."); + if (wrapperTable->m_VectorFromScalarNode_GetOutputResult == nullptr) + throw std::runtime_error("Could not call Lib3MF method VectorFromScalarNode::GetOutputResult."); + Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); + Lib3MFResult errorCode = wrapperTable->m_VectorFromScalarNode_GetOutputResult(instanceHandle, &hReturnResult); + CheckError(isolate, wrapperTable, instanceHandle, errorCode); + Local instanceObjResult = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnResult); + args.GetReturnValue().Set(instanceObjResult); + + } catch (std::exception & E) { + RaiseError(isolate, E.what()); + } +} + /************************************************************************************************************************* Class CLib3MFDecomposeVectorNode Implementation **************************************************************************************************************************/ @@ -14300,25 +14405,25 @@ void CLib3MFComposeMatrixNode::GetOutputResult(const FunctionCallbackInfo } /************************************************************************************************************************* - Class CLib3MFComposeMatrixFromRowVectorsNode Implementation + Class CLib3MFMatrixFromRowsNode Implementation **************************************************************************************************************************/ -CLib3MFComposeMatrixFromRowVectorsNode::CLib3MFComposeMatrixFromRowVectorsNode() +CLib3MFMatrixFromRowsNode::CLib3MFMatrixFromRowsNode() : CLib3MFBaseClass() { } -CLib3MFComposeMatrixFromRowVectorsNode::~CLib3MFComposeMatrixFromRowVectorsNode() +CLib3MFMatrixFromRowsNode::~CLib3MFMatrixFromRowsNode() { } -void CLib3MFComposeMatrixFromRowVectorsNode::Init() +void CLib3MFMatrixFromRowsNode::Init() { Isolate* isolate = Isolate::GetCurrent(); // Prepare constructor template Local tpl = FunctionTemplate::New(isolate, New); - tpl->SetClassName(String::NewFromUtf8(isolate, "Lib3MFComposeMatrixFromRowVectorsNode")); + tpl->SetClassName(String::NewFromUtf8(isolate, "Lib3MFMatrixFromRowsNode")); tpl->InstanceTemplate()->SetInternalFieldCount(NODEWRAPPER_FIELDCOUNT); // Prototype @@ -14331,22 +14436,22 @@ void CLib3MFComposeMatrixFromRowVectorsNode::Init() } -void CLib3MFComposeMatrixFromRowVectorsNode::New(const FunctionCallbackInfo& args) +void CLib3MFMatrixFromRowsNode::New(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); HandleScope scope(isolate); if (args.IsConstructCall()) { CLib3MFBaseClass * holderObj = ObjectWrap::Unwrap(args.Holder()); - CLib3MFComposeMatrixFromRowVectorsNode * composematrixfromrowvectorsnodeInstance = new CLib3MFComposeMatrixFromRowVectorsNode(); - composematrixfromrowvectorsnodeInstance->Wrap(args.This()); + CLib3MFMatrixFromRowsNode * matrixfromrowsnodeInstance = new CLib3MFMatrixFromRowsNode(); + matrixfromrowsnodeInstance->Wrap(args.This()); args.GetReturnValue().Set(args.This()); } else { - RaiseError(isolate, "Lib3MFComposeMatrixFromRowVectorsNode: Invalid call to Constructor"); + RaiseError(isolate, "Lib3MFMatrixFromRowsNode: Invalid call to Constructor"); } } -Local CLib3MFComposeMatrixFromRowVectorsNode::NewInstance(Local pParent, Lib3MFHandle pHandle) +Local CLib3MFMatrixFromRowsNode::NewInstance(Local pParent, Lib3MFHandle pHandle) { Isolate* isolate = Isolate::GetCurrent(); HandleScope scope(isolate); @@ -14360,7 +14465,7 @@ Local CLib3MFComposeMatrixFromRowVectorsNode::NewInstance(Local } -void CLib3MFComposeMatrixFromRowVectorsNode::GetInputA(const FunctionCallbackInfo& args) +void CLib3MFMatrixFromRowsNode::GetInputA(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); HandleScope scope(isolate); @@ -14369,10 +14474,10 @@ void CLib3MFComposeMatrixFromRowVectorsNode::GetInputA(const FunctionCallbackInf sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); if (wrapperTable == nullptr) throw std::runtime_error("Could not get wrapper table for Lib3MF method GetInputA."); - if (wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA == nullptr) - throw std::runtime_error("Could not call Lib3MF method ComposeMatrixFromRowVectorsNode::GetInputA."); + if (wrapperTable->m_MatrixFromRowsNode_GetInputA == nullptr) + throw std::runtime_error("Could not call Lib3MF method MatrixFromRowsNode::GetInputA."); Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); - Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA(instanceHandle, &hReturnRow0); + Lib3MFResult errorCode = wrapperTable->m_MatrixFromRowsNode_GetInputA(instanceHandle, &hReturnRow0); CheckError(isolate, wrapperTable, instanceHandle, errorCode); Local instanceObjRow0 = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnRow0); args.GetReturnValue().Set(instanceObjRow0); @@ -14383,7 +14488,7 @@ void CLib3MFComposeMatrixFromRowVectorsNode::GetInputA(const FunctionCallbackInf } -void CLib3MFComposeMatrixFromRowVectorsNode::GetInputB(const FunctionCallbackInfo& args) +void CLib3MFMatrixFromRowsNode::GetInputB(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); HandleScope scope(isolate); @@ -14392,10 +14497,10 @@ void CLib3MFComposeMatrixFromRowVectorsNode::GetInputB(const FunctionCallbackInf sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); if (wrapperTable == nullptr) throw std::runtime_error("Could not get wrapper table for Lib3MF method GetInputB."); - if (wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB == nullptr) - throw std::runtime_error("Could not call Lib3MF method ComposeMatrixFromRowVectorsNode::GetInputB."); + if (wrapperTable->m_MatrixFromRowsNode_GetInputB == nullptr) + throw std::runtime_error("Could not call Lib3MF method MatrixFromRowsNode::GetInputB."); Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); - Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB(instanceHandle, &hReturnRow1); + Lib3MFResult errorCode = wrapperTable->m_MatrixFromRowsNode_GetInputB(instanceHandle, &hReturnRow1); CheckError(isolate, wrapperTable, instanceHandle, errorCode); Local instanceObjRow1 = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnRow1); args.GetReturnValue().Set(instanceObjRow1); @@ -14406,7 +14511,7 @@ void CLib3MFComposeMatrixFromRowVectorsNode::GetInputB(const FunctionCallbackInf } -void CLib3MFComposeMatrixFromRowVectorsNode::GetInputC(const FunctionCallbackInfo& args) +void CLib3MFMatrixFromRowsNode::GetInputC(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); HandleScope scope(isolate); @@ -14415,10 +14520,10 @@ void CLib3MFComposeMatrixFromRowVectorsNode::GetInputC(const FunctionCallbackInf sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); if (wrapperTable == nullptr) throw std::runtime_error("Could not get wrapper table for Lib3MF method GetInputC."); - if (wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC == nullptr) - throw std::runtime_error("Could not call Lib3MF method ComposeMatrixFromRowVectorsNode::GetInputC."); + if (wrapperTable->m_MatrixFromRowsNode_GetInputC == nullptr) + throw std::runtime_error("Could not call Lib3MF method MatrixFromRowsNode::GetInputC."); Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); - Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC(instanceHandle, &hReturnRow2); + Lib3MFResult errorCode = wrapperTable->m_MatrixFromRowsNode_GetInputC(instanceHandle, &hReturnRow2); CheckError(isolate, wrapperTable, instanceHandle, errorCode); Local instanceObjRow2 = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnRow2); args.GetReturnValue().Set(instanceObjRow2); @@ -14429,7 +14534,7 @@ void CLib3MFComposeMatrixFromRowVectorsNode::GetInputC(const FunctionCallbackInf } -void CLib3MFComposeMatrixFromRowVectorsNode::GetInputD(const FunctionCallbackInfo& args) +void CLib3MFMatrixFromRowsNode::GetInputD(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); HandleScope scope(isolate); @@ -14438,10 +14543,10 @@ void CLib3MFComposeMatrixFromRowVectorsNode::GetInputD(const FunctionCallbackInf sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); if (wrapperTable == nullptr) throw std::runtime_error("Could not get wrapper table for Lib3MF method GetInputD."); - if (wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD == nullptr) - throw std::runtime_error("Could not call Lib3MF method ComposeMatrixFromRowVectorsNode::GetInputD."); + if (wrapperTable->m_MatrixFromRowsNode_GetInputD == nullptr) + throw std::runtime_error("Could not call Lib3MF method MatrixFromRowsNode::GetInputD."); Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); - Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD(instanceHandle, &hReturnRow3); + Lib3MFResult errorCode = wrapperTable->m_MatrixFromRowsNode_GetInputD(instanceHandle, &hReturnRow3); CheckError(isolate, wrapperTable, instanceHandle, errorCode); Local instanceObjRow3 = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnRow3); args.GetReturnValue().Set(instanceObjRow3); @@ -14452,7 +14557,7 @@ void CLib3MFComposeMatrixFromRowVectorsNode::GetInputD(const FunctionCallbackInf } -void CLib3MFComposeMatrixFromRowVectorsNode::GetOutputResult(const FunctionCallbackInfo& args) +void CLib3MFMatrixFromRowsNode::GetOutputResult(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); HandleScope scope(isolate); @@ -14461,10 +14566,10 @@ void CLib3MFComposeMatrixFromRowVectorsNode::GetOutputResult(const FunctionCallb sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); if (wrapperTable == nullptr) throw std::runtime_error("Could not get wrapper table for Lib3MF method GetOutputResult."); - if (wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult == nullptr) - throw std::runtime_error("Could not call Lib3MF method ComposeMatrixFromRowVectorsNode::GetOutputResult."); + if (wrapperTable->m_MatrixFromRowsNode_GetOutputResult == nullptr) + throw std::runtime_error("Could not call Lib3MF method MatrixFromRowsNode::GetOutputResult."); Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); - Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult(instanceHandle, &hReturnResult); + Lib3MFResult errorCode = wrapperTable->m_MatrixFromRowsNode_GetOutputResult(instanceHandle, &hReturnResult); CheckError(isolate, wrapperTable, instanceHandle, errorCode); Local instanceObjResult = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnResult); args.GetReturnValue().Set(instanceObjResult); @@ -14475,25 +14580,25 @@ void CLib3MFComposeMatrixFromRowVectorsNode::GetOutputResult(const FunctionCallb } /************************************************************************************************************************* - Class CLib3MFComposeMatrixFromColumnVectors Implementation + Class CLib3MFMatrixFromColumnsNode Implementation **************************************************************************************************************************/ -CLib3MFComposeMatrixFromColumnVectors::CLib3MFComposeMatrixFromColumnVectors() +CLib3MFMatrixFromColumnsNode::CLib3MFMatrixFromColumnsNode() : CLib3MFBaseClass() { } -CLib3MFComposeMatrixFromColumnVectors::~CLib3MFComposeMatrixFromColumnVectors() +CLib3MFMatrixFromColumnsNode::~CLib3MFMatrixFromColumnsNode() { } -void CLib3MFComposeMatrixFromColumnVectors::Init() +void CLib3MFMatrixFromColumnsNode::Init() { Isolate* isolate = Isolate::GetCurrent(); // Prepare constructor template Local tpl = FunctionTemplate::New(isolate, New); - tpl->SetClassName(String::NewFromUtf8(isolate, "Lib3MFComposeMatrixFromColumnVectors")); + tpl->SetClassName(String::NewFromUtf8(isolate, "Lib3MFMatrixFromColumnsNode")); tpl->InstanceTemplate()->SetInternalFieldCount(NODEWRAPPER_FIELDCOUNT); // Prototype @@ -14506,22 +14611,22 @@ void CLib3MFComposeMatrixFromColumnVectors::Init() } -void CLib3MFComposeMatrixFromColumnVectors::New(const FunctionCallbackInfo& args) +void CLib3MFMatrixFromColumnsNode::New(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); HandleScope scope(isolate); if (args.IsConstructCall()) { CLib3MFBaseClass * holderObj = ObjectWrap::Unwrap(args.Holder()); - CLib3MFComposeMatrixFromColumnVectors * composematrixfromcolumnvectorsInstance = new CLib3MFComposeMatrixFromColumnVectors(); - composematrixfromcolumnvectorsInstance->Wrap(args.This()); + CLib3MFMatrixFromColumnsNode * matrixfromcolumnsnodeInstance = new CLib3MFMatrixFromColumnsNode(); + matrixfromcolumnsnodeInstance->Wrap(args.This()); args.GetReturnValue().Set(args.This()); } else { - RaiseError(isolate, "Lib3MFComposeMatrixFromColumnVectors: Invalid call to Constructor"); + RaiseError(isolate, "Lib3MFMatrixFromColumnsNode: Invalid call to Constructor"); } } -Local CLib3MFComposeMatrixFromColumnVectors::NewInstance(Local pParent, Lib3MFHandle pHandle) +Local CLib3MFMatrixFromColumnsNode::NewInstance(Local pParent, Lib3MFHandle pHandle) { Isolate* isolate = Isolate::GetCurrent(); HandleScope scope(isolate); @@ -14535,7 +14640,7 @@ Local CLib3MFComposeMatrixFromColumnVectors::NewInstance(Local p } -void CLib3MFComposeMatrixFromColumnVectors::GetInputA(const FunctionCallbackInfo& args) +void CLib3MFMatrixFromColumnsNode::GetInputA(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); HandleScope scope(isolate); @@ -14544,10 +14649,10 @@ void CLib3MFComposeMatrixFromColumnVectors::GetInputA(const FunctionCallbackInfo sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); if (wrapperTable == nullptr) throw std::runtime_error("Could not get wrapper table for Lib3MF method GetInputA."); - if (wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA == nullptr) - throw std::runtime_error("Could not call Lib3MF method ComposeMatrixFromColumnVectors::GetInputA."); + if (wrapperTable->m_MatrixFromColumnsNode_GetInputA == nullptr) + throw std::runtime_error("Could not call Lib3MF method MatrixFromColumnsNode::GetInputA."); Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); - Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA(instanceHandle, &hReturnColumn0); + Lib3MFResult errorCode = wrapperTable->m_MatrixFromColumnsNode_GetInputA(instanceHandle, &hReturnColumn0); CheckError(isolate, wrapperTable, instanceHandle, errorCode); Local instanceObjColumn0 = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnColumn0); args.GetReturnValue().Set(instanceObjColumn0); @@ -14558,7 +14663,7 @@ void CLib3MFComposeMatrixFromColumnVectors::GetInputA(const FunctionCallbackInfo } -void CLib3MFComposeMatrixFromColumnVectors::GetInputB(const FunctionCallbackInfo& args) +void CLib3MFMatrixFromColumnsNode::GetInputB(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); HandleScope scope(isolate); @@ -14567,10 +14672,10 @@ void CLib3MFComposeMatrixFromColumnVectors::GetInputB(const FunctionCallbackInfo sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); if (wrapperTable == nullptr) throw std::runtime_error("Could not get wrapper table for Lib3MF method GetInputB."); - if (wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB == nullptr) - throw std::runtime_error("Could not call Lib3MF method ComposeMatrixFromColumnVectors::GetInputB."); + if (wrapperTable->m_MatrixFromColumnsNode_GetInputB == nullptr) + throw std::runtime_error("Could not call Lib3MF method MatrixFromColumnsNode::GetInputB."); Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); - Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB(instanceHandle, &hReturnColumn1); + Lib3MFResult errorCode = wrapperTable->m_MatrixFromColumnsNode_GetInputB(instanceHandle, &hReturnColumn1); CheckError(isolate, wrapperTable, instanceHandle, errorCode); Local instanceObjColumn1 = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnColumn1); args.GetReturnValue().Set(instanceObjColumn1); @@ -14581,7 +14686,7 @@ void CLib3MFComposeMatrixFromColumnVectors::GetInputB(const FunctionCallbackInfo } -void CLib3MFComposeMatrixFromColumnVectors::GetInputC(const FunctionCallbackInfo& args) +void CLib3MFMatrixFromColumnsNode::GetInputC(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); HandleScope scope(isolate); @@ -14590,10 +14695,10 @@ void CLib3MFComposeMatrixFromColumnVectors::GetInputC(const FunctionCallbackInfo sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); if (wrapperTable == nullptr) throw std::runtime_error("Could not get wrapper table for Lib3MF method GetInputC."); - if (wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC == nullptr) - throw std::runtime_error("Could not call Lib3MF method ComposeMatrixFromColumnVectors::GetInputC."); + if (wrapperTable->m_MatrixFromColumnsNode_GetInputC == nullptr) + throw std::runtime_error("Could not call Lib3MF method MatrixFromColumnsNode::GetInputC."); Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); - Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC(instanceHandle, &hReturnColumn2); + Lib3MFResult errorCode = wrapperTable->m_MatrixFromColumnsNode_GetInputC(instanceHandle, &hReturnColumn2); CheckError(isolate, wrapperTable, instanceHandle, errorCode); Local instanceObjColumn2 = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnColumn2); args.GetReturnValue().Set(instanceObjColumn2); @@ -14604,7 +14709,7 @@ void CLib3MFComposeMatrixFromColumnVectors::GetInputC(const FunctionCallbackInfo } -void CLib3MFComposeMatrixFromColumnVectors::GetInputD(const FunctionCallbackInfo& args) +void CLib3MFMatrixFromColumnsNode::GetInputD(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); HandleScope scope(isolate); @@ -14613,10 +14718,10 @@ void CLib3MFComposeMatrixFromColumnVectors::GetInputD(const FunctionCallbackInfo sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); if (wrapperTable == nullptr) throw std::runtime_error("Could not get wrapper table for Lib3MF method GetInputD."); - if (wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD == nullptr) - throw std::runtime_error("Could not call Lib3MF method ComposeMatrixFromColumnVectors::GetInputD."); + if (wrapperTable->m_MatrixFromColumnsNode_GetInputD == nullptr) + throw std::runtime_error("Could not call Lib3MF method MatrixFromColumnsNode::GetInputD."); Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); - Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD(instanceHandle, &hReturnColumn3); + Lib3MFResult errorCode = wrapperTable->m_MatrixFromColumnsNode_GetInputD(instanceHandle, &hReturnColumn3); CheckError(isolate, wrapperTable, instanceHandle, errorCode); Local instanceObjColumn3 = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnColumn3); args.GetReturnValue().Set(instanceObjColumn3); @@ -14627,7 +14732,7 @@ void CLib3MFComposeMatrixFromColumnVectors::GetInputD(const FunctionCallbackInfo } -void CLib3MFComposeMatrixFromColumnVectors::GetOutputResult(const FunctionCallbackInfo& args) +void CLib3MFMatrixFromColumnsNode::GetOutputResult(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); HandleScope scope(isolate); @@ -14636,10 +14741,10 @@ void CLib3MFComposeMatrixFromColumnVectors::GetOutputResult(const FunctionCallba sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); if (wrapperTable == nullptr) throw std::runtime_error("Could not get wrapper table for Lib3MF method GetOutputResult."); - if (wrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult == nullptr) - throw std::runtime_error("Could not call Lib3MF method ComposeMatrixFromColumnVectors::GetOutputResult."); + if (wrapperTable->m_MatrixFromColumnsNode_GetOutputResult == nullptr) + throw std::runtime_error("Could not call Lib3MF method MatrixFromColumnsNode::GetOutputResult."); Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); - Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult(instanceHandle, &hReturnResult); + Lib3MFResult errorCode = wrapperTable->m_MatrixFromColumnsNode_GetOutputResult(instanceHandle, &hReturnResult); CheckError(isolate, wrapperTable, instanceHandle, errorCode); Local instanceObjResult = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnResult); args.GetReturnValue().Set(instanceObjResult); @@ -15157,6 +15262,133 @@ void CLib3MFMeshNode::GetOutputDistance(const FunctionCallbackInfo& args) } } +/************************************************************************************************************************* + Class CLib3MFUnsignedMeshNode Implementation +**************************************************************************************************************************/ + +CLib3MFUnsignedMeshNode::CLib3MFUnsignedMeshNode() + : CLib3MFBaseClass() +{ +} + +CLib3MFUnsignedMeshNode::~CLib3MFUnsignedMeshNode() +{ +} + +void CLib3MFUnsignedMeshNode::Init() +{ + Isolate* isolate = Isolate::GetCurrent(); + + // Prepare constructor template + Local tpl = FunctionTemplate::New(isolate, New); + tpl->SetClassName(String::NewFromUtf8(isolate, "Lib3MFUnsignedMeshNode")); + tpl->InstanceTemplate()->SetInternalFieldCount(NODEWRAPPER_FIELDCOUNT); + + // Prototype + NODE_SET_PROTOTYPE_METHOD(tpl, "GetInputMesh", GetInputMesh); + NODE_SET_PROTOTYPE_METHOD(tpl, "GetInputPos", GetInputPos); + NODE_SET_PROTOTYPE_METHOD(tpl, "GetOutputDistance", GetOutputDistance); + constructor.Reset(isolate, tpl->GetFunction(isolate->GetCurrentContext()).ToLocalChecked()); + +} + +void CLib3MFUnsignedMeshNode::New(const FunctionCallbackInfo& args) +{ + Isolate* isolate = args.GetIsolate(); + HandleScope scope(isolate); + + if (args.IsConstructCall()) { + CLib3MFBaseClass * holderObj = ObjectWrap::Unwrap(args.Holder()); + CLib3MFUnsignedMeshNode * unsignedmeshnodeInstance = new CLib3MFUnsignedMeshNode(); + unsignedmeshnodeInstance->Wrap(args.This()); + args.GetReturnValue().Set(args.This()); + } else { + RaiseError(isolate, "Lib3MFUnsignedMeshNode: Invalid call to Constructor"); + } +} + +Local CLib3MFUnsignedMeshNode::NewInstance(Local pParent, Lib3MFHandle pHandle) +{ + Isolate* isolate = Isolate::GetCurrent(); + HandleScope scope(isolate); + Local cons = Local::New(isolate, constructor); + Local instance; + if (cons->NewInstance(isolate->GetCurrentContext()).ToLocal(&instance)) { + instance->SetInternalField(NODEWRAPPER_TABLEINDEX, External::New(isolate, CLib3MFBaseClass::getDynamicWrapperTable(pParent))); + instance->SetInternalField(NODEWRAPPER_HANDLEINDEX, External::New(isolate, pHandle)); + } + return instance; +} + + +void CLib3MFUnsignedMeshNode::GetInputMesh(const FunctionCallbackInfo& args) +{ + Isolate* isolate = args.GetIsolate(); + HandleScope scope(isolate); + try { + Lib3MFHandle hReturnMesh = nullptr; + sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); + if (wrapperTable == nullptr) + throw std::runtime_error("Could not get wrapper table for Lib3MF method GetInputMesh."); + if (wrapperTable->m_UnsignedMeshNode_GetInputMesh == nullptr) + throw std::runtime_error("Could not call Lib3MF method UnsignedMeshNode::GetInputMesh."); + Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); + Lib3MFResult errorCode = wrapperTable->m_UnsignedMeshNode_GetInputMesh(instanceHandle, &hReturnMesh); + CheckError(isolate, wrapperTable, instanceHandle, errorCode); + Local instanceObjMesh = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnMesh); + args.GetReturnValue().Set(instanceObjMesh); + + } catch (std::exception & E) { + RaiseError(isolate, E.what()); + } +} + + +void CLib3MFUnsignedMeshNode::GetInputPos(const FunctionCallbackInfo& args) +{ + Isolate* isolate = args.GetIsolate(); + HandleScope scope(isolate); + try { + Lib3MFHandle hReturnPos = nullptr; + sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); + if (wrapperTable == nullptr) + throw std::runtime_error("Could not get wrapper table for Lib3MF method GetInputPos."); + if (wrapperTable->m_UnsignedMeshNode_GetInputPos == nullptr) + throw std::runtime_error("Could not call Lib3MF method UnsignedMeshNode::GetInputPos."); + Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); + Lib3MFResult errorCode = wrapperTable->m_UnsignedMeshNode_GetInputPos(instanceHandle, &hReturnPos); + CheckError(isolate, wrapperTable, instanceHandle, errorCode); + Local instanceObjPos = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnPos); + args.GetReturnValue().Set(instanceObjPos); + + } catch (std::exception & E) { + RaiseError(isolate, E.what()); + } +} + + +void CLib3MFUnsignedMeshNode::GetOutputDistance(const FunctionCallbackInfo& args) +{ + Isolate* isolate = args.GetIsolate(); + HandleScope scope(isolate); + try { + Lib3MFHandle hReturnDistance = nullptr; + sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); + if (wrapperTable == nullptr) + throw std::runtime_error("Could not get wrapper table for Lib3MF method GetOutputDistance."); + if (wrapperTable->m_UnsignedMeshNode_GetOutputDistance == nullptr) + throw std::runtime_error("Could not call Lib3MF method UnsignedMeshNode::GetOutputDistance."); + Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); + Lib3MFResult errorCode = wrapperTable->m_UnsignedMeshNode_GetOutputDistance(instanceHandle, &hReturnDistance); + CheckError(isolate, wrapperTable, instanceHandle, errorCode); + Local instanceObjDistance = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnDistance); + args.GetReturnValue().Set(instanceObjDistance); + + } catch (std::exception & E) { + RaiseError(isolate, E.what()); + } +} + /************************************************************************************************************************* Class CLib3MFFunctionCallNode Implementation **************************************************************************************************************************/ @@ -15728,13 +15960,16 @@ void CLib3MFImplicitFunction::Init() NODE_SET_PROTOTYPE_METHOD(tpl, "AddSelectNode", AddSelectNode); NODE_SET_PROTOTYPE_METHOD(tpl, "AddClampNode", AddClampNode); NODE_SET_PROTOTYPE_METHOD(tpl, "AddComposeVectorNode", AddComposeVectorNode); + NODE_SET_PROTOTYPE_METHOD(tpl, "AddVectorFromScalarNode", AddVectorFromScalarNode); NODE_SET_PROTOTYPE_METHOD(tpl, "AddDecomposeVectorNode", AddDecomposeVectorNode); NODE_SET_PROTOTYPE_METHOD(tpl, "AddComposeMatrixNode", AddComposeMatrixNode); - NODE_SET_PROTOTYPE_METHOD(tpl, "AddComposeMatrixFromRowVectorsNode", AddComposeMatrixFromRowVectorsNode); + NODE_SET_PROTOTYPE_METHOD(tpl, "AddMatrixFromRowsNode", AddMatrixFromRowsNode); + NODE_SET_PROTOTYPE_METHOD(tpl, "AddMatrixFromColumnsNode", AddMatrixFromColumnsNode); NODE_SET_PROTOTYPE_METHOD(tpl, "AddConstantNode", AddConstantNode); NODE_SET_PROTOTYPE_METHOD(tpl, "AddConstVecNode", AddConstVecNode); NODE_SET_PROTOTYPE_METHOD(tpl, "AddConstMatNode", AddConstMatNode); NODE_SET_PROTOTYPE_METHOD(tpl, "AddMeshNode", AddMeshNode); + NODE_SET_PROTOTYPE_METHOD(tpl, "AddUnsignedMeshNode", AddUnsignedMeshNode); NODE_SET_PROTOTYPE_METHOD(tpl, "AddFunctionCallNode", AddFunctionCallNode); NODE_SET_PROTOTYPE_METHOD(tpl, "GetNodes", GetNodes); NODE_SET_PROTOTYPE_METHOD(tpl, "RemoveNode", RemoveNode); @@ -17441,6 +17676,44 @@ void CLib3MFImplicitFunction::AddComposeVectorNode(const FunctionCallbackInfo& args) +{ + Isolate* isolate = args.GetIsolate(); + HandleScope scope(isolate); + try { + if (!args[0]->IsString()) { + throw std::runtime_error("Expected string parameter 0 (Identifier)"); + } + if (!args[1]->IsString()) { + throw std::runtime_error("Expected string parameter 1 (DisplayName)"); + } + if (!args[2]->IsString()) { + throw std::runtime_error("Expected string parameter 2 (Tag)"); + } + v8::String::Utf8Value sutf8Identifier(isolate, args[0]); + std::string sIdentifier = *sutf8Identifier; + v8::String::Utf8Value sutf8DisplayName(isolate, args[1]); + std::string sDisplayName = *sutf8DisplayName; + v8::String::Utf8Value sutf8Tag(isolate, args[2]); + std::string sTag = *sutf8Tag; + Lib3MFHandle hReturnNode = nullptr; + sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); + if (wrapperTable == nullptr) + throw std::runtime_error("Could not get wrapper table for Lib3MF method AddVectorFromScalarNode."); + if (wrapperTable->m_ImplicitFunction_AddVectorFromScalarNode == nullptr) + throw std::runtime_error("Could not call Lib3MF method ImplicitFunction::AddVectorFromScalarNode."); + Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); + Lib3MFResult errorCode = wrapperTable->m_ImplicitFunction_AddVectorFromScalarNode(instanceHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hReturnNode); + CheckError(isolate, wrapperTable, instanceHandle, errorCode); + Local instanceObjNode = CLib3MFVectorFromScalarNode::NewInstance(args.Holder(), hReturnNode); + args.GetReturnValue().Set(instanceObjNode); + + } catch (std::exception & E) { + RaiseError(isolate, E.what()); + } +} + + void CLib3MFImplicitFunction::AddDecomposeVectorNode(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); @@ -17517,7 +17790,7 @@ void CLib3MFImplicitFunction::AddComposeMatrixNode(const FunctionCallbackInfo& args) +void CLib3MFImplicitFunction::AddMatrixFromRowsNode(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); HandleScope scope(isolate); @@ -17540,13 +17813,51 @@ void CLib3MFImplicitFunction::AddComposeMatrixFromRowVectorsNode(const FunctionC Lib3MFHandle hReturnNode = nullptr; sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); if (wrapperTable == nullptr) - throw std::runtime_error("Could not get wrapper table for Lib3MF method AddComposeMatrixFromRowVectorsNode."); - if (wrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode == nullptr) - throw std::runtime_error("Could not call Lib3MF method ImplicitFunction::AddComposeMatrixFromRowVectorsNode."); + throw std::runtime_error("Could not get wrapper table for Lib3MF method AddMatrixFromRowsNode."); + if (wrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode == nullptr) + throw std::runtime_error("Could not call Lib3MF method ImplicitFunction::AddMatrixFromRowsNode."); Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); - Lib3MFResult errorCode = wrapperTable->m_ImplicitFunction_AddComposeMatrixFromRowVectorsNode(instanceHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hReturnNode); + Lib3MFResult errorCode = wrapperTable->m_ImplicitFunction_AddMatrixFromRowsNode(instanceHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hReturnNode); CheckError(isolate, wrapperTable, instanceHandle, errorCode); - Local instanceObjNode = CLib3MFComposeMatrixFromRowVectorsNode::NewInstance(args.Holder(), hReturnNode); + Local instanceObjNode = CLib3MFMatrixFromRowsNode::NewInstance(args.Holder(), hReturnNode); + args.GetReturnValue().Set(instanceObjNode); + + } catch (std::exception & E) { + RaiseError(isolate, E.what()); + } +} + + +void CLib3MFImplicitFunction::AddMatrixFromColumnsNode(const FunctionCallbackInfo& args) +{ + Isolate* isolate = args.GetIsolate(); + HandleScope scope(isolate); + try { + if (!args[0]->IsString()) { + throw std::runtime_error("Expected string parameter 0 (Identifier)"); + } + if (!args[1]->IsString()) { + throw std::runtime_error("Expected string parameter 1 (DisplayName)"); + } + if (!args[2]->IsString()) { + throw std::runtime_error("Expected string parameter 2 (Tag)"); + } + v8::String::Utf8Value sutf8Identifier(isolate, args[0]); + std::string sIdentifier = *sutf8Identifier; + v8::String::Utf8Value sutf8DisplayName(isolate, args[1]); + std::string sDisplayName = *sutf8DisplayName; + v8::String::Utf8Value sutf8Tag(isolate, args[2]); + std::string sTag = *sutf8Tag; + Lib3MFHandle hReturnNode = nullptr; + sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); + if (wrapperTable == nullptr) + throw std::runtime_error("Could not get wrapper table for Lib3MF method AddMatrixFromColumnsNode."); + if (wrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode == nullptr) + throw std::runtime_error("Could not call Lib3MF method ImplicitFunction::AddMatrixFromColumnsNode."); + Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); + Lib3MFResult errorCode = wrapperTable->m_ImplicitFunction_AddMatrixFromColumnsNode(instanceHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hReturnNode); + CheckError(isolate, wrapperTable, instanceHandle, errorCode); + Local instanceObjNode = CLib3MFMatrixFromColumnsNode::NewInstance(args.Holder(), hReturnNode); args.GetReturnValue().Set(instanceObjNode); } catch (std::exception & E) { @@ -17707,6 +18018,44 @@ void CLib3MFImplicitFunction::AddMeshNode(const FunctionCallbackInfo& arg } +void CLib3MFImplicitFunction::AddUnsignedMeshNode(const FunctionCallbackInfo& args) +{ + Isolate* isolate = args.GetIsolate(); + HandleScope scope(isolate); + try { + if (!args[0]->IsString()) { + throw std::runtime_error("Expected string parameter 0 (Identifier)"); + } + if (!args[1]->IsString()) { + throw std::runtime_error("Expected string parameter 1 (DisplayName)"); + } + if (!args[2]->IsString()) { + throw std::runtime_error("Expected string parameter 2 (Tag)"); + } + v8::String::Utf8Value sutf8Identifier(isolate, args[0]); + std::string sIdentifier = *sutf8Identifier; + v8::String::Utf8Value sutf8DisplayName(isolate, args[1]); + std::string sDisplayName = *sutf8DisplayName; + v8::String::Utf8Value sutf8Tag(isolate, args[2]); + std::string sTag = *sutf8Tag; + Lib3MFHandle hReturnNode = nullptr; + sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); + if (wrapperTable == nullptr) + throw std::runtime_error("Could not get wrapper table for Lib3MF method AddUnsignedMeshNode."); + if (wrapperTable->m_ImplicitFunction_AddUnsignedMeshNode == nullptr) + throw std::runtime_error("Could not call Lib3MF method ImplicitFunction::AddUnsignedMeshNode."); + Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); + Lib3MFResult errorCode = wrapperTable->m_ImplicitFunction_AddUnsignedMeshNode(instanceHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hReturnNode); + CheckError(isolate, wrapperTable, instanceHandle, errorCode); + Local instanceObjNode = CLib3MFUnsignedMeshNode::NewInstance(args.Holder(), hReturnNode); + args.GetReturnValue().Set(instanceObjNode); + + } catch (std::exception & E) { + RaiseError(isolate, E.what()); + } +} + + void CLib3MFImplicitFunction::AddFunctionCallNode(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); @@ -22722,8 +23071,8 @@ void CLib3MFWrapper::New(const FunctionCallbackInfo& args) newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_ComposeVector"), Integer::New(isolate, 8)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_DecomposeVector"), Integer::New(isolate, 9)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_ComposeMatrix"), Integer::New(isolate, 10)); - newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_ComposeMatrixFromColumnVectors"), Integer::New(isolate, 11)); - newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_ComposeMatrixFromRowVectors"), Integer::New(isolate, 12)); + newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_MatrixFromColumns"), Integer::New(isolate, 11)); + newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_MatrixFromRows"), Integer::New(isolate, 12)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_Dot"), Integer::New(isolate, 13)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_Cross"), Integer::New(isolate, 14)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_MatVecMultiplication"), Integer::New(isolate, 15)); @@ -22760,6 +23109,8 @@ void CLib3MFWrapper::New(const FunctionCallbackInfo& args) newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_Mesh"), Integer::New(isolate, 46)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_Length"), Integer::New(isolate, 47)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_Resource"), Integer::New(isolate, 48)); + newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_VectorFromScalar"), Integer::New(isolate, 49)); + newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_UnsignedMesh"), Integer::New(isolate, 50)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitPortType_Scalar"), Integer::New(isolate, 1)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitPortType_Vector"), Integer::New(isolate, 2)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitPortType_Matrix"), Integer::New(isolate, 3)); diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.h b/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.h index 802fda68b..ac8f4604b 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.h +++ b/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.h @@ -1842,6 +1842,25 @@ class CLib3MFComposeVectorNode : public CLib3MFBaseClass { }; +/************************************************************************************************************************* + Class CLib3MFVectorFromScalarNode +**************************************************************************************************************************/ +class CLib3MFVectorFromScalarNode : public CLib3MFBaseClass { +private: + static void New(const v8::FunctionCallbackInfo& args); + static v8::Persistent constructor; + static void GetInputA(const v8::FunctionCallbackInfo& args); + static void GetOutputResult(const v8::FunctionCallbackInfo& args); + +public: + CLib3MFVectorFromScalarNode(); + ~CLib3MFVectorFromScalarNode(); + + static void Init(); + static v8::Local NewInstance(v8::Local, Lib3MFHandle pHandle); + +}; + /************************************************************************************************************************* Class CLib3MFDecomposeVectorNode **************************************************************************************************************************/ @@ -1898,9 +1917,9 @@ class CLib3MFComposeMatrixNode : public CLib3MFBaseClass { }; /************************************************************************************************************************* - Class CLib3MFComposeMatrixFromRowVectorsNode + Class CLib3MFMatrixFromRowsNode **************************************************************************************************************************/ -class CLib3MFComposeMatrixFromRowVectorsNode : public CLib3MFBaseClass { +class CLib3MFMatrixFromRowsNode : public CLib3MFBaseClass { private: static void New(const v8::FunctionCallbackInfo& args); static v8::Persistent constructor; @@ -1911,8 +1930,8 @@ class CLib3MFComposeMatrixFromRowVectorsNode : public CLib3MFBaseClass { static void GetOutputResult(const v8::FunctionCallbackInfo& args); public: - CLib3MFComposeMatrixFromRowVectorsNode(); - ~CLib3MFComposeMatrixFromRowVectorsNode(); + CLib3MFMatrixFromRowsNode(); + ~CLib3MFMatrixFromRowsNode(); static void Init(); static v8::Local NewInstance(v8::Local, Lib3MFHandle pHandle); @@ -1920,9 +1939,9 @@ class CLib3MFComposeMatrixFromRowVectorsNode : public CLib3MFBaseClass { }; /************************************************************************************************************************* - Class CLib3MFComposeMatrixFromColumnVectors + Class CLib3MFMatrixFromColumnsNode **************************************************************************************************************************/ -class CLib3MFComposeMatrixFromColumnVectors : public CLib3MFBaseClass { +class CLib3MFMatrixFromColumnsNode : public CLib3MFBaseClass { private: static void New(const v8::FunctionCallbackInfo& args); static v8::Persistent constructor; @@ -1933,8 +1952,8 @@ class CLib3MFComposeMatrixFromColumnVectors : public CLib3MFBaseClass { static void GetOutputResult(const v8::FunctionCallbackInfo& args); public: - CLib3MFComposeMatrixFromColumnVectors(); - ~CLib3MFComposeMatrixFromColumnVectors(); + CLib3MFMatrixFromColumnsNode(); + ~CLib3MFMatrixFromColumnsNode(); static void Init(); static v8::Local NewInstance(v8::Local, Lib3MFHandle pHandle); @@ -2021,6 +2040,26 @@ class CLib3MFMeshNode : public CLib3MFBaseClass { }; +/************************************************************************************************************************* + Class CLib3MFUnsignedMeshNode +**************************************************************************************************************************/ +class CLib3MFUnsignedMeshNode : public CLib3MFBaseClass { +private: + static void New(const v8::FunctionCallbackInfo& args); + static v8::Persistent constructor; + static void GetInputMesh(const v8::FunctionCallbackInfo& args); + static void GetInputPos(const v8::FunctionCallbackInfo& args); + static void GetOutputDistance(const v8::FunctionCallbackInfo& args); + +public: + CLib3MFUnsignedMeshNode(); + ~CLib3MFUnsignedMeshNode(); + + static void Init(); + static v8::Local NewInstance(v8::Local, Lib3MFHandle pHandle); + +}; + /************************************************************************************************************************* Class CLib3MFFunctionCallNode **************************************************************************************************************************/ @@ -2132,13 +2171,16 @@ class CLib3MFImplicitFunction : public CLib3MFBaseClass { static void AddSelectNode(const v8::FunctionCallbackInfo& args); static void AddClampNode(const v8::FunctionCallbackInfo& args); static void AddComposeVectorNode(const v8::FunctionCallbackInfo& args); + static void AddVectorFromScalarNode(const v8::FunctionCallbackInfo& args); static void AddDecomposeVectorNode(const v8::FunctionCallbackInfo& args); static void AddComposeMatrixNode(const v8::FunctionCallbackInfo& args); - static void AddComposeMatrixFromRowVectorsNode(const v8::FunctionCallbackInfo& args); + static void AddMatrixFromRowsNode(const v8::FunctionCallbackInfo& args); + static void AddMatrixFromColumnsNode(const v8::FunctionCallbackInfo& args); static void AddConstantNode(const v8::FunctionCallbackInfo& args); static void AddConstVecNode(const v8::FunctionCallbackInfo& args); static void AddConstMatNode(const v8::FunctionCallbackInfo& args); static void AddMeshNode(const v8::FunctionCallbackInfo& args); + static void AddUnsignedMeshNode(const v8::FunctionCallbackInfo& args); static void AddFunctionCallNode(const v8::FunctionCallbackInfo& args); static void GetNodes(const v8::FunctionCallbackInfo& args); static void RemoveNode(const v8::FunctionCallbackInfo& args); diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_types.h b/Autogenerated/Bindings/NodeJS/lib3mf_types.h index a43ce9619..ca186c77a 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_types.h +++ b/Autogenerated/Bindings/NodeJS/lib3mf_types.h @@ -291,14 +291,16 @@ typedef Lib3MFHandle Lib3MF_PowNode; typedef Lib3MFHandle Lib3MF_SelectNode; typedef Lib3MFHandle Lib3MF_ClampNode; typedef Lib3MFHandle Lib3MF_ComposeVectorNode; +typedef Lib3MFHandle Lib3MF_VectorFromScalarNode; typedef Lib3MFHandle Lib3MF_DecomposeVectorNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixNode; -typedef Lib3MFHandle Lib3MF_ComposeMatrixFromRowVectorsNode; -typedef Lib3MFHandle Lib3MF_ComposeMatrixFromColumnVectors; +typedef Lib3MFHandle Lib3MF_MatrixFromRowsNode; +typedef Lib3MFHandle Lib3MF_MatrixFromColumnsNode; typedef Lib3MFHandle Lib3MF_ConstantNode; typedef Lib3MFHandle Lib3MF_ConstVecNode; typedef Lib3MFHandle Lib3MF_ConstMatNode; typedef Lib3MFHandle Lib3MF_MeshNode; +typedef Lib3MFHandle Lib3MF_UnsignedMeshNode; typedef Lib3MFHandle Lib3MF_FunctionCallNode; typedef Lib3MFHandle Lib3MF_NodeIterator; typedef Lib3MFHandle Lib3MF_Function; @@ -454,8 +456,8 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeComposeVector = 8, /** Creates a vector from three scalar values */ eImplicitNodeTypeDecomposeVector = 9, /** Decomposes a vector into three scalar values */ eImplicitNodeTypeComposeMatrix = 10, /** Creates a matrix from nine scalar values */ - eImplicitNodeTypeComposeMatrixFromColumnVectors = 11, /** Creates a matrix from three column vector values */ - eImplicitNodeTypeComposeMatrixFromRowVectors = 12, /** Creates a matrix from three row vector values */ + eImplicitNodeTypeMatrixFromColumns = 11, /** Creates a matrix from three column vector values */ + eImplicitNodeTypeMatrixFromRows = 12, /** Creates a matrix from three row vector values */ eImplicitNodeTypeDot = 13, /** Calculates the dot product of two vector values */ eImplicitNodeTypeCross = 14, /** Calculates the cross product of two vector values */ eImplicitNodeTypeMatVecMultiplication = 15, /** Multiplies a matrix with a vector */ @@ -491,7 +493,9 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeFunctionCall = 45, /** Calls a function */ eImplicitNodeTypeMesh = 46, /** Calculates the signed distance to a mesh */ eImplicitNodeTypeLength = 47, /** Calculates the length of a vector */ - eImplicitNodeTypeResource = 48 /** Selects a resource (function, mesh etc.) */ + eImplicitNodeTypeResource = 48, /** Selects a resource (function, mesh etc.) */ + eImplicitNodeTypeVectorFromScalar = 49, /** Creates a vector from one scalar values */ + eImplicitNodeTypeUnsignedMesh = 50 /** Calculates the unsigned distance to a mesh */ } eLib3MFImplicitNodeType; /** diff --git a/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas b/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas index 5b03b10f0..10f00e837 100644 --- a/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas +++ b/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas @@ -262,8 +262,8 @@ interface eImplicitNodeTypeComposeVector, eImplicitNodeTypeDecomposeVector, eImplicitNodeTypeComposeMatrix, - eImplicitNodeTypeComposeMatrixFromColumnVectors, - eImplicitNodeTypeComposeMatrixFromRowVectors, + eImplicitNodeTypeMatrixFromColumns, + eImplicitNodeTypeMatrixFromRows, eImplicitNodeTypeDot, eImplicitNodeTypeCross, eImplicitNodeTypeMatVecMultiplication, @@ -299,7 +299,9 @@ interface eImplicitNodeTypeFunctionCall, eImplicitNodeTypeMesh, eImplicitNodeTypeLength, - eImplicitNodeTypeResource + eImplicitNodeTypeResource, + eImplicitNodeTypeVectorFromScalar, + eImplicitNodeTypeUnsignedMesh ); TLib3MFImplicitPortType = ( @@ -556,14 +558,16 @@ TLib3MFPowNode = class; TLib3MFSelectNode = class; TLib3MFClampNode = class; TLib3MFComposeVectorNode = class; + TLib3MFVectorFromScalarNode = class; TLib3MFDecomposeVectorNode = class; TLib3MFComposeMatrixNode = class; - TLib3MFComposeMatrixFromRowVectorsNode = class; - TLib3MFComposeMatrixFromColumnVectors = class; + TLib3MFMatrixFromRowsNode = class; + TLib3MFMatrixFromColumnsNode = class; TLib3MFConstantNode = class; TLib3MFConstVecNode = class; TLib3MFConstMatNode = class; TLib3MFMeshNode = class; + TLib3MFUnsignedMeshNode = class; TLib3MFFunctionCallNode = class; TLib3MFNodeIterator = class; TLib3MFFunction = class; @@ -3855,6 +3859,29 @@ TLib3MFModel = class; TLib3MFComposeVectorNode_GetOutputResultFunc = function(pComposeVectorNode: TLib3MFHandle; out pResult: TLib3MFHandle): TLib3MFResult; cdecl; +(************************************************************************************************************************* + Function type definitions for VectorFromScalarNode +**************************************************************************************************************************) + + (** + * Retrieves the input + * + * @param[in] pVectorFromScalarNode - VectorFromScalarNode instance. + * @param[out] pA - the input for the x component + * @return error code or 0 (success) + *) + TLib3MFVectorFromScalarNode_GetInputAFunc = function(pVectorFromScalarNode: TLib3MFHandle; out pA: TLib3MFHandle): TLib3MFResult; cdecl; + + (** + * Retrieves the output + * + * @param[in] pVectorFromScalarNode - VectorFromScalarNode instance. + * @param[out] pResult - the output + * @return error code or 0 (success) + *) + TLib3MFVectorFromScalarNode_GetOutputResultFunc = function(pVectorFromScalarNode: TLib3MFHandle; out pResult: TLib3MFHandle): TLib3MFResult; cdecl; + + (************************************************************************************************************************* Function type definitions for DecomposeVectorNode **************************************************************************************************************************) @@ -4055,103 +4082,103 @@ TLib3MFModel = class; (************************************************************************************************************************* - Function type definitions for ComposeMatrixFromRowVectorsNode + Function type definitions for MatrixFromRowsNode **************************************************************************************************************************) (** * Retrieves the input for the first row * - * @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. + * @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow0 - the input for the first row * @return error code or 0 (success) *) - TLib3MFComposeMatrixFromRowVectorsNode_GetInputAFunc = function(pComposeMatrixFromRowVectorsNode: TLib3MFHandle; out pRow0: TLib3MFHandle): TLib3MFResult; cdecl; + TLib3MFMatrixFromRowsNode_GetInputAFunc = function(pMatrixFromRowsNode: TLib3MFHandle; out pRow0: TLib3MFHandle): TLib3MFResult; cdecl; (** * Retrieves the input for the second row * - * @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. + * @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow1 - the input for the second row * @return error code or 0 (success) *) - TLib3MFComposeMatrixFromRowVectorsNode_GetInputBFunc = function(pComposeMatrixFromRowVectorsNode: TLib3MFHandle; out pRow1: TLib3MFHandle): TLib3MFResult; cdecl; + TLib3MFMatrixFromRowsNode_GetInputBFunc = function(pMatrixFromRowsNode: TLib3MFHandle; out pRow1: TLib3MFHandle): TLib3MFResult; cdecl; (** * Retrieves the input for the third row * - * @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. + * @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow2 - the input for the third row * @return error code or 0 (success) *) - TLib3MFComposeMatrixFromRowVectorsNode_GetInputCFunc = function(pComposeMatrixFromRowVectorsNode: TLib3MFHandle; out pRow2: TLib3MFHandle): TLib3MFResult; cdecl; + TLib3MFMatrixFromRowsNode_GetInputCFunc = function(pMatrixFromRowsNode: TLib3MFHandle; out pRow2: TLib3MFHandle): TLib3MFResult; cdecl; (** * Retrieves the input for the fourth row * - * @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. + * @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow3 - the input for the fourth row * @return error code or 0 (success) *) - TLib3MFComposeMatrixFromRowVectorsNode_GetInputDFunc = function(pComposeMatrixFromRowVectorsNode: TLib3MFHandle; out pRow3: TLib3MFHandle): TLib3MFResult; cdecl; + TLib3MFMatrixFromRowsNode_GetInputDFunc = function(pMatrixFromRowsNode: TLib3MFHandle; out pRow3: TLib3MFHandle): TLib3MFResult; cdecl; (** * Retrieves the output * - * @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. + * @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pResult - the output * @return error code or 0 (success) *) - TLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultFunc = function(pComposeMatrixFromRowVectorsNode: TLib3MFHandle; out pResult: TLib3MFHandle): TLib3MFResult; cdecl; + TLib3MFMatrixFromRowsNode_GetOutputResultFunc = function(pMatrixFromRowsNode: TLib3MFHandle; out pResult: TLib3MFHandle): TLib3MFResult; cdecl; (************************************************************************************************************************* - Function type definitions for ComposeMatrixFromColumnVectors + Function type definitions for MatrixFromColumnsNode **************************************************************************************************************************) (** * Retrieves the input for the first column * - * @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. + * @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn0 - the input for the first column * @return error code or 0 (success) *) - TLib3MFComposeMatrixFromColumnVectors_GetInputAFunc = function(pComposeMatrixFromColumnVectors: TLib3MFHandle; out pColumn0: TLib3MFHandle): TLib3MFResult; cdecl; + TLib3MFMatrixFromColumnsNode_GetInputAFunc = function(pMatrixFromColumnsNode: TLib3MFHandle; out pColumn0: TLib3MFHandle): TLib3MFResult; cdecl; (** * Retrieves the input for the second column * - * @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. + * @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn1 - the input for the second column * @return error code or 0 (success) *) - TLib3MFComposeMatrixFromColumnVectors_GetInputBFunc = function(pComposeMatrixFromColumnVectors: TLib3MFHandle; out pColumn1: TLib3MFHandle): TLib3MFResult; cdecl; + TLib3MFMatrixFromColumnsNode_GetInputBFunc = function(pMatrixFromColumnsNode: TLib3MFHandle; out pColumn1: TLib3MFHandle): TLib3MFResult; cdecl; (** * Retrieves the input for the third column * - * @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. + * @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn2 - the input for the third column * @return error code or 0 (success) *) - TLib3MFComposeMatrixFromColumnVectors_GetInputCFunc = function(pComposeMatrixFromColumnVectors: TLib3MFHandle; out pColumn2: TLib3MFHandle): TLib3MFResult; cdecl; + TLib3MFMatrixFromColumnsNode_GetInputCFunc = function(pMatrixFromColumnsNode: TLib3MFHandle; out pColumn2: TLib3MFHandle): TLib3MFResult; cdecl; (** * Retrieves the input for the fourth column * - * @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. + * @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn3 - the input for the fourth column * @return error code or 0 (success) *) - TLib3MFComposeMatrixFromColumnVectors_GetInputDFunc = function(pComposeMatrixFromColumnVectors: TLib3MFHandle; out pColumn3: TLib3MFHandle): TLib3MFResult; cdecl; + TLib3MFMatrixFromColumnsNode_GetInputDFunc = function(pMatrixFromColumnsNode: TLib3MFHandle; out pColumn3: TLib3MFHandle): TLib3MFResult; cdecl; (** * Retrieves the output * - * @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. + * @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pResult - the output * @return error code or 0 (success) *) - TLib3MFComposeMatrixFromColumnVectors_GetOutputResultFunc = function(pComposeMatrixFromColumnVectors: TLib3MFHandle; out pResult: TLib3MFHandle): TLib3MFResult; cdecl; + TLib3MFMatrixFromColumnsNode_GetOutputResultFunc = function(pMatrixFromColumnsNode: TLib3MFHandle; out pResult: TLib3MFHandle): TLib3MFResult; cdecl; (************************************************************************************************************************* @@ -4282,6 +4309,38 @@ TLib3MFModel = class; TLib3MFMeshNode_GetOutputDistanceFunc = function(pMeshNode: TLib3MFHandle; out pDistance: TLib3MFHandle): TLib3MFResult; cdecl; +(************************************************************************************************************************* + Function type definitions for UnsignedMeshNode +**************************************************************************************************************************) + + (** + * Retrieves the input for the model resource id of the mesh + * + * @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. + * @param[out] pMesh - the input port for the model resource id of the mesh + * @return error code or 0 (success) + *) + TLib3MFUnsignedMeshNode_GetInputMeshFunc = function(pUnsignedMeshNode: TLib3MFHandle; out pMesh: TLib3MFHandle): TLib3MFResult; cdecl; + + (** + * Retrieves the input for the position + * + * @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. + * @param[out] pPos - the input port for the position + * @return error code or 0 (success) + *) + TLib3MFUnsignedMeshNode_GetInputPosFunc = function(pUnsignedMeshNode: TLib3MFHandle; out pPos: TLib3MFHandle): TLib3MFResult; cdecl; + + (** + * Retrieves the output + * + * @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. + * @param[out] pDistance - the output port for the unsigned distance to the mesh + * @return error code or 0 (success) + *) + TLib3MFUnsignedMeshNode_GetOutputDistanceFunc = function(pUnsignedMeshNode: TLib3MFHandle; out pDistance: TLib3MFHandle): TLib3MFResult; cdecl; + + (************************************************************************************************************************* Function type definitions for FunctionCallNode **************************************************************************************************************************) @@ -4940,6 +4999,18 @@ TLib3MFModel = class; *) TLib3MFImplicitFunction_AddComposeVectorNodeFunc = function(pImplicitFunction: TLib3MFHandle; const pIdentifier: PAnsiChar; const pDisplayName: PAnsiChar; const pTag: PAnsiChar; out pNode: TLib3MFHandle): TLib3MFResult; cdecl; + (** + * Add a VectorFromScalar + * + * @param[in] pImplicitFunction - ImplicitFunction instance. + * @param[in] pIdentifier - the identifier of the node + * @param[in] pDisplayName - the display name of the node + * @param[in] pTag - the tag of the node + * @param[out] pNode - the added node + * @return error code or 0 (success) + *) + TLib3MFImplicitFunction_AddVectorFromScalarNodeFunc = function(pImplicitFunction: TLib3MFHandle; const pIdentifier: PAnsiChar; const pDisplayName: PAnsiChar; const pTag: PAnsiChar; out pNode: TLib3MFHandle): TLib3MFResult; cdecl; + (** * Add a DecomposeVectorNode * @@ -4965,7 +5036,7 @@ TLib3MFModel = class; TLib3MFImplicitFunction_AddComposeMatrixNodeFunc = function(pImplicitFunction: TLib3MFHandle; const pIdentifier: PAnsiChar; const pDisplayName: PAnsiChar; const pTag: PAnsiChar; out pNode: TLib3MFHandle): TLib3MFResult; cdecl; (** - * Add a ComposeMatrixFromRowVectorsNode + * Add a MatrixFromRowsNode * * @param[in] pImplicitFunction - ImplicitFunction instance. * @param[in] pIdentifier - the identifier of the node @@ -4974,7 +5045,19 @@ TLib3MFModel = class; * @param[out] pNode - the added node * @return error code or 0 (success) *) - TLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodeFunc = function(pImplicitFunction: TLib3MFHandle; const pIdentifier: PAnsiChar; const pDisplayName: PAnsiChar; const pTag: PAnsiChar; out pNode: TLib3MFHandle): TLib3MFResult; cdecl; + TLib3MFImplicitFunction_AddMatrixFromRowsNodeFunc = function(pImplicitFunction: TLib3MFHandle; const pIdentifier: PAnsiChar; const pDisplayName: PAnsiChar; const pTag: PAnsiChar; out pNode: TLib3MFHandle): TLib3MFResult; cdecl; + + (** + * Add a MatrixFromColumnsNode + * + * @param[in] pImplicitFunction - ImplicitFunction instance. + * @param[in] pIdentifier - the identifier of the node + * @param[in] pDisplayName - the display name of the node + * @param[in] pTag - the tag of the node + * @param[out] pNode - the added node + * @return error code or 0 (success) + *) + TLib3MFImplicitFunction_AddMatrixFromColumnsNodeFunc = function(pImplicitFunction: TLib3MFHandle; const pIdentifier: PAnsiChar; const pDisplayName: PAnsiChar; const pTag: PAnsiChar; out pNode: TLib3MFHandle): TLib3MFResult; cdecl; (** * Add a ConstantNode @@ -5024,6 +5107,18 @@ TLib3MFModel = class; *) TLib3MFImplicitFunction_AddMeshNodeFunc = function(pImplicitFunction: TLib3MFHandle; const pIdentifier: PAnsiChar; const pDisplayName: PAnsiChar; const pTag: PAnsiChar; out pNode: TLib3MFHandle): TLib3MFResult; cdecl; + (** + * Add a UnsignedMeshNode + * + * @param[in] pImplicitFunction - ImplicitFunction instance. + * @param[in] pIdentifier - the identifier of the node + * @param[in] pDisplayName - the display name of the node + * @param[in] pTag - the tag of the node + * @param[out] pNode - the added node + * @return error code or 0 (success) + *) + TLib3MFImplicitFunction_AddUnsignedMeshNodeFunc = function(pImplicitFunction: TLib3MFHandle; const pIdentifier: PAnsiChar; const pDisplayName: PAnsiChar; const pTag: PAnsiChar; out pNode: TLib3MFHandle): TLib3MFResult; cdecl; + (** * Add a FunctionCallNode * @@ -8096,6 +8191,19 @@ TLib3MFComposeVectorNode = class(TLib3MFImplicitNode) end; +(************************************************************************************************************************* + Class definition for VectorFromScalarNode +**************************************************************************************************************************) + + TLib3MFVectorFromScalarNode = class(TLib3MFImplicitNode) + public + constructor Create(AWrapper: TLib3MFWrapper; AHandle: TLib3MFHandle); + destructor Destroy; override; + function GetInputA(): TLib3MFImplicitPort; + function GetOutputResult(): TLib3MFImplicitPort; + end; + + (************************************************************************************************************************* Class definition for DecomposeVectorNode **************************************************************************************************************************) @@ -8140,10 +8248,10 @@ TLib3MFComposeMatrixNode = class(TLib3MFImplicitNode) (************************************************************************************************************************* - Class definition for ComposeMatrixFromRowVectorsNode + Class definition for MatrixFromRowsNode **************************************************************************************************************************) - TLib3MFComposeMatrixFromRowVectorsNode = class(TLib3MFImplicitNode) + TLib3MFMatrixFromRowsNode = class(TLib3MFImplicitNode) public constructor Create(AWrapper: TLib3MFWrapper; AHandle: TLib3MFHandle); destructor Destroy; override; @@ -8156,10 +8264,10 @@ TLib3MFComposeMatrixFromRowVectorsNode = class(TLib3MFImplicitNode) (************************************************************************************************************************* - Class definition for ComposeMatrixFromColumnVectors + Class definition for MatrixFromColumnsNode **************************************************************************************************************************) - TLib3MFComposeMatrixFromColumnVectors = class(TLib3MFImplicitNode) + TLib3MFMatrixFromColumnsNode = class(TLib3MFImplicitNode) public constructor Create(AWrapper: TLib3MFWrapper; AHandle: TLib3MFHandle); destructor Destroy; override; @@ -8227,6 +8335,20 @@ TLib3MFMeshNode = class(TLib3MFImplicitNode) end; +(************************************************************************************************************************* + Class definition for UnsignedMeshNode +**************************************************************************************************************************) + + TLib3MFUnsignedMeshNode = class(TLib3MFImplicitNode) + public + constructor Create(AWrapper: TLib3MFWrapper; AHandle: TLib3MFHandle); + destructor Destroy; override; + function GetInputMesh(): TLib3MFImplicitPort; + function GetInputPos(): TLib3MFImplicitPort; + function GetOutputDistance(): TLib3MFImplicitPort; + end; + + (************************************************************************************************************************* Class definition for FunctionCallNode **************************************************************************************************************************) @@ -8321,13 +8443,16 @@ TLib3MFImplicitFunction = class(TLib3MFFunction) function AddSelectNode(const AIdentifier: String; const AConfiguration: TLib3MFImplicitNodeConfiguration; const ADisplayName: String; const ATag: String): TLib3MFSelectNode; function AddClampNode(const AIdentifier: String; const AConfiguration: TLib3MFImplicitNodeConfiguration; const ADisplayName: String; const ATag: String): TLib3MFClampNode; function AddComposeVectorNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFComposeVectorNode; + function AddVectorFromScalarNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFVectorFromScalarNode; function AddDecomposeVectorNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFDecomposeVectorNode; function AddComposeMatrixNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFComposeMatrixNode; - function AddComposeMatrixFromRowVectorsNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFComposeMatrixFromRowVectorsNode; + function AddMatrixFromRowsNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFMatrixFromRowsNode; + function AddMatrixFromColumnsNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFMatrixFromColumnsNode; function AddConstantNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFConstantNode; function AddConstVecNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFConstVecNode; function AddConstMatNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFConstMatNode; function AddMeshNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFMeshNode; + function AddUnsignedMeshNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFUnsignedMeshNode; function AddFunctionCallNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFFunctionCallNode; function GetNodes(): TLib3MFNodeIterator; procedure RemoveNode(const ANode: TLib3MFImplicitNode); @@ -8922,6 +9047,8 @@ TLib3MFWrapper = class(TObject) FLib3MFComposeVectorNode_GetInputYFunc: TLib3MFComposeVectorNode_GetInputYFunc; FLib3MFComposeVectorNode_GetInputZFunc: TLib3MFComposeVectorNode_GetInputZFunc; FLib3MFComposeVectorNode_GetOutputResultFunc: TLib3MFComposeVectorNode_GetOutputResultFunc; + FLib3MFVectorFromScalarNode_GetInputAFunc: TLib3MFVectorFromScalarNode_GetInputAFunc; + FLib3MFVectorFromScalarNode_GetOutputResultFunc: TLib3MFVectorFromScalarNode_GetOutputResultFunc; FLib3MFDecomposeVectorNode_GetInputAFunc: TLib3MFDecomposeVectorNode_GetInputAFunc; FLib3MFDecomposeVectorNode_GetOutputXFunc: TLib3MFDecomposeVectorNode_GetOutputXFunc; FLib3MFDecomposeVectorNode_GetOutputYFunc: TLib3MFDecomposeVectorNode_GetOutputYFunc; @@ -8943,16 +9070,16 @@ TLib3MFWrapper = class(TObject) FLib3MFComposeMatrixNode_GetInputM32Func: TLib3MFComposeMatrixNode_GetInputM32Func; FLib3MFComposeMatrixNode_GetInputM33Func: TLib3MFComposeMatrixNode_GetInputM33Func; FLib3MFComposeMatrixNode_GetOutputResultFunc: TLib3MFComposeMatrixNode_GetOutputResultFunc; - FLib3MFComposeMatrixFromRowVectorsNode_GetInputAFunc: TLib3MFComposeMatrixFromRowVectorsNode_GetInputAFunc; - FLib3MFComposeMatrixFromRowVectorsNode_GetInputBFunc: TLib3MFComposeMatrixFromRowVectorsNode_GetInputBFunc; - FLib3MFComposeMatrixFromRowVectorsNode_GetInputCFunc: TLib3MFComposeMatrixFromRowVectorsNode_GetInputCFunc; - FLib3MFComposeMatrixFromRowVectorsNode_GetInputDFunc: TLib3MFComposeMatrixFromRowVectorsNode_GetInputDFunc; - FLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultFunc: TLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultFunc; - FLib3MFComposeMatrixFromColumnVectors_GetInputAFunc: TLib3MFComposeMatrixFromColumnVectors_GetInputAFunc; - FLib3MFComposeMatrixFromColumnVectors_GetInputBFunc: TLib3MFComposeMatrixFromColumnVectors_GetInputBFunc; - FLib3MFComposeMatrixFromColumnVectors_GetInputCFunc: TLib3MFComposeMatrixFromColumnVectors_GetInputCFunc; - FLib3MFComposeMatrixFromColumnVectors_GetInputDFunc: TLib3MFComposeMatrixFromColumnVectors_GetInputDFunc; - FLib3MFComposeMatrixFromColumnVectors_GetOutputResultFunc: TLib3MFComposeMatrixFromColumnVectors_GetOutputResultFunc; + FLib3MFMatrixFromRowsNode_GetInputAFunc: TLib3MFMatrixFromRowsNode_GetInputAFunc; + FLib3MFMatrixFromRowsNode_GetInputBFunc: TLib3MFMatrixFromRowsNode_GetInputBFunc; + FLib3MFMatrixFromRowsNode_GetInputCFunc: TLib3MFMatrixFromRowsNode_GetInputCFunc; + FLib3MFMatrixFromRowsNode_GetInputDFunc: TLib3MFMatrixFromRowsNode_GetInputDFunc; + FLib3MFMatrixFromRowsNode_GetOutputResultFunc: TLib3MFMatrixFromRowsNode_GetOutputResultFunc; + FLib3MFMatrixFromColumnsNode_GetInputAFunc: TLib3MFMatrixFromColumnsNode_GetInputAFunc; + FLib3MFMatrixFromColumnsNode_GetInputBFunc: TLib3MFMatrixFromColumnsNode_GetInputBFunc; + FLib3MFMatrixFromColumnsNode_GetInputCFunc: TLib3MFMatrixFromColumnsNode_GetInputCFunc; + FLib3MFMatrixFromColumnsNode_GetInputDFunc: TLib3MFMatrixFromColumnsNode_GetInputDFunc; + FLib3MFMatrixFromColumnsNode_GetOutputResultFunc: TLib3MFMatrixFromColumnsNode_GetOutputResultFunc; FLib3MFConstantNode_SetConstantFunc: TLib3MFConstantNode_SetConstantFunc; FLib3MFConstantNode_GetConstantFunc: TLib3MFConstantNode_GetConstantFunc; FLib3MFConstantNode_GetOutputValueFunc: TLib3MFConstantNode_GetOutputValueFunc; @@ -8965,6 +9092,9 @@ TLib3MFWrapper = class(TObject) FLib3MFMeshNode_GetInputMeshFunc: TLib3MFMeshNode_GetInputMeshFunc; FLib3MFMeshNode_GetInputPosFunc: TLib3MFMeshNode_GetInputPosFunc; FLib3MFMeshNode_GetOutputDistanceFunc: TLib3MFMeshNode_GetOutputDistanceFunc; + FLib3MFUnsignedMeshNode_GetInputMeshFunc: TLib3MFUnsignedMeshNode_GetInputMeshFunc; + FLib3MFUnsignedMeshNode_GetInputPosFunc: TLib3MFUnsignedMeshNode_GetInputPosFunc; + FLib3MFUnsignedMeshNode_GetOutputDistanceFunc: TLib3MFUnsignedMeshNode_GetOutputDistanceFunc; FLib3MFFunctionCallNode_GetInputFunctionIDFunc: TLib3MFFunctionCallNode_GetInputFunctionIDFunc; FLib3MFNodeIterator_GetCurrentFunc: TLib3MFNodeIterator_GetCurrentFunc; FLib3MFFunction_GetDisplayNameFunc: TLib3MFFunction_GetDisplayNameFunc; @@ -9018,13 +9148,16 @@ TLib3MFWrapper = class(TObject) FLib3MFImplicitFunction_AddSelectNodeFunc: TLib3MFImplicitFunction_AddSelectNodeFunc; FLib3MFImplicitFunction_AddClampNodeFunc: TLib3MFImplicitFunction_AddClampNodeFunc; FLib3MFImplicitFunction_AddComposeVectorNodeFunc: TLib3MFImplicitFunction_AddComposeVectorNodeFunc; + FLib3MFImplicitFunction_AddVectorFromScalarNodeFunc: TLib3MFImplicitFunction_AddVectorFromScalarNodeFunc; FLib3MFImplicitFunction_AddDecomposeVectorNodeFunc: TLib3MFImplicitFunction_AddDecomposeVectorNodeFunc; FLib3MFImplicitFunction_AddComposeMatrixNodeFunc: TLib3MFImplicitFunction_AddComposeMatrixNodeFunc; - FLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodeFunc: TLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodeFunc; + FLib3MFImplicitFunction_AddMatrixFromRowsNodeFunc: TLib3MFImplicitFunction_AddMatrixFromRowsNodeFunc; + FLib3MFImplicitFunction_AddMatrixFromColumnsNodeFunc: TLib3MFImplicitFunction_AddMatrixFromColumnsNodeFunc; FLib3MFImplicitFunction_AddConstantNodeFunc: TLib3MFImplicitFunction_AddConstantNodeFunc; FLib3MFImplicitFunction_AddConstVecNodeFunc: TLib3MFImplicitFunction_AddConstVecNodeFunc; FLib3MFImplicitFunction_AddConstMatNodeFunc: TLib3MFImplicitFunction_AddConstMatNodeFunc; FLib3MFImplicitFunction_AddMeshNodeFunc: TLib3MFImplicitFunction_AddMeshNodeFunc; + FLib3MFImplicitFunction_AddUnsignedMeshNodeFunc: TLib3MFImplicitFunction_AddUnsignedMeshNodeFunc; FLib3MFImplicitFunction_AddFunctionCallNodeFunc: TLib3MFImplicitFunction_AddFunctionCallNodeFunc; FLib3MFImplicitFunction_GetNodesFunc: TLib3MFImplicitFunction_GetNodesFunc; FLib3MFImplicitFunction_RemoveNodeFunc: TLib3MFImplicitFunction_RemoveNodeFunc; @@ -9507,6 +9640,8 @@ TLib3MFWrapper = class(TObject) property Lib3MFComposeVectorNode_GetInputYFunc: TLib3MFComposeVectorNode_GetInputYFunc read FLib3MFComposeVectorNode_GetInputYFunc; property Lib3MFComposeVectorNode_GetInputZFunc: TLib3MFComposeVectorNode_GetInputZFunc read FLib3MFComposeVectorNode_GetInputZFunc; property Lib3MFComposeVectorNode_GetOutputResultFunc: TLib3MFComposeVectorNode_GetOutputResultFunc read FLib3MFComposeVectorNode_GetOutputResultFunc; + property Lib3MFVectorFromScalarNode_GetInputAFunc: TLib3MFVectorFromScalarNode_GetInputAFunc read FLib3MFVectorFromScalarNode_GetInputAFunc; + property Lib3MFVectorFromScalarNode_GetOutputResultFunc: TLib3MFVectorFromScalarNode_GetOutputResultFunc read FLib3MFVectorFromScalarNode_GetOutputResultFunc; property Lib3MFDecomposeVectorNode_GetInputAFunc: TLib3MFDecomposeVectorNode_GetInputAFunc read FLib3MFDecomposeVectorNode_GetInputAFunc; property Lib3MFDecomposeVectorNode_GetOutputXFunc: TLib3MFDecomposeVectorNode_GetOutputXFunc read FLib3MFDecomposeVectorNode_GetOutputXFunc; property Lib3MFDecomposeVectorNode_GetOutputYFunc: TLib3MFDecomposeVectorNode_GetOutputYFunc read FLib3MFDecomposeVectorNode_GetOutputYFunc; @@ -9528,16 +9663,16 @@ TLib3MFWrapper = class(TObject) property Lib3MFComposeMatrixNode_GetInputM32Func: TLib3MFComposeMatrixNode_GetInputM32Func read FLib3MFComposeMatrixNode_GetInputM32Func; property Lib3MFComposeMatrixNode_GetInputM33Func: TLib3MFComposeMatrixNode_GetInputM33Func read FLib3MFComposeMatrixNode_GetInputM33Func; property Lib3MFComposeMatrixNode_GetOutputResultFunc: TLib3MFComposeMatrixNode_GetOutputResultFunc read FLib3MFComposeMatrixNode_GetOutputResultFunc; - property Lib3MFComposeMatrixFromRowVectorsNode_GetInputAFunc: TLib3MFComposeMatrixFromRowVectorsNode_GetInputAFunc read FLib3MFComposeMatrixFromRowVectorsNode_GetInputAFunc; - property Lib3MFComposeMatrixFromRowVectorsNode_GetInputBFunc: TLib3MFComposeMatrixFromRowVectorsNode_GetInputBFunc read FLib3MFComposeMatrixFromRowVectorsNode_GetInputBFunc; - property Lib3MFComposeMatrixFromRowVectorsNode_GetInputCFunc: TLib3MFComposeMatrixFromRowVectorsNode_GetInputCFunc read FLib3MFComposeMatrixFromRowVectorsNode_GetInputCFunc; - property Lib3MFComposeMatrixFromRowVectorsNode_GetInputDFunc: TLib3MFComposeMatrixFromRowVectorsNode_GetInputDFunc read FLib3MFComposeMatrixFromRowVectorsNode_GetInputDFunc; - property Lib3MFComposeMatrixFromRowVectorsNode_GetOutputResultFunc: TLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultFunc read FLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultFunc; - property Lib3MFComposeMatrixFromColumnVectors_GetInputAFunc: TLib3MFComposeMatrixFromColumnVectors_GetInputAFunc read FLib3MFComposeMatrixFromColumnVectors_GetInputAFunc; - property Lib3MFComposeMatrixFromColumnVectors_GetInputBFunc: TLib3MFComposeMatrixFromColumnVectors_GetInputBFunc read FLib3MFComposeMatrixFromColumnVectors_GetInputBFunc; - property Lib3MFComposeMatrixFromColumnVectors_GetInputCFunc: TLib3MFComposeMatrixFromColumnVectors_GetInputCFunc read FLib3MFComposeMatrixFromColumnVectors_GetInputCFunc; - property Lib3MFComposeMatrixFromColumnVectors_GetInputDFunc: TLib3MFComposeMatrixFromColumnVectors_GetInputDFunc read FLib3MFComposeMatrixFromColumnVectors_GetInputDFunc; - property Lib3MFComposeMatrixFromColumnVectors_GetOutputResultFunc: TLib3MFComposeMatrixFromColumnVectors_GetOutputResultFunc read FLib3MFComposeMatrixFromColumnVectors_GetOutputResultFunc; + property Lib3MFMatrixFromRowsNode_GetInputAFunc: TLib3MFMatrixFromRowsNode_GetInputAFunc read FLib3MFMatrixFromRowsNode_GetInputAFunc; + property Lib3MFMatrixFromRowsNode_GetInputBFunc: TLib3MFMatrixFromRowsNode_GetInputBFunc read FLib3MFMatrixFromRowsNode_GetInputBFunc; + property Lib3MFMatrixFromRowsNode_GetInputCFunc: TLib3MFMatrixFromRowsNode_GetInputCFunc read FLib3MFMatrixFromRowsNode_GetInputCFunc; + property Lib3MFMatrixFromRowsNode_GetInputDFunc: TLib3MFMatrixFromRowsNode_GetInputDFunc read FLib3MFMatrixFromRowsNode_GetInputDFunc; + property Lib3MFMatrixFromRowsNode_GetOutputResultFunc: TLib3MFMatrixFromRowsNode_GetOutputResultFunc read FLib3MFMatrixFromRowsNode_GetOutputResultFunc; + property Lib3MFMatrixFromColumnsNode_GetInputAFunc: TLib3MFMatrixFromColumnsNode_GetInputAFunc read FLib3MFMatrixFromColumnsNode_GetInputAFunc; + property Lib3MFMatrixFromColumnsNode_GetInputBFunc: TLib3MFMatrixFromColumnsNode_GetInputBFunc read FLib3MFMatrixFromColumnsNode_GetInputBFunc; + property Lib3MFMatrixFromColumnsNode_GetInputCFunc: TLib3MFMatrixFromColumnsNode_GetInputCFunc read FLib3MFMatrixFromColumnsNode_GetInputCFunc; + property Lib3MFMatrixFromColumnsNode_GetInputDFunc: TLib3MFMatrixFromColumnsNode_GetInputDFunc read FLib3MFMatrixFromColumnsNode_GetInputDFunc; + property Lib3MFMatrixFromColumnsNode_GetOutputResultFunc: TLib3MFMatrixFromColumnsNode_GetOutputResultFunc read FLib3MFMatrixFromColumnsNode_GetOutputResultFunc; property Lib3MFConstantNode_SetConstantFunc: TLib3MFConstantNode_SetConstantFunc read FLib3MFConstantNode_SetConstantFunc; property Lib3MFConstantNode_GetConstantFunc: TLib3MFConstantNode_GetConstantFunc read FLib3MFConstantNode_GetConstantFunc; property Lib3MFConstantNode_GetOutputValueFunc: TLib3MFConstantNode_GetOutputValueFunc read FLib3MFConstantNode_GetOutputValueFunc; @@ -9550,6 +9685,9 @@ TLib3MFWrapper = class(TObject) property Lib3MFMeshNode_GetInputMeshFunc: TLib3MFMeshNode_GetInputMeshFunc read FLib3MFMeshNode_GetInputMeshFunc; property Lib3MFMeshNode_GetInputPosFunc: TLib3MFMeshNode_GetInputPosFunc read FLib3MFMeshNode_GetInputPosFunc; property Lib3MFMeshNode_GetOutputDistanceFunc: TLib3MFMeshNode_GetOutputDistanceFunc read FLib3MFMeshNode_GetOutputDistanceFunc; + property Lib3MFUnsignedMeshNode_GetInputMeshFunc: TLib3MFUnsignedMeshNode_GetInputMeshFunc read FLib3MFUnsignedMeshNode_GetInputMeshFunc; + property Lib3MFUnsignedMeshNode_GetInputPosFunc: TLib3MFUnsignedMeshNode_GetInputPosFunc read FLib3MFUnsignedMeshNode_GetInputPosFunc; + property Lib3MFUnsignedMeshNode_GetOutputDistanceFunc: TLib3MFUnsignedMeshNode_GetOutputDistanceFunc read FLib3MFUnsignedMeshNode_GetOutputDistanceFunc; property Lib3MFFunctionCallNode_GetInputFunctionIDFunc: TLib3MFFunctionCallNode_GetInputFunctionIDFunc read FLib3MFFunctionCallNode_GetInputFunctionIDFunc; property Lib3MFNodeIterator_GetCurrentFunc: TLib3MFNodeIterator_GetCurrentFunc read FLib3MFNodeIterator_GetCurrentFunc; property Lib3MFFunction_GetDisplayNameFunc: TLib3MFFunction_GetDisplayNameFunc read FLib3MFFunction_GetDisplayNameFunc; @@ -9603,13 +9741,16 @@ TLib3MFWrapper = class(TObject) property Lib3MFImplicitFunction_AddSelectNodeFunc: TLib3MFImplicitFunction_AddSelectNodeFunc read FLib3MFImplicitFunction_AddSelectNodeFunc; property Lib3MFImplicitFunction_AddClampNodeFunc: TLib3MFImplicitFunction_AddClampNodeFunc read FLib3MFImplicitFunction_AddClampNodeFunc; property Lib3MFImplicitFunction_AddComposeVectorNodeFunc: TLib3MFImplicitFunction_AddComposeVectorNodeFunc read FLib3MFImplicitFunction_AddComposeVectorNodeFunc; + property Lib3MFImplicitFunction_AddVectorFromScalarNodeFunc: TLib3MFImplicitFunction_AddVectorFromScalarNodeFunc read FLib3MFImplicitFunction_AddVectorFromScalarNodeFunc; property Lib3MFImplicitFunction_AddDecomposeVectorNodeFunc: TLib3MFImplicitFunction_AddDecomposeVectorNodeFunc read FLib3MFImplicitFunction_AddDecomposeVectorNodeFunc; property Lib3MFImplicitFunction_AddComposeMatrixNodeFunc: TLib3MFImplicitFunction_AddComposeMatrixNodeFunc read FLib3MFImplicitFunction_AddComposeMatrixNodeFunc; - property Lib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodeFunc: TLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodeFunc read FLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodeFunc; + property Lib3MFImplicitFunction_AddMatrixFromRowsNodeFunc: TLib3MFImplicitFunction_AddMatrixFromRowsNodeFunc read FLib3MFImplicitFunction_AddMatrixFromRowsNodeFunc; + property Lib3MFImplicitFunction_AddMatrixFromColumnsNodeFunc: TLib3MFImplicitFunction_AddMatrixFromColumnsNodeFunc read FLib3MFImplicitFunction_AddMatrixFromColumnsNodeFunc; property Lib3MFImplicitFunction_AddConstantNodeFunc: TLib3MFImplicitFunction_AddConstantNodeFunc read FLib3MFImplicitFunction_AddConstantNodeFunc; property Lib3MFImplicitFunction_AddConstVecNodeFunc: TLib3MFImplicitFunction_AddConstVecNodeFunc read FLib3MFImplicitFunction_AddConstVecNodeFunc; property Lib3MFImplicitFunction_AddConstMatNodeFunc: TLib3MFImplicitFunction_AddConstMatNodeFunc read FLib3MFImplicitFunction_AddConstMatNodeFunc; property Lib3MFImplicitFunction_AddMeshNodeFunc: TLib3MFImplicitFunction_AddMeshNodeFunc read FLib3MFImplicitFunction_AddMeshNodeFunc; + property Lib3MFImplicitFunction_AddUnsignedMeshNodeFunc: TLib3MFImplicitFunction_AddUnsignedMeshNodeFunc read FLib3MFImplicitFunction_AddUnsignedMeshNodeFunc; property Lib3MFImplicitFunction_AddFunctionCallNodeFunc: TLib3MFImplicitFunction_AddFunctionCallNodeFunc read FLib3MFImplicitFunction_AddFunctionCallNodeFunc; property Lib3MFImplicitFunction_GetNodesFunc: TLib3MFImplicitFunction_GetNodesFunc read FLib3MFImplicitFunction_GetNodesFunc; property Lib3MFImplicitFunction_RemoveNodeFunc: TLib3MFImplicitFunction_RemoveNodeFunc read FLib3MFImplicitFunction_RemoveNodeFunc; @@ -9955,14 +10096,16 @@ TLib3MFPolymorphicFactory<_T:class; _B> = record function TLib3MFPolymorphicFactoryMakeSelectNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFSelectNode; function TLib3MFPolymorphicFactoryMakeClampNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFClampNode; function TLib3MFPolymorphicFactoryMakeComposeVectorNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFComposeVectorNode; + function TLib3MFPolymorphicFactoryMakeVectorFromScalarNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFVectorFromScalarNode; function TLib3MFPolymorphicFactoryMakeDecomposeVectorNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFDecomposeVectorNode; function TLib3MFPolymorphicFactoryMakeComposeMatrixNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFComposeMatrixNode; - function TLib3MFPolymorphicFactoryMakeComposeMatrixFromRowVectorsNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFComposeMatrixFromRowVectorsNode; - function TLib3MFPolymorphicFactoryMakeComposeMatrixFromColumnVectors(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFComposeMatrixFromColumnVectors; + function TLib3MFPolymorphicFactoryMakeMatrixFromRowsNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFMatrixFromRowsNode; + function TLib3MFPolymorphicFactoryMakeMatrixFromColumnsNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFMatrixFromColumnsNode; function TLib3MFPolymorphicFactoryMakeConstantNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFConstantNode; function TLib3MFPolymorphicFactoryMakeConstVecNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFConstVecNode; function TLib3MFPolymorphicFactoryMakeConstMatNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFConstMatNode; function TLib3MFPolymorphicFactoryMakeMeshNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFMeshNode; + function TLib3MFPolymorphicFactoryMakeUnsignedMeshNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFUnsignedMeshNode; function TLib3MFPolymorphicFactoryMakeFunctionCallNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFFunctionCallNode; function TLib3MFPolymorphicFactoryMakeNodeIterator(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFNodeIterator; function TLib3MFPolymorphicFactoryMakeFunction(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFFunction; @@ -10404,8 +10547,8 @@ implementation eImplicitNodeTypeComposeVector: Result := 8; eImplicitNodeTypeDecomposeVector: Result := 9; eImplicitNodeTypeComposeMatrix: Result := 10; - eImplicitNodeTypeComposeMatrixFromColumnVectors: Result := 11; - eImplicitNodeTypeComposeMatrixFromRowVectors: Result := 12; + eImplicitNodeTypeMatrixFromColumns: Result := 11; + eImplicitNodeTypeMatrixFromRows: Result := 12; eImplicitNodeTypeDot: Result := 13; eImplicitNodeTypeCross: Result := 14; eImplicitNodeTypeMatVecMultiplication: Result := 15; @@ -10442,6 +10585,8 @@ implementation eImplicitNodeTypeMesh: Result := 46; eImplicitNodeTypeLength: Result := 47; eImplicitNodeTypeResource: Result := 48; + eImplicitNodeTypeVectorFromScalar: Result := 49; + eImplicitNodeTypeUnsignedMesh: Result := 50; else raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_INVALIDPARAM, 'invalid enum value'); end; @@ -10460,8 +10605,8 @@ implementation 8: Result := eImplicitNodeTypeComposeVector; 9: Result := eImplicitNodeTypeDecomposeVector; 10: Result := eImplicitNodeTypeComposeMatrix; - 11: Result := eImplicitNodeTypeComposeMatrixFromColumnVectors; - 12: Result := eImplicitNodeTypeComposeMatrixFromRowVectors; + 11: Result := eImplicitNodeTypeMatrixFromColumns; + 12: Result := eImplicitNodeTypeMatrixFromRows; 13: Result := eImplicitNodeTypeDot; 14: Result := eImplicitNodeTypeCross; 15: Result := eImplicitNodeTypeMatVecMultiplication; @@ -10498,6 +10643,8 @@ implementation 46: Result := eImplicitNodeTypeMesh; 47: Result := eImplicitNodeTypeLength; 48: Result := eImplicitNodeTypeResource; + 49: Result := eImplicitNodeTypeVectorFromScalar; + 50: Result := eImplicitNodeTypeUnsignedMesh; else raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_INVALIDPARAM, 'invalid enum constant'); end; @@ -10769,14 +10916,16 @@ implementation QWord($1127ED71E05A9BD4): begin Obj := TLIB3MFSelectNode.Create(Wrapper, Handle); if Obj.inheritsFrom(_T) then Result := Obj as _T; end; // First 64 bits of SHA1 of a string: "Lib3MF::SelectNode" QWord($77AF68C971B1485F): begin Obj := TLIB3MFClampNode.Create(Wrapper, Handle); if Obj.inheritsFrom(_T) then Result := Obj as _T; end; // First 64 bits of SHA1 of a string: "Lib3MF::ClampNode" QWord($49C24B8840C01F7E): begin Obj := TLIB3MFComposeVectorNode.Create(Wrapper, Handle); if Obj.inheritsFrom(_T) then Result := Obj as _T; end; // First 64 bits of SHA1 of a string: "Lib3MF::ComposeVectorNode" + QWord($2E417B93351375E2): begin Obj := TLIB3MFVectorFromScalarNode.Create(Wrapper, Handle); if Obj.inheritsFrom(_T) then Result := Obj as _T; end; // First 64 bits of SHA1 of a string: "Lib3MF::VectorFromScalarNode" QWord($CC4F8D561CCE35D4): begin Obj := TLIB3MFDecomposeVectorNode.Create(Wrapper, Handle); if Obj.inheritsFrom(_T) then Result := Obj as _T; end; // First 64 bits of SHA1 of a string: "Lib3MF::DecomposeVectorNode" QWord($9EF9EB54A53AA40D): begin Obj := TLIB3MFComposeMatrixNode.Create(Wrapper, Handle); if Obj.inheritsFrom(_T) then Result := Obj as _T; end; // First 64 bits of SHA1 of a string: "Lib3MF::ComposeMatrixNode" - QWord($5F89513A9B5FC583): begin Obj := TLIB3MFComposeMatrixFromRowVectorsNode.Create(Wrapper, Handle); if Obj.inheritsFrom(_T) then Result := Obj as _T; end; // First 64 bits of SHA1 of a string: "Lib3MF::ComposeMatrixFromRowVectorsNode" - QWord($1A740A1E16230053): begin Obj := TLIB3MFComposeMatrixFromColumnVectors.Create(Wrapper, Handle); if Obj.inheritsFrom(_T) then Result := Obj as _T; end; // First 64 bits of SHA1 of a string: "Lib3MF::ComposeMatrixFromColumnVectors" + QWord($D6DFD0A7EB64AC33): begin Obj := TLIB3MFMatrixFromRowsNode.Create(Wrapper, Handle); if Obj.inheritsFrom(_T) then Result := Obj as _T; end; // First 64 bits of SHA1 of a string: "Lib3MF::MatrixFromRowsNode" + QWord($0DCBEAFCF83F3AAC): begin Obj := TLIB3MFMatrixFromColumnsNode.Create(Wrapper, Handle); if Obj.inheritsFrom(_T) then Result := Obj as _T; end; // First 64 bits of SHA1 of a string: "Lib3MF::MatrixFromColumnsNode" QWord($3F8E5D082F966B1B): begin Obj := TLIB3MFConstantNode.Create(Wrapper, Handle); if Obj.inheritsFrom(_T) then Result := Obj as _T; end; // First 64 bits of SHA1 of a string: "Lib3MF::ConstantNode" QWord($9C9363B3F708D556): begin Obj := TLIB3MFConstVecNode.Create(Wrapper, Handle); if Obj.inheritsFrom(_T) then Result := Obj as _T; end; // First 64 bits of SHA1 of a string: "Lib3MF::ConstVecNode" QWord($F85C90EDCE6F90A4): begin Obj := TLIB3MFConstMatNode.Create(Wrapper, Handle); if Obj.inheritsFrom(_T) then Result := Obj as _T; end; // First 64 bits of SHA1 of a string: "Lib3MF::ConstMatNode" QWord($53601FD432E3DEF4): begin Obj := TLIB3MFMeshNode.Create(Wrapper, Handle); if Obj.inheritsFrom(_T) then Result := Obj as _T; end; // First 64 bits of SHA1 of a string: "Lib3MF::MeshNode" + QWord($29985A628251A9CD): begin Obj := TLIB3MFUnsignedMeshNode.Create(Wrapper, Handle); if Obj.inheritsFrom(_T) then Result := Obj as _T; end; // First 64 bits of SHA1 of a string: "Lib3MF::UnsignedMeshNode" QWord($0765C17C952F24E3): begin Obj := TLIB3MFFunctionCallNode.Create(Wrapper, Handle); if Obj.inheritsFrom(_T) then Result := Obj as _T; end; // First 64 bits of SHA1 of a string: "Lib3MF::FunctionCallNode" QWord($FC006BC888CAB4D0): begin Obj := TLIB3MFNodeIterator.Create(Wrapper, Handle); if Obj.inheritsFrom(_T) then Result := Obj as _T; end; // First 64 bits of SHA1 of a string: "Lib3MF::NodeIterator" QWord($9EFB2757CA1A5231): begin Obj := TLIB3MFFunction.Create(Wrapper, Handle); if Obj.inheritsFrom(_T) then Result := Obj as _T; end; // First 64 bits of SHA1 of a string: "Lib3MF::Function" @@ -11144,6 +11293,10 @@ implementation begin Result := TLib3MFPolymorphicFactory.Make(Wrapper, Handle); end; + function TLib3MFPolymorphicFactoryMakeVectorFromScalarNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFVectorFromScalarNode; + begin + Result := TLib3MFPolymorphicFactory.Make(Wrapper, Handle); + end; function TLib3MFPolymorphicFactoryMakeDecomposeVectorNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFDecomposeVectorNode; begin Result := TLib3MFPolymorphicFactory.Make(Wrapper, Handle); @@ -11152,13 +11305,13 @@ implementation begin Result := TLib3MFPolymorphicFactory.Make(Wrapper, Handle); end; - function TLib3MFPolymorphicFactoryMakeComposeMatrixFromRowVectorsNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFComposeMatrixFromRowVectorsNode; + function TLib3MFPolymorphicFactoryMakeMatrixFromRowsNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFMatrixFromRowsNode; begin - Result := TLib3MFPolymorphicFactory.Make(Wrapper, Handle); + Result := TLib3MFPolymorphicFactory.Make(Wrapper, Handle); end; - function TLib3MFPolymorphicFactoryMakeComposeMatrixFromColumnVectors(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFComposeMatrixFromColumnVectors; + function TLib3MFPolymorphicFactoryMakeMatrixFromColumnsNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFMatrixFromColumnsNode; begin - Result := TLib3MFPolymorphicFactory.Make(Wrapper, Handle); + Result := TLib3MFPolymorphicFactory.Make(Wrapper, Handle); end; function TLib3MFPolymorphicFactoryMakeConstantNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFConstantNode; begin @@ -11176,6 +11329,10 @@ implementation begin Result := TLib3MFPolymorphicFactory.Make(Wrapper, Handle); end; + function TLib3MFPolymorphicFactoryMakeUnsignedMeshNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFUnsignedMeshNode; + begin + Result := TLib3MFPolymorphicFactory.Make(Wrapper, Handle); + end; function TLib3MFPolymorphicFactoryMakeFunctionCallNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFFunctionCallNode; begin Result := TLib3MFPolymorphicFactory.Make(Wrapper, Handle); @@ -15116,6 +15273,42 @@ implementation Result := TLib3MFPolymorphicFactory.Make(FWrapper, HResult); end; +(************************************************************************************************************************* + Class implementation for VectorFromScalarNode +**************************************************************************************************************************) + + constructor TLib3MFVectorFromScalarNode.Create(AWrapper: TLib3MFWrapper; AHandle: TLib3MFHandle); + begin + inherited Create(AWrapper, AHandle); + end; + + destructor TLib3MFVectorFromScalarNode.Destroy; + begin + inherited; + end; + + function TLib3MFVectorFromScalarNode.GetInputA(): TLib3MFImplicitPort; + var + HA: TLib3MFHandle; + begin + Result := nil; + HA := nil; + FWrapper.CheckError(Self, FWrapper.Lib3MFVectorFromScalarNode_GetInputAFunc(FHandle, HA)); + if Assigned(HA) then + Result := TLib3MFPolymorphicFactory.Make(FWrapper, HA); + end; + + function TLib3MFVectorFromScalarNode.GetOutputResult(): TLib3MFImplicitPort; + var + HResult: TLib3MFHandle; + begin + Result := nil; + HResult := nil; + FWrapper.CheckError(Self, FWrapper.Lib3MFVectorFromScalarNode_GetOutputResultFunc(FHandle, HResult)); + if Assigned(HResult) then + Result := TLib3MFPolymorphicFactory.Make(FWrapper, HResult); + end; + (************************************************************************************************************************* Class implementation for DecomposeVectorNode **************************************************************************************************************************) @@ -15376,139 +15569,139 @@ implementation end; (************************************************************************************************************************* - Class implementation for ComposeMatrixFromRowVectorsNode + Class implementation for MatrixFromRowsNode **************************************************************************************************************************) - constructor TLib3MFComposeMatrixFromRowVectorsNode.Create(AWrapper: TLib3MFWrapper; AHandle: TLib3MFHandle); + constructor TLib3MFMatrixFromRowsNode.Create(AWrapper: TLib3MFWrapper; AHandle: TLib3MFHandle); begin inherited Create(AWrapper, AHandle); end; - destructor TLib3MFComposeMatrixFromRowVectorsNode.Destroy; + destructor TLib3MFMatrixFromRowsNode.Destroy; begin inherited; end; - function TLib3MFComposeMatrixFromRowVectorsNode.GetInputA(): TLib3MFImplicitPort; + function TLib3MFMatrixFromRowsNode.GetInputA(): TLib3MFImplicitPort; var HRow0: TLib3MFHandle; begin Result := nil; HRow0 := nil; - FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromRowVectorsNode_GetInputAFunc(FHandle, HRow0)); + FWrapper.CheckError(Self, FWrapper.Lib3MFMatrixFromRowsNode_GetInputAFunc(FHandle, HRow0)); if Assigned(HRow0) then Result := TLib3MFPolymorphicFactory.Make(FWrapper, HRow0); end; - function TLib3MFComposeMatrixFromRowVectorsNode.GetInputB(): TLib3MFImplicitPort; + function TLib3MFMatrixFromRowsNode.GetInputB(): TLib3MFImplicitPort; var HRow1: TLib3MFHandle; begin Result := nil; HRow1 := nil; - FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromRowVectorsNode_GetInputBFunc(FHandle, HRow1)); + FWrapper.CheckError(Self, FWrapper.Lib3MFMatrixFromRowsNode_GetInputBFunc(FHandle, HRow1)); if Assigned(HRow1) then Result := TLib3MFPolymorphicFactory.Make(FWrapper, HRow1); end; - function TLib3MFComposeMatrixFromRowVectorsNode.GetInputC(): TLib3MFImplicitPort; + function TLib3MFMatrixFromRowsNode.GetInputC(): TLib3MFImplicitPort; var HRow2: TLib3MFHandle; begin Result := nil; HRow2 := nil; - FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromRowVectorsNode_GetInputCFunc(FHandle, HRow2)); + FWrapper.CheckError(Self, FWrapper.Lib3MFMatrixFromRowsNode_GetInputCFunc(FHandle, HRow2)); if Assigned(HRow2) then Result := TLib3MFPolymorphicFactory.Make(FWrapper, HRow2); end; - function TLib3MFComposeMatrixFromRowVectorsNode.GetInputD(): TLib3MFImplicitPort; + function TLib3MFMatrixFromRowsNode.GetInputD(): TLib3MFImplicitPort; var HRow3: TLib3MFHandle; begin Result := nil; HRow3 := nil; - FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromRowVectorsNode_GetInputDFunc(FHandle, HRow3)); + FWrapper.CheckError(Self, FWrapper.Lib3MFMatrixFromRowsNode_GetInputDFunc(FHandle, HRow3)); if Assigned(HRow3) then Result := TLib3MFPolymorphicFactory.Make(FWrapper, HRow3); end; - function TLib3MFComposeMatrixFromRowVectorsNode.GetOutputResult(): TLib3MFImplicitPort; + function TLib3MFMatrixFromRowsNode.GetOutputResult(): TLib3MFImplicitPort; var HResult: TLib3MFHandle; begin Result := nil; HResult := nil; - FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromRowVectorsNode_GetOutputResultFunc(FHandle, HResult)); + FWrapper.CheckError(Self, FWrapper.Lib3MFMatrixFromRowsNode_GetOutputResultFunc(FHandle, HResult)); if Assigned(HResult) then Result := TLib3MFPolymorphicFactory.Make(FWrapper, HResult); end; (************************************************************************************************************************* - Class implementation for ComposeMatrixFromColumnVectors + Class implementation for MatrixFromColumnsNode **************************************************************************************************************************) - constructor TLib3MFComposeMatrixFromColumnVectors.Create(AWrapper: TLib3MFWrapper; AHandle: TLib3MFHandle); + constructor TLib3MFMatrixFromColumnsNode.Create(AWrapper: TLib3MFWrapper; AHandle: TLib3MFHandle); begin inherited Create(AWrapper, AHandle); end; - destructor TLib3MFComposeMatrixFromColumnVectors.Destroy; + destructor TLib3MFMatrixFromColumnsNode.Destroy; begin inherited; end; - function TLib3MFComposeMatrixFromColumnVectors.GetInputA(): TLib3MFImplicitPort; + function TLib3MFMatrixFromColumnsNode.GetInputA(): TLib3MFImplicitPort; var HColumn0: TLib3MFHandle; begin Result := nil; HColumn0 := nil; - FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromColumnVectors_GetInputAFunc(FHandle, HColumn0)); + FWrapper.CheckError(Self, FWrapper.Lib3MFMatrixFromColumnsNode_GetInputAFunc(FHandle, HColumn0)); if Assigned(HColumn0) then Result := TLib3MFPolymorphicFactory.Make(FWrapper, HColumn0); end; - function TLib3MFComposeMatrixFromColumnVectors.GetInputB(): TLib3MFImplicitPort; + function TLib3MFMatrixFromColumnsNode.GetInputB(): TLib3MFImplicitPort; var HColumn1: TLib3MFHandle; begin Result := nil; HColumn1 := nil; - FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromColumnVectors_GetInputBFunc(FHandle, HColumn1)); + FWrapper.CheckError(Self, FWrapper.Lib3MFMatrixFromColumnsNode_GetInputBFunc(FHandle, HColumn1)); if Assigned(HColumn1) then Result := TLib3MFPolymorphicFactory.Make(FWrapper, HColumn1); end; - function TLib3MFComposeMatrixFromColumnVectors.GetInputC(): TLib3MFImplicitPort; + function TLib3MFMatrixFromColumnsNode.GetInputC(): TLib3MFImplicitPort; var HColumn2: TLib3MFHandle; begin Result := nil; HColumn2 := nil; - FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromColumnVectors_GetInputCFunc(FHandle, HColumn2)); + FWrapper.CheckError(Self, FWrapper.Lib3MFMatrixFromColumnsNode_GetInputCFunc(FHandle, HColumn2)); if Assigned(HColumn2) then Result := TLib3MFPolymorphicFactory.Make(FWrapper, HColumn2); end; - function TLib3MFComposeMatrixFromColumnVectors.GetInputD(): TLib3MFImplicitPort; + function TLib3MFMatrixFromColumnsNode.GetInputD(): TLib3MFImplicitPort; var HColumn3: TLib3MFHandle; begin Result := nil; HColumn3 := nil; - FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromColumnVectors_GetInputDFunc(FHandle, HColumn3)); + FWrapper.CheckError(Self, FWrapper.Lib3MFMatrixFromColumnsNode_GetInputDFunc(FHandle, HColumn3)); if Assigned(HColumn3) then Result := TLib3MFPolymorphicFactory.Make(FWrapper, HColumn3); end; - function TLib3MFComposeMatrixFromColumnVectors.GetOutputResult(): TLib3MFImplicitPort; + function TLib3MFMatrixFromColumnsNode.GetOutputResult(): TLib3MFImplicitPort; var HResult: TLib3MFHandle; begin Result := nil; HResult := nil; - FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromColumnVectors_GetOutputResultFunc(FHandle, HResult)); + FWrapper.CheckError(Self, FWrapper.Lib3MFMatrixFromColumnsNode_GetOutputResultFunc(FHandle, HResult)); if Assigned(HResult) then Result := TLib3MFPolymorphicFactory.Make(FWrapper, HResult); end; @@ -15665,6 +15858,53 @@ implementation Result := TLib3MFPolymorphicFactory.Make(FWrapper, HDistance); end; +(************************************************************************************************************************* + Class implementation for UnsignedMeshNode +**************************************************************************************************************************) + + constructor TLib3MFUnsignedMeshNode.Create(AWrapper: TLib3MFWrapper; AHandle: TLib3MFHandle); + begin + inherited Create(AWrapper, AHandle); + end; + + destructor TLib3MFUnsignedMeshNode.Destroy; + begin + inherited; + end; + + function TLib3MFUnsignedMeshNode.GetInputMesh(): TLib3MFImplicitPort; + var + HMesh: TLib3MFHandle; + begin + Result := nil; + HMesh := nil; + FWrapper.CheckError(Self, FWrapper.Lib3MFUnsignedMeshNode_GetInputMeshFunc(FHandle, HMesh)); + if Assigned(HMesh) then + Result := TLib3MFPolymorphicFactory.Make(FWrapper, HMesh); + end; + + function TLib3MFUnsignedMeshNode.GetInputPos(): TLib3MFImplicitPort; + var + HPos: TLib3MFHandle; + begin + Result := nil; + HPos := nil; + FWrapper.CheckError(Self, FWrapper.Lib3MFUnsignedMeshNode_GetInputPosFunc(FHandle, HPos)); + if Assigned(HPos) then + Result := TLib3MFPolymorphicFactory.Make(FWrapper, HPos); + end; + + function TLib3MFUnsignedMeshNode.GetOutputDistance(): TLib3MFImplicitPort; + var + HDistance: TLib3MFHandle; + begin + Result := nil; + HDistance := nil; + FWrapper.CheckError(Self, FWrapper.Lib3MFUnsignedMeshNode_GetOutputDistanceFunc(FHandle, HDistance)); + if Assigned(HDistance) then + Result := TLib3MFPolymorphicFactory.Make(FWrapper, HDistance); + end; + (************************************************************************************************************************* Class implementation for FunctionCallNode **************************************************************************************************************************) @@ -16298,6 +16538,17 @@ implementation Result := TLib3MFPolymorphicFactory.Make(FWrapper, HNode); end; + function TLib3MFImplicitFunction.AddVectorFromScalarNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFVectorFromScalarNode; + var + HNode: TLib3MFHandle; + begin + Result := nil; + HNode := nil; + FWrapper.CheckError(Self, FWrapper.Lib3MFImplicitFunction_AddVectorFromScalarNodeFunc(FHandle, PAnsiChar(AIdentifier), PAnsiChar(ADisplayName), PAnsiChar(ATag), HNode)); + if Assigned(HNode) then + Result := TLib3MFPolymorphicFactory.Make(FWrapper, HNode); + end; + function TLib3MFImplicitFunction.AddDecomposeVectorNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFDecomposeVectorNode; var HNode: TLib3MFHandle; @@ -16320,15 +16571,26 @@ implementation Result := TLib3MFPolymorphicFactory.Make(FWrapper, HNode); end; - function TLib3MFImplicitFunction.AddComposeMatrixFromRowVectorsNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFComposeMatrixFromRowVectorsNode; + function TLib3MFImplicitFunction.AddMatrixFromRowsNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFMatrixFromRowsNode; var HNode: TLib3MFHandle; begin Result := nil; HNode := nil; - FWrapper.CheckError(Self, FWrapper.Lib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodeFunc(FHandle, PAnsiChar(AIdentifier), PAnsiChar(ADisplayName), PAnsiChar(ATag), HNode)); + FWrapper.CheckError(Self, FWrapper.Lib3MFImplicitFunction_AddMatrixFromRowsNodeFunc(FHandle, PAnsiChar(AIdentifier), PAnsiChar(ADisplayName), PAnsiChar(ATag), HNode)); if Assigned(HNode) then - Result := TLib3MFPolymorphicFactory.Make(FWrapper, HNode); + Result := TLib3MFPolymorphicFactory.Make(FWrapper, HNode); + end; + + function TLib3MFImplicitFunction.AddMatrixFromColumnsNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFMatrixFromColumnsNode; + var + HNode: TLib3MFHandle; + begin + Result := nil; + HNode := nil; + FWrapper.CheckError(Self, FWrapper.Lib3MFImplicitFunction_AddMatrixFromColumnsNodeFunc(FHandle, PAnsiChar(AIdentifier), PAnsiChar(ADisplayName), PAnsiChar(ATag), HNode)); + if Assigned(HNode) then + Result := TLib3MFPolymorphicFactory.Make(FWrapper, HNode); end; function TLib3MFImplicitFunction.AddConstantNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFConstantNode; @@ -16375,6 +16637,17 @@ implementation Result := TLib3MFPolymorphicFactory.Make(FWrapper, HNode); end; + function TLib3MFImplicitFunction.AddUnsignedMeshNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFUnsignedMeshNode; + var + HNode: TLib3MFHandle; + begin + Result := nil; + HNode := nil; + FWrapper.CheckError(Self, FWrapper.Lib3MFImplicitFunction_AddUnsignedMeshNodeFunc(FHandle, PAnsiChar(AIdentifier), PAnsiChar(ADisplayName), PAnsiChar(ATag), HNode)); + if Assigned(HNode) then + Result := TLib3MFPolymorphicFactory.Make(FWrapper, HNode); + end; + function TLib3MFImplicitFunction.AddFunctionCallNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFFunctionCallNode; var HNode: TLib3MFHandle; @@ -18493,6 +18766,8 @@ implementation FLib3MFComposeVectorNode_GetInputYFunc := LoadFunction('lib3mf_composevectornode_getinputy'); FLib3MFComposeVectorNode_GetInputZFunc := LoadFunction('lib3mf_composevectornode_getinputz'); FLib3MFComposeVectorNode_GetOutputResultFunc := LoadFunction('lib3mf_composevectornode_getoutputresult'); + FLib3MFVectorFromScalarNode_GetInputAFunc := LoadFunction('lib3mf_vectorfromscalarnode_getinputa'); + FLib3MFVectorFromScalarNode_GetOutputResultFunc := LoadFunction('lib3mf_vectorfromscalarnode_getoutputresult'); FLib3MFDecomposeVectorNode_GetInputAFunc := LoadFunction('lib3mf_decomposevectornode_getinputa'); FLib3MFDecomposeVectorNode_GetOutputXFunc := LoadFunction('lib3mf_decomposevectornode_getoutputx'); FLib3MFDecomposeVectorNode_GetOutputYFunc := LoadFunction('lib3mf_decomposevectornode_getoutputy'); @@ -18514,16 +18789,16 @@ implementation FLib3MFComposeMatrixNode_GetInputM32Func := LoadFunction('lib3mf_composematrixnode_getinputm32'); FLib3MFComposeMatrixNode_GetInputM33Func := LoadFunction('lib3mf_composematrixnode_getinputm33'); FLib3MFComposeMatrixNode_GetOutputResultFunc := LoadFunction('lib3mf_composematrixnode_getoutputresult'); - FLib3MFComposeMatrixFromRowVectorsNode_GetInputAFunc := LoadFunction('lib3mf_composematrixfromrowvectorsnode_getinputa'); - FLib3MFComposeMatrixFromRowVectorsNode_GetInputBFunc := LoadFunction('lib3mf_composematrixfromrowvectorsnode_getinputb'); - FLib3MFComposeMatrixFromRowVectorsNode_GetInputCFunc := LoadFunction('lib3mf_composematrixfromrowvectorsnode_getinputc'); - FLib3MFComposeMatrixFromRowVectorsNode_GetInputDFunc := LoadFunction('lib3mf_composematrixfromrowvectorsnode_getinputd'); - FLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultFunc := LoadFunction('lib3mf_composematrixfromrowvectorsnode_getoutputresult'); - FLib3MFComposeMatrixFromColumnVectors_GetInputAFunc := LoadFunction('lib3mf_composematrixfromcolumnvectors_getinputa'); - FLib3MFComposeMatrixFromColumnVectors_GetInputBFunc := LoadFunction('lib3mf_composematrixfromcolumnvectors_getinputb'); - FLib3MFComposeMatrixFromColumnVectors_GetInputCFunc := LoadFunction('lib3mf_composematrixfromcolumnvectors_getinputc'); - FLib3MFComposeMatrixFromColumnVectors_GetInputDFunc := LoadFunction('lib3mf_composematrixfromcolumnvectors_getinputd'); - FLib3MFComposeMatrixFromColumnVectors_GetOutputResultFunc := LoadFunction('lib3mf_composematrixfromcolumnvectors_getoutputresult'); + FLib3MFMatrixFromRowsNode_GetInputAFunc := LoadFunction('lib3mf_matrixfromrowsnode_getinputa'); + FLib3MFMatrixFromRowsNode_GetInputBFunc := LoadFunction('lib3mf_matrixfromrowsnode_getinputb'); + FLib3MFMatrixFromRowsNode_GetInputCFunc := LoadFunction('lib3mf_matrixfromrowsnode_getinputc'); + FLib3MFMatrixFromRowsNode_GetInputDFunc := LoadFunction('lib3mf_matrixfromrowsnode_getinputd'); + FLib3MFMatrixFromRowsNode_GetOutputResultFunc := LoadFunction('lib3mf_matrixfromrowsnode_getoutputresult'); + FLib3MFMatrixFromColumnsNode_GetInputAFunc := LoadFunction('lib3mf_matrixfromcolumnsnode_getinputa'); + FLib3MFMatrixFromColumnsNode_GetInputBFunc := LoadFunction('lib3mf_matrixfromcolumnsnode_getinputb'); + FLib3MFMatrixFromColumnsNode_GetInputCFunc := LoadFunction('lib3mf_matrixfromcolumnsnode_getinputc'); + FLib3MFMatrixFromColumnsNode_GetInputDFunc := LoadFunction('lib3mf_matrixfromcolumnsnode_getinputd'); + FLib3MFMatrixFromColumnsNode_GetOutputResultFunc := LoadFunction('lib3mf_matrixfromcolumnsnode_getoutputresult'); FLib3MFConstantNode_SetConstantFunc := LoadFunction('lib3mf_constantnode_setconstant'); FLib3MFConstantNode_GetConstantFunc := LoadFunction('lib3mf_constantnode_getconstant'); FLib3MFConstantNode_GetOutputValueFunc := LoadFunction('lib3mf_constantnode_getoutputvalue'); @@ -18536,6 +18811,9 @@ implementation FLib3MFMeshNode_GetInputMeshFunc := LoadFunction('lib3mf_meshnode_getinputmesh'); FLib3MFMeshNode_GetInputPosFunc := LoadFunction('lib3mf_meshnode_getinputpos'); FLib3MFMeshNode_GetOutputDistanceFunc := LoadFunction('lib3mf_meshnode_getoutputdistance'); + FLib3MFUnsignedMeshNode_GetInputMeshFunc := LoadFunction('lib3mf_unsignedmeshnode_getinputmesh'); + FLib3MFUnsignedMeshNode_GetInputPosFunc := LoadFunction('lib3mf_unsignedmeshnode_getinputpos'); + FLib3MFUnsignedMeshNode_GetOutputDistanceFunc := LoadFunction('lib3mf_unsignedmeshnode_getoutputdistance'); FLib3MFFunctionCallNode_GetInputFunctionIDFunc := LoadFunction('lib3mf_functioncallnode_getinputfunctionid'); FLib3MFNodeIterator_GetCurrentFunc := LoadFunction('lib3mf_nodeiterator_getcurrent'); FLib3MFFunction_GetDisplayNameFunc := LoadFunction('lib3mf_function_getdisplayname'); @@ -18589,13 +18867,16 @@ implementation FLib3MFImplicitFunction_AddSelectNodeFunc := LoadFunction('lib3mf_implicitfunction_addselectnode'); FLib3MFImplicitFunction_AddClampNodeFunc := LoadFunction('lib3mf_implicitfunction_addclampnode'); FLib3MFImplicitFunction_AddComposeVectorNodeFunc := LoadFunction('lib3mf_implicitfunction_addcomposevectornode'); + FLib3MFImplicitFunction_AddVectorFromScalarNodeFunc := LoadFunction('lib3mf_implicitfunction_addvectorfromscalarnode'); FLib3MFImplicitFunction_AddDecomposeVectorNodeFunc := LoadFunction('lib3mf_implicitfunction_adddecomposevectornode'); FLib3MFImplicitFunction_AddComposeMatrixNodeFunc := LoadFunction('lib3mf_implicitfunction_addcomposematrixnode'); - FLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodeFunc := LoadFunction('lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode'); + FLib3MFImplicitFunction_AddMatrixFromRowsNodeFunc := LoadFunction('lib3mf_implicitfunction_addmatrixfromrowsnode'); + FLib3MFImplicitFunction_AddMatrixFromColumnsNodeFunc := LoadFunction('lib3mf_implicitfunction_addmatrixfromcolumnsnode'); FLib3MFImplicitFunction_AddConstantNodeFunc := LoadFunction('lib3mf_implicitfunction_addconstantnode'); FLib3MFImplicitFunction_AddConstVecNodeFunc := LoadFunction('lib3mf_implicitfunction_addconstvecnode'); FLib3MFImplicitFunction_AddConstMatNodeFunc := LoadFunction('lib3mf_implicitfunction_addconstmatnode'); FLib3MFImplicitFunction_AddMeshNodeFunc := LoadFunction('lib3mf_implicitfunction_addmeshnode'); + FLib3MFImplicitFunction_AddUnsignedMeshNodeFunc := LoadFunction('lib3mf_implicitfunction_addunsignedmeshnode'); FLib3MFImplicitFunction_AddFunctionCallNodeFunc := LoadFunction('lib3mf_implicitfunction_addfunctioncallnode'); FLib3MFImplicitFunction_GetNodesFunc := LoadFunction('lib3mf_implicitfunction_getnodes'); FLib3MFImplicitFunction_RemoveNodeFunc := LoadFunction('lib3mf_implicitfunction_removenode'); @@ -19665,6 +19946,12 @@ implementation if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); AResult := ALookupMethod(PAnsiChar('lib3mf_composevectornode_getoutputresult'), @FLib3MFComposeVectorNode_GetOutputResultFunc); + if AResult <> LIB3MF_SUCCESS then + raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); + AResult := ALookupMethod(PAnsiChar('lib3mf_vectorfromscalarnode_getinputa'), @FLib3MFVectorFromScalarNode_GetInputAFunc); + if AResult <> LIB3MF_SUCCESS then + raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); + AResult := ALookupMethod(PAnsiChar('lib3mf_vectorfromscalarnode_getoutputresult'), @FLib3MFVectorFromScalarNode_GetOutputResultFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); AResult := ALookupMethod(PAnsiChar('lib3mf_decomposevectornode_getinputa'), @FLib3MFDecomposeVectorNode_GetInputAFunc); @@ -19730,34 +20017,34 @@ implementation AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixnode_getoutputresult'), @FLib3MFComposeMatrixNode_GetOutputResultFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); - AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromrowvectorsnode_getinputa'), @FLib3MFComposeMatrixFromRowVectorsNode_GetInputAFunc); + AResult := ALookupMethod(PAnsiChar('lib3mf_matrixfromrowsnode_getinputa'), @FLib3MFMatrixFromRowsNode_GetInputAFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); - AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromrowvectorsnode_getinputb'), @FLib3MFComposeMatrixFromRowVectorsNode_GetInputBFunc); + AResult := ALookupMethod(PAnsiChar('lib3mf_matrixfromrowsnode_getinputb'), @FLib3MFMatrixFromRowsNode_GetInputBFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); - AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromrowvectorsnode_getinputc'), @FLib3MFComposeMatrixFromRowVectorsNode_GetInputCFunc); + AResult := ALookupMethod(PAnsiChar('lib3mf_matrixfromrowsnode_getinputc'), @FLib3MFMatrixFromRowsNode_GetInputCFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); - AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromrowvectorsnode_getinputd'), @FLib3MFComposeMatrixFromRowVectorsNode_GetInputDFunc); + AResult := ALookupMethod(PAnsiChar('lib3mf_matrixfromrowsnode_getinputd'), @FLib3MFMatrixFromRowsNode_GetInputDFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); - AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromrowvectorsnode_getoutputresult'), @FLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultFunc); + AResult := ALookupMethod(PAnsiChar('lib3mf_matrixfromrowsnode_getoutputresult'), @FLib3MFMatrixFromRowsNode_GetOutputResultFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); - AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromcolumnvectors_getinputa'), @FLib3MFComposeMatrixFromColumnVectors_GetInputAFunc); + AResult := ALookupMethod(PAnsiChar('lib3mf_matrixfromcolumnsnode_getinputa'), @FLib3MFMatrixFromColumnsNode_GetInputAFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); - AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromcolumnvectors_getinputb'), @FLib3MFComposeMatrixFromColumnVectors_GetInputBFunc); + AResult := ALookupMethod(PAnsiChar('lib3mf_matrixfromcolumnsnode_getinputb'), @FLib3MFMatrixFromColumnsNode_GetInputBFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); - AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromcolumnvectors_getinputc'), @FLib3MFComposeMatrixFromColumnVectors_GetInputCFunc); + AResult := ALookupMethod(PAnsiChar('lib3mf_matrixfromcolumnsnode_getinputc'), @FLib3MFMatrixFromColumnsNode_GetInputCFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); - AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromcolumnvectors_getinputd'), @FLib3MFComposeMatrixFromColumnVectors_GetInputDFunc); + AResult := ALookupMethod(PAnsiChar('lib3mf_matrixfromcolumnsnode_getinputd'), @FLib3MFMatrixFromColumnsNode_GetInputDFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); - AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromcolumnvectors_getoutputresult'), @FLib3MFComposeMatrixFromColumnVectors_GetOutputResultFunc); + AResult := ALookupMethod(PAnsiChar('lib3mf_matrixfromcolumnsnode_getoutputresult'), @FLib3MFMatrixFromColumnsNode_GetOutputResultFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); AResult := ALookupMethod(PAnsiChar('lib3mf_constantnode_setconstant'), @FLib3MFConstantNode_SetConstantFunc); @@ -19794,6 +20081,15 @@ implementation if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); AResult := ALookupMethod(PAnsiChar('lib3mf_meshnode_getoutputdistance'), @FLib3MFMeshNode_GetOutputDistanceFunc); + if AResult <> LIB3MF_SUCCESS then + raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); + AResult := ALookupMethod(PAnsiChar('lib3mf_unsignedmeshnode_getinputmesh'), @FLib3MFUnsignedMeshNode_GetInputMeshFunc); + if AResult <> LIB3MF_SUCCESS then + raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); + AResult := ALookupMethod(PAnsiChar('lib3mf_unsignedmeshnode_getinputpos'), @FLib3MFUnsignedMeshNode_GetInputPosFunc); + if AResult <> LIB3MF_SUCCESS then + raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); + AResult := ALookupMethod(PAnsiChar('lib3mf_unsignedmeshnode_getoutputdistance'), @FLib3MFUnsignedMeshNode_GetOutputDistanceFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); AResult := ALookupMethod(PAnsiChar('lib3mf_functioncallnode_getinputfunctionid'), @FLib3MFFunctionCallNode_GetInputFunctionIDFunc); @@ -19953,6 +20249,9 @@ implementation if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); AResult := ALookupMethod(PAnsiChar('lib3mf_implicitfunction_addcomposevectornode'), @FLib3MFImplicitFunction_AddComposeVectorNodeFunc); + if AResult <> LIB3MF_SUCCESS then + raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); + AResult := ALookupMethod(PAnsiChar('lib3mf_implicitfunction_addvectorfromscalarnode'), @FLib3MFImplicitFunction_AddVectorFromScalarNodeFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); AResult := ALookupMethod(PAnsiChar('lib3mf_implicitfunction_adddecomposevectornode'), @FLib3MFImplicitFunction_AddDecomposeVectorNodeFunc); @@ -19961,7 +20260,10 @@ implementation AResult := ALookupMethod(PAnsiChar('lib3mf_implicitfunction_addcomposematrixnode'), @FLib3MFImplicitFunction_AddComposeMatrixNodeFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); - AResult := ALookupMethod(PAnsiChar('lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode'), @FLib3MFImplicitFunction_AddComposeMatrixFromRowVectorsNodeFunc); + AResult := ALookupMethod(PAnsiChar('lib3mf_implicitfunction_addmatrixfromrowsnode'), @FLib3MFImplicitFunction_AddMatrixFromRowsNodeFunc); + if AResult <> LIB3MF_SUCCESS then + raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); + AResult := ALookupMethod(PAnsiChar('lib3mf_implicitfunction_addmatrixfromcolumnsnode'), @FLib3MFImplicitFunction_AddMatrixFromColumnsNodeFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); AResult := ALookupMethod(PAnsiChar('lib3mf_implicitfunction_addconstantnode'), @FLib3MFImplicitFunction_AddConstantNodeFunc); @@ -19974,6 +20276,9 @@ implementation if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); AResult := ALookupMethod(PAnsiChar('lib3mf_implicitfunction_addmeshnode'), @FLib3MFImplicitFunction_AddMeshNodeFunc); + if AResult <> LIB3MF_SUCCESS then + raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); + AResult := ALookupMethod(PAnsiChar('lib3mf_implicitfunction_addunsignedmeshnode'), @FLib3MFImplicitFunction_AddUnsignedMeshNodeFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); AResult := ALookupMethod(PAnsiChar('lib3mf_implicitfunction_addfunctioncallnode'), @FLib3MFImplicitFunction_AddFunctionCallNodeFunc); diff --git a/Autogenerated/Bindings/Python/Lib3MF.py b/Autogenerated/Bindings/Python/Lib3MF.py index c015bfb97..1aaeddfb3 100644 --- a/Autogenerated/Bindings/Python/Lib3MF.py +++ b/Autogenerated/Bindings/Python/Lib3MF.py @@ -428,6 +428,8 @@ class FunctionTable: lib3mf_composevectornode_getinputy = None lib3mf_composevectornode_getinputz = None lib3mf_composevectornode_getoutputresult = None + lib3mf_vectorfromscalarnode_getinputa = None + lib3mf_vectorfromscalarnode_getoutputresult = None lib3mf_decomposevectornode_getinputa = None lib3mf_decomposevectornode_getoutputx = None lib3mf_decomposevectornode_getoutputy = None @@ -449,16 +451,16 @@ class FunctionTable: lib3mf_composematrixnode_getinputm32 = None lib3mf_composematrixnode_getinputm33 = None lib3mf_composematrixnode_getoutputresult = None - lib3mf_composematrixfromrowvectorsnode_getinputa = None - lib3mf_composematrixfromrowvectorsnode_getinputb = None - lib3mf_composematrixfromrowvectorsnode_getinputc = None - lib3mf_composematrixfromrowvectorsnode_getinputd = None - lib3mf_composematrixfromrowvectorsnode_getoutputresult = None - lib3mf_composematrixfromcolumnvectors_getinputa = None - lib3mf_composematrixfromcolumnvectors_getinputb = None - lib3mf_composematrixfromcolumnvectors_getinputc = None - lib3mf_composematrixfromcolumnvectors_getinputd = None - lib3mf_composematrixfromcolumnvectors_getoutputresult = None + lib3mf_matrixfromrowsnode_getinputa = None + lib3mf_matrixfromrowsnode_getinputb = None + lib3mf_matrixfromrowsnode_getinputc = None + lib3mf_matrixfromrowsnode_getinputd = None + lib3mf_matrixfromrowsnode_getoutputresult = None + lib3mf_matrixfromcolumnsnode_getinputa = None + lib3mf_matrixfromcolumnsnode_getinputb = None + lib3mf_matrixfromcolumnsnode_getinputc = None + lib3mf_matrixfromcolumnsnode_getinputd = None + lib3mf_matrixfromcolumnsnode_getoutputresult = None lib3mf_constantnode_setconstant = None lib3mf_constantnode_getconstant = None lib3mf_constantnode_getoutputvalue = None @@ -471,6 +473,9 @@ class FunctionTable: lib3mf_meshnode_getinputmesh = None lib3mf_meshnode_getinputpos = None lib3mf_meshnode_getoutputdistance = None + lib3mf_unsignedmeshnode_getinputmesh = None + lib3mf_unsignedmeshnode_getinputpos = None + lib3mf_unsignedmeshnode_getoutputdistance = None lib3mf_functioncallnode_getinputfunctionid = None lib3mf_nodeiterator_getcurrent = None lib3mf_function_getdisplayname = None @@ -524,13 +529,16 @@ class FunctionTable: lib3mf_implicitfunction_addselectnode = None lib3mf_implicitfunction_addclampnode = None lib3mf_implicitfunction_addcomposevectornode = None + lib3mf_implicitfunction_addvectorfromscalarnode = None lib3mf_implicitfunction_adddecomposevectornode = None lib3mf_implicitfunction_addcomposematrixnode = None - lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode = None + lib3mf_implicitfunction_addmatrixfromrowsnode = None + lib3mf_implicitfunction_addmatrixfromcolumnsnode = None lib3mf_implicitfunction_addconstantnode = None lib3mf_implicitfunction_addconstvecnode = None lib3mf_implicitfunction_addconstmatnode = None lib3mf_implicitfunction_addmeshnode = None + lib3mf_implicitfunction_addunsignedmeshnode = None lib3mf_implicitfunction_addfunctioncallnode = None lib3mf_implicitfunction_getnodes = None lib3mf_implicitfunction_removenode = None @@ -833,8 +841,8 @@ class ImplicitNodeType(CTypesEnum): ComposeVector = 8 DecomposeVector = 9 ComposeMatrix = 10 - ComposeMatrixFromColumnVectors = 11 - ComposeMatrixFromRowVectors = 12 + MatrixFromColumns = 11 + MatrixFromRows = 12 Dot = 13 Cross = 14 MatVecMultiplication = 15 @@ -871,6 +879,8 @@ class ImplicitNodeType(CTypesEnum): Mesh = 46 Length = 47 Resource = 48 + VectorFromScalar = 49 + UnsignedMesh = 50 '''Definition of ImplicitPortType ''' class ImplicitPortType(CTypesEnum): @@ -2975,6 +2985,18 @@ def _loadFunctionTableFromMethod(self, symbolLookupMethodAddress): methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) self.lib.lib3mf_composevectornode_getoutputresult = methodType(int(methodAddress.value)) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_vectorfromscalarnode_getinputa")), methodAddress) + if err != 0: + raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) + methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) + self.lib.lib3mf_vectorfromscalarnode_getinputa = methodType(int(methodAddress.value)) + + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_vectorfromscalarnode_getoutputresult")), methodAddress) + if err != 0: + raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) + methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) + self.lib.lib3mf_vectorfromscalarnode_getoutputresult = methodType(int(methodAddress.value)) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_decomposevectornode_getinputa")), methodAddress) if err != 0: raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) @@ -3101,65 +3123,65 @@ def _loadFunctionTableFromMethod(self, symbolLookupMethodAddress): methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) self.lib.lib3mf_composematrixnode_getoutputresult = methodType(int(methodAddress.value)) - err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromrowvectorsnode_getinputa")), methodAddress) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_matrixfromrowsnode_getinputa")), methodAddress) if err != 0: raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) - self.lib.lib3mf_composematrixfromrowvectorsnode_getinputa = methodType(int(methodAddress.value)) + self.lib.lib3mf_matrixfromrowsnode_getinputa = methodType(int(methodAddress.value)) - err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromrowvectorsnode_getinputb")), methodAddress) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_matrixfromrowsnode_getinputb")), methodAddress) if err != 0: raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) - self.lib.lib3mf_composematrixfromrowvectorsnode_getinputb = methodType(int(methodAddress.value)) + self.lib.lib3mf_matrixfromrowsnode_getinputb = methodType(int(methodAddress.value)) - err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromrowvectorsnode_getinputc")), methodAddress) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_matrixfromrowsnode_getinputc")), methodAddress) if err != 0: raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) - self.lib.lib3mf_composematrixfromrowvectorsnode_getinputc = methodType(int(methodAddress.value)) + self.lib.lib3mf_matrixfromrowsnode_getinputc = methodType(int(methodAddress.value)) - err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromrowvectorsnode_getinputd")), methodAddress) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_matrixfromrowsnode_getinputd")), methodAddress) if err != 0: raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) - self.lib.lib3mf_composematrixfromrowvectorsnode_getinputd = methodType(int(methodAddress.value)) + self.lib.lib3mf_matrixfromrowsnode_getinputd = methodType(int(methodAddress.value)) - err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromrowvectorsnode_getoutputresult")), methodAddress) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_matrixfromrowsnode_getoutputresult")), methodAddress) if err != 0: raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) - self.lib.lib3mf_composematrixfromrowvectorsnode_getoutputresult = methodType(int(methodAddress.value)) + self.lib.lib3mf_matrixfromrowsnode_getoutputresult = methodType(int(methodAddress.value)) - err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromcolumnvectors_getinputa")), methodAddress) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_matrixfromcolumnsnode_getinputa")), methodAddress) if err != 0: raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) - self.lib.lib3mf_composematrixfromcolumnvectors_getinputa = methodType(int(methodAddress.value)) + self.lib.lib3mf_matrixfromcolumnsnode_getinputa = methodType(int(methodAddress.value)) - err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromcolumnvectors_getinputb")), methodAddress) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_matrixfromcolumnsnode_getinputb")), methodAddress) if err != 0: raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) - self.lib.lib3mf_composematrixfromcolumnvectors_getinputb = methodType(int(methodAddress.value)) + self.lib.lib3mf_matrixfromcolumnsnode_getinputb = methodType(int(methodAddress.value)) - err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromcolumnvectors_getinputc")), methodAddress) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_matrixfromcolumnsnode_getinputc")), methodAddress) if err != 0: raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) - self.lib.lib3mf_composematrixfromcolumnvectors_getinputc = methodType(int(methodAddress.value)) + self.lib.lib3mf_matrixfromcolumnsnode_getinputc = methodType(int(methodAddress.value)) - err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromcolumnvectors_getinputd")), methodAddress) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_matrixfromcolumnsnode_getinputd")), methodAddress) if err != 0: raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) - self.lib.lib3mf_composematrixfromcolumnvectors_getinputd = methodType(int(methodAddress.value)) + self.lib.lib3mf_matrixfromcolumnsnode_getinputd = methodType(int(methodAddress.value)) - err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromcolumnvectors_getoutputresult")), methodAddress) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_matrixfromcolumnsnode_getoutputresult")), methodAddress) if err != 0: raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) - self.lib.lib3mf_composematrixfromcolumnvectors_getoutputresult = methodType(int(methodAddress.value)) + self.lib.lib3mf_matrixfromcolumnsnode_getoutputresult = methodType(int(methodAddress.value)) err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_constantnode_setconstant")), methodAddress) if err != 0: @@ -3233,6 +3255,24 @@ def _loadFunctionTableFromMethod(self, symbolLookupMethodAddress): methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) self.lib.lib3mf_meshnode_getoutputdistance = methodType(int(methodAddress.value)) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_unsignedmeshnode_getinputmesh")), methodAddress) + if err != 0: + raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) + methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) + self.lib.lib3mf_unsignedmeshnode_getinputmesh = methodType(int(methodAddress.value)) + + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_unsignedmeshnode_getinputpos")), methodAddress) + if err != 0: + raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) + methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) + self.lib.lib3mf_unsignedmeshnode_getinputpos = methodType(int(methodAddress.value)) + + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_unsignedmeshnode_getoutputdistance")), methodAddress) + if err != 0: + raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) + methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)) + self.lib.lib3mf_unsignedmeshnode_getoutputdistance = methodType(int(methodAddress.value)) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_functioncallnode_getinputfunctionid")), methodAddress) if err != 0: raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) @@ -3551,6 +3591,12 @@ def _loadFunctionTableFromMethod(self, symbolLookupMethodAddress): methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)) self.lib.lib3mf_implicitfunction_addcomposevectornode = methodType(int(methodAddress.value)) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_implicitfunction_addvectorfromscalarnode")), methodAddress) + if err != 0: + raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) + methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)) + self.lib.lib3mf_implicitfunction_addvectorfromscalarnode = methodType(int(methodAddress.value)) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_implicitfunction_adddecomposevectornode")), methodAddress) if err != 0: raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) @@ -3563,11 +3609,17 @@ def _loadFunctionTableFromMethod(self, symbolLookupMethodAddress): methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)) self.lib.lib3mf_implicitfunction_addcomposematrixnode = methodType(int(methodAddress.value)) - err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode")), methodAddress) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_implicitfunction_addmatrixfromrowsnode")), methodAddress) if err != 0: raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)) - self.lib.lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode = methodType(int(methodAddress.value)) + self.lib.lib3mf_implicitfunction_addmatrixfromrowsnode = methodType(int(methodAddress.value)) + + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_implicitfunction_addmatrixfromcolumnsnode")), methodAddress) + if err != 0: + raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) + methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)) + self.lib.lib3mf_implicitfunction_addmatrixfromcolumnsnode = methodType(int(methodAddress.value)) err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_implicitfunction_addconstantnode")), methodAddress) if err != 0: @@ -3593,6 +3645,12 @@ def _loadFunctionTableFromMethod(self, symbolLookupMethodAddress): methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)) self.lib.lib3mf_implicitfunction_addmeshnode = methodType(int(methodAddress.value)) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_implicitfunction_addunsignedmeshnode")), methodAddress) + if err != 0: + raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) + methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)) + self.lib.lib3mf_implicitfunction_addunsignedmeshnode = methodType(int(methodAddress.value)) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_implicitfunction_addfunctioncallnode")), methodAddress) if err != 0: raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) @@ -5491,6 +5549,12 @@ def _loadFunctionTable(self): self.lib.lib3mf_composevectornode_getoutputresult.restype = ctypes.c_int32 self.lib.lib3mf_composevectornode_getoutputresult.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_vectorfromscalarnode_getinputa.restype = ctypes.c_int32 + self.lib.lib3mf_vectorfromscalarnode_getinputa.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] + + self.lib.lib3mf_vectorfromscalarnode_getoutputresult.restype = ctypes.c_int32 + self.lib.lib3mf_vectorfromscalarnode_getoutputresult.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_decomposevectornode_getinputa.restype = ctypes.c_int32 self.lib.lib3mf_decomposevectornode_getinputa.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] @@ -5554,35 +5618,35 @@ def _loadFunctionTable(self): self.lib.lib3mf_composematrixnode_getoutputresult.restype = ctypes.c_int32 self.lib.lib3mf_composematrixnode_getoutputresult.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] - self.lib.lib3mf_composematrixfromrowvectorsnode_getinputa.restype = ctypes.c_int32 - self.lib.lib3mf_composematrixfromrowvectorsnode_getinputa.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_matrixfromrowsnode_getinputa.restype = ctypes.c_int32 + self.lib.lib3mf_matrixfromrowsnode_getinputa.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] - self.lib.lib3mf_composematrixfromrowvectorsnode_getinputb.restype = ctypes.c_int32 - self.lib.lib3mf_composematrixfromrowvectorsnode_getinputb.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_matrixfromrowsnode_getinputb.restype = ctypes.c_int32 + self.lib.lib3mf_matrixfromrowsnode_getinputb.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] - self.lib.lib3mf_composematrixfromrowvectorsnode_getinputc.restype = ctypes.c_int32 - self.lib.lib3mf_composematrixfromrowvectorsnode_getinputc.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_matrixfromrowsnode_getinputc.restype = ctypes.c_int32 + self.lib.lib3mf_matrixfromrowsnode_getinputc.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] - self.lib.lib3mf_composematrixfromrowvectorsnode_getinputd.restype = ctypes.c_int32 - self.lib.lib3mf_composematrixfromrowvectorsnode_getinputd.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_matrixfromrowsnode_getinputd.restype = ctypes.c_int32 + self.lib.lib3mf_matrixfromrowsnode_getinputd.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] - self.lib.lib3mf_composematrixfromrowvectorsnode_getoutputresult.restype = ctypes.c_int32 - self.lib.lib3mf_composematrixfromrowvectorsnode_getoutputresult.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_matrixfromrowsnode_getoutputresult.restype = ctypes.c_int32 + self.lib.lib3mf_matrixfromrowsnode_getoutputresult.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] - self.lib.lib3mf_composematrixfromcolumnvectors_getinputa.restype = ctypes.c_int32 - self.lib.lib3mf_composematrixfromcolumnvectors_getinputa.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_matrixfromcolumnsnode_getinputa.restype = ctypes.c_int32 + self.lib.lib3mf_matrixfromcolumnsnode_getinputa.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] - self.lib.lib3mf_composematrixfromcolumnvectors_getinputb.restype = ctypes.c_int32 - self.lib.lib3mf_composematrixfromcolumnvectors_getinputb.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_matrixfromcolumnsnode_getinputb.restype = ctypes.c_int32 + self.lib.lib3mf_matrixfromcolumnsnode_getinputb.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] - self.lib.lib3mf_composematrixfromcolumnvectors_getinputc.restype = ctypes.c_int32 - self.lib.lib3mf_composematrixfromcolumnvectors_getinputc.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_matrixfromcolumnsnode_getinputc.restype = ctypes.c_int32 + self.lib.lib3mf_matrixfromcolumnsnode_getinputc.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] - self.lib.lib3mf_composematrixfromcolumnvectors_getinputd.restype = ctypes.c_int32 - self.lib.lib3mf_composematrixfromcolumnvectors_getinputd.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_matrixfromcolumnsnode_getinputd.restype = ctypes.c_int32 + self.lib.lib3mf_matrixfromcolumnsnode_getinputd.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] - self.lib.lib3mf_composematrixfromcolumnvectors_getoutputresult.restype = ctypes.c_int32 - self.lib.lib3mf_composematrixfromcolumnvectors_getoutputresult.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_matrixfromcolumnsnode_getoutputresult.restype = ctypes.c_int32 + self.lib.lib3mf_matrixfromcolumnsnode_getoutputresult.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] self.lib.lib3mf_constantnode_setconstant.restype = ctypes.c_int32 self.lib.lib3mf_constantnode_setconstant.argtypes = [ctypes.c_void_p, ctypes.c_double] @@ -5620,6 +5684,15 @@ def _loadFunctionTable(self): self.lib.lib3mf_meshnode_getoutputdistance.restype = ctypes.c_int32 self.lib.lib3mf_meshnode_getoutputdistance.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_unsignedmeshnode_getinputmesh.restype = ctypes.c_int32 + self.lib.lib3mf_unsignedmeshnode_getinputmesh.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] + + self.lib.lib3mf_unsignedmeshnode_getinputpos.restype = ctypes.c_int32 + self.lib.lib3mf_unsignedmeshnode_getinputpos.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] + + self.lib.lib3mf_unsignedmeshnode_getoutputdistance.restype = ctypes.c_int32 + self.lib.lib3mf_unsignedmeshnode_getoutputdistance.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_functioncallnode_getinputfunctionid.restype = ctypes.c_int32 self.lib.lib3mf_functioncallnode_getinputfunctionid.argtypes = [ctypes.c_void_p, ctypes.POINTER(ctypes.c_void_p)] @@ -5779,14 +5852,20 @@ def _loadFunctionTable(self): self.lib.lib3mf_implicitfunction_addcomposevectornode.restype = ctypes.c_int32 self.lib.lib3mf_implicitfunction_addcomposevectornode.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_implicitfunction_addvectorfromscalarnode.restype = ctypes.c_int32 + self.lib.lib3mf_implicitfunction_addvectorfromscalarnode.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_implicitfunction_adddecomposevectornode.restype = ctypes.c_int32 self.lib.lib3mf_implicitfunction_adddecomposevectornode.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)] self.lib.lib3mf_implicitfunction_addcomposematrixnode.restype = ctypes.c_int32 self.lib.lib3mf_implicitfunction_addcomposematrixnode.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)] - self.lib.lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode.restype = ctypes.c_int32 - self.lib.lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_implicitfunction_addmatrixfromrowsnode.restype = ctypes.c_int32 + self.lib.lib3mf_implicitfunction_addmatrixfromrowsnode.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)] + + self.lib.lib3mf_implicitfunction_addmatrixfromcolumnsnode.restype = ctypes.c_int32 + self.lib.lib3mf_implicitfunction_addmatrixfromcolumnsnode.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)] self.lib.lib3mf_implicitfunction_addconstantnode.restype = ctypes.c_int32 self.lib.lib3mf_implicitfunction_addconstantnode.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)] @@ -5800,6 +5879,9 @@ def _loadFunctionTable(self): self.lib.lib3mf_implicitfunction_addmeshnode.restype = ctypes.c_int32 self.lib.lib3mf_implicitfunction_addmeshnode.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_implicitfunction_addunsignedmeshnode.restype = ctypes.c_int32 + self.lib.lib3mf_implicitfunction_addunsignedmeshnode.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_implicitfunction_addfunctioncallnode.restype = ctypes.c_int32 self.lib.lib3mf_implicitfunction_addfunctioncallnode.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)] @@ -6657,14 +6739,16 @@ def getObjectById_77AF68C971B1485F(self, handle, wrapper): # First 64 bits of SH return ClampNode(handle, wrapper) def getObjectById_49C24B8840C01F7E(self, handle, wrapper): # First 64 bits of SHA1 of a string: "Lib3MF::ComposeVectorNode" return ComposeVectorNode(handle, wrapper) + def getObjectById_2E417B93351375E2(self, handle, wrapper): # First 64 bits of SHA1 of a string: "Lib3MF::VectorFromScalarNode" + return VectorFromScalarNode(handle, wrapper) def getObjectById_CC4F8D561CCE35D4(self, handle, wrapper): # First 64 bits of SHA1 of a string: "Lib3MF::DecomposeVectorNode" return DecomposeVectorNode(handle, wrapper) def getObjectById_9EF9EB54A53AA40D(self, handle, wrapper): # First 64 bits of SHA1 of a string: "Lib3MF::ComposeMatrixNode" return ComposeMatrixNode(handle, wrapper) - def getObjectById_5F89513A9B5FC583(self, handle, wrapper): # First 64 bits of SHA1 of a string: "Lib3MF::ComposeMatrixFromRowVectorsNode" - return ComposeMatrixFromRowVectorsNode(handle, wrapper) - def getObjectById_1A740A1E16230053(self, handle, wrapper): # First 64 bits of SHA1 of a string: "Lib3MF::ComposeMatrixFromColumnVectors" - return ComposeMatrixFromColumnVectors(handle, wrapper) + def getObjectById_D6DFD0A7EB64AC33(self, handle, wrapper): # First 64 bits of SHA1 of a string: "Lib3MF::MatrixFromRowsNode" + return MatrixFromRowsNode(handle, wrapper) + def getObjectById_0DCBEAFCF83F3AAC(self, handle, wrapper): # First 64 bits of SHA1 of a string: "Lib3MF::MatrixFromColumnsNode" + return MatrixFromColumnsNode(handle, wrapper) def getObjectById_3F8E5D082F966B1B(self, handle, wrapper): # First 64 bits of SHA1 of a string: "Lib3MF::ConstantNode" return ConstantNode(handle, wrapper) def getObjectById_9C9363B3F708D556(self, handle, wrapper): # First 64 bits of SHA1 of a string: "Lib3MF::ConstVecNode" @@ -6673,6 +6757,8 @@ def getObjectById_F85C90EDCE6F90A4(self, handle, wrapper): # First 64 bits of SH return ConstMatNode(handle, wrapper) def getObjectById_53601FD432E3DEF4(self, handle, wrapper): # First 64 bits of SHA1 of a string: "Lib3MF::MeshNode" return MeshNode(handle, wrapper) + def getObjectById_29985A628251A9CD(self, handle, wrapper): # First 64 bits of SHA1 of a string: "Lib3MF::UnsignedMeshNode" + return UnsignedMeshNode(handle, wrapper) def getObjectById_0765C17C952F24E3(self, handle, wrapper): # First 64 bits of SHA1 of a string: "Lib3MF::FunctionCallNode" return FunctionCallNode(handle, wrapper) def getObjectById_FC006BC888CAB4D0(self, handle, wrapper): # First 64 bits of SHA1 of a string: "Lib3MF::NodeIterator" @@ -9593,6 +9679,33 @@ def GetOutputResult(self): +''' Class Implementation for VectorFromScalarNode +''' +class VectorFromScalarNode(ImplicitNode): + def __init__(self, handle, wrapper): + ImplicitNode.__init__(self, handle, wrapper) + def GetInputA(self): + AHandle = ctypes.c_void_p() + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_vectorfromscalarnode_getinputa(self._handle, AHandle)) + if AHandle: + AObject = self._wrapper._polymorphicFactory(AHandle) + else: + raise ELib3MFException(ErrorCodes.INVALIDCAST, 'Invalid return/output value') + + return AObject + + def GetOutputResult(self): + ResultHandle = ctypes.c_void_p() + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_vectorfromscalarnode_getoutputresult(self._handle, ResultHandle)) + if ResultHandle: + ResultObject = self._wrapper._polymorphicFactory(ResultHandle) + else: + raise ELib3MFException(ErrorCodes.INVALIDCAST, 'Invalid return/output value') + + return ResultObject + + + ''' Class Implementation for DecomposeVectorNode ''' class DecomposeVectorNode(ImplicitNode): @@ -9817,14 +9930,14 @@ def GetOutputResult(self): -''' Class Implementation for ComposeMatrixFromRowVectorsNode +''' Class Implementation for MatrixFromRowsNode ''' -class ComposeMatrixFromRowVectorsNode(ImplicitNode): +class MatrixFromRowsNode(ImplicitNode): def __init__(self, handle, wrapper): ImplicitNode.__init__(self, handle, wrapper) def GetInputA(self): Row0Handle = ctypes.c_void_p() - self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromrowvectorsnode_getinputa(self._handle, Row0Handle)) + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_matrixfromrowsnode_getinputa(self._handle, Row0Handle)) if Row0Handle: Row0Object = self._wrapper._polymorphicFactory(Row0Handle) else: @@ -9834,7 +9947,7 @@ def GetInputA(self): def GetInputB(self): Row1Handle = ctypes.c_void_p() - self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromrowvectorsnode_getinputb(self._handle, Row1Handle)) + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_matrixfromrowsnode_getinputb(self._handle, Row1Handle)) if Row1Handle: Row1Object = self._wrapper._polymorphicFactory(Row1Handle) else: @@ -9844,7 +9957,7 @@ def GetInputB(self): def GetInputC(self): Row2Handle = ctypes.c_void_p() - self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromrowvectorsnode_getinputc(self._handle, Row2Handle)) + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_matrixfromrowsnode_getinputc(self._handle, Row2Handle)) if Row2Handle: Row2Object = self._wrapper._polymorphicFactory(Row2Handle) else: @@ -9854,7 +9967,7 @@ def GetInputC(self): def GetInputD(self): Row3Handle = ctypes.c_void_p() - self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromrowvectorsnode_getinputd(self._handle, Row3Handle)) + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_matrixfromrowsnode_getinputd(self._handle, Row3Handle)) if Row3Handle: Row3Object = self._wrapper._polymorphicFactory(Row3Handle) else: @@ -9864,7 +9977,7 @@ def GetInputD(self): def GetOutputResult(self): ResultHandle = ctypes.c_void_p() - self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromrowvectorsnode_getoutputresult(self._handle, ResultHandle)) + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_matrixfromrowsnode_getoutputresult(self._handle, ResultHandle)) if ResultHandle: ResultObject = self._wrapper._polymorphicFactory(ResultHandle) else: @@ -9874,14 +9987,14 @@ def GetOutputResult(self): -''' Class Implementation for ComposeMatrixFromColumnVectors +''' Class Implementation for MatrixFromColumnsNode ''' -class ComposeMatrixFromColumnVectors(ImplicitNode): +class MatrixFromColumnsNode(ImplicitNode): def __init__(self, handle, wrapper): ImplicitNode.__init__(self, handle, wrapper) def GetInputA(self): Column0Handle = ctypes.c_void_p() - self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromcolumnvectors_getinputa(self._handle, Column0Handle)) + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_matrixfromcolumnsnode_getinputa(self._handle, Column0Handle)) if Column0Handle: Column0Object = self._wrapper._polymorphicFactory(Column0Handle) else: @@ -9891,7 +10004,7 @@ def GetInputA(self): def GetInputB(self): Column1Handle = ctypes.c_void_p() - self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromcolumnvectors_getinputb(self._handle, Column1Handle)) + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_matrixfromcolumnsnode_getinputb(self._handle, Column1Handle)) if Column1Handle: Column1Object = self._wrapper._polymorphicFactory(Column1Handle) else: @@ -9901,7 +10014,7 @@ def GetInputB(self): def GetInputC(self): Column2Handle = ctypes.c_void_p() - self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromcolumnvectors_getinputc(self._handle, Column2Handle)) + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_matrixfromcolumnsnode_getinputc(self._handle, Column2Handle)) if Column2Handle: Column2Object = self._wrapper._polymorphicFactory(Column2Handle) else: @@ -9911,7 +10024,7 @@ def GetInputC(self): def GetInputD(self): Column3Handle = ctypes.c_void_p() - self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromcolumnvectors_getinputd(self._handle, Column3Handle)) + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_matrixfromcolumnsnode_getinputd(self._handle, Column3Handle)) if Column3Handle: Column3Object = self._wrapper._polymorphicFactory(Column3Handle) else: @@ -9921,7 +10034,7 @@ def GetInputD(self): def GetOutputResult(self): ResultHandle = ctypes.c_void_p() - self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromcolumnvectors_getoutputresult(self._handle, ResultHandle)) + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_matrixfromcolumnsnode_getoutputresult(self._handle, ResultHandle)) if ResultHandle: ResultObject = self._wrapper._polymorphicFactory(ResultHandle) else: @@ -10050,6 +10163,43 @@ def GetOutputDistance(self): +''' Class Implementation for UnsignedMeshNode +''' +class UnsignedMeshNode(ImplicitNode): + def __init__(self, handle, wrapper): + ImplicitNode.__init__(self, handle, wrapper) + def GetInputMesh(self): + MeshHandle = ctypes.c_void_p() + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_unsignedmeshnode_getinputmesh(self._handle, MeshHandle)) + if MeshHandle: + MeshObject = self._wrapper._polymorphicFactory(MeshHandle) + else: + raise ELib3MFException(ErrorCodes.INVALIDCAST, 'Invalid return/output value') + + return MeshObject + + def GetInputPos(self): + PosHandle = ctypes.c_void_p() + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_unsignedmeshnode_getinputpos(self._handle, PosHandle)) + if PosHandle: + PosObject = self._wrapper._polymorphicFactory(PosHandle) + else: + raise ELib3MFException(ErrorCodes.INVALIDCAST, 'Invalid return/output value') + + return PosObject + + def GetOutputDistance(self): + DistanceHandle = ctypes.c_void_p() + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_unsignedmeshnode_getoutputdistance(self._handle, DistanceHandle)) + if DistanceHandle: + DistanceObject = self._wrapper._polymorphicFactory(DistanceHandle) + else: + raise ELib3MFException(ErrorCodes.INVALIDCAST, 'Invalid return/output value') + + return DistanceObject + + + ''' Class Implementation for FunctionCallNode ''' class FunctionCallNode(ImplicitNode): @@ -10719,6 +10869,19 @@ def AddComposeVectorNode(self, Identifier, DisplayName, Tag): return NodeObject + def AddVectorFromScalarNode(self, Identifier, DisplayName, Tag): + pIdentifier = ctypes.c_char_p(str.encode(Identifier)) + pDisplayName = ctypes.c_char_p(str.encode(DisplayName)) + pTag = ctypes.c_char_p(str.encode(Tag)) + NodeHandle = ctypes.c_void_p() + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_implicitfunction_addvectorfromscalarnode(self._handle, pIdentifier, pDisplayName, pTag, NodeHandle)) + if NodeHandle: + NodeObject = self._wrapper._polymorphicFactory(NodeHandle) + else: + raise ELib3MFException(ErrorCodes.INVALIDCAST, 'Invalid return/output value') + + return NodeObject + def AddDecomposeVectorNode(self, Identifier, DisplayName, Tag): pIdentifier = ctypes.c_char_p(str.encode(Identifier)) pDisplayName = ctypes.c_char_p(str.encode(DisplayName)) @@ -10745,12 +10908,25 @@ def AddComposeMatrixNode(self, Identifier, DisplayName, Tag): return NodeObject - def AddComposeMatrixFromRowVectorsNode(self, Identifier, DisplayName, Tag): + def AddMatrixFromRowsNode(self, Identifier, DisplayName, Tag): + pIdentifier = ctypes.c_char_p(str.encode(Identifier)) + pDisplayName = ctypes.c_char_p(str.encode(DisplayName)) + pTag = ctypes.c_char_p(str.encode(Tag)) + NodeHandle = ctypes.c_void_p() + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_implicitfunction_addmatrixfromrowsnode(self._handle, pIdentifier, pDisplayName, pTag, NodeHandle)) + if NodeHandle: + NodeObject = self._wrapper._polymorphicFactory(NodeHandle) + else: + raise ELib3MFException(ErrorCodes.INVALIDCAST, 'Invalid return/output value') + + return NodeObject + + def AddMatrixFromColumnsNode(self, Identifier, DisplayName, Tag): pIdentifier = ctypes.c_char_p(str.encode(Identifier)) pDisplayName = ctypes.c_char_p(str.encode(DisplayName)) pTag = ctypes.c_char_p(str.encode(Tag)) NodeHandle = ctypes.c_void_p() - self._wrapper.checkError(self, self._wrapper.lib.lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode(self._handle, pIdentifier, pDisplayName, pTag, NodeHandle)) + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_implicitfunction_addmatrixfromcolumnsnode(self._handle, pIdentifier, pDisplayName, pTag, NodeHandle)) if NodeHandle: NodeObject = self._wrapper._polymorphicFactory(NodeHandle) else: @@ -10810,6 +10986,19 @@ def AddMeshNode(self, Identifier, DisplayName, Tag): return NodeObject + def AddUnsignedMeshNode(self, Identifier, DisplayName, Tag): + pIdentifier = ctypes.c_char_p(str.encode(Identifier)) + pDisplayName = ctypes.c_char_p(str.encode(DisplayName)) + pTag = ctypes.c_char_p(str.encode(Tag)) + NodeHandle = ctypes.c_void_p() + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_implicitfunction_addunsignedmeshnode(self._handle, pIdentifier, pDisplayName, pTag, NodeHandle)) + if NodeHandle: + NodeObject = self._wrapper._polymorphicFactory(NodeHandle) + else: + raise ELib3MFException(ErrorCodes.INVALIDCAST, 'Invalid return/output value') + + return NodeObject + def AddFunctionCallNode(self, Identifier, DisplayName, Tag): pIdentifier = ctypes.c_char_p(str.encode(Identifier)) pDisplayName = ctypes.c_char_p(str.encode(DisplayName)) diff --git a/Autogenerated/Source/lib3mf_abi.hpp b/Autogenerated/Source/lib3mf_abi.hpp index 1671c3d43..dbd09dfb2 100644 --- a/Autogenerated/Source/lib3mf_abi.hpp +++ b/Autogenerated/Source/lib3mf_abi.hpp @@ -3239,6 +3239,28 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composevectornode_getinputz(Lib3MF_ComposeVe */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composevectornode_getoutputresult(Lib3MF_ComposeVectorNode pComposeVectorNode, Lib3MF_ImplicitPort * pResult); +/************************************************************************************************************************* + Class definition for VectorFromScalarNode +**************************************************************************************************************************/ + +/** +* Retrieves the input +* +* @param[in] pVectorFromScalarNode - VectorFromScalarNode instance. +* @param[out] pA - the input for the x component +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_vectorfromscalarnode_getinputa(Lib3MF_VectorFromScalarNode pVectorFromScalarNode, Lib3MF_ImplicitPort * pA); + +/** +* Retrieves the output +* +* @param[in] pVectorFromScalarNode - VectorFromScalarNode instance. +* @param[out] pResult - the output +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_vectorfromscalarnode_getoutputresult(Lib3MF_VectorFromScalarNode pVectorFromScalarNode, Lib3MF_ImplicitPort * pResult); + /************************************************************************************************************************* Class definition for DecomposeVectorNode **************************************************************************************************************************/ @@ -3437,102 +3459,102 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getinputm33(Lib3MF_Compose LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getoutputresult(Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* - Class definition for ComposeMatrixFromRowVectorsNode + Class definition for MatrixFromRowsNode **************************************************************************************************************************/ /** * Retrieves the input for the first row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow0 - the input for the first row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputa(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromrowsnode_getinputa(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow0); /** * Retrieves the input for the second row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow1 - the input for the second row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputb(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromrowsnode_getinputb(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow1); /** * Retrieves the input for the third row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow2 - the input for the third row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputc(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromrowsnode_getinputc(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow2); /** * Retrieves the input for the fourth row * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pRow3 - the input for the fourth row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputd(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromrowsnode_getinputd(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow3); /** * Retrieves the output * -* @param[in] pComposeMatrixFromRowVectorsNode - ComposeMatrixFromRowVectorsNode instance. +* @param[in] pMatrixFromRowsNode - MatrixFromRowsNode instance. * @param[out] pResult - the output * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getoutputresult(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pResult); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromrowsnode_getoutputresult(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* - Class definition for ComposeMatrixFromColumnVectors + Class definition for MatrixFromColumnsNode **************************************************************************************************************************/ /** * Retrieves the input for the first column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn0 - the input for the first column * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputa(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn0); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromcolumnsnode_getinputa(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn0); /** * Retrieves the input for the second column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn1 - the input for the second column * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputb(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn1); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromcolumnsnode_getinputb(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn1); /** * Retrieves the input for the third column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn2 - the input for the third column * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputc(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn2); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromcolumnsnode_getinputc(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn2); /** * Retrieves the input for the fourth column * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pColumn3 - the input for the fourth column * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputd(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn3); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromcolumnsnode_getinputd(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn3); /** * Retrieves the output * -* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[in] pMatrixFromColumnsNode - MatrixFromColumnsNode instance. * @param[out] pResult - the output * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromcolumnvectors_getoutputresult(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pResult); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_matrixfromcolumnsnode_getoutputresult(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pResult); /************************************************************************************************************************* Class definition for ConstantNode @@ -3658,6 +3680,37 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_meshnode_getinputpos(Lib3MF_MeshNode pMeshNo */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_meshnode_getoutputdistance(Lib3MF_MeshNode pMeshNode, Lib3MF_ImplicitPort * pDistance); +/************************************************************************************************************************* + Class definition for UnsignedMeshNode +**************************************************************************************************************************/ + +/** +* Retrieves the input for the model resource id of the mesh +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pMesh - the input port for the model resource id of the mesh +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_unsignedmeshnode_getinputmesh(Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pMesh); + +/** +* Retrieves the input for the position +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pPos - the input port for the position +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_unsignedmeshnode_getinputpos(Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pPos); + +/** +* Retrieves the output +* +* @param[in] pUnsignedMeshNode - UnsignedMeshNode instance. +* @param[out] pDistance - the output port for the unsigned distance to the mesh +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_unsignedmeshnode_getoutputdistance(Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pDistance); + /************************************************************************************************************************* Class definition for FunctionCallNode **************************************************************************************************************************/ @@ -4313,6 +4366,18 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addclampnode(Lib3MF_Implici */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addcomposevectornode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeVectorNode * pNode); +/** +* Add a VectorFromScalar +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addvectorfromscalarnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_VectorFromScalarNode * pNode); + /** * Add a DecomposeVectorNode * @@ -4338,7 +4403,19 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_adddecomposevectornode(Lib3 LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addcomposematrixnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeMatrixNode * pNode); /** -* Add a ComposeMatrixFromRowVectorsNode +* Add a MatrixFromRowsNode +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addmatrixfromrowsnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MatrixFromRowsNode * pNode); + +/** +* Add a MatrixFromColumnsNode * * @param[in] pImplicitFunction - ImplicitFunction instance. * @param[in] pIdentifier - the identifier of the node @@ -4347,7 +4424,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addcomposematrixnode(Lib3MF * @param[out] pNode - the added node * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeMatrixFromRowVectorsNode * pNode); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addmatrixfromcolumnsnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MatrixFromColumnsNode * pNode); /** * Add a ConstantNode @@ -4397,6 +4474,18 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addconstmatnode(Lib3MF_Impl */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addmeshnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MeshNode * pNode); +/** +* Add a UnsignedMeshNode +* +* @param[in] pImplicitFunction - ImplicitFunction instance. +* @param[in] pIdentifier - the identifier of the node +* @param[in] pDisplayName - the display name of the node +* @param[in] pTag - the tag of the node +* @param[out] pNode - the added node +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addunsignedmeshnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_UnsignedMeshNode * pNode); + /** * Add a FunctionCallNode * diff --git a/Autogenerated/Source/lib3mf_interfaces.hpp b/Autogenerated/Source/lib3mf_interfaces.hpp index 2bc79fa70..c62345e94 100644 --- a/Autogenerated/Source/lib3mf_interfaces.hpp +++ b/Autogenerated/Source/lib3mf_interfaces.hpp @@ -138,14 +138,16 @@ class IPowNode; class ISelectNode; class IClampNode; class IComposeVectorNode; +class IVectorFromScalarNode; class IDecomposeVectorNode; class IComposeMatrixNode; -class IComposeMatrixFromRowVectorsNode; -class IComposeMatrixFromColumnVectors; +class IMatrixFromRowsNode; +class IMatrixFromColumnsNode; class IConstantNode; class IConstVecNode; class IConstMatNode; class IMeshNode; +class IUnsignedMeshNode; class IFunctionCallNode; class INodeIterator; class IFunction; @@ -3986,6 +3988,38 @@ class IComposeVectorNode : public virtual IImplicitNode { typedef IBaseSharedPtr PIComposeVectorNode; +/************************************************************************************************************************* + Class interface for VectorFromScalarNode +**************************************************************************************************************************/ + +class IVectorFromScalarNode : public virtual IImplicitNode { +public: + /** + * IVectorFromScalarNode::ClassTypeId - Get Class Type Id + * @return Class type as a 64 bits integer + */ + Lib3MF_uint64 ClassTypeId() override + { + return 0x2E417B93351375E2UL; // First 64 bits of SHA1 of a string: "Lib3MF::VectorFromScalarNode" + } + + /** + * IVectorFromScalarNode::GetInputA - Retrieves the input + * @return the input for the x component + */ + virtual IImplicitPort * GetInputA() = 0; + + /** + * IVectorFromScalarNode::GetOutputResult - Retrieves the output + * @return the output + */ + virtual IImplicitPort * GetOutputResult() = 0; + +}; + +typedef IBaseSharedPtr PIVectorFromScalarNode; + + /************************************************************************************************************************* Class interface for DecomposeVectorNode **************************************************************************************************************************/ @@ -4153,103 +4187,103 @@ typedef IBaseSharedPtr PIComposeMatrixNode; /************************************************************************************************************************* - Class interface for ComposeMatrixFromRowVectorsNode + Class interface for MatrixFromRowsNode **************************************************************************************************************************/ -class IComposeMatrixFromRowVectorsNode : public virtual IImplicitNode { +class IMatrixFromRowsNode : public virtual IImplicitNode { public: /** - * IComposeMatrixFromRowVectorsNode::ClassTypeId - Get Class Type Id + * IMatrixFromRowsNode::ClassTypeId - Get Class Type Id * @return Class type as a 64 bits integer */ Lib3MF_uint64 ClassTypeId() override { - return 0x5F89513A9B5FC583UL; // First 64 bits of SHA1 of a string: "Lib3MF::ComposeMatrixFromRowVectorsNode" + return 0xD6DFD0A7EB64AC33UL; // First 64 bits of SHA1 of a string: "Lib3MF::MatrixFromRowsNode" } /** - * IComposeMatrixFromRowVectorsNode::GetInputA - Retrieves the input for the first row + * IMatrixFromRowsNode::GetInputA - Retrieves the input for the first row * @return the input for the first row */ virtual IImplicitPort * GetInputA() = 0; /** - * IComposeMatrixFromRowVectorsNode::GetInputB - Retrieves the input for the second row + * IMatrixFromRowsNode::GetInputB - Retrieves the input for the second row * @return the input for the second row */ virtual IImplicitPort * GetInputB() = 0; /** - * IComposeMatrixFromRowVectorsNode::GetInputC - Retrieves the input for the third row + * IMatrixFromRowsNode::GetInputC - Retrieves the input for the third row * @return the input for the third row */ virtual IImplicitPort * GetInputC() = 0; /** - * IComposeMatrixFromRowVectorsNode::GetInputD - Retrieves the input for the fourth row + * IMatrixFromRowsNode::GetInputD - Retrieves the input for the fourth row * @return the input for the fourth row */ virtual IImplicitPort * GetInputD() = 0; /** - * IComposeMatrixFromRowVectorsNode::GetOutputResult - Retrieves the output + * IMatrixFromRowsNode::GetOutputResult - Retrieves the output * @return the output */ virtual IImplicitPort * GetOutputResult() = 0; }; -typedef IBaseSharedPtr PIComposeMatrixFromRowVectorsNode; +typedef IBaseSharedPtr PIMatrixFromRowsNode; /************************************************************************************************************************* - Class interface for ComposeMatrixFromColumnVectors + Class interface for MatrixFromColumnsNode **************************************************************************************************************************/ -class IComposeMatrixFromColumnVectors : public virtual IImplicitNode { +class IMatrixFromColumnsNode : public virtual IImplicitNode { public: /** - * IComposeMatrixFromColumnVectors::ClassTypeId - Get Class Type Id + * IMatrixFromColumnsNode::ClassTypeId - Get Class Type Id * @return Class type as a 64 bits integer */ Lib3MF_uint64 ClassTypeId() override { - return 0x1A740A1E16230053UL; // First 64 bits of SHA1 of a string: "Lib3MF::ComposeMatrixFromColumnVectors" + return 0xDCBEAFCF83F3AACUL; // First 64 bits of SHA1 of a string: "Lib3MF::MatrixFromColumnsNode" } /** - * IComposeMatrixFromColumnVectors::GetInputA - Retrieves the input for the first column + * IMatrixFromColumnsNode::GetInputA - Retrieves the input for the first column * @return the input for the first column */ virtual IImplicitPort * GetInputA() = 0; /** - * IComposeMatrixFromColumnVectors::GetInputB - Retrieves the input for the second column + * IMatrixFromColumnsNode::GetInputB - Retrieves the input for the second column * @return the input for the second column */ virtual IImplicitPort * GetInputB() = 0; /** - * IComposeMatrixFromColumnVectors::GetInputC - Retrieves the input for the third column + * IMatrixFromColumnsNode::GetInputC - Retrieves the input for the third column * @return the input for the third column */ virtual IImplicitPort * GetInputC() = 0; /** - * IComposeMatrixFromColumnVectors::GetInputD - Retrieves the input for the fourth column + * IMatrixFromColumnsNode::GetInputD - Retrieves the input for the fourth column * @return the input for the fourth column */ virtual IImplicitPort * GetInputD() = 0; /** - * IComposeMatrixFromColumnVectors::GetOutputResult - Retrieves the output + * IMatrixFromColumnsNode::GetOutputResult - Retrieves the output * @return the output */ virtual IImplicitPort * GetOutputResult() = 0; }; -typedef IBaseSharedPtr PIComposeMatrixFromColumnVectors; +typedef IBaseSharedPtr PIMatrixFromColumnsNode; /************************************************************************************************************************* @@ -4404,6 +4438,44 @@ class IMeshNode : public virtual IImplicitNode { typedef IBaseSharedPtr PIMeshNode; +/************************************************************************************************************************* + Class interface for UnsignedMeshNode +**************************************************************************************************************************/ + +class IUnsignedMeshNode : public virtual IImplicitNode { +public: + /** + * IUnsignedMeshNode::ClassTypeId - Get Class Type Id + * @return Class type as a 64 bits integer + */ + Lib3MF_uint64 ClassTypeId() override + { + return 0x29985A628251A9CDUL; // First 64 bits of SHA1 of a string: "Lib3MF::UnsignedMeshNode" + } + + /** + * IUnsignedMeshNode::GetInputMesh - Retrieves the input for the model resource id of the mesh + * @return the input port for the model resource id of the mesh + */ + virtual IImplicitPort * GetInputMesh() = 0; + + /** + * IUnsignedMeshNode::GetInputPos - Retrieves the input for the position + * @return the input port for the position + */ + virtual IImplicitPort * GetInputPos() = 0; + + /** + * IUnsignedMeshNode::GetOutputDistance - Retrieves the output + * @return the output port for the unsigned distance to the mesh + */ + virtual IImplicitPort * GetOutputDistance() = 0; + +}; + +typedef IBaseSharedPtr PIUnsignedMeshNode; + + /************************************************************************************************************************* Class interface for FunctionCallNode **************************************************************************************************************************/ @@ -4955,6 +5027,15 @@ class IImplicitFunction : public virtual IFunction { */ virtual IComposeVectorNode * AddComposeVectorNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) = 0; + /** + * IImplicitFunction::AddVectorFromScalarNode - Add a VectorFromScalar + * @param[in] sIdentifier - the identifier of the node + * @param[in] sDisplayName - the display name of the node + * @param[in] sTag - the tag of the node + * @return the added node + */ + virtual IVectorFromScalarNode * AddVectorFromScalarNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) = 0; + /** * IImplicitFunction::AddDecomposeVectorNode - Add a DecomposeVectorNode * @param[in] sIdentifier - the identifier of the node @@ -4974,13 +5055,22 @@ class IImplicitFunction : public virtual IFunction { virtual IComposeMatrixNode * AddComposeMatrixNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) = 0; /** - * IImplicitFunction::AddComposeMatrixFromRowVectorsNode - Add a ComposeMatrixFromRowVectorsNode + * IImplicitFunction::AddMatrixFromRowsNode - Add a MatrixFromRowsNode + * @param[in] sIdentifier - the identifier of the node + * @param[in] sDisplayName - the display name of the node + * @param[in] sTag - the tag of the node + * @return the added node + */ + virtual IMatrixFromRowsNode * AddMatrixFromRowsNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) = 0; + + /** + * IImplicitFunction::AddMatrixFromColumnsNode - Add a MatrixFromColumnsNode * @param[in] sIdentifier - the identifier of the node * @param[in] sDisplayName - the display name of the node * @param[in] sTag - the tag of the node * @return the added node */ - virtual IComposeMatrixFromRowVectorsNode * AddComposeMatrixFromRowVectorsNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) = 0; + virtual IMatrixFromColumnsNode * AddMatrixFromColumnsNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) = 0; /** * IImplicitFunction::AddConstantNode - Add a ConstantNode @@ -5018,6 +5108,15 @@ class IImplicitFunction : public virtual IFunction { */ virtual IMeshNode * AddMeshNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) = 0; + /** + * IImplicitFunction::AddUnsignedMeshNode - Add a UnsignedMeshNode + * @param[in] sIdentifier - the identifier of the node + * @param[in] sDisplayName - the display name of the node + * @param[in] sTag - the tag of the node + * @return the added node + */ + virtual IUnsignedMeshNode * AddUnsignedMeshNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) = 0; + /** * IImplicitFunction::AddFunctionCallNode - Add a FunctionCallNode * @param[in] sIdentifier - the identifier of the node diff --git a/Autogenerated/Source/lib3mf_interfacewrapper.cpp b/Autogenerated/Source/lib3mf_interfacewrapper.cpp index 2745a7873..061c1782d 100644 --- a/Autogenerated/Source/lib3mf_interfacewrapper.cpp +++ b/Autogenerated/Source/lib3mf_interfacewrapper.cpp @@ -11212,6 +11212,82 @@ Lib3MFResult lib3mf_composevectornode_getoutputresult(Lib3MF_ComposeVectorNode p } +/************************************************************************************************************************* + Class implementation for VectorFromScalarNode +**************************************************************************************************************************/ +Lib3MFResult lib3mf_vectorfromscalarnode_getinputa(Lib3MF_VectorFromScalarNode pVectorFromScalarNode, Lib3MF_ImplicitPort * pA) +{ + IBase* pIBaseClass = (IBase *)pVectorFromScalarNode; + + PLib3MFInterfaceJournalEntry pJournalEntry; + try { + if (m_GlobalJournal.get() != nullptr) { + pJournalEntry = m_GlobalJournal->beginClassMethod(pVectorFromScalarNode, "VectorFromScalarNode", "GetInputA"); + } + if (pA == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + IBase* pBaseA(nullptr); + IVectorFromScalarNode* pIVectorFromScalarNode = dynamic_cast(pIBaseClass); + if (!pIVectorFromScalarNode) + throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); + + pBaseA = pIVectorFromScalarNode->GetInputA(); + + *pA = (IBase*)(pBaseA); + if (pJournalEntry.get() != nullptr) { + pJournalEntry->addHandleResult("A", *pA); + pJournalEntry->writeSuccess(); + } + return LIB3MF_SUCCESS; + } + catch (ELib3MFInterfaceException & Exception) { + return handleLib3MFException(pIBaseClass, Exception, pJournalEntry.get()); + } + catch (std::exception & StdException) { + return handleStdException(pIBaseClass, StdException, pJournalEntry.get()); + } + catch (...) { + return handleUnhandledException(pIBaseClass, pJournalEntry.get()); + } +} + +Lib3MFResult lib3mf_vectorfromscalarnode_getoutputresult(Lib3MF_VectorFromScalarNode pVectorFromScalarNode, Lib3MF_ImplicitPort * pResult) +{ + IBase* pIBaseClass = (IBase *)pVectorFromScalarNode; + + PLib3MFInterfaceJournalEntry pJournalEntry; + try { + if (m_GlobalJournal.get() != nullptr) { + pJournalEntry = m_GlobalJournal->beginClassMethod(pVectorFromScalarNode, "VectorFromScalarNode", "GetOutputResult"); + } + if (pResult == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + IBase* pBaseResult(nullptr); + IVectorFromScalarNode* pIVectorFromScalarNode = dynamic_cast(pIBaseClass); + if (!pIVectorFromScalarNode) + throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); + + pBaseResult = pIVectorFromScalarNode->GetOutputResult(); + + *pResult = (IBase*)(pBaseResult); + if (pJournalEntry.get() != nullptr) { + pJournalEntry->addHandleResult("Result", *pResult); + pJournalEntry->writeSuccess(); + } + return LIB3MF_SUCCESS; + } + catch (ELib3MFInterfaceException & Exception) { + return handleLib3MFException(pIBaseClass, Exception, pJournalEntry.get()); + } + catch (std::exception & StdException) { + return handleStdException(pIBaseClass, StdException, pJournalEntry.get()); + } + catch (...) { + return handleUnhandledException(pIBaseClass, pJournalEntry.get()); + } +} + + /************************************************************************************************************************* Class implementation for DecomposeVectorNode **************************************************************************************************************************/ @@ -11977,25 +12053,25 @@ Lib3MFResult lib3mf_composematrixnode_getoutputresult(Lib3MF_ComposeMatrixNode p /************************************************************************************************************************* - Class implementation for ComposeMatrixFromRowVectorsNode + Class implementation for MatrixFromRowsNode **************************************************************************************************************************/ -Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputa(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0) +Lib3MFResult lib3mf_matrixfromrowsnode_getinputa(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow0) { - IBase* pIBaseClass = (IBase *)pComposeMatrixFromRowVectorsNode; + IBase* pIBaseClass = (IBase *)pMatrixFromRowsNode; PLib3MFInterfaceJournalEntry pJournalEntry; try { if (m_GlobalJournal.get() != nullptr) { - pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromRowVectorsNode, "ComposeMatrixFromRowVectorsNode", "GetInputA"); + pJournalEntry = m_GlobalJournal->beginClassMethod(pMatrixFromRowsNode, "MatrixFromRowsNode", "GetInputA"); } if (pRow0 == nullptr) throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); IBase* pBaseRow0(nullptr); - IComposeMatrixFromRowVectorsNode* pIComposeMatrixFromRowVectorsNode = dynamic_cast(pIBaseClass); - if (!pIComposeMatrixFromRowVectorsNode) + IMatrixFromRowsNode* pIMatrixFromRowsNode = dynamic_cast(pIBaseClass); + if (!pIMatrixFromRowsNode) throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); - pBaseRow0 = pIComposeMatrixFromRowVectorsNode->GetInputA(); + pBaseRow0 = pIMatrixFromRowsNode->GetInputA(); *pRow0 = (IBase*)(pBaseRow0); if (pJournalEntry.get() != nullptr) { @@ -12015,23 +12091,23 @@ Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputa(Lib3MF_ComposeMatr } } -Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputb(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1) +Lib3MFResult lib3mf_matrixfromrowsnode_getinputb(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow1) { - IBase* pIBaseClass = (IBase *)pComposeMatrixFromRowVectorsNode; + IBase* pIBaseClass = (IBase *)pMatrixFromRowsNode; PLib3MFInterfaceJournalEntry pJournalEntry; try { if (m_GlobalJournal.get() != nullptr) { - pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromRowVectorsNode, "ComposeMatrixFromRowVectorsNode", "GetInputB"); + pJournalEntry = m_GlobalJournal->beginClassMethod(pMatrixFromRowsNode, "MatrixFromRowsNode", "GetInputB"); } if (pRow1 == nullptr) throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); IBase* pBaseRow1(nullptr); - IComposeMatrixFromRowVectorsNode* pIComposeMatrixFromRowVectorsNode = dynamic_cast(pIBaseClass); - if (!pIComposeMatrixFromRowVectorsNode) + IMatrixFromRowsNode* pIMatrixFromRowsNode = dynamic_cast(pIBaseClass); + if (!pIMatrixFromRowsNode) throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); - pBaseRow1 = pIComposeMatrixFromRowVectorsNode->GetInputB(); + pBaseRow1 = pIMatrixFromRowsNode->GetInputB(); *pRow1 = (IBase*)(pBaseRow1); if (pJournalEntry.get() != nullptr) { @@ -12051,23 +12127,23 @@ Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputb(Lib3MF_ComposeMatr } } -Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputc(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2) +Lib3MFResult lib3mf_matrixfromrowsnode_getinputc(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow2) { - IBase* pIBaseClass = (IBase *)pComposeMatrixFromRowVectorsNode; + IBase* pIBaseClass = (IBase *)pMatrixFromRowsNode; PLib3MFInterfaceJournalEntry pJournalEntry; try { if (m_GlobalJournal.get() != nullptr) { - pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromRowVectorsNode, "ComposeMatrixFromRowVectorsNode", "GetInputC"); + pJournalEntry = m_GlobalJournal->beginClassMethod(pMatrixFromRowsNode, "MatrixFromRowsNode", "GetInputC"); } if (pRow2 == nullptr) throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); IBase* pBaseRow2(nullptr); - IComposeMatrixFromRowVectorsNode* pIComposeMatrixFromRowVectorsNode = dynamic_cast(pIBaseClass); - if (!pIComposeMatrixFromRowVectorsNode) + IMatrixFromRowsNode* pIMatrixFromRowsNode = dynamic_cast(pIBaseClass); + if (!pIMatrixFromRowsNode) throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); - pBaseRow2 = pIComposeMatrixFromRowVectorsNode->GetInputC(); + pBaseRow2 = pIMatrixFromRowsNode->GetInputC(); *pRow2 = (IBase*)(pBaseRow2); if (pJournalEntry.get() != nullptr) { @@ -12087,23 +12163,23 @@ Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputc(Lib3MF_ComposeMatr } } -Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputd(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3) +Lib3MFResult lib3mf_matrixfromrowsnode_getinputd(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pRow3) { - IBase* pIBaseClass = (IBase *)pComposeMatrixFromRowVectorsNode; + IBase* pIBaseClass = (IBase *)pMatrixFromRowsNode; PLib3MFInterfaceJournalEntry pJournalEntry; try { if (m_GlobalJournal.get() != nullptr) { - pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromRowVectorsNode, "ComposeMatrixFromRowVectorsNode", "GetInputD"); + pJournalEntry = m_GlobalJournal->beginClassMethod(pMatrixFromRowsNode, "MatrixFromRowsNode", "GetInputD"); } if (pRow3 == nullptr) throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); IBase* pBaseRow3(nullptr); - IComposeMatrixFromRowVectorsNode* pIComposeMatrixFromRowVectorsNode = dynamic_cast(pIBaseClass); - if (!pIComposeMatrixFromRowVectorsNode) + IMatrixFromRowsNode* pIMatrixFromRowsNode = dynamic_cast(pIBaseClass); + if (!pIMatrixFromRowsNode) throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); - pBaseRow3 = pIComposeMatrixFromRowVectorsNode->GetInputD(); + pBaseRow3 = pIMatrixFromRowsNode->GetInputD(); *pRow3 = (IBase*)(pBaseRow3); if (pJournalEntry.get() != nullptr) { @@ -12123,23 +12199,23 @@ Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputd(Lib3MF_ComposeMatr } } -Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getoutputresult(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pResult) +Lib3MFResult lib3mf_matrixfromrowsnode_getoutputresult(Lib3MF_MatrixFromRowsNode pMatrixFromRowsNode, Lib3MF_ImplicitPort * pResult) { - IBase* pIBaseClass = (IBase *)pComposeMatrixFromRowVectorsNode; + IBase* pIBaseClass = (IBase *)pMatrixFromRowsNode; PLib3MFInterfaceJournalEntry pJournalEntry; try { if (m_GlobalJournal.get() != nullptr) { - pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromRowVectorsNode, "ComposeMatrixFromRowVectorsNode", "GetOutputResult"); + pJournalEntry = m_GlobalJournal->beginClassMethod(pMatrixFromRowsNode, "MatrixFromRowsNode", "GetOutputResult"); } if (pResult == nullptr) throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); IBase* pBaseResult(nullptr); - IComposeMatrixFromRowVectorsNode* pIComposeMatrixFromRowVectorsNode = dynamic_cast(pIBaseClass); - if (!pIComposeMatrixFromRowVectorsNode) + IMatrixFromRowsNode* pIMatrixFromRowsNode = dynamic_cast(pIBaseClass); + if (!pIMatrixFromRowsNode) throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); - pBaseResult = pIComposeMatrixFromRowVectorsNode->GetOutputResult(); + pBaseResult = pIMatrixFromRowsNode->GetOutputResult(); *pResult = (IBase*)(pBaseResult); if (pJournalEntry.get() != nullptr) { @@ -12161,25 +12237,25 @@ Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getoutputresult(Lib3MF_Compo /************************************************************************************************************************* - Class implementation for ComposeMatrixFromColumnVectors + Class implementation for MatrixFromColumnsNode **************************************************************************************************************************/ -Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputa(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn0) +Lib3MFResult lib3mf_matrixfromcolumnsnode_getinputa(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn0) { - IBase* pIBaseClass = (IBase *)pComposeMatrixFromColumnVectors; + IBase* pIBaseClass = (IBase *)pMatrixFromColumnsNode; PLib3MFInterfaceJournalEntry pJournalEntry; try { if (m_GlobalJournal.get() != nullptr) { - pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromColumnVectors, "ComposeMatrixFromColumnVectors", "GetInputA"); + pJournalEntry = m_GlobalJournal->beginClassMethod(pMatrixFromColumnsNode, "MatrixFromColumnsNode", "GetInputA"); } if (pColumn0 == nullptr) throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); IBase* pBaseColumn0(nullptr); - IComposeMatrixFromColumnVectors* pIComposeMatrixFromColumnVectors = dynamic_cast(pIBaseClass); - if (!pIComposeMatrixFromColumnVectors) + IMatrixFromColumnsNode* pIMatrixFromColumnsNode = dynamic_cast(pIBaseClass); + if (!pIMatrixFromColumnsNode) throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); - pBaseColumn0 = pIComposeMatrixFromColumnVectors->GetInputA(); + pBaseColumn0 = pIMatrixFromColumnsNode->GetInputA(); *pColumn0 = (IBase*)(pBaseColumn0); if (pJournalEntry.get() != nullptr) { @@ -12199,23 +12275,23 @@ Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputa(Lib3MF_ComposeMatri } } -Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputb(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn1) +Lib3MFResult lib3mf_matrixfromcolumnsnode_getinputb(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn1) { - IBase* pIBaseClass = (IBase *)pComposeMatrixFromColumnVectors; + IBase* pIBaseClass = (IBase *)pMatrixFromColumnsNode; PLib3MFInterfaceJournalEntry pJournalEntry; try { if (m_GlobalJournal.get() != nullptr) { - pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromColumnVectors, "ComposeMatrixFromColumnVectors", "GetInputB"); + pJournalEntry = m_GlobalJournal->beginClassMethod(pMatrixFromColumnsNode, "MatrixFromColumnsNode", "GetInputB"); } if (pColumn1 == nullptr) throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); IBase* pBaseColumn1(nullptr); - IComposeMatrixFromColumnVectors* pIComposeMatrixFromColumnVectors = dynamic_cast(pIBaseClass); - if (!pIComposeMatrixFromColumnVectors) + IMatrixFromColumnsNode* pIMatrixFromColumnsNode = dynamic_cast(pIBaseClass); + if (!pIMatrixFromColumnsNode) throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); - pBaseColumn1 = pIComposeMatrixFromColumnVectors->GetInputB(); + pBaseColumn1 = pIMatrixFromColumnsNode->GetInputB(); *pColumn1 = (IBase*)(pBaseColumn1); if (pJournalEntry.get() != nullptr) { @@ -12235,23 +12311,23 @@ Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputb(Lib3MF_ComposeMatri } } -Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputc(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn2) +Lib3MFResult lib3mf_matrixfromcolumnsnode_getinputc(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn2) { - IBase* pIBaseClass = (IBase *)pComposeMatrixFromColumnVectors; + IBase* pIBaseClass = (IBase *)pMatrixFromColumnsNode; PLib3MFInterfaceJournalEntry pJournalEntry; try { if (m_GlobalJournal.get() != nullptr) { - pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromColumnVectors, "ComposeMatrixFromColumnVectors", "GetInputC"); + pJournalEntry = m_GlobalJournal->beginClassMethod(pMatrixFromColumnsNode, "MatrixFromColumnsNode", "GetInputC"); } if (pColumn2 == nullptr) throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); IBase* pBaseColumn2(nullptr); - IComposeMatrixFromColumnVectors* pIComposeMatrixFromColumnVectors = dynamic_cast(pIBaseClass); - if (!pIComposeMatrixFromColumnVectors) + IMatrixFromColumnsNode* pIMatrixFromColumnsNode = dynamic_cast(pIBaseClass); + if (!pIMatrixFromColumnsNode) throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); - pBaseColumn2 = pIComposeMatrixFromColumnVectors->GetInputC(); + pBaseColumn2 = pIMatrixFromColumnsNode->GetInputC(); *pColumn2 = (IBase*)(pBaseColumn2); if (pJournalEntry.get() != nullptr) { @@ -12271,23 +12347,23 @@ Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputc(Lib3MF_ComposeMatri } } -Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputd(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn3) +Lib3MFResult lib3mf_matrixfromcolumnsnode_getinputd(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pColumn3) { - IBase* pIBaseClass = (IBase *)pComposeMatrixFromColumnVectors; + IBase* pIBaseClass = (IBase *)pMatrixFromColumnsNode; PLib3MFInterfaceJournalEntry pJournalEntry; try { if (m_GlobalJournal.get() != nullptr) { - pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromColumnVectors, "ComposeMatrixFromColumnVectors", "GetInputD"); + pJournalEntry = m_GlobalJournal->beginClassMethod(pMatrixFromColumnsNode, "MatrixFromColumnsNode", "GetInputD"); } if (pColumn3 == nullptr) throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); IBase* pBaseColumn3(nullptr); - IComposeMatrixFromColumnVectors* pIComposeMatrixFromColumnVectors = dynamic_cast(pIBaseClass); - if (!pIComposeMatrixFromColumnVectors) + IMatrixFromColumnsNode* pIMatrixFromColumnsNode = dynamic_cast(pIBaseClass); + if (!pIMatrixFromColumnsNode) throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); - pBaseColumn3 = pIComposeMatrixFromColumnVectors->GetInputD(); + pBaseColumn3 = pIMatrixFromColumnsNode->GetInputD(); *pColumn3 = (IBase*)(pBaseColumn3); if (pJournalEntry.get() != nullptr) { @@ -12307,23 +12383,23 @@ Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputd(Lib3MF_ComposeMatri } } -Lib3MFResult lib3mf_composematrixfromcolumnvectors_getoutputresult(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pResult) +Lib3MFResult lib3mf_matrixfromcolumnsnode_getoutputresult(Lib3MF_MatrixFromColumnsNode pMatrixFromColumnsNode, Lib3MF_ImplicitPort * pResult) { - IBase* pIBaseClass = (IBase *)pComposeMatrixFromColumnVectors; + IBase* pIBaseClass = (IBase *)pMatrixFromColumnsNode; PLib3MFInterfaceJournalEntry pJournalEntry; try { if (m_GlobalJournal.get() != nullptr) { - pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromColumnVectors, "ComposeMatrixFromColumnVectors", "GetOutputResult"); + pJournalEntry = m_GlobalJournal->beginClassMethod(pMatrixFromColumnsNode, "MatrixFromColumnsNode", "GetOutputResult"); } if (pResult == nullptr) throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); IBase* pBaseResult(nullptr); - IComposeMatrixFromColumnVectors* pIComposeMatrixFromColumnVectors = dynamic_cast(pIBaseClass); - if (!pIComposeMatrixFromColumnVectors) + IMatrixFromColumnsNode* pIMatrixFromColumnsNode = dynamic_cast(pIBaseClass); + if (!pIMatrixFromColumnsNode) throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); - pBaseResult = pIComposeMatrixFromColumnVectors->GetOutputResult(); + pBaseResult = pIMatrixFromColumnsNode->GetOutputResult(); *pResult = (IBase*)(pBaseResult); if (pJournalEntry.get() != nullptr) { @@ -12770,6 +12846,118 @@ Lib3MFResult lib3mf_meshnode_getoutputdistance(Lib3MF_MeshNode pMeshNode, Lib3MF } +/************************************************************************************************************************* + Class implementation for UnsignedMeshNode +**************************************************************************************************************************/ +Lib3MFResult lib3mf_unsignedmeshnode_getinputmesh(Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pMesh) +{ + IBase* pIBaseClass = (IBase *)pUnsignedMeshNode; + + PLib3MFInterfaceJournalEntry pJournalEntry; + try { + if (m_GlobalJournal.get() != nullptr) { + pJournalEntry = m_GlobalJournal->beginClassMethod(pUnsignedMeshNode, "UnsignedMeshNode", "GetInputMesh"); + } + if (pMesh == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + IBase* pBaseMesh(nullptr); + IUnsignedMeshNode* pIUnsignedMeshNode = dynamic_cast(pIBaseClass); + if (!pIUnsignedMeshNode) + throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); + + pBaseMesh = pIUnsignedMeshNode->GetInputMesh(); + + *pMesh = (IBase*)(pBaseMesh); + if (pJournalEntry.get() != nullptr) { + pJournalEntry->addHandleResult("Mesh", *pMesh); + pJournalEntry->writeSuccess(); + } + return LIB3MF_SUCCESS; + } + catch (ELib3MFInterfaceException & Exception) { + return handleLib3MFException(pIBaseClass, Exception, pJournalEntry.get()); + } + catch (std::exception & StdException) { + return handleStdException(pIBaseClass, StdException, pJournalEntry.get()); + } + catch (...) { + return handleUnhandledException(pIBaseClass, pJournalEntry.get()); + } +} + +Lib3MFResult lib3mf_unsignedmeshnode_getinputpos(Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pPos) +{ + IBase* pIBaseClass = (IBase *)pUnsignedMeshNode; + + PLib3MFInterfaceJournalEntry pJournalEntry; + try { + if (m_GlobalJournal.get() != nullptr) { + pJournalEntry = m_GlobalJournal->beginClassMethod(pUnsignedMeshNode, "UnsignedMeshNode", "GetInputPos"); + } + if (pPos == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + IBase* pBasePos(nullptr); + IUnsignedMeshNode* pIUnsignedMeshNode = dynamic_cast(pIBaseClass); + if (!pIUnsignedMeshNode) + throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); + + pBasePos = pIUnsignedMeshNode->GetInputPos(); + + *pPos = (IBase*)(pBasePos); + if (pJournalEntry.get() != nullptr) { + pJournalEntry->addHandleResult("Pos", *pPos); + pJournalEntry->writeSuccess(); + } + return LIB3MF_SUCCESS; + } + catch (ELib3MFInterfaceException & Exception) { + return handleLib3MFException(pIBaseClass, Exception, pJournalEntry.get()); + } + catch (std::exception & StdException) { + return handleStdException(pIBaseClass, StdException, pJournalEntry.get()); + } + catch (...) { + return handleUnhandledException(pIBaseClass, pJournalEntry.get()); + } +} + +Lib3MFResult lib3mf_unsignedmeshnode_getoutputdistance(Lib3MF_UnsignedMeshNode pUnsignedMeshNode, Lib3MF_ImplicitPort * pDistance) +{ + IBase* pIBaseClass = (IBase *)pUnsignedMeshNode; + + PLib3MFInterfaceJournalEntry pJournalEntry; + try { + if (m_GlobalJournal.get() != nullptr) { + pJournalEntry = m_GlobalJournal->beginClassMethod(pUnsignedMeshNode, "UnsignedMeshNode", "GetOutputDistance"); + } + if (pDistance == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + IBase* pBaseDistance(nullptr); + IUnsignedMeshNode* pIUnsignedMeshNode = dynamic_cast(pIBaseClass); + if (!pIUnsignedMeshNode) + throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); + + pBaseDistance = pIUnsignedMeshNode->GetOutputDistance(); + + *pDistance = (IBase*)(pBaseDistance); + if (pJournalEntry.get() != nullptr) { + pJournalEntry->addHandleResult("Distance", *pDistance); + pJournalEntry->writeSuccess(); + } + return LIB3MF_SUCCESS; + } + catch (ELib3MFInterfaceException & Exception) { + return handleLib3MFException(pIBaseClass, Exception, pJournalEntry.get()); + } + catch (std::exception & StdException) { + return handleStdException(pIBaseClass, StdException, pJournalEntry.get()); + } + catch (...) { + return handleUnhandledException(pIBaseClass, pJournalEntry.get()); + } +} + + /************************************************************************************************************************* Class implementation for FunctionCallNode **************************************************************************************************************************/ @@ -15260,6 +15448,54 @@ Lib3MFResult lib3mf_implicitfunction_addcomposevectornode(Lib3MF_ImplicitFunctio } } +Lib3MFResult lib3mf_implicitfunction_addvectorfromscalarnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_VectorFromScalarNode * pNode) +{ + IBase* pIBaseClass = (IBase *)pImplicitFunction; + + PLib3MFInterfaceJournalEntry pJournalEntry; + try { + if (m_GlobalJournal.get() != nullptr) { + pJournalEntry = m_GlobalJournal->beginClassMethod(pImplicitFunction, "ImplicitFunction", "AddVectorFromScalarNode"); + pJournalEntry->addStringParameter("Identifier", pIdentifier); + pJournalEntry->addStringParameter("DisplayName", pDisplayName); + pJournalEntry->addStringParameter("Tag", pTag); + } + if (pIdentifier == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + if (pDisplayName == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + if (pTag == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + if (pNode == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + std::string sIdentifier(pIdentifier); + std::string sDisplayName(pDisplayName); + std::string sTag(pTag); + IBase* pBaseNode(nullptr); + IImplicitFunction* pIImplicitFunction = dynamic_cast(pIBaseClass); + if (!pIImplicitFunction) + throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); + + pBaseNode = pIImplicitFunction->AddVectorFromScalarNode(sIdentifier, sDisplayName, sTag); + + *pNode = (IBase*)(pBaseNode); + if (pJournalEntry.get() != nullptr) { + pJournalEntry->addHandleResult("Node", *pNode); + pJournalEntry->writeSuccess(); + } + return LIB3MF_SUCCESS; + } + catch (ELib3MFInterfaceException & Exception) { + return handleLib3MFException(pIBaseClass, Exception, pJournalEntry.get()); + } + catch (std::exception & StdException) { + return handleStdException(pIBaseClass, StdException, pJournalEntry.get()); + } + catch (...) { + return handleUnhandledException(pIBaseClass, pJournalEntry.get()); + } +} + Lib3MFResult lib3mf_implicitfunction_adddecomposevectornode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_DecomposeVectorNode * pNode) { IBase* pIBaseClass = (IBase *)pImplicitFunction; @@ -15356,14 +15592,14 @@ Lib3MFResult lib3mf_implicitfunction_addcomposematrixnode(Lib3MF_ImplicitFunctio } } -Lib3MFResult lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_ComposeMatrixFromRowVectorsNode * pNode) +Lib3MFResult lib3mf_implicitfunction_addmatrixfromrowsnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MatrixFromRowsNode * pNode) { IBase* pIBaseClass = (IBase *)pImplicitFunction; PLib3MFInterfaceJournalEntry pJournalEntry; try { if (m_GlobalJournal.get() != nullptr) { - pJournalEntry = m_GlobalJournal->beginClassMethod(pImplicitFunction, "ImplicitFunction", "AddComposeMatrixFromRowVectorsNode"); + pJournalEntry = m_GlobalJournal->beginClassMethod(pImplicitFunction, "ImplicitFunction", "AddMatrixFromRowsNode"); pJournalEntry->addStringParameter("Identifier", pIdentifier); pJournalEntry->addStringParameter("DisplayName", pDisplayName); pJournalEntry->addStringParameter("Tag", pTag); @@ -15384,7 +15620,55 @@ Lib3MFResult lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode(Lib3MF_I if (!pIImplicitFunction) throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); - pBaseNode = pIImplicitFunction->AddComposeMatrixFromRowVectorsNode(sIdentifier, sDisplayName, sTag); + pBaseNode = pIImplicitFunction->AddMatrixFromRowsNode(sIdentifier, sDisplayName, sTag); + + *pNode = (IBase*)(pBaseNode); + if (pJournalEntry.get() != nullptr) { + pJournalEntry->addHandleResult("Node", *pNode); + pJournalEntry->writeSuccess(); + } + return LIB3MF_SUCCESS; + } + catch (ELib3MFInterfaceException & Exception) { + return handleLib3MFException(pIBaseClass, Exception, pJournalEntry.get()); + } + catch (std::exception & StdException) { + return handleStdException(pIBaseClass, StdException, pJournalEntry.get()); + } + catch (...) { + return handleUnhandledException(pIBaseClass, pJournalEntry.get()); + } +} + +Lib3MFResult lib3mf_implicitfunction_addmatrixfromcolumnsnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_MatrixFromColumnsNode * pNode) +{ + IBase* pIBaseClass = (IBase *)pImplicitFunction; + + PLib3MFInterfaceJournalEntry pJournalEntry; + try { + if (m_GlobalJournal.get() != nullptr) { + pJournalEntry = m_GlobalJournal->beginClassMethod(pImplicitFunction, "ImplicitFunction", "AddMatrixFromColumnsNode"); + pJournalEntry->addStringParameter("Identifier", pIdentifier); + pJournalEntry->addStringParameter("DisplayName", pDisplayName); + pJournalEntry->addStringParameter("Tag", pTag); + } + if (pIdentifier == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + if (pDisplayName == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + if (pTag == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + if (pNode == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + std::string sIdentifier(pIdentifier); + std::string sDisplayName(pDisplayName); + std::string sTag(pTag); + IBase* pBaseNode(nullptr); + IImplicitFunction* pIImplicitFunction = dynamic_cast(pIBaseClass); + if (!pIImplicitFunction) + throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); + + pBaseNode = pIImplicitFunction->AddMatrixFromColumnsNode(sIdentifier, sDisplayName, sTag); *pNode = (IBase*)(pBaseNode); if (pJournalEntry.get() != nullptr) { @@ -15596,6 +15880,54 @@ Lib3MFResult lib3mf_implicitfunction_addmeshnode(Lib3MF_ImplicitFunction pImplic } } +Lib3MFResult lib3mf_implicitfunction_addunsignedmeshnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_UnsignedMeshNode * pNode) +{ + IBase* pIBaseClass = (IBase *)pImplicitFunction; + + PLib3MFInterfaceJournalEntry pJournalEntry; + try { + if (m_GlobalJournal.get() != nullptr) { + pJournalEntry = m_GlobalJournal->beginClassMethod(pImplicitFunction, "ImplicitFunction", "AddUnsignedMeshNode"); + pJournalEntry->addStringParameter("Identifier", pIdentifier); + pJournalEntry->addStringParameter("DisplayName", pDisplayName); + pJournalEntry->addStringParameter("Tag", pTag); + } + if (pIdentifier == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + if (pDisplayName == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + if (pTag == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + if (pNode == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + std::string sIdentifier(pIdentifier); + std::string sDisplayName(pDisplayName); + std::string sTag(pTag); + IBase* pBaseNode(nullptr); + IImplicitFunction* pIImplicitFunction = dynamic_cast(pIBaseClass); + if (!pIImplicitFunction) + throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); + + pBaseNode = pIImplicitFunction->AddUnsignedMeshNode(sIdentifier, sDisplayName, sTag); + + *pNode = (IBase*)(pBaseNode); + if (pJournalEntry.get() != nullptr) { + pJournalEntry->addHandleResult("Node", *pNode); + pJournalEntry->writeSuccess(); + } + return LIB3MF_SUCCESS; + } + catch (ELib3MFInterfaceException & Exception) { + return handleLib3MFException(pIBaseClass, Exception, pJournalEntry.get()); + } + catch (std::exception & StdException) { + return handleStdException(pIBaseClass, StdException, pJournalEntry.get()); + } + catch (...) { + return handleUnhandledException(pIBaseClass, pJournalEntry.get()); + } +} + Lib3MFResult lib3mf_implicitfunction_addfunctioncallnode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_FunctionCallNode * pNode) { IBase* pIBaseClass = (IBase *)pImplicitFunction; @@ -22227,6 +22559,10 @@ Lib3MFResult Lib3MF::Impl::Lib3MF_GetProcAddress (const char * pProcName, void * *ppProcAddress = (void*) &lib3mf_composevectornode_getinputz; if (sProcName == "lib3mf_composevectornode_getoutputresult") *ppProcAddress = (void*) &lib3mf_composevectornode_getoutputresult; + if (sProcName == "lib3mf_vectorfromscalarnode_getinputa") + *ppProcAddress = (void*) &lib3mf_vectorfromscalarnode_getinputa; + if (sProcName == "lib3mf_vectorfromscalarnode_getoutputresult") + *ppProcAddress = (void*) &lib3mf_vectorfromscalarnode_getoutputresult; if (sProcName == "lib3mf_decomposevectornode_getinputa") *ppProcAddress = (void*) &lib3mf_decomposevectornode_getinputa; if (sProcName == "lib3mf_decomposevectornode_getoutputx") @@ -22269,26 +22605,26 @@ Lib3MFResult Lib3MF::Impl::Lib3MF_GetProcAddress (const char * pProcName, void * *ppProcAddress = (void*) &lib3mf_composematrixnode_getinputm33; if (sProcName == "lib3mf_composematrixnode_getoutputresult") *ppProcAddress = (void*) &lib3mf_composematrixnode_getoutputresult; - if (sProcName == "lib3mf_composematrixfromrowvectorsnode_getinputa") - *ppProcAddress = (void*) &lib3mf_composematrixfromrowvectorsnode_getinputa; - if (sProcName == "lib3mf_composematrixfromrowvectorsnode_getinputb") - *ppProcAddress = (void*) &lib3mf_composematrixfromrowvectorsnode_getinputb; - if (sProcName == "lib3mf_composematrixfromrowvectorsnode_getinputc") - *ppProcAddress = (void*) &lib3mf_composematrixfromrowvectorsnode_getinputc; - if (sProcName == "lib3mf_composematrixfromrowvectorsnode_getinputd") - *ppProcAddress = (void*) &lib3mf_composematrixfromrowvectorsnode_getinputd; - if (sProcName == "lib3mf_composematrixfromrowvectorsnode_getoutputresult") - *ppProcAddress = (void*) &lib3mf_composematrixfromrowvectorsnode_getoutputresult; - if (sProcName == "lib3mf_composematrixfromcolumnvectors_getinputa") - *ppProcAddress = (void*) &lib3mf_composematrixfromcolumnvectors_getinputa; - if (sProcName == "lib3mf_composematrixfromcolumnvectors_getinputb") - *ppProcAddress = (void*) &lib3mf_composematrixfromcolumnvectors_getinputb; - if (sProcName == "lib3mf_composematrixfromcolumnvectors_getinputc") - *ppProcAddress = (void*) &lib3mf_composematrixfromcolumnvectors_getinputc; - if (sProcName == "lib3mf_composematrixfromcolumnvectors_getinputd") - *ppProcAddress = (void*) &lib3mf_composematrixfromcolumnvectors_getinputd; - if (sProcName == "lib3mf_composematrixfromcolumnvectors_getoutputresult") - *ppProcAddress = (void*) &lib3mf_composematrixfromcolumnvectors_getoutputresult; + if (sProcName == "lib3mf_matrixfromrowsnode_getinputa") + *ppProcAddress = (void*) &lib3mf_matrixfromrowsnode_getinputa; + if (sProcName == "lib3mf_matrixfromrowsnode_getinputb") + *ppProcAddress = (void*) &lib3mf_matrixfromrowsnode_getinputb; + if (sProcName == "lib3mf_matrixfromrowsnode_getinputc") + *ppProcAddress = (void*) &lib3mf_matrixfromrowsnode_getinputc; + if (sProcName == "lib3mf_matrixfromrowsnode_getinputd") + *ppProcAddress = (void*) &lib3mf_matrixfromrowsnode_getinputd; + if (sProcName == "lib3mf_matrixfromrowsnode_getoutputresult") + *ppProcAddress = (void*) &lib3mf_matrixfromrowsnode_getoutputresult; + if (sProcName == "lib3mf_matrixfromcolumnsnode_getinputa") + *ppProcAddress = (void*) &lib3mf_matrixfromcolumnsnode_getinputa; + if (sProcName == "lib3mf_matrixfromcolumnsnode_getinputb") + *ppProcAddress = (void*) &lib3mf_matrixfromcolumnsnode_getinputb; + if (sProcName == "lib3mf_matrixfromcolumnsnode_getinputc") + *ppProcAddress = (void*) &lib3mf_matrixfromcolumnsnode_getinputc; + if (sProcName == "lib3mf_matrixfromcolumnsnode_getinputd") + *ppProcAddress = (void*) &lib3mf_matrixfromcolumnsnode_getinputd; + if (sProcName == "lib3mf_matrixfromcolumnsnode_getoutputresult") + *ppProcAddress = (void*) &lib3mf_matrixfromcolumnsnode_getoutputresult; if (sProcName == "lib3mf_constantnode_setconstant") *ppProcAddress = (void*) &lib3mf_constantnode_setconstant; if (sProcName == "lib3mf_constantnode_getconstant") @@ -22313,6 +22649,12 @@ Lib3MFResult Lib3MF::Impl::Lib3MF_GetProcAddress (const char * pProcName, void * *ppProcAddress = (void*) &lib3mf_meshnode_getinputpos; if (sProcName == "lib3mf_meshnode_getoutputdistance") *ppProcAddress = (void*) &lib3mf_meshnode_getoutputdistance; + if (sProcName == "lib3mf_unsignedmeshnode_getinputmesh") + *ppProcAddress = (void*) &lib3mf_unsignedmeshnode_getinputmesh; + if (sProcName == "lib3mf_unsignedmeshnode_getinputpos") + *ppProcAddress = (void*) &lib3mf_unsignedmeshnode_getinputpos; + if (sProcName == "lib3mf_unsignedmeshnode_getoutputdistance") + *ppProcAddress = (void*) &lib3mf_unsignedmeshnode_getoutputdistance; if (sProcName == "lib3mf_functioncallnode_getinputfunctionid") *ppProcAddress = (void*) &lib3mf_functioncallnode_getinputfunctionid; if (sProcName == "lib3mf_nodeiterator_getcurrent") @@ -22419,12 +22761,16 @@ Lib3MFResult Lib3MF::Impl::Lib3MF_GetProcAddress (const char * pProcName, void * *ppProcAddress = (void*) &lib3mf_implicitfunction_addclampnode; if (sProcName == "lib3mf_implicitfunction_addcomposevectornode") *ppProcAddress = (void*) &lib3mf_implicitfunction_addcomposevectornode; + if (sProcName == "lib3mf_implicitfunction_addvectorfromscalarnode") + *ppProcAddress = (void*) &lib3mf_implicitfunction_addvectorfromscalarnode; if (sProcName == "lib3mf_implicitfunction_adddecomposevectornode") *ppProcAddress = (void*) &lib3mf_implicitfunction_adddecomposevectornode; if (sProcName == "lib3mf_implicitfunction_addcomposematrixnode") *ppProcAddress = (void*) &lib3mf_implicitfunction_addcomposematrixnode; - if (sProcName == "lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode") - *ppProcAddress = (void*) &lib3mf_implicitfunction_addcomposematrixfromrowvectorsnode; + if (sProcName == "lib3mf_implicitfunction_addmatrixfromrowsnode") + *ppProcAddress = (void*) &lib3mf_implicitfunction_addmatrixfromrowsnode; + if (sProcName == "lib3mf_implicitfunction_addmatrixfromcolumnsnode") + *ppProcAddress = (void*) &lib3mf_implicitfunction_addmatrixfromcolumnsnode; if (sProcName == "lib3mf_implicitfunction_addconstantnode") *ppProcAddress = (void*) &lib3mf_implicitfunction_addconstantnode; if (sProcName == "lib3mf_implicitfunction_addconstvecnode") @@ -22433,6 +22779,8 @@ Lib3MFResult Lib3MF::Impl::Lib3MF_GetProcAddress (const char * pProcName, void * *ppProcAddress = (void*) &lib3mf_implicitfunction_addconstmatnode; if (sProcName == "lib3mf_implicitfunction_addmeshnode") *ppProcAddress = (void*) &lib3mf_implicitfunction_addmeshnode; + if (sProcName == "lib3mf_implicitfunction_addunsignedmeshnode") + *ppProcAddress = (void*) &lib3mf_implicitfunction_addunsignedmeshnode; if (sProcName == "lib3mf_implicitfunction_addfunctioncallnode") *ppProcAddress = (void*) &lib3mf_implicitfunction_addfunctioncallnode; if (sProcName == "lib3mf_implicitfunction_getnodes") diff --git a/Autogenerated/Source/lib3mf_types.hpp b/Autogenerated/Source/lib3mf_types.hpp index 1b0d9bd95..4d1b8125a 100644 --- a/Autogenerated/Source/lib3mf_types.hpp +++ b/Autogenerated/Source/lib3mf_types.hpp @@ -290,14 +290,16 @@ typedef Lib3MFHandle Lib3MF_PowNode; typedef Lib3MFHandle Lib3MF_SelectNode; typedef Lib3MFHandle Lib3MF_ClampNode; typedef Lib3MFHandle Lib3MF_ComposeVectorNode; +typedef Lib3MFHandle Lib3MF_VectorFromScalarNode; typedef Lib3MFHandle Lib3MF_DecomposeVectorNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixNode; -typedef Lib3MFHandle Lib3MF_ComposeMatrixFromRowVectorsNode; -typedef Lib3MFHandle Lib3MF_ComposeMatrixFromColumnVectors; +typedef Lib3MFHandle Lib3MF_MatrixFromRowsNode; +typedef Lib3MFHandle Lib3MF_MatrixFromColumnsNode; typedef Lib3MFHandle Lib3MF_ConstantNode; typedef Lib3MFHandle Lib3MF_ConstVecNode; typedef Lib3MFHandle Lib3MF_ConstMatNode; typedef Lib3MFHandle Lib3MF_MeshNode; +typedef Lib3MFHandle Lib3MF_UnsignedMeshNode; typedef Lib3MFHandle Lib3MF_FunctionCallNode; typedef Lib3MFHandle Lib3MF_NodeIterator; typedef Lib3MFHandle Lib3MF_Function; @@ -455,8 +457,8 @@ namespace Lib3MF { ComposeVector = 8, /** Creates a vector from three scalar values */ DecomposeVector = 9, /** Decomposes a vector into three scalar values */ ComposeMatrix = 10, /** Creates a matrix from nine scalar values */ - ComposeMatrixFromColumnVectors = 11, /** Creates a matrix from three column vector values */ - ComposeMatrixFromRowVectors = 12, /** Creates a matrix from three row vector values */ + MatrixFromColumns = 11, /** Creates a matrix from three column vector values */ + MatrixFromRows = 12, /** Creates a matrix from three row vector values */ Dot = 13, /** Calculates the dot product of two vector values */ Cross = 14, /** Calculates the cross product of two vector values */ MatVecMultiplication = 15, /** Multiplies a matrix with a vector */ @@ -492,7 +494,9 @@ namespace Lib3MF { FunctionCall = 45, /** Calls a function */ Mesh = 46, /** Calculates the signed distance to a mesh */ Length = 47, /** Calculates the length of a vector */ - Resource = 48 /** Selects a resource (function, mesh etc.) */ + Resource = 48, /** Selects a resource (function, mesh etc.) */ + VectorFromScalar = 49, /** Creates a vector from one scalar values */ + UnsignedMesh = 50 /** Calculates the unsigned distance to a mesh */ }; /** diff --git a/AutomaticComponentToolkit/lib3mf.xml b/AutomaticComponentToolkit/lib3mf.xml index 18386b0a7..2f16c14f6 100644 --- a/AutomaticComponentToolkit/lib3mf.xml +++ b/AutomaticComponentToolkit/lib3mf.xml @@ -1790,9 +1790,9 @@ value="9" />