From 094431b90a886ef3f4de191874975555ee1e5b46 Mon Sep 17 00:00:00 2001 From: "Orend, Dr Jan (ORJ)" <56254096+3dJan@users.noreply.github.com> Date: Tue, 31 Oct 2023 15:11:48 +0100 Subject: [PATCH] [Volumetric/Implicit] Enabling dynamic_pointer_cast for nodeiterator->getCurrent() --- Autogenerated/Bindings/C/lib3mf.h | 57 +++- Autogenerated/Bindings/C/lib3mf_types.h | 1 + .../Bindings/CDynamic/lib3mf_dynamic.cc | 82 ++++-- .../Bindings/CDynamic/lib3mf_dynamic.h | 70 ++++- .../Bindings/CDynamic/lib3mf_types.h | 1 + Autogenerated/Bindings/CSharp/Lib3MF.cs | 96 +++++-- Autogenerated/Bindings/Cpp/lib3mf_abi.hpp | 57 +++- .../Bindings/Cpp/lib3mf_implicit.hpp | 138 ++++++++-- Autogenerated/Bindings/Cpp/lib3mf_types.hpp | 1 + .../Bindings/CppDynamic/lib3mf_dynamic.h | 70 ++++- .../Bindings/CppDynamic/lib3mf_dynamic.hpp | 256 +++++++++++++++--- .../Bindings/CppDynamic/lib3mf_types.hpp | 1 + Autogenerated/Bindings/Go/lib3mf.go | 145 ++++++++-- Autogenerated/Bindings/Go/lib3mf_dynamic.cc | 82 ++++-- Autogenerated/Bindings/Go/lib3mf_dynamic.h | 70 ++++- Autogenerated/Bindings/Go/lib3mf_types.h | 1 + .../Bindings/NodeJS/lib3mf_dynamic.cc | 82 ++++-- .../Bindings/NodeJS/lib3mf_dynamic.h | 70 ++++- .../Bindings/NodeJS/lib3mf_nodeaddon.cc | 1 + .../Bindings/NodeJS/lib3mf_nodewrapper.cc | 224 +++++++++++++-- .../Bindings/NodeJS/lib3mf_nodewrapper.h | 30 +- Autogenerated/Bindings/NodeJS/lib3mf_types.h | 1 + Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas | 236 +++++++++++++--- Autogenerated/Bindings/Python/Lib3MF.py | 165 +++++++++-- Autogenerated/Source/lib3mf_abi.hpp | 57 +++- Autogenerated/Source/lib3mf_interfaces.hpp | 67 ++++- .../Source/lib3mf_interfacewrapper.cpp | 234 ++++++++++++++-- Autogenerated/Source/lib3mf_types.hpp | 1 + AutomaticComponentToolkit/lib3mf.xml | 35 ++- .../lib3mf_composematrixfromcolumnvectors.hpp | 117 ++++++++ ...lib3mf_composematrixfromrowvectorsnode.hpp | 8 +- Include/API/lib3mf_nodeiterator.hpp | 1 + .../lib3mf_composematrixfromcolumnvectors.cpp | 73 +++++ ...lib3mf_composematrixfromrowvectorsnode.cpp | 10 +- Source/API/lib3mf_nodeiterator.cpp | 218 ++++++++++++++- .../Source/UnitTest_Utilities.cpp | 9 +- 36 files changed, 2449 insertions(+), 318 deletions(-) create mode 100644 Include/API/lib3mf_composematrixfromcolumnvectors.hpp create mode 100644 Source/API/lib3mf_composematrixfromcolumnvectors.cpp diff --git a/Autogenerated/Bindings/C/lib3mf.h b/Autogenerated/Bindings/C/lib3mf.h index 7d4caa0b6..ed9c32c12 100644 --- a/Autogenerated/Bindings/C/lib3mf.h +++ b/Autogenerated/Bindings/C/lib3mf.h @@ -3447,7 +3447,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getoutputresult(Lib3MF_Com * @param[out] pRow0 - the input for the first row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow0(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputa(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); /** * Retrieves the input for the second row @@ -3456,7 +3456,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow0 * @param[out] pRow1 - the input for the second row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow1(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputb(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); /** * Retrieves the input for the third row @@ -3465,7 +3465,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow1 * @param[out] pRow2 - the input for the third row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow2(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputc(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); /** * Retrieves the input for the fourth row @@ -3474,7 +3474,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow2 * @param[out] pRow3 - the input for the fourth row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow3(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputd(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); /** * Retrieves the output @@ -3485,6 +3485,55 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow3 */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getoutputresult(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pResult); +/************************************************************************************************************************* + Class definition for ComposeMatrixFromColumnVectors +**************************************************************************************************************************/ + +/** +* Retrieves the input for the first column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the second column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the third column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the fourth column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the output +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[out] pResult - the output +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromcolumnvectors_getoutputresult(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pResult); + /************************************************************************************************************************* Class definition for ConstantNode **************************************************************************************************************************/ diff --git a/Autogenerated/Bindings/C/lib3mf_types.h b/Autogenerated/Bindings/C/lib3mf_types.h index c85bce857..998f09f99 100644 --- a/Autogenerated/Bindings/C/lib3mf_types.h +++ b/Autogenerated/Bindings/C/lib3mf_types.h @@ -286,6 +286,7 @@ typedef Lib3MFHandle Lib3MF_ComposeVectorNode; typedef Lib3MFHandle Lib3MF_DecomposeVectorNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixFromRowVectorsNode; +typedef Lib3MFHandle Lib3MF_ComposeMatrixFromColumnVectors; typedef Lib3MFHandle Lib3MF_ConstantNode; typedef Lib3MFHandle Lib3MF_ConstVecNode; typedef Lib3MFHandle Lib3MF_ConstMatNode; diff --git a/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.cc b/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.cc index 040a57b3d..abcfd27c7 100644 --- a/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.cc +++ b/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.cc @@ -363,11 +363,16 @@ Lib3MFResult InitLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable) pWrapperTable->m_ComposeMatrixNode_GetInputM32 = NULL; pWrapperTable->m_ComposeMatrixNode_GetInputM33 = NULL; pWrapperTable->m_ComposeMatrixNode_GetOutputResult = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0 = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 = 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_ConstantNode_SetConstant = NULL; pWrapperTable->m_ConstantNode_GetConstant = NULL; pWrapperTable->m_ConstantNode_GetOutputValue = NULL; @@ -3508,39 +3513,39 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow0"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputa"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow0"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputa"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0 == NULL) + if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow1"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputb"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow1"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputb"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 == NULL) + if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow2"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputc"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow2"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputc"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 == NULL) + if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow3"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputd"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow3"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputd"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 == NULL) + if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 @@ -3552,6 +3557,51 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = (PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputa"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = (PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputa"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = (PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputb"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = (PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputb"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = (PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputc"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = (PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputc"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = (PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputd"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = (PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputd"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = (PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getoutputresult"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = (PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getoutputresult"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_ConstantNode_SetConstant = (PLib3MFConstantNode_SetConstantPtr) GetProcAddress(hLibrary, "lib3mf_constantnode_setconstant"); #else // _WIN32 diff --git a/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.h b/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.h index 1752eb649..536e869f0 100644 --- a/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.h +++ b/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.h @@ -3434,7 +3434,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetOutputResultPtr) (Lib3MF_Comp * @param[out] pRow0 - the input for the first row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); +typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); /** * Retrieves the input for the second row @@ -3443,7 +3443,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr) ( * @param[out] pRow1 - the input for the second row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); +typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); /** * Retrieves the input for the third row @@ -3452,7 +3452,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr) ( * @param[out] pRow2 - the input for the third row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); +typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); /** * Retrieves the input for the fourth row @@ -3461,7 +3461,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr) ( * @param[out] pRow3 - the input for the fourth row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); +typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); /** * Retrieves the output @@ -3472,6 +3472,55 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr) ( */ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pResult); +/************************************************************************************************************************* + Class definition for ComposeMatrixFromColumnVectors +**************************************************************************************************************************/ + +/** +* Retrieves the input for the first column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the second column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the third column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the fourth column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the output +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[out] pResult - the output +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pResult); + /************************************************************************************************************************* Class definition for ConstantNode **************************************************************************************************************************/ @@ -6439,11 +6488,16 @@ typedef struct { PLib3MFComposeMatrixNode_GetInputM32Ptr m_ComposeMatrixNode_GetInputM32; PLib3MFComposeMatrixNode_GetInputM33Ptr m_ComposeMatrixNode_GetInputM33; PLib3MFComposeMatrixNode_GetOutputResultPtr m_ComposeMatrixNode_GetOutputResult; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr m_ComposeMatrixFromRowVectorsNode_GetInputRow0; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr m_ComposeMatrixFromRowVectorsNode_GetInputRow1; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr m_ComposeMatrixFromRowVectorsNode_GetInputRow2; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr m_ComposeMatrixFromRowVectorsNode_GetInputRow3; + 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; PLib3MFConstantNode_SetConstantPtr m_ConstantNode_SetConstant; PLib3MFConstantNode_GetConstantPtr m_ConstantNode_GetConstant; PLib3MFConstantNode_GetOutputValuePtr m_ConstantNode_GetOutputValue; diff --git a/Autogenerated/Bindings/CDynamic/lib3mf_types.h b/Autogenerated/Bindings/CDynamic/lib3mf_types.h index c85bce857..998f09f99 100644 --- a/Autogenerated/Bindings/CDynamic/lib3mf_types.h +++ b/Autogenerated/Bindings/CDynamic/lib3mf_types.h @@ -286,6 +286,7 @@ typedef Lib3MFHandle Lib3MF_ComposeVectorNode; typedef Lib3MFHandle Lib3MF_DecomposeVectorNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixFromRowVectorsNode; +typedef Lib3MFHandle Lib3MF_ComposeMatrixFromColumnVectors; typedef Lib3MFHandle Lib3MF_ConstantNode; typedef Lib3MFHandle Lib3MF_ConstVecNode; typedef Lib3MFHandle Lib3MF_ConstMatNode; diff --git a/Autogenerated/Bindings/CSharp/Lib3MF.cs b/Autogenerated/Bindings/CSharp/Lib3MF.cs index 21c67b105..c0db5ade0 100644 --- a/Autogenerated/Bindings/CSharp/Lib3MF.cs +++ b/Autogenerated/Bindings/CSharp/Lib3MF.cs @@ -1377,21 +1377,36 @@ 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_getinputrow0", CallingConvention=CallingConvention.Cdecl)] - public unsafe extern static Int32 ComposeMatrixFromRowVectorsNode_GetInputRow0 (IntPtr Handle, out IntPtr ARow0); + [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_composematrixfromrowvectorsnode_getinputrow1", CallingConvention=CallingConvention.Cdecl)] - public unsafe extern static Int32 ComposeMatrixFromRowVectorsNode_GetInputRow1 (IntPtr Handle, out IntPtr ARow1); + [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_composematrixfromrowvectorsnode_getinputrow2", CallingConvention=CallingConvention.Cdecl)] - public unsafe extern static Int32 ComposeMatrixFromRowVectorsNode_GetInputRow2 (IntPtr Handle, out IntPtr ARow2); + [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_composematrixfromrowvectorsnode_getinputrow3", CallingConvention=CallingConvention.Cdecl)] - public unsafe extern static Int32 ComposeMatrixFromRowVectorsNode_GetInputRow3 (IntPtr Handle, out IntPtr ARow3); + [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_composematrixfromrowvectorsnode_getoutputresult", CallingConvention=CallingConvention.Cdecl)] public unsafe extern static Int32 ComposeMatrixFromRowVectorsNode_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_composematrixfromcolumnvectors_getinputb", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 ComposeMatrixFromColumnVectors_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_composematrixfromcolumnvectors_getinputd", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 ComposeMatrixFromColumnVectors_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_constantnode_setconstant", CallingConvention=CallingConvention.Cdecl)] public unsafe extern static Int32 ConstantNode_SetConstant (IntPtr Handle, Double AValue); @@ -2587,6 +2602,7 @@ public static T PolymorphicFactory(IntPtr Handle) where T : class 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 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" @@ -6109,35 +6125,35 @@ public CComposeMatrixFromRowVectorsNode (IntPtr NewHandle) : base (NewHandle) { } - public CImplicitPort GetInputRow0 () + public CImplicitPort GetInputA () { IntPtr newRow0 = IntPtr.Zero; - CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromRowVectorsNode_GetInputRow0 (Handle, out newRow0)); + CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromRowVectorsNode_GetInputA (Handle, out newRow0)); return Internal.Lib3MFWrapper.PolymorphicFactory(newRow0); } - public CImplicitPort GetInputRow1 () + public CImplicitPort GetInputB () { IntPtr newRow1 = IntPtr.Zero; - CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromRowVectorsNode_GetInputRow1 (Handle, out newRow1)); + CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromRowVectorsNode_GetInputB (Handle, out newRow1)); return Internal.Lib3MFWrapper.PolymorphicFactory(newRow1); } - public CImplicitPort GetInputRow2 () + public CImplicitPort GetInputC () { IntPtr newRow2 = IntPtr.Zero; - CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromRowVectorsNode_GetInputRow2 (Handle, out newRow2)); + CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromRowVectorsNode_GetInputC (Handle, out newRow2)); return Internal.Lib3MFWrapper.PolymorphicFactory(newRow2); } - public CImplicitPort GetInputRow3 () + public CImplicitPort GetInputD () { IntPtr newRow3 = IntPtr.Zero; - CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromRowVectorsNode_GetInputRow3 (Handle, out newRow3)); + CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromRowVectorsNode_GetInputD (Handle, out newRow3)); return Internal.Lib3MFWrapper.PolymorphicFactory(newRow3); } @@ -6151,6 +6167,54 @@ public CImplicitPort GetOutputResult () } + public class CComposeMatrixFromColumnVectors : CImplicitNode + { + public CComposeMatrixFromColumnVectors (IntPtr NewHandle) : base (NewHandle) + { + } + + public CImplicitPort GetInputA () + { + IntPtr newColumn0 = IntPtr.Zero; + + CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromColumnVectors_GetInputA (Handle, out newColumn0)); + return Internal.Lib3MFWrapper.PolymorphicFactory(newColumn0); + } + + public CImplicitPort GetInputB () + { + IntPtr newColumn1 = IntPtr.Zero; + + CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromColumnVectors_GetInputB (Handle, out newColumn1)); + return Internal.Lib3MFWrapper.PolymorphicFactory(newColumn1); + } + + public CImplicitPort GetInputC () + { + IntPtr newColumn2 = IntPtr.Zero; + + CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromColumnVectors_GetInputC (Handle, out newColumn2)); + return Internal.Lib3MFWrapper.PolymorphicFactory(newColumn2); + } + + public CImplicitPort GetInputD () + { + IntPtr newColumn3 = IntPtr.Zero; + + CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromColumnVectors_GetInputD (Handle, out newColumn3)); + return Internal.Lib3MFWrapper.PolymorphicFactory(newColumn3); + } + + public CImplicitPort GetOutputResult () + { + IntPtr newResult = IntPtr.Zero; + + CheckError(Internal.Lib3MFWrapper.ComposeMatrixFromColumnVectors_GetOutputResult (Handle, out newResult)); + return Internal.Lib3MFWrapper.PolymorphicFactory(newResult); + } + + } + public class CConstantNode : CImplicitNode { public CConstantNode (IntPtr NewHandle) : base (NewHandle) diff --git a/Autogenerated/Bindings/Cpp/lib3mf_abi.hpp b/Autogenerated/Bindings/Cpp/lib3mf_abi.hpp index 158a36422..f33231f20 100644 --- a/Autogenerated/Bindings/Cpp/lib3mf_abi.hpp +++ b/Autogenerated/Bindings/Cpp/lib3mf_abi.hpp @@ -3447,7 +3447,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getoutputresult(Lib3MF_Com * @param[out] pRow0 - the input for the first row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow0(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputa(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); /** * Retrieves the input for the second row @@ -3456,7 +3456,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow0 * @param[out] pRow1 - the input for the second row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow1(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputb(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); /** * Retrieves the input for the third row @@ -3465,7 +3465,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow1 * @param[out] pRow2 - the input for the third row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow2(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputc(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); /** * Retrieves the input for the fourth row @@ -3474,7 +3474,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow2 * @param[out] pRow3 - the input for the fourth row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow3(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputd(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); /** * Retrieves the output @@ -3485,6 +3485,55 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow3 */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getoutputresult(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pResult); +/************************************************************************************************************************* + Class definition for ComposeMatrixFromColumnVectors +**************************************************************************************************************************/ + +/** +* Retrieves the input for the first column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the second column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the third column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the fourth column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the output +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[out] pResult - the output +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromcolumnvectors_getoutputresult(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pResult); + /************************************************************************************************************************* Class definition for ConstantNode **************************************************************************************************************************/ diff --git a/Autogenerated/Bindings/Cpp/lib3mf_implicit.hpp b/Autogenerated/Bindings/Cpp/lib3mf_implicit.hpp index 4543abf15..8bd6b7b8a 100644 --- a/Autogenerated/Bindings/Cpp/lib3mf_implicit.hpp +++ b/Autogenerated/Bindings/Cpp/lib3mf_implicit.hpp @@ -147,6 +147,7 @@ class CComposeVectorNode; class CDecomposeVectorNode; class CComposeMatrixNode; class CComposeMatrixFromRowVectorsNode; +class CComposeMatrixFromColumnVectors; class CConstantNode; class CConstVecNode; class CConstMatNode; @@ -262,6 +263,7 @@ typedef CComposeVectorNode CLib3MFComposeVectorNode; typedef CDecomposeVectorNode CLib3MFDecomposeVectorNode; typedef CComposeMatrixNode CLib3MFComposeMatrixNode; typedef CComposeMatrixFromRowVectorsNode CLib3MFComposeMatrixFromRowVectorsNode; +typedef CComposeMatrixFromColumnVectors CLib3MFComposeMatrixFromColumnVectors; typedef CConstantNode CLib3MFConstantNode; typedef CConstVecNode CLib3MFConstVecNode; typedef CConstMatNode CLib3MFConstMatNode; @@ -377,6 +379,7 @@ typedef std::shared_ptr PComposeVectorNode; typedef std::shared_ptr PDecomposeVectorNode; typedef std::shared_ptr PComposeMatrixNode; typedef std::shared_ptr PComposeMatrixFromRowVectorsNode; +typedef std::shared_ptr PComposeMatrixFromColumnVectors; typedef std::shared_ptr PConstantNode; typedef std::shared_ptr PConstVecNode; typedef std::shared_ptr PConstMatNode; @@ -492,6 +495,7 @@ typedef PComposeVectorNode PLib3MFComposeVectorNode; typedef PDecomposeVectorNode PLib3MFDecomposeVectorNode; typedef PComposeMatrixNode PLib3MFComposeMatrixNode; typedef PComposeMatrixFromRowVectorsNode PLib3MFComposeMatrixFromRowVectorsNode; +typedef PComposeMatrixFromColumnVectors PLib3MFComposeMatrixFromColumnVectors; typedef PConstantNode PLib3MFConstantNode; typedef PConstVecNode PLib3MFConstVecNode; typedef PConstMatNode PLib3MFConstMatNode; @@ -883,6 +887,7 @@ class CWrapper { friend class CDecomposeVectorNode; friend class CComposeMatrixNode; friend class CComposeMatrixFromRowVectorsNode; + friend class CComposeMatrixFromColumnVectors; friend class CConstantNode; friend class CConstVecNode; friend class CConstMatNode; @@ -2700,10 +2705,31 @@ class CComposeMatrixFromRowVectorsNode : public CImplicitNode { { } - inline PImplicitPort GetInputRow0(); - inline PImplicitPort GetInputRow1(); - inline PImplicitPort GetInputRow2(); - inline PImplicitPort GetInputRow3(); + inline PImplicitPort GetInputA(); + inline PImplicitPort GetInputB(); + inline PImplicitPort GetInputC(); + inline PImplicitPort GetInputD(); + inline PImplicitPort GetOutputResult(); +}; + +/************************************************************************************************************************* + Class CComposeMatrixFromColumnVectors +**************************************************************************************************************************/ +class CComposeMatrixFromColumnVectors : public CImplicitNode { +public: + + /** + * CComposeMatrixFromColumnVectors::CComposeMatrixFromColumnVectors - Constructor for ComposeMatrixFromColumnVectors class. + */ + CComposeMatrixFromColumnVectors(CWrapper* pWrapper, Lib3MFHandle pHandle) + : CImplicitNode(pWrapper, pHandle) + { + } + + inline PImplicitPort GetInputA(); + inline PImplicitPort GetInputB(); + inline PImplicitPort GetInputC(); + inline PImplicitPort GetInputD(); inline PImplicitPort GetOutputResult(); }; @@ -3364,6 +3390,7 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) 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 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" @@ -7971,13 +7998,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) */ /** - * CComposeMatrixFromRowVectorsNode::GetInputRow0 - Retrieves the input for the first row + * CComposeMatrixFromRowVectorsNode::GetInputA - Retrieves the input for the first row * @return the input for the first row */ - PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputRow0() + PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputA() { Lib3MFHandle hRow0 = nullptr; - CheckError(lib3mf_composematrixfromrowvectorsnode_getinputrow0(m_pHandle, &hRow0)); + CheckError(lib3mf_composematrixfromrowvectorsnode_getinputa(m_pHandle, &hRow0)); if (!hRow0) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -7986,13 +8013,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromRowVectorsNode::GetInputRow1 - Retrieves the input for the second row + * CComposeMatrixFromRowVectorsNode::GetInputB - Retrieves the input for the second row * @return the input for the second row */ - PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputRow1() + PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputB() { Lib3MFHandle hRow1 = nullptr; - CheckError(lib3mf_composematrixfromrowvectorsnode_getinputrow1(m_pHandle, &hRow1)); + CheckError(lib3mf_composematrixfromrowvectorsnode_getinputb(m_pHandle, &hRow1)); if (!hRow1) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -8001,13 +8028,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromRowVectorsNode::GetInputRow2 - Retrieves the input for the third row + * CComposeMatrixFromRowVectorsNode::GetInputC - Retrieves the input for the third row * @return the input for the third row */ - PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputRow2() + PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputC() { Lib3MFHandle hRow2 = nullptr; - CheckError(lib3mf_composematrixfromrowvectorsnode_getinputrow2(m_pHandle, &hRow2)); + CheckError(lib3mf_composematrixfromrowvectorsnode_getinputc(m_pHandle, &hRow2)); if (!hRow2) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -8016,13 +8043,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromRowVectorsNode::GetInputRow3 - Retrieves the input for the fourth row + * CComposeMatrixFromRowVectorsNode::GetInputD - Retrieves the input for the fourth row * @return the input for the fourth row */ - PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputRow3() + PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputD() { Lib3MFHandle hRow3 = nullptr; - CheckError(lib3mf_composematrixfromrowvectorsnode_getinputrow3(m_pHandle, &hRow3)); + CheckError(lib3mf_composematrixfromrowvectorsnode_getinputd(m_pHandle, &hRow3)); if (!hRow3) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -8045,6 +8072,85 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hResult))); } + /** + * Method definitions for class CComposeMatrixFromColumnVectors + */ + + /** + * CComposeMatrixFromColumnVectors::GetInputA - Retrieves the input for the first column + * @return the input for the first column + */ + PImplicitPort CComposeMatrixFromColumnVectors::GetInputA() + { + Lib3MFHandle hColumn0 = nullptr; + CheckError(lib3mf_composematrixfromcolumnvectors_getinputa(m_pHandle, &hColumn0)); + + if (!hColumn0) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hColumn0))); + } + + /** + * CComposeMatrixFromColumnVectors::GetInputB - Retrieves the input for the second column + * @return the input for the second column + */ + PImplicitPort CComposeMatrixFromColumnVectors::GetInputB() + { + Lib3MFHandle hColumn1 = nullptr; + CheckError(lib3mf_composematrixfromcolumnvectors_getinputb(m_pHandle, &hColumn1)); + + if (!hColumn1) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hColumn1))); + } + + /** + * CComposeMatrixFromColumnVectors::GetInputC - Retrieves the input for the third column + * @return the input for the third column + */ + PImplicitPort CComposeMatrixFromColumnVectors::GetInputC() + { + Lib3MFHandle hColumn2 = nullptr; + CheckError(lib3mf_composematrixfromcolumnvectors_getinputc(m_pHandle, &hColumn2)); + + if (!hColumn2) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hColumn2))); + } + + /** + * CComposeMatrixFromColumnVectors::GetInputD - Retrieves the input for the fourth column + * @return the input for the fourth column + */ + PImplicitPort CComposeMatrixFromColumnVectors::GetInputD() + { + Lib3MFHandle hColumn3 = nullptr; + CheckError(lib3mf_composematrixfromcolumnvectors_getinputd(m_pHandle, &hColumn3)); + + if (!hColumn3) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hColumn3))); + } + + /** + * CComposeMatrixFromColumnVectors::GetOutputResult - Retrieves the output + * @return the output + */ + PImplicitPort CComposeMatrixFromColumnVectors::GetOutputResult() + { + Lib3MFHandle hResult = nullptr; + CheckError(lib3mf_composematrixfromcolumnvectors_getoutputresult(m_pHandle, &hResult)); + + if (!hResult) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hResult))); + } + /** * Method definitions for class CConstantNode */ diff --git a/Autogenerated/Bindings/Cpp/lib3mf_types.hpp b/Autogenerated/Bindings/Cpp/lib3mf_types.hpp index a2304ec27..a80775966 100644 --- a/Autogenerated/Bindings/Cpp/lib3mf_types.hpp +++ b/Autogenerated/Bindings/Cpp/lib3mf_types.hpp @@ -285,6 +285,7 @@ typedef Lib3MFHandle Lib3MF_ComposeVectorNode; typedef Lib3MFHandle Lib3MF_DecomposeVectorNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixFromRowVectorsNode; +typedef Lib3MFHandle Lib3MF_ComposeMatrixFromColumnVectors; typedef Lib3MFHandle Lib3MF_ConstantNode; typedef Lib3MFHandle Lib3MF_ConstVecNode; typedef Lib3MFHandle Lib3MF_ConstMatNode; diff --git a/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.h b/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.h index 96f1bbc46..dbbc18e2d 100644 --- a/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.h +++ b/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.h @@ -3434,7 +3434,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetOutputResultPtr) (Lib3MF_Comp * @param[out] pRow0 - the input for the first row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); +typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); /** * Retrieves the input for the second row @@ -3443,7 +3443,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr) ( * @param[out] pRow1 - the input for the second row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); +typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); /** * Retrieves the input for the third row @@ -3452,7 +3452,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr) ( * @param[out] pRow2 - the input for the third row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); +typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); /** * Retrieves the input for the fourth row @@ -3461,7 +3461,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr) ( * @param[out] pRow3 - the input for the fourth row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); +typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); /** * Retrieves the output @@ -3472,6 +3472,55 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr) ( */ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pResult); +/************************************************************************************************************************* + Class definition for ComposeMatrixFromColumnVectors +**************************************************************************************************************************/ + +/** +* Retrieves the input for the first column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the second column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the third column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the fourth column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the output +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[out] pResult - the output +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pResult); + /************************************************************************************************************************* Class definition for ConstantNode **************************************************************************************************************************/ @@ -6439,11 +6488,16 @@ typedef struct { PLib3MFComposeMatrixNode_GetInputM32Ptr m_ComposeMatrixNode_GetInputM32; PLib3MFComposeMatrixNode_GetInputM33Ptr m_ComposeMatrixNode_GetInputM33; PLib3MFComposeMatrixNode_GetOutputResultPtr m_ComposeMatrixNode_GetOutputResult; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr m_ComposeMatrixFromRowVectorsNode_GetInputRow0; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr m_ComposeMatrixFromRowVectorsNode_GetInputRow1; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr m_ComposeMatrixFromRowVectorsNode_GetInputRow2; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr m_ComposeMatrixFromRowVectorsNode_GetInputRow3; + 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; PLib3MFConstantNode_SetConstantPtr m_ConstantNode_SetConstant; PLib3MFConstantNode_GetConstantPtr m_ConstantNode_GetConstant; PLib3MFConstantNode_GetOutputValuePtr m_ConstantNode_GetOutputValue; diff --git a/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.hpp b/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.hpp index 73d47e642..a4ff80dc3 100644 --- a/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.hpp +++ b/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.hpp @@ -147,6 +147,7 @@ class CComposeVectorNode; class CDecomposeVectorNode; class CComposeMatrixNode; class CComposeMatrixFromRowVectorsNode; +class CComposeMatrixFromColumnVectors; class CConstantNode; class CConstVecNode; class CConstMatNode; @@ -262,6 +263,7 @@ typedef CComposeVectorNode CLib3MFComposeVectorNode; typedef CDecomposeVectorNode CLib3MFDecomposeVectorNode; typedef CComposeMatrixNode CLib3MFComposeMatrixNode; typedef CComposeMatrixFromRowVectorsNode CLib3MFComposeMatrixFromRowVectorsNode; +typedef CComposeMatrixFromColumnVectors CLib3MFComposeMatrixFromColumnVectors; typedef CConstantNode CLib3MFConstantNode; typedef CConstVecNode CLib3MFConstVecNode; typedef CConstMatNode CLib3MFConstMatNode; @@ -377,6 +379,7 @@ typedef std::shared_ptr PComposeVectorNode; typedef std::shared_ptr PDecomposeVectorNode; typedef std::shared_ptr PComposeMatrixNode; typedef std::shared_ptr PComposeMatrixFromRowVectorsNode; +typedef std::shared_ptr PComposeMatrixFromColumnVectors; typedef std::shared_ptr PConstantNode; typedef std::shared_ptr PConstVecNode; typedef std::shared_ptr PConstMatNode; @@ -492,6 +495,7 @@ typedef PComposeVectorNode PLib3MFComposeVectorNode; typedef PDecomposeVectorNode PLib3MFDecomposeVectorNode; typedef PComposeMatrixNode PLib3MFComposeMatrixNode; typedef PComposeMatrixFromRowVectorsNode PLib3MFComposeMatrixFromRowVectorsNode; +typedef PComposeMatrixFromColumnVectors PLib3MFComposeMatrixFromColumnVectors; typedef PConstantNode PLib3MFConstantNode; typedef PConstVecNode PLib3MFConstVecNode; typedef PConstMatNode PLib3MFConstMatNode; @@ -907,6 +911,7 @@ class CWrapper { friend class CDecomposeVectorNode; friend class CComposeMatrixNode; friend class CComposeMatrixFromRowVectorsNode; + friend class CComposeMatrixFromColumnVectors; friend class CConstantNode; friend class CConstVecNode; friend class CConstMatNode; @@ -2724,10 +2729,31 @@ class CComposeMatrixFromRowVectorsNode : public CImplicitNode { { } - inline PImplicitPort GetInputRow0(); - inline PImplicitPort GetInputRow1(); - inline PImplicitPort GetInputRow2(); - inline PImplicitPort GetInputRow3(); + inline PImplicitPort GetInputA(); + inline PImplicitPort GetInputB(); + inline PImplicitPort GetInputC(); + inline PImplicitPort GetInputD(); + inline PImplicitPort GetOutputResult(); +}; + +/************************************************************************************************************************* + Class CComposeMatrixFromColumnVectors +**************************************************************************************************************************/ +class CComposeMatrixFromColumnVectors : public CImplicitNode { +public: + + /** + * CComposeMatrixFromColumnVectors::CComposeMatrixFromColumnVectors - Constructor for ComposeMatrixFromColumnVectors class. + */ + CComposeMatrixFromColumnVectors(CWrapper* pWrapper, Lib3MFHandle pHandle) + : CImplicitNode(pWrapper, pHandle) + { + } + + inline PImplicitPort GetInputA(); + inline PImplicitPort GetInputB(); + inline PImplicitPort GetInputC(); + inline PImplicitPort GetInputD(); inline PImplicitPort GetOutputResult(); }; @@ -3388,6 +3414,7 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) 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 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" @@ -4009,11 +4036,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_GetInputRow0 = nullptr; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 = nullptr; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 = nullptr; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 = 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_ConstantNode_SetConstant = nullptr; pWrapperTable->m_ConstantNode_GetConstant = nullptr; pWrapperTable->m_ConstantNode_GetOutputValue = nullptr; @@ -7150,39 +7182,39 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow0"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputa"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow0"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputa"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0 == nullptr) + if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow1"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputb"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow1"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputb"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 == nullptr) + if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow2"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputc"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow2"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputc"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 == nullptr) + if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow3"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputd"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow3"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputd"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 == nullptr) + if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 @@ -7194,6 +7226,51 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = (PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputa"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = (PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputa"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA == nullptr) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = (PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputb"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = (PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputb"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB == nullptr) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = (PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputc"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = (PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputc"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC == nullptr) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = (PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputd"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = (PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputd"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD == nullptr) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = (PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getoutputresult"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = (PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getoutputresult"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult == nullptr) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_ConstantNode_SetConstant = (PLib3MFConstantNode_SetConstantPtr) GetProcAddress(hLibrary, "lib3mf_constantnode_setconstant"); #else // _WIN32 @@ -10720,26 +10797,46 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixNode_GetOutputResult == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; - eLookupError = (*pLookup)("lib3mf_composematrixfromrowvectorsnode_getinputrow0", (void**)&(pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0)); - if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0 == nullptr) ) + eLookupError = (*pLookup)("lib3mf_composematrixfromrowvectorsnode_getinputa", (void**)&(pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA)); + if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; - eLookupError = (*pLookup)("lib3mf_composematrixfromrowvectorsnode_getinputrow1", (void**)&(pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1)); - if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 == nullptr) ) + eLookupError = (*pLookup)("lib3mf_composematrixfromrowvectorsnode_getinputb", (void**)&(pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB)); + if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; - eLookupError = (*pLookup)("lib3mf_composematrixfromrowvectorsnode_getinputrow2", (void**)&(pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2)); - if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 == nullptr) ) + eLookupError = (*pLookup)("lib3mf_composematrixfromrowvectorsnode_getinputc", (void**)&(pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC)); + if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; - eLookupError = (*pLookup)("lib3mf_composematrixfromrowvectorsnode_getinputrow3", (void**)&(pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3)); - if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 == nullptr) ) + eLookupError = (*pLookup)("lib3mf_composematrixfromrowvectorsnode_getinputd", (void**)&(pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD)); + if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; eLookupError = (*pLookup)("lib3mf_composematrixfromrowvectorsnode_getoutputresult", (void**)&(pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult)); if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + eLookupError = (*pLookup)("lib3mf_composematrixfromcolumnvectors_getinputa", (void**)&(pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA)); + if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA == nullptr) ) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + eLookupError = (*pLookup)("lib3mf_composematrixfromcolumnvectors_getinputb", (void**)&(pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB)); + if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB == nullptr) ) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + eLookupError = (*pLookup)("lib3mf_composematrixfromcolumnvectors_getinputc", (void**)&(pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC)); + if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC == nullptr) ) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + eLookupError = (*pLookup)("lib3mf_composematrixfromcolumnvectors_getinputd", (void**)&(pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD)); + if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD == nullptr) ) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + eLookupError = (*pLookup)("lib3mf_composematrixfromcolumnvectors_getoutputresult", (void**)&(pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult)); + if ( (eLookupError != 0) || (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult == nullptr) ) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + eLookupError = (*pLookup)("lib3mf_constantnode_setconstant", (void**)&(pWrapperTable->m_ConstantNode_SetConstant)); if ( (eLookupError != 0) || (pWrapperTable->m_ConstantNode_SetConstant == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; @@ -16051,13 +16148,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) */ /** - * CComposeMatrixFromRowVectorsNode::GetInputRow0 - Retrieves the input for the first row + * CComposeMatrixFromRowVectorsNode::GetInputA - Retrieves the input for the first row * @return the input for the first row */ - PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputRow0() + PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputA() { Lib3MFHandle hRow0 = nullptr; - CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromRowVectorsNode_GetInputRow0(m_pHandle, &hRow0)); + CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromRowVectorsNode_GetInputA(m_pHandle, &hRow0)); if (!hRow0) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -16066,13 +16163,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromRowVectorsNode::GetInputRow1 - Retrieves the input for the second row + * CComposeMatrixFromRowVectorsNode::GetInputB - Retrieves the input for the second row * @return the input for the second row */ - PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputRow1() + PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputB() { Lib3MFHandle hRow1 = nullptr; - CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromRowVectorsNode_GetInputRow1(m_pHandle, &hRow1)); + CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromRowVectorsNode_GetInputB(m_pHandle, &hRow1)); if (!hRow1) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -16081,13 +16178,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromRowVectorsNode::GetInputRow2 - Retrieves the input for the third row + * CComposeMatrixFromRowVectorsNode::GetInputC - Retrieves the input for the third row * @return the input for the third row */ - PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputRow2() + PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputC() { Lib3MFHandle hRow2 = nullptr; - CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromRowVectorsNode_GetInputRow2(m_pHandle, &hRow2)); + CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromRowVectorsNode_GetInputC(m_pHandle, &hRow2)); if (!hRow2) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -16096,13 +16193,13 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CComposeMatrixFromRowVectorsNode::GetInputRow3 - Retrieves the input for the fourth row + * CComposeMatrixFromRowVectorsNode::GetInputD - Retrieves the input for the fourth row * @return the input for the fourth row */ - PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputRow3() + PImplicitPort CComposeMatrixFromRowVectorsNode::GetInputD() { Lib3MFHandle hRow3 = nullptr; - CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromRowVectorsNode_GetInputRow3(m_pHandle, &hRow3)); + CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromRowVectorsNode_GetInputD(m_pHandle, &hRow3)); if (!hRow3) { CheckError(LIB3MF_ERROR_INVALIDPARAM); @@ -16125,6 +16222,85 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hResult))); } + /** + * Method definitions for class CComposeMatrixFromColumnVectors + */ + + /** + * CComposeMatrixFromColumnVectors::GetInputA - Retrieves the input for the first column + * @return the input for the first column + */ + PImplicitPort CComposeMatrixFromColumnVectors::GetInputA() + { + Lib3MFHandle hColumn0 = nullptr; + CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromColumnVectors_GetInputA(m_pHandle, &hColumn0)); + + if (!hColumn0) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hColumn0))); + } + + /** + * CComposeMatrixFromColumnVectors::GetInputB - Retrieves the input for the second column + * @return the input for the second column + */ + PImplicitPort CComposeMatrixFromColumnVectors::GetInputB() + { + Lib3MFHandle hColumn1 = nullptr; + CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromColumnVectors_GetInputB(m_pHandle, &hColumn1)); + + if (!hColumn1) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hColumn1))); + } + + /** + * CComposeMatrixFromColumnVectors::GetInputC - Retrieves the input for the third column + * @return the input for the third column + */ + PImplicitPort CComposeMatrixFromColumnVectors::GetInputC() + { + Lib3MFHandle hColumn2 = nullptr; + CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromColumnVectors_GetInputC(m_pHandle, &hColumn2)); + + if (!hColumn2) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hColumn2))); + } + + /** + * CComposeMatrixFromColumnVectors::GetInputD - Retrieves the input for the fourth column + * @return the input for the fourth column + */ + PImplicitPort CComposeMatrixFromColumnVectors::GetInputD() + { + Lib3MFHandle hColumn3 = nullptr; + CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromColumnVectors_GetInputD(m_pHandle, &hColumn3)); + + if (!hColumn3) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hColumn3))); + } + + /** + * CComposeMatrixFromColumnVectors::GetOutputResult - Retrieves the output + * @return the output + */ + PImplicitPort CComposeMatrixFromColumnVectors::GetOutputResult() + { + Lib3MFHandle hResult = nullptr; + CheckError(m_pWrapper->m_WrapperTable.m_ComposeMatrixFromColumnVectors_GetOutputResult(m_pHandle, &hResult)); + + if (!hResult) { + CheckError(LIB3MF_ERROR_INVALIDPARAM); + } + return std::shared_ptr(dynamic_cast(m_pWrapper->polymorphicFactory(hResult))); + } + /** * Method definitions for class CConstantNode */ diff --git a/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp b/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp index a2304ec27..a80775966 100644 --- a/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp +++ b/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp @@ -285,6 +285,7 @@ typedef Lib3MFHandle Lib3MF_ComposeVectorNode; typedef Lib3MFHandle Lib3MF_DecomposeVectorNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixFromRowVectorsNode; +typedef Lib3MFHandle Lib3MF_ComposeMatrixFromColumnVectors; typedef Lib3MFHandle Lib3MF_ConstantNode; typedef Lib3MFHandle Lib3MF_ConstVecNode; typedef Lib3MFHandle Lib3MF_ConstMatNode; diff --git a/Autogenerated/Bindings/Go/lib3mf.go b/Autogenerated/Bindings/Go/lib3mf.go index 2e22548aa..728fa8b87 100644 --- a/Autogenerated/Bindings/Go/lib3mf.go +++ b/Autogenerated/Bindings/Go/lib3mf.go @@ -2907,39 +2907,39 @@ Lib3MFResult CCall_lib3mf_composematrixnode_getoutputresult(Lib3MFHandle library } -Lib3MFResult CCall_lib3mf_composematrixfromrowvectorsnode_getinputrow0(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0) +Lib3MFResult CCall_lib3mf_composematrixfromrowvectorsnode_getinputa(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0) { if (libraryHandle == 0) return LIB3MF_ERROR_INVALIDCAST; sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; - return wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0 (pComposeMatrixFromRowVectorsNode, pRow0); + return wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA (pComposeMatrixFromRowVectorsNode, pRow0); } -Lib3MFResult CCall_lib3mf_composematrixfromrowvectorsnode_getinputrow1(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1) +Lib3MFResult CCall_lib3mf_composematrixfromrowvectorsnode_getinputb(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1) { if (libraryHandle == 0) return LIB3MF_ERROR_INVALIDCAST; sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; - return wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 (pComposeMatrixFromRowVectorsNode, pRow1); + return wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB (pComposeMatrixFromRowVectorsNode, pRow1); } -Lib3MFResult CCall_lib3mf_composematrixfromrowvectorsnode_getinputrow2(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2) +Lib3MFResult CCall_lib3mf_composematrixfromrowvectorsnode_getinputc(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2) { if (libraryHandle == 0) return LIB3MF_ERROR_INVALIDCAST; sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; - return wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 (pComposeMatrixFromRowVectorsNode, pRow2); + return wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC (pComposeMatrixFromRowVectorsNode, pRow2); } -Lib3MFResult CCall_lib3mf_composematrixfromrowvectorsnode_getinputrow3(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3) +Lib3MFResult CCall_lib3mf_composematrixfromrowvectorsnode_getinputd(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3) { if (libraryHandle == 0) return LIB3MF_ERROR_INVALIDCAST; sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; - return wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 (pComposeMatrixFromRowVectorsNode, pRow3); + return wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD (pComposeMatrixFromRowVectorsNode, pRow3); } @@ -2952,6 +2952,51 @@ Lib3MFResult CCall_lib3mf_composematrixfromrowvectorsnode_getoutputresult(Lib3MF } +Lib3MFResult CCall_lib3mf_composematrixfromcolumnvectors_getinputa(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn0) +{ + if (libraryHandle == 0) + return LIB3MF_ERROR_INVALIDCAST; + sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; + return wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA (pComposeMatrixFromColumnVectors, pColumn0); +} + + +Lib3MFResult CCall_lib3mf_composematrixfromcolumnvectors_getinputb(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn1) +{ + if (libraryHandle == 0) + return LIB3MF_ERROR_INVALIDCAST; + sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; + return wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB (pComposeMatrixFromColumnVectors, pColumn1); +} + + +Lib3MFResult CCall_lib3mf_composematrixfromcolumnvectors_getinputc(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn2) +{ + if (libraryHandle == 0) + return LIB3MF_ERROR_INVALIDCAST; + sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; + return wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC (pComposeMatrixFromColumnVectors, pColumn2); +} + + +Lib3MFResult CCall_lib3mf_composematrixfromcolumnvectors_getinputd(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn3) +{ + if (libraryHandle == 0) + return LIB3MF_ERROR_INVALIDCAST; + sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; + return wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD (pComposeMatrixFromColumnVectors, pColumn3); +} + + +Lib3MFResult CCall_lib3mf_composematrixfromcolumnvectors_getoutputresult(Lib3MFHandle libraryHandle, Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pResult) +{ + if (libraryHandle == 0) + return LIB3MF_ERROR_INVALIDCAST; + sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; + return wrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult (pComposeMatrixFromColumnVectors, pResult); +} + + Lib3MFResult CCall_lib3mf_constantnode_setconstant(Lib3MFHandle libraryHandle, Lib3MF_ConstantNode pConstantNode, Lib3MF_double dValue) { if (libraryHandle == 0) @@ -10139,40 +10184,40 @@ func (wrapper Wrapper) NewComposeMatrixFromRowVectorsNode(r ref) ComposeMatrixFr return ComposeMatrixFromRowVectorsNode{wrapper.NewImplicitNode(r)} } -// GetInputRow0 retrieves the input for the first row. -func (inst ComposeMatrixFromRowVectorsNode) GetInputRow0() (ImplicitPort, error) { +// GetInputA retrieves the input for the first row. +func (inst ComposeMatrixFromRowVectorsNode) GetInputA() (ImplicitPort, error) { var row0 ref - ret := C.CCall_lib3mf_composematrixfromrowvectorsnode_getinputrow0(inst.wrapperRef.LibraryHandle, inst.Ref, &row0) + ret := C.CCall_lib3mf_composematrixfromrowvectorsnode_getinputa(inst.wrapperRef.LibraryHandle, inst.Ref, &row0) if ret != 0 { return ImplicitPort{}, makeError(uint32(ret)) } return inst.wrapperRef.NewImplicitPort(row0), nil } -// GetInputRow1 retrieves the input for the second row. -func (inst ComposeMatrixFromRowVectorsNode) GetInputRow1() (ImplicitPort, error) { +// GetInputB retrieves the input for the second row. +func (inst ComposeMatrixFromRowVectorsNode) GetInputB() (ImplicitPort, error) { var row1 ref - ret := C.CCall_lib3mf_composematrixfromrowvectorsnode_getinputrow1(inst.wrapperRef.LibraryHandle, inst.Ref, &row1) + ret := C.CCall_lib3mf_composematrixfromrowvectorsnode_getinputb(inst.wrapperRef.LibraryHandle, inst.Ref, &row1) if ret != 0 { return ImplicitPort{}, makeError(uint32(ret)) } return inst.wrapperRef.NewImplicitPort(row1), nil } -// GetInputRow2 retrieves the input for the third row. -func (inst ComposeMatrixFromRowVectorsNode) GetInputRow2() (ImplicitPort, error) { +// GetInputC retrieves the input for the third row. +func (inst ComposeMatrixFromRowVectorsNode) GetInputC() (ImplicitPort, error) { var row2 ref - ret := C.CCall_lib3mf_composematrixfromrowvectorsnode_getinputrow2(inst.wrapperRef.LibraryHandle, inst.Ref, &row2) + ret := C.CCall_lib3mf_composematrixfromrowvectorsnode_getinputc(inst.wrapperRef.LibraryHandle, inst.Ref, &row2) if ret != 0 { return ImplicitPort{}, makeError(uint32(ret)) } return inst.wrapperRef.NewImplicitPort(row2), nil } -// GetInputRow3 retrieves the input for the fourth row. -func (inst ComposeMatrixFromRowVectorsNode) GetInputRow3() (ImplicitPort, error) { +// GetInputD retrieves the input for the fourth row. +func (inst ComposeMatrixFromRowVectorsNode) GetInputD() (ImplicitPort, error) { var row3 ref - ret := C.CCall_lib3mf_composematrixfromrowvectorsnode_getinputrow3(inst.wrapperRef.LibraryHandle, inst.Ref, &row3) + ret := C.CCall_lib3mf_composematrixfromrowvectorsnode_getinputd(inst.wrapperRef.LibraryHandle, inst.Ref, &row3) if ret != 0 { return ImplicitPort{}, makeError(uint32(ret)) } @@ -10190,6 +10235,66 @@ func (inst ComposeMatrixFromRowVectorsNode) GetOutputResult() (ImplicitPort, err } +// ComposeMatrixFromColumnVectors represents a Lib3MF class. +type ComposeMatrixFromColumnVectors struct { + ImplicitNode +} + +func (wrapper Wrapper) NewComposeMatrixFromColumnVectors(r ref) ComposeMatrixFromColumnVectors { + return ComposeMatrixFromColumnVectors{wrapper.NewImplicitNode(r)} +} + +// GetInputA retrieves the input for the first column. +func (inst ComposeMatrixFromColumnVectors) GetInputA() (ImplicitPort, error) { + var column0 ref + ret := C.CCall_lib3mf_composematrixfromcolumnvectors_getinputa(inst.wrapperRef.LibraryHandle, inst.Ref, &column0) + if ret != 0 { + return ImplicitPort{}, makeError(uint32(ret)) + } + return inst.wrapperRef.NewImplicitPort(column0), nil +} + +// GetInputB retrieves the input for the second column. +func (inst ComposeMatrixFromColumnVectors) GetInputB() (ImplicitPort, error) { + var column1 ref + ret := C.CCall_lib3mf_composematrixfromcolumnvectors_getinputb(inst.wrapperRef.LibraryHandle, inst.Ref, &column1) + if ret != 0 { + return ImplicitPort{}, makeError(uint32(ret)) + } + return inst.wrapperRef.NewImplicitPort(column1), nil +} + +// GetInputC retrieves the input for the third column. +func (inst ComposeMatrixFromColumnVectors) GetInputC() (ImplicitPort, error) { + var column2 ref + ret := C.CCall_lib3mf_composematrixfromcolumnvectors_getinputc(inst.wrapperRef.LibraryHandle, inst.Ref, &column2) + if ret != 0 { + return ImplicitPort{}, makeError(uint32(ret)) + } + return inst.wrapperRef.NewImplicitPort(column2), nil +} + +// GetInputD retrieves the input for the fourth column. +func (inst ComposeMatrixFromColumnVectors) GetInputD() (ImplicitPort, error) { + var column3 ref + ret := C.CCall_lib3mf_composematrixfromcolumnvectors_getinputd(inst.wrapperRef.LibraryHandle, inst.Ref, &column3) + if ret != 0 { + return ImplicitPort{}, makeError(uint32(ret)) + } + return inst.wrapperRef.NewImplicitPort(column3), nil +} + +// GetOutputResult retrieves the output. +func (inst ComposeMatrixFromColumnVectors) GetOutputResult() (ImplicitPort, error) { + var result ref + ret := C.CCall_lib3mf_composematrixfromcolumnvectors_getoutputresult(inst.wrapperRef.LibraryHandle, inst.Ref, &result) + if ret != 0 { + return ImplicitPort{}, makeError(uint32(ret)) + } + return inst.wrapperRef.NewImplicitPort(result), nil +} + + // ConstantNode represents a Lib3MF class. type ConstantNode struct { ImplicitNode diff --git a/Autogenerated/Bindings/Go/lib3mf_dynamic.cc b/Autogenerated/Bindings/Go/lib3mf_dynamic.cc index 040a57b3d..abcfd27c7 100644 --- a/Autogenerated/Bindings/Go/lib3mf_dynamic.cc +++ b/Autogenerated/Bindings/Go/lib3mf_dynamic.cc @@ -363,11 +363,16 @@ Lib3MFResult InitLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable) pWrapperTable->m_ComposeMatrixNode_GetInputM32 = NULL; pWrapperTable->m_ComposeMatrixNode_GetInputM33 = NULL; pWrapperTable->m_ComposeMatrixNode_GetOutputResult = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0 = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 = 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_ConstantNode_SetConstant = NULL; pWrapperTable->m_ConstantNode_GetConstant = NULL; pWrapperTable->m_ConstantNode_GetOutputValue = NULL; @@ -3508,39 +3513,39 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow0"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputa"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow0"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputa"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0 == NULL) + if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow1"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputb"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow1"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputb"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 == NULL) + if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow2"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputc"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow2"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputc"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 == NULL) + if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow3"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputd"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow3"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputd"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 == NULL) + if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 @@ -3552,6 +3557,51 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = (PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputa"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = (PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputa"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = (PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputb"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = (PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputb"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = (PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputc"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = (PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputc"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = (PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputd"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = (PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputd"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = (PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getoutputresult"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = (PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getoutputresult"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_ConstantNode_SetConstant = (PLib3MFConstantNode_SetConstantPtr) GetProcAddress(hLibrary, "lib3mf_constantnode_setconstant"); #else // _WIN32 diff --git a/Autogenerated/Bindings/Go/lib3mf_dynamic.h b/Autogenerated/Bindings/Go/lib3mf_dynamic.h index 1752eb649..536e869f0 100644 --- a/Autogenerated/Bindings/Go/lib3mf_dynamic.h +++ b/Autogenerated/Bindings/Go/lib3mf_dynamic.h @@ -3434,7 +3434,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetOutputResultPtr) (Lib3MF_Comp * @param[out] pRow0 - the input for the first row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); +typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); /** * Retrieves the input for the second row @@ -3443,7 +3443,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr) ( * @param[out] pRow1 - the input for the second row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); +typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); /** * Retrieves the input for the third row @@ -3452,7 +3452,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr) ( * @param[out] pRow2 - the input for the third row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); +typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); /** * Retrieves the input for the fourth row @@ -3461,7 +3461,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr) ( * @param[out] pRow3 - the input for the fourth row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); +typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); /** * Retrieves the output @@ -3472,6 +3472,55 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr) ( */ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pResult); +/************************************************************************************************************************* + Class definition for ComposeMatrixFromColumnVectors +**************************************************************************************************************************/ + +/** +* Retrieves the input for the first column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the second column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the third column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the fourth column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the output +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[out] pResult - the output +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pResult); + /************************************************************************************************************************* Class definition for ConstantNode **************************************************************************************************************************/ @@ -6439,11 +6488,16 @@ typedef struct { PLib3MFComposeMatrixNode_GetInputM32Ptr m_ComposeMatrixNode_GetInputM32; PLib3MFComposeMatrixNode_GetInputM33Ptr m_ComposeMatrixNode_GetInputM33; PLib3MFComposeMatrixNode_GetOutputResultPtr m_ComposeMatrixNode_GetOutputResult; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr m_ComposeMatrixFromRowVectorsNode_GetInputRow0; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr m_ComposeMatrixFromRowVectorsNode_GetInputRow1; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr m_ComposeMatrixFromRowVectorsNode_GetInputRow2; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr m_ComposeMatrixFromRowVectorsNode_GetInputRow3; + 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; PLib3MFConstantNode_SetConstantPtr m_ConstantNode_SetConstant; PLib3MFConstantNode_GetConstantPtr m_ConstantNode_GetConstant; PLib3MFConstantNode_GetOutputValuePtr m_ConstantNode_GetOutputValue; diff --git a/Autogenerated/Bindings/Go/lib3mf_types.h b/Autogenerated/Bindings/Go/lib3mf_types.h index c85bce857..998f09f99 100644 --- a/Autogenerated/Bindings/Go/lib3mf_types.h +++ b/Autogenerated/Bindings/Go/lib3mf_types.h @@ -286,6 +286,7 @@ typedef Lib3MFHandle Lib3MF_ComposeVectorNode; typedef Lib3MFHandle Lib3MF_DecomposeVectorNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixFromRowVectorsNode; +typedef Lib3MFHandle Lib3MF_ComposeMatrixFromColumnVectors; typedef Lib3MFHandle Lib3MF_ConstantNode; typedef Lib3MFHandle Lib3MF_ConstVecNode; typedef Lib3MFHandle Lib3MF_ConstMatNode; diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.cc b/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.cc index 040a57b3d..abcfd27c7 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.cc +++ b/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.cc @@ -363,11 +363,16 @@ Lib3MFResult InitLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable) pWrapperTable->m_ComposeMatrixNode_GetInputM32 = NULL; pWrapperTable->m_ComposeMatrixNode_GetInputM33 = NULL; pWrapperTable->m_ComposeMatrixNode_GetOutputResult = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0 = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 = NULL; - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 = 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_ConstantNode_SetConstant = NULL; pWrapperTable->m_ConstantNode_GetConstant = NULL; pWrapperTable->m_ConstantNode_GetOutputValue = NULL; @@ -3508,39 +3513,39 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow0"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputa"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow0"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputa"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0 == NULL) + if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow1"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputb"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow1"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputb"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 == NULL) + if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow2"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputc"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow2"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputc"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 == NULL) + if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow3"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputd"); #else // _WIN32 - pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputrow3"); + pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD = (PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) dlsym(hLibrary, "lib3mf_composematrixfromrowvectorsnode_getinputd"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 == NULL) + if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 @@ -3552,6 +3557,51 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, if (pWrapperTable->m_ComposeMatrixFromRowVectorsNode_GetOutputResult == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = (PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputa"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA = (PLib3MFComposeMatrixFromColumnVectors_GetInputAPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputa"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = (PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputb"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB = (PLib3MFComposeMatrixFromColumnVectors_GetInputBPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputb"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = (PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputc"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC = (PLib3MFComposeMatrixFromColumnVectors_GetInputCPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputc"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = (PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputd"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD = (PLib3MFComposeMatrixFromColumnVectors_GetInputDPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getinputd"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + + #ifdef _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = (PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) GetProcAddress(hLibrary, "lib3mf_composematrixfromcolumnvectors_getoutputresult"); + #else // _WIN32 + pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult = (PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) dlsym(hLibrary, "lib3mf_composematrixfromcolumnvectors_getoutputresult"); + dlerror(); + #endif // _WIN32 + if (pWrapperTable->m_ComposeMatrixFromColumnVectors_GetOutputResult == NULL) + return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; + #ifdef _WIN32 pWrapperTable->m_ConstantNode_SetConstant = (PLib3MFConstantNode_SetConstantPtr) GetProcAddress(hLibrary, "lib3mf_constantnode_setconstant"); #else // _WIN32 diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.h b/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.h index 1752eb649..536e869f0 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.h +++ b/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.h @@ -3434,7 +3434,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetOutputResultPtr) (Lib3MF_Comp * @param[out] pRow0 - the input for the first row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); +typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputAPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); /** * Retrieves the input for the second row @@ -3443,7 +3443,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr) ( * @param[out] pRow1 - the input for the second row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); +typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputBPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); /** * Retrieves the input for the third row @@ -3452,7 +3452,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr) ( * @param[out] pRow2 - the input for the third row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); +typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputCPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); /** * Retrieves the input for the fourth row @@ -3461,7 +3461,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr) ( * @param[out] pRow3 - the input for the fourth row * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); +typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputDPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); /** * Retrieves the output @@ -3472,6 +3472,55 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr) ( */ typedef Lib3MFResult (*PLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultPtr) (Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pResult); +/************************************************************************************************************************* + Class definition for ComposeMatrixFromColumnVectors +**************************************************************************************************************************/ + +/** +* Retrieves the input for the first column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the second column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the third column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the fourth column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the output +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[out] pResult - the output +* @return error code or 0 (success) +*/ +typedef Lib3MFResult (*PLib3MFComposeMatrixFromColumnVectors_GetOutputResultPtr) (Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pResult); + /************************************************************************************************************************* Class definition for ConstantNode **************************************************************************************************************************/ @@ -6439,11 +6488,16 @@ typedef struct { PLib3MFComposeMatrixNode_GetInputM32Ptr m_ComposeMatrixNode_GetInputM32; PLib3MFComposeMatrixNode_GetInputM33Ptr m_ComposeMatrixNode_GetInputM33; PLib3MFComposeMatrixNode_GetOutputResultPtr m_ComposeMatrixNode_GetOutputResult; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Ptr m_ComposeMatrixFromRowVectorsNode_GetInputRow0; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Ptr m_ComposeMatrixFromRowVectorsNode_GetInputRow1; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Ptr m_ComposeMatrixFromRowVectorsNode_GetInputRow2; - PLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Ptr m_ComposeMatrixFromRowVectorsNode_GetInputRow3; + 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; PLib3MFConstantNode_SetConstantPtr m_ConstantNode_SetConstant; PLib3MFConstantNode_GetConstantPtr m_ConstantNode_GetConstant; PLib3MFConstantNode_GetOutputValuePtr m_ConstantNode_GetOutputValue; diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_nodeaddon.cc b/Autogenerated/Bindings/NodeJS/lib3mf_nodeaddon.cc index b63dd2a6b..ab6080716 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_nodeaddon.cc +++ b/Autogenerated/Bindings/NodeJS/lib3mf_nodeaddon.cc @@ -138,6 +138,7 @@ void InitAll(v8::Local exports, v8::Local module) CLib3MFDecomposeVectorNode::Init(); CLib3MFComposeMatrixNode::Init(); CLib3MFComposeMatrixFromRowVectorsNode::Init(); + CLib3MFComposeMatrixFromColumnVectors::Init(); CLib3MFConstantNode::Init(); CLib3MFConstVecNode::Init(); CLib3MFConstMatNode::Init(); diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc b/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc index 6373528a5..b0084d8fa 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc +++ b/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc @@ -131,6 +131,7 @@ Persistent CLib3MFComposeVectorNode::constructor; Persistent CLib3MFDecomposeVectorNode::constructor; Persistent CLib3MFComposeMatrixNode::constructor; Persistent CLib3MFComposeMatrixFromRowVectorsNode::constructor; +Persistent CLib3MFComposeMatrixFromColumnVectors::constructor; Persistent CLib3MFConstantNode::constructor; Persistent CLib3MFConstVecNode::constructor; Persistent CLib3MFConstMatNode::constructor; @@ -14321,10 +14322,10 @@ void CLib3MFComposeMatrixFromRowVectorsNode::Init() tpl->InstanceTemplate()->SetInternalFieldCount(NODEWRAPPER_FIELDCOUNT); // Prototype - NODE_SET_PROTOTYPE_METHOD(tpl, "GetInputRow0", GetInputRow0); - NODE_SET_PROTOTYPE_METHOD(tpl, "GetInputRow1", GetInputRow1); - NODE_SET_PROTOTYPE_METHOD(tpl, "GetInputRow2", GetInputRow2); - NODE_SET_PROTOTYPE_METHOD(tpl, "GetInputRow3", GetInputRow3); + NODE_SET_PROTOTYPE_METHOD(tpl, "GetInputA", GetInputA); + NODE_SET_PROTOTYPE_METHOD(tpl, "GetInputB", GetInputB); + NODE_SET_PROTOTYPE_METHOD(tpl, "GetInputC", GetInputC); + NODE_SET_PROTOTYPE_METHOD(tpl, "GetInputD", GetInputD); NODE_SET_PROTOTYPE_METHOD(tpl, "GetOutputResult", GetOutputResult); constructor.Reset(isolate, tpl->GetFunction(isolate->GetCurrentContext()).ToLocalChecked()); @@ -14359,7 +14360,7 @@ Local CLib3MFComposeMatrixFromRowVectorsNode::NewInstance(Local } -void CLib3MFComposeMatrixFromRowVectorsNode::GetInputRow0(const FunctionCallbackInfo& args) +void CLib3MFComposeMatrixFromRowVectorsNode::GetInputA(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); HandleScope scope(isolate); @@ -14367,11 +14368,11 @@ void CLib3MFComposeMatrixFromRowVectorsNode::GetInputRow0(const FunctionCallback Lib3MFHandle hReturnRow0 = nullptr; sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); if (wrapperTable == nullptr) - throw std::runtime_error("Could not get wrapper table for Lib3MF method GetInputRow0."); - if (wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0 == nullptr) - throw std::runtime_error("Could not call Lib3MF method ComposeMatrixFromRowVectorsNode::GetInputRow0."); + 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."); Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); - Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow0(instanceHandle, &hReturnRow0); + Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputA(instanceHandle, &hReturnRow0); CheckError(isolate, wrapperTable, instanceHandle, errorCode); Local instanceObjRow0 = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnRow0); args.GetReturnValue().Set(instanceObjRow0); @@ -14382,7 +14383,7 @@ void CLib3MFComposeMatrixFromRowVectorsNode::GetInputRow0(const FunctionCallback } -void CLib3MFComposeMatrixFromRowVectorsNode::GetInputRow1(const FunctionCallbackInfo& args) +void CLib3MFComposeMatrixFromRowVectorsNode::GetInputB(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); HandleScope scope(isolate); @@ -14390,11 +14391,11 @@ void CLib3MFComposeMatrixFromRowVectorsNode::GetInputRow1(const FunctionCallback Lib3MFHandle hReturnRow1 = nullptr; sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); if (wrapperTable == nullptr) - throw std::runtime_error("Could not get wrapper table for Lib3MF method GetInputRow1."); - if (wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1 == nullptr) - throw std::runtime_error("Could not call Lib3MF method ComposeMatrixFromRowVectorsNode::GetInputRow1."); + 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."); Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); - Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow1(instanceHandle, &hReturnRow1); + Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputB(instanceHandle, &hReturnRow1); CheckError(isolate, wrapperTable, instanceHandle, errorCode); Local instanceObjRow1 = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnRow1); args.GetReturnValue().Set(instanceObjRow1); @@ -14405,7 +14406,7 @@ void CLib3MFComposeMatrixFromRowVectorsNode::GetInputRow1(const FunctionCallback } -void CLib3MFComposeMatrixFromRowVectorsNode::GetInputRow2(const FunctionCallbackInfo& args) +void CLib3MFComposeMatrixFromRowVectorsNode::GetInputC(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); HandleScope scope(isolate); @@ -14413,11 +14414,11 @@ void CLib3MFComposeMatrixFromRowVectorsNode::GetInputRow2(const FunctionCallback Lib3MFHandle hReturnRow2 = nullptr; sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); if (wrapperTable == nullptr) - throw std::runtime_error("Could not get wrapper table for Lib3MF method GetInputRow2."); - if (wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2 == nullptr) - throw std::runtime_error("Could not call Lib3MF method ComposeMatrixFromRowVectorsNode::GetInputRow2."); + 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."); Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); - Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow2(instanceHandle, &hReturnRow2); + Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputC(instanceHandle, &hReturnRow2); CheckError(isolate, wrapperTable, instanceHandle, errorCode); Local instanceObjRow2 = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnRow2); args.GetReturnValue().Set(instanceObjRow2); @@ -14428,7 +14429,7 @@ void CLib3MFComposeMatrixFromRowVectorsNode::GetInputRow2(const FunctionCallback } -void CLib3MFComposeMatrixFromRowVectorsNode::GetInputRow3(const FunctionCallbackInfo& args) +void CLib3MFComposeMatrixFromRowVectorsNode::GetInputD(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); HandleScope scope(isolate); @@ -14436,11 +14437,11 @@ void CLib3MFComposeMatrixFromRowVectorsNode::GetInputRow3(const FunctionCallback Lib3MFHandle hReturnRow3 = nullptr; sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); if (wrapperTable == nullptr) - throw std::runtime_error("Could not get wrapper table for Lib3MF method GetInputRow3."); - if (wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3 == nullptr) - throw std::runtime_error("Could not call Lib3MF method ComposeMatrixFromRowVectorsNode::GetInputRow3."); + 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."); Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); - Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputRow3(instanceHandle, &hReturnRow3); + Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromRowVectorsNode_GetInputD(instanceHandle, &hReturnRow3); CheckError(isolate, wrapperTable, instanceHandle, errorCode); Local instanceObjRow3 = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnRow3); args.GetReturnValue().Set(instanceObjRow3); @@ -14473,6 +14474,181 @@ void CLib3MFComposeMatrixFromRowVectorsNode::GetOutputResult(const FunctionCallb } } +/************************************************************************************************************************* + Class CLib3MFComposeMatrixFromColumnVectors Implementation +**************************************************************************************************************************/ + +CLib3MFComposeMatrixFromColumnVectors::CLib3MFComposeMatrixFromColumnVectors() + : CLib3MFBaseClass() +{ +} + +CLib3MFComposeMatrixFromColumnVectors::~CLib3MFComposeMatrixFromColumnVectors() +{ +} + +void CLib3MFComposeMatrixFromColumnVectors::Init() +{ + Isolate* isolate = Isolate::GetCurrent(); + + // Prepare constructor template + Local tpl = FunctionTemplate::New(isolate, New); + tpl->SetClassName(String::NewFromUtf8(isolate, "Lib3MFComposeMatrixFromColumnVectors")); + tpl->InstanceTemplate()->SetInternalFieldCount(NODEWRAPPER_FIELDCOUNT); + + // Prototype + NODE_SET_PROTOTYPE_METHOD(tpl, "GetInputA", GetInputA); + NODE_SET_PROTOTYPE_METHOD(tpl, "GetInputB", GetInputB); + NODE_SET_PROTOTYPE_METHOD(tpl, "GetInputC", GetInputC); + NODE_SET_PROTOTYPE_METHOD(tpl, "GetInputD", GetInputD); + NODE_SET_PROTOTYPE_METHOD(tpl, "GetOutputResult", GetOutputResult); + constructor.Reset(isolate, tpl->GetFunction(isolate->GetCurrentContext()).ToLocalChecked()); + +} + +void CLib3MFComposeMatrixFromColumnVectors::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()); + args.GetReturnValue().Set(args.This()); + } else { + RaiseError(isolate, "Lib3MFComposeMatrixFromColumnVectors: Invalid call to Constructor"); + } +} + +Local CLib3MFComposeMatrixFromColumnVectors::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 CLib3MFComposeMatrixFromColumnVectors::GetInputA(const FunctionCallbackInfo& args) +{ + Isolate* isolate = args.GetIsolate(); + HandleScope scope(isolate); + try { + Lib3MFHandle hReturnColumn0 = 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_ComposeMatrixFromColumnVectors_GetInputA == nullptr) + throw std::runtime_error("Could not call Lib3MF method ComposeMatrixFromColumnVectors::GetInputA."); + Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); + Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputA(instanceHandle, &hReturnColumn0); + CheckError(isolate, wrapperTable, instanceHandle, errorCode); + Local instanceObjColumn0 = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnColumn0); + args.GetReturnValue().Set(instanceObjColumn0); + + } catch (std::exception & E) { + RaiseError(isolate, E.what()); + } +} + + +void CLib3MFComposeMatrixFromColumnVectors::GetInputB(const FunctionCallbackInfo& args) +{ + Isolate* isolate = args.GetIsolate(); + HandleScope scope(isolate); + try { + Lib3MFHandle hReturnColumn1 = nullptr; + 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."); + Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); + Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputB(instanceHandle, &hReturnColumn1); + CheckError(isolate, wrapperTable, instanceHandle, errorCode); + Local instanceObjColumn1 = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnColumn1); + args.GetReturnValue().Set(instanceObjColumn1); + + } catch (std::exception & E) { + RaiseError(isolate, E.what()); + } +} + + +void CLib3MFComposeMatrixFromColumnVectors::GetInputC(const FunctionCallbackInfo& args) +{ + Isolate* isolate = args.GetIsolate(); + HandleScope scope(isolate); + try { + Lib3MFHandle hReturnColumn2 = nullptr; + 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."); + Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); + Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputC(instanceHandle, &hReturnColumn2); + CheckError(isolate, wrapperTable, instanceHandle, errorCode); + Local instanceObjColumn2 = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnColumn2); + args.GetReturnValue().Set(instanceObjColumn2); + + } catch (std::exception & E) { + RaiseError(isolate, E.what()); + } +} + + +void CLib3MFComposeMatrixFromColumnVectors::GetInputD(const FunctionCallbackInfo& args) +{ + Isolate* isolate = args.GetIsolate(); + HandleScope scope(isolate); + try { + Lib3MFHandle hReturnColumn3 = nullptr; + 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."); + Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); + Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromColumnVectors_GetInputD(instanceHandle, &hReturnColumn3); + CheckError(isolate, wrapperTable, instanceHandle, errorCode); + Local instanceObjColumn3 = CLib3MFImplicitPort::NewInstance(args.Holder(), hReturnColumn3); + args.GetReturnValue().Set(instanceObjColumn3); + + } catch (std::exception & E) { + RaiseError(isolate, E.what()); + } +} + + +void CLib3MFComposeMatrixFromColumnVectors::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_ComposeMatrixFromColumnVectors_GetOutputResult == nullptr) + throw std::runtime_error("Could not call Lib3MF method ComposeMatrixFromColumnVectors::GetOutputResult."); + Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); + Lib3MFResult errorCode = wrapperTable->m_ComposeMatrixFromColumnVectors_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 CLib3MFConstantNode Implementation **************************************************************************************************************************/ diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.h b/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.h index 6ca17daad..ef08a5480 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.h +++ b/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.h @@ -1904,10 +1904,10 @@ class CLib3MFComposeMatrixFromRowVectorsNode : public CLib3MFBaseClass { private: static void New(const v8::FunctionCallbackInfo& args); static v8::Persistent constructor; - static void GetInputRow0(const v8::FunctionCallbackInfo& args); - static void GetInputRow1(const v8::FunctionCallbackInfo& args); - static void GetInputRow2(const v8::FunctionCallbackInfo& args); - static void GetInputRow3(const v8::FunctionCallbackInfo& args); + static void GetInputA(const v8::FunctionCallbackInfo& args); + static void GetInputB(const v8::FunctionCallbackInfo& args); + static void GetInputC(const v8::FunctionCallbackInfo& args); + static void GetInputD(const v8::FunctionCallbackInfo& args); static void GetOutputResult(const v8::FunctionCallbackInfo& args); public: @@ -1919,6 +1919,28 @@ class CLib3MFComposeMatrixFromRowVectorsNode : public CLib3MFBaseClass { }; +/************************************************************************************************************************* + Class CLib3MFComposeMatrixFromColumnVectors +**************************************************************************************************************************/ +class CLib3MFComposeMatrixFromColumnVectors : public CLib3MFBaseClass { +private: + static void New(const v8::FunctionCallbackInfo& args); + static v8::Persistent constructor; + static void GetInputA(const v8::FunctionCallbackInfo& args); + static void GetInputB(const v8::FunctionCallbackInfo& args); + static void GetInputC(const v8::FunctionCallbackInfo& args); + static void GetInputD(const v8::FunctionCallbackInfo& args); + static void GetOutputResult(const v8::FunctionCallbackInfo& args); + +public: + CLib3MFComposeMatrixFromColumnVectors(); + ~CLib3MFComposeMatrixFromColumnVectors(); + + static void Init(); + static v8::Local NewInstance(v8::Local, Lib3MFHandle pHandle); + +}; + /************************************************************************************************************************* Class CLib3MFConstantNode **************************************************************************************************************************/ diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_types.h b/Autogenerated/Bindings/NodeJS/lib3mf_types.h index c85bce857..998f09f99 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_types.h +++ b/Autogenerated/Bindings/NodeJS/lib3mf_types.h @@ -286,6 +286,7 @@ typedef Lib3MFHandle Lib3MF_ComposeVectorNode; typedef Lib3MFHandle Lib3MF_DecomposeVectorNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixFromRowVectorsNode; +typedef Lib3MFHandle Lib3MF_ComposeMatrixFromColumnVectors; typedef Lib3MFHandle Lib3MF_ConstantNode; typedef Lib3MFHandle Lib3MF_ConstVecNode; typedef Lib3MFHandle Lib3MF_ConstMatNode; diff --git a/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas b/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas index 03cfcbede..c6e91e431 100644 --- a/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas +++ b/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas @@ -555,6 +555,7 @@ TLib3MFComposeVectorNode = class; TLib3MFDecomposeVectorNode = class; TLib3MFComposeMatrixNode = class; TLib3MFComposeMatrixFromRowVectorsNode = class; + TLib3MFComposeMatrixFromColumnVectors = class; TLib3MFConstantNode = class; TLib3MFConstVecNode = class; TLib3MFConstMatNode = class; @@ -4060,7 +4061,7 @@ TLib3MFModel = class; * @param[out] pRow0 - the input for the first row * @return error code or 0 (success) *) - TLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Func = function(pComposeMatrixFromRowVectorsNode: TLib3MFHandle; out pRow0: TLib3MFHandle): TLib3MFResult; cdecl; + TLib3MFComposeMatrixFromRowVectorsNode_GetInputAFunc = function(pComposeMatrixFromRowVectorsNode: TLib3MFHandle; out pRow0: TLib3MFHandle): TLib3MFResult; cdecl; (** * Retrieves the input for the second row @@ -4069,7 +4070,7 @@ TLib3MFModel = class; * @param[out] pRow1 - the input for the second row * @return error code or 0 (success) *) - TLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Func = function(pComposeMatrixFromRowVectorsNode: TLib3MFHandle; out pRow1: TLib3MFHandle): TLib3MFResult; cdecl; + TLib3MFComposeMatrixFromRowVectorsNode_GetInputBFunc = function(pComposeMatrixFromRowVectorsNode: TLib3MFHandle; out pRow1: TLib3MFHandle): TLib3MFResult; cdecl; (** * Retrieves the input for the third row @@ -4078,7 +4079,7 @@ TLib3MFModel = class; * @param[out] pRow2 - the input for the third row * @return error code or 0 (success) *) - TLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Func = function(pComposeMatrixFromRowVectorsNode: TLib3MFHandle; out pRow2: TLib3MFHandle): TLib3MFResult; cdecl; + TLib3MFComposeMatrixFromRowVectorsNode_GetInputCFunc = function(pComposeMatrixFromRowVectorsNode: TLib3MFHandle; out pRow2: TLib3MFHandle): TLib3MFResult; cdecl; (** * Retrieves the input for the fourth row @@ -4087,7 +4088,7 @@ TLib3MFModel = class; * @param[out] pRow3 - the input for the fourth row * @return error code or 0 (success) *) - TLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Func = function(pComposeMatrixFromRowVectorsNode: TLib3MFHandle; out pRow3: TLib3MFHandle): TLib3MFResult; cdecl; + TLib3MFComposeMatrixFromRowVectorsNode_GetInputDFunc = function(pComposeMatrixFromRowVectorsNode: TLib3MFHandle; out pRow3: TLib3MFHandle): TLib3MFResult; cdecl; (** * Retrieves the output @@ -4099,6 +4100,56 @@ TLib3MFModel = class; TLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultFunc = function(pComposeMatrixFromRowVectorsNode: TLib3MFHandle; out pResult: TLib3MFHandle): TLib3MFResult; cdecl; +(************************************************************************************************************************* + Function type definitions for ComposeMatrixFromColumnVectors +**************************************************************************************************************************) + + (** + * Retrieves the input for the first column + * + * @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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; + + (** + * Retrieves the input for the second column + * + * @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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; + + (** + * Retrieves the input for the third column + * + * @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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; + + (** + * Retrieves the input for the fourth column + * + * @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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; + + (** + * Retrieves the output + * + * @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. + * @param[out] pResult - the output + * @return error code or 0 (success) + *) + TLib3MFComposeMatrixFromColumnVectors_GetOutputResultFunc = function(pComposeMatrixFromColumnVectors: TLib3MFHandle; out pResult: TLib3MFHandle): TLib3MFResult; cdecl; + + (************************************************************************************************************************* Function type definitions for ConstantNode **************************************************************************************************************************) @@ -8092,10 +8143,26 @@ TLib3MFComposeMatrixFromRowVectorsNode = class(TLib3MFImplicitNode) public constructor Create(AWrapper: TLib3MFWrapper; AHandle: TLib3MFHandle); destructor Destroy; override; - function GetInputRow0(): TLib3MFImplicitPort; - function GetInputRow1(): TLib3MFImplicitPort; - function GetInputRow2(): TLib3MFImplicitPort; - function GetInputRow3(): TLib3MFImplicitPort; + function GetInputA(): TLib3MFImplicitPort; + function GetInputB(): TLib3MFImplicitPort; + function GetInputC(): TLib3MFImplicitPort; + function GetInputD(): TLib3MFImplicitPort; + function GetOutputResult(): TLib3MFImplicitPort; + end; + + +(************************************************************************************************************************* + Class definition for ComposeMatrixFromColumnVectors +**************************************************************************************************************************) + + TLib3MFComposeMatrixFromColumnVectors = class(TLib3MFImplicitNode) + public + constructor Create(AWrapper: TLib3MFWrapper; AHandle: TLib3MFHandle); + destructor Destroy; override; + function GetInputA(): TLib3MFImplicitPort; + function GetInputB(): TLib3MFImplicitPort; + function GetInputC(): TLib3MFImplicitPort; + function GetInputD(): TLib3MFImplicitPort; function GetOutputResult(): TLib3MFImplicitPort; end; @@ -8872,11 +8939,16 @@ TLib3MFWrapper = class(TObject) FLib3MFComposeMatrixNode_GetInputM32Func: TLib3MFComposeMatrixNode_GetInputM32Func; FLib3MFComposeMatrixNode_GetInputM33Func: TLib3MFComposeMatrixNode_GetInputM33Func; FLib3MFComposeMatrixNode_GetOutputResultFunc: TLib3MFComposeMatrixNode_GetOutputResultFunc; - FLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Func: TLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Func; - FLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Func: TLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Func; - FLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Func: TLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Func; - FLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Func: TLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Func; + 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; FLib3MFConstantNode_SetConstantFunc: TLib3MFConstantNode_SetConstantFunc; FLib3MFConstantNode_GetConstantFunc: TLib3MFConstantNode_GetConstantFunc; FLib3MFConstantNode_GetOutputValueFunc: TLib3MFConstantNode_GetOutputValueFunc; @@ -9452,11 +9524,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_GetInputRow0Func: TLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Func read FLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Func; - property Lib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Func: TLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Func read FLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Func; - property Lib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Func: TLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Func read FLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Func; - property Lib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Func: TLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Func read FLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Func; + 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 Lib3MFConstantNode_SetConstantFunc: TLib3MFConstantNode_SetConstantFunc read FLib3MFConstantNode_SetConstantFunc; property Lib3MFConstantNode_GetConstantFunc: TLib3MFConstantNode_GetConstantFunc read FLib3MFConstantNode_GetConstantFunc; property Lib3MFConstantNode_GetOutputValueFunc: TLib3MFConstantNode_GetOutputValueFunc read FLib3MFConstantNode_GetOutputValueFunc; @@ -9877,6 +9954,7 @@ TLib3MFPolymorphicFactory<_T:class; _B> = record 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 TLib3MFPolymorphicFactoryMakeConstantNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFConstantNode; function TLib3MFPolymorphicFactoryMakeConstVecNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFConstVecNode; function TLib3MFPolymorphicFactoryMakeConstMatNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFConstMatNode; @@ -10690,6 +10768,7 @@ implementation 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($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" @@ -11073,6 +11152,10 @@ implementation begin Result := TLib3MFPolymorphicFactory.Make(Wrapper, Handle); end; + function TLib3MFPolymorphicFactoryMakeComposeMatrixFromColumnVectors(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFComposeMatrixFromColumnVectors; + begin + Result := TLib3MFPolymorphicFactory.Make(Wrapper, Handle); + end; function TLib3MFPolymorphicFactoryMakeConstantNode(Wrapper: TLib3MFWrapper; Handle: TLib3MFHandle): TLIB3MFConstantNode; begin Result := TLib3MFPolymorphicFactory.Make(Wrapper, Handle); @@ -15298,46 +15381,46 @@ implementation inherited; end; - function TLib3MFComposeMatrixFromRowVectorsNode.GetInputRow0(): TLib3MFImplicitPort; + function TLib3MFComposeMatrixFromRowVectorsNode.GetInputA(): TLib3MFImplicitPort; var HRow0: TLib3MFHandle; begin Result := nil; HRow0 := nil; - FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Func(FHandle, HRow0)); + FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromRowVectorsNode_GetInputAFunc(FHandle, HRow0)); if Assigned(HRow0) then Result := TLib3MFPolymorphicFactory.Make(FWrapper, HRow0); end; - function TLib3MFComposeMatrixFromRowVectorsNode.GetInputRow1(): TLib3MFImplicitPort; + function TLib3MFComposeMatrixFromRowVectorsNode.GetInputB(): TLib3MFImplicitPort; var HRow1: TLib3MFHandle; begin Result := nil; HRow1 := nil; - FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Func(FHandle, HRow1)); + FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromRowVectorsNode_GetInputBFunc(FHandle, HRow1)); if Assigned(HRow1) then Result := TLib3MFPolymorphicFactory.Make(FWrapper, HRow1); end; - function TLib3MFComposeMatrixFromRowVectorsNode.GetInputRow2(): TLib3MFImplicitPort; + function TLib3MFComposeMatrixFromRowVectorsNode.GetInputC(): TLib3MFImplicitPort; var HRow2: TLib3MFHandle; begin Result := nil; HRow2 := nil; - FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Func(FHandle, HRow2)); + FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromRowVectorsNode_GetInputCFunc(FHandle, HRow2)); if Assigned(HRow2) then Result := TLib3MFPolymorphicFactory.Make(FWrapper, HRow2); end; - function TLib3MFComposeMatrixFromRowVectorsNode.GetInputRow3(): TLib3MFImplicitPort; + function TLib3MFComposeMatrixFromRowVectorsNode.GetInputD(): TLib3MFImplicitPort; var HRow3: TLib3MFHandle; begin Result := nil; HRow3 := nil; - FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Func(FHandle, HRow3)); + FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromRowVectorsNode_GetInputDFunc(FHandle, HRow3)); if Assigned(HRow3) then Result := TLib3MFPolymorphicFactory.Make(FWrapper, HRow3); end; @@ -15353,6 +15436,75 @@ implementation Result := TLib3MFPolymorphicFactory.Make(FWrapper, HResult); end; +(************************************************************************************************************************* + Class implementation for ComposeMatrixFromColumnVectors +**************************************************************************************************************************) + + constructor TLib3MFComposeMatrixFromColumnVectors.Create(AWrapper: TLib3MFWrapper; AHandle: TLib3MFHandle); + begin + inherited Create(AWrapper, AHandle); + end; + + destructor TLib3MFComposeMatrixFromColumnVectors.Destroy; + begin + inherited; + end; + + function TLib3MFComposeMatrixFromColumnVectors.GetInputA(): TLib3MFImplicitPort; + var + HColumn0: TLib3MFHandle; + begin + Result := nil; + HColumn0 := nil; + FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromColumnVectors_GetInputAFunc(FHandle, HColumn0)); + if Assigned(HColumn0) then + Result := TLib3MFPolymorphicFactory.Make(FWrapper, HColumn0); + end; + + function TLib3MFComposeMatrixFromColumnVectors.GetInputB(): TLib3MFImplicitPort; + var + HColumn1: TLib3MFHandle; + begin + Result := nil; + HColumn1 := nil; + FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromColumnVectors_GetInputBFunc(FHandle, HColumn1)); + if Assigned(HColumn1) then + Result := TLib3MFPolymorphicFactory.Make(FWrapper, HColumn1); + end; + + function TLib3MFComposeMatrixFromColumnVectors.GetInputC(): TLib3MFImplicitPort; + var + HColumn2: TLib3MFHandle; + begin + Result := nil; + HColumn2 := nil; + FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromColumnVectors_GetInputCFunc(FHandle, HColumn2)); + if Assigned(HColumn2) then + Result := TLib3MFPolymorphicFactory.Make(FWrapper, HColumn2); + end; + + function TLib3MFComposeMatrixFromColumnVectors.GetInputD(): TLib3MFImplicitPort; + var + HColumn3: TLib3MFHandle; + begin + Result := nil; + HColumn3 := nil; + FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromColumnVectors_GetInputDFunc(FHandle, HColumn3)); + if Assigned(HColumn3) then + Result := TLib3MFPolymorphicFactory.Make(FWrapper, HColumn3); + end; + + function TLib3MFComposeMatrixFromColumnVectors.GetOutputResult(): TLib3MFImplicitPort; + var + HResult: TLib3MFHandle; + begin + Result := nil; + HResult := nil; + FWrapper.CheckError(Self, FWrapper.Lib3MFComposeMatrixFromColumnVectors_GetOutputResultFunc(FHandle, HResult)); + if Assigned(HResult) then + Result := TLib3MFPolymorphicFactory.Make(FWrapper, HResult); + end; + (************************************************************************************************************************* Class implementation for ConstantNode **************************************************************************************************************************) @@ -18354,11 +18506,16 @@ implementation FLib3MFComposeMatrixNode_GetInputM32Func := LoadFunction('lib3mf_composematrixnode_getinputm32'); FLib3MFComposeMatrixNode_GetInputM33Func := LoadFunction('lib3mf_composematrixnode_getinputm33'); FLib3MFComposeMatrixNode_GetOutputResultFunc := LoadFunction('lib3mf_composematrixnode_getoutputresult'); - FLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Func := LoadFunction('lib3mf_composematrixfromrowvectorsnode_getinputrow0'); - FLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Func := LoadFunction('lib3mf_composematrixfromrowvectorsnode_getinputrow1'); - FLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Func := LoadFunction('lib3mf_composematrixfromrowvectorsnode_getinputrow2'); - FLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Func := LoadFunction('lib3mf_composematrixfromrowvectorsnode_getinputrow3'); + 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'); FLib3MFConstantNode_SetConstantFunc := LoadFunction('lib3mf_constantnode_setconstant'); FLib3MFConstantNode_GetConstantFunc := LoadFunction('lib3mf_constantnode_getconstant'); FLib3MFConstantNode_GetOutputValueFunc := LoadFunction('lib3mf_constantnode_getoutputvalue'); @@ -19565,19 +19722,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_getinputrow0'), @FLib3MFComposeMatrixFromRowVectorsNode_GetInputRow0Func); + AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromrowvectorsnode_getinputa'), @FLib3MFComposeMatrixFromRowVectorsNode_GetInputAFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); - AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromrowvectorsnode_getinputrow1'), @FLib3MFComposeMatrixFromRowVectorsNode_GetInputRow1Func); + AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromrowvectorsnode_getinputb'), @FLib3MFComposeMatrixFromRowVectorsNode_GetInputBFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); - AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromrowvectorsnode_getinputrow2'), @FLib3MFComposeMatrixFromRowVectorsNode_GetInputRow2Func); + AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromrowvectorsnode_getinputc'), @FLib3MFComposeMatrixFromRowVectorsNode_GetInputCFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); - AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromrowvectorsnode_getinputrow3'), @FLib3MFComposeMatrixFromRowVectorsNode_GetInputRow3Func); + AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromrowvectorsnode_getinputd'), @FLib3MFComposeMatrixFromRowVectorsNode_GetInputDFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromrowvectorsnode_getoutputresult'), @FLib3MFComposeMatrixFromRowVectorsNode_GetOutputResultFunc); + if AResult <> LIB3MF_SUCCESS then + raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); + AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromcolumnvectors_getinputa'), @FLib3MFComposeMatrixFromColumnVectors_GetInputAFunc); + if AResult <> LIB3MF_SUCCESS then + raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); + AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromcolumnvectors_getinputb'), @FLib3MFComposeMatrixFromColumnVectors_GetInputBFunc); + if AResult <> LIB3MF_SUCCESS then + raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); + AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromcolumnvectors_getinputc'), @FLib3MFComposeMatrixFromColumnVectors_GetInputCFunc); + if AResult <> LIB3MF_SUCCESS then + raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); + AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromcolumnvectors_getinputd'), @FLib3MFComposeMatrixFromColumnVectors_GetInputDFunc); + if AResult <> LIB3MF_SUCCESS then + raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); + AResult := ALookupMethod(PAnsiChar('lib3mf_composematrixfromcolumnvectors_getoutputresult'), @FLib3MFComposeMatrixFromColumnVectors_GetOutputResultFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); AResult := ALookupMethod(PAnsiChar('lib3mf_constantnode_setconstant'), @FLib3MFConstantNode_SetConstantFunc); diff --git a/Autogenerated/Bindings/Python/Lib3MF.py b/Autogenerated/Bindings/Python/Lib3MF.py index 305329e0d..ceadb1384 100644 --- a/Autogenerated/Bindings/Python/Lib3MF.py +++ b/Autogenerated/Bindings/Python/Lib3MF.py @@ -445,11 +445,16 @@ class FunctionTable: lib3mf_composematrixnode_getinputm32 = None lib3mf_composematrixnode_getinputm33 = None lib3mf_composematrixnode_getoutputresult = None - lib3mf_composematrixfromrowvectorsnode_getinputrow0 = None - lib3mf_composematrixfromrowvectorsnode_getinputrow1 = None - lib3mf_composematrixfromrowvectorsnode_getinputrow2 = None - lib3mf_composematrixfromrowvectorsnode_getinputrow3 = 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_constantnode_setconstant = None lib3mf_constantnode_getconstant = None lib3mf_constantnode_getoutputvalue = None @@ -3092,29 +3097,29 @@ 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_getinputrow0")), methodAddress) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromrowvectorsnode_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_getinputrow0 = methodType(int(methodAddress.value)) + self.lib.lib3mf_composematrixfromrowvectorsnode_getinputa = methodType(int(methodAddress.value)) - err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromrowvectorsnode_getinputrow1")), methodAddress) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromrowvectorsnode_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_getinputrow1 = methodType(int(methodAddress.value)) + self.lib.lib3mf_composematrixfromrowvectorsnode_getinputb = methodType(int(methodAddress.value)) - err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromrowvectorsnode_getinputrow2")), methodAddress) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromrowvectorsnode_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_getinputrow2 = methodType(int(methodAddress.value)) + self.lib.lib3mf_composematrixfromrowvectorsnode_getinputc = methodType(int(methodAddress.value)) - err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromrowvectorsnode_getinputrow3")), methodAddress) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromrowvectorsnode_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_getinputrow3 = methodType(int(methodAddress.value)) + self.lib.lib3mf_composematrixfromrowvectorsnode_getinputd = methodType(int(methodAddress.value)) err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromrowvectorsnode_getoutputresult")), methodAddress) if err != 0: @@ -3122,6 +3127,36 @@ def _loadFunctionTableFromMethod(self, symbolLookupMethodAddress): 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)) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromcolumnvectors_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)) + + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromcolumnvectors_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)) + + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromcolumnvectors_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)) + + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromcolumnvectors_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)) + + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_composematrixfromcolumnvectors_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)) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_constantnode_setconstant")), methodAddress) if err != 0: raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) @@ -5515,21 +5550,36 @@ 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_getinputrow0.restype = ctypes.c_int32 - self.lib.lib3mf_composematrixfromrowvectorsnode_getinputrow0.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_composematrixfromrowvectorsnode_getinputrow1.restype = ctypes.c_int32 - self.lib.lib3mf_composematrixfromrowvectorsnode_getinputrow1.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_composematrixfromrowvectorsnode_getinputrow2.restype = ctypes.c_int32 - self.lib.lib3mf_composematrixfromrowvectorsnode_getinputrow2.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_composematrixfromrowvectorsnode_getinputrow3.restype = ctypes.c_int32 - self.lib.lib3mf_composematrixfromrowvectorsnode_getinputrow3.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_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_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_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_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_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_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_constantnode_setconstant.restype = ctypes.c_int32 self.lib.lib3mf_constantnode_setconstant.argtypes = [ctypes.c_void_p, ctypes.c_double] @@ -6609,6 +6659,8 @@ def getObjectById_9EF9EB54A53AA40D(self, handle, wrapper): # First 64 bits of SH 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_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" @@ -9766,9 +9818,9 @@ def GetOutputResult(self): class ComposeMatrixFromRowVectorsNode(ImplicitNode): def __init__(self, handle, wrapper): ImplicitNode.__init__(self, handle, wrapper) - def GetInputRow0(self): + def GetInputA(self): Row0Handle = ctypes.c_void_p() - self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromrowvectorsnode_getinputrow0(self._handle, Row0Handle)) + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromrowvectorsnode_getinputa(self._handle, Row0Handle)) if Row0Handle: Row0Object = self._wrapper._polymorphicFactory(Row0Handle) else: @@ -9776,9 +9828,9 @@ def GetInputRow0(self): return Row0Object - def GetInputRow1(self): + def GetInputB(self): Row1Handle = ctypes.c_void_p() - self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromrowvectorsnode_getinputrow1(self._handle, Row1Handle)) + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromrowvectorsnode_getinputb(self._handle, Row1Handle)) if Row1Handle: Row1Object = self._wrapper._polymorphicFactory(Row1Handle) else: @@ -9786,9 +9838,9 @@ def GetInputRow1(self): return Row1Object - def GetInputRow2(self): + def GetInputC(self): Row2Handle = ctypes.c_void_p() - self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromrowvectorsnode_getinputrow2(self._handle, Row2Handle)) + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromrowvectorsnode_getinputc(self._handle, Row2Handle)) if Row2Handle: Row2Object = self._wrapper._polymorphicFactory(Row2Handle) else: @@ -9796,9 +9848,9 @@ def GetInputRow2(self): return Row2Object - def GetInputRow3(self): + def GetInputD(self): Row3Handle = ctypes.c_void_p() - self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromrowvectorsnode_getinputrow3(self._handle, Row3Handle)) + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromrowvectorsnode_getinputd(self._handle, Row3Handle)) if Row3Handle: Row3Object = self._wrapper._polymorphicFactory(Row3Handle) else: @@ -9818,6 +9870,63 @@ def GetOutputResult(self): +''' Class Implementation for ComposeMatrixFromColumnVectors +''' +class ComposeMatrixFromColumnVectors(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)) + if Column0Handle: + Column0Object = self._wrapper._polymorphicFactory(Column0Handle) + else: + raise ELib3MFException(ErrorCodes.INVALIDCAST, 'Invalid return/output value') + + return Column0Object + + def GetInputB(self): + Column1Handle = ctypes.c_void_p() + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromcolumnvectors_getinputb(self._handle, Column1Handle)) + if Column1Handle: + Column1Object = self._wrapper._polymorphicFactory(Column1Handle) + else: + raise ELib3MFException(ErrorCodes.INVALIDCAST, 'Invalid return/output value') + + return Column1Object + + def GetInputC(self): + Column2Handle = ctypes.c_void_p() + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromcolumnvectors_getinputc(self._handle, Column2Handle)) + if Column2Handle: + Column2Object = self._wrapper._polymorphicFactory(Column2Handle) + else: + raise ELib3MFException(ErrorCodes.INVALIDCAST, 'Invalid return/output value') + + return Column2Object + + def GetInputD(self): + Column3Handle = ctypes.c_void_p() + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromcolumnvectors_getinputd(self._handle, Column3Handle)) + if Column3Handle: + Column3Object = self._wrapper._polymorphicFactory(Column3Handle) + else: + raise ELib3MFException(ErrorCodes.INVALIDCAST, 'Invalid return/output value') + + return Column3Object + + def GetOutputResult(self): + ResultHandle = ctypes.c_void_p() + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_composematrixfromcolumnvectors_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 ConstantNode ''' class ConstantNode(ImplicitNode): diff --git a/Autogenerated/Source/lib3mf_abi.hpp b/Autogenerated/Source/lib3mf_abi.hpp index 158a36422..f33231f20 100644 --- a/Autogenerated/Source/lib3mf_abi.hpp +++ b/Autogenerated/Source/lib3mf_abi.hpp @@ -3447,7 +3447,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getoutputresult(Lib3MF_Com * @param[out] pRow0 - the input for the first row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow0(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputa(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0); /** * Retrieves the input for the second row @@ -3456,7 +3456,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow0 * @param[out] pRow1 - the input for the second row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow1(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputb(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1); /** * Retrieves the input for the third row @@ -3465,7 +3465,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow1 * @param[out] pRow2 - the input for the third row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow2(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputc(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2); /** * Retrieves the input for the fourth row @@ -3474,7 +3474,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow2 * @param[out] pRow3 - the input for the fourth row * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow3(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputd(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3); /** * Retrieves the output @@ -3485,6 +3485,55 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow3 */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getoutputresult(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pResult); +/************************************************************************************************************************* + Class definition for ComposeMatrixFromColumnVectors +**************************************************************************************************************************/ + +/** +* Retrieves the input for the first column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the second column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the third column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the input for the fourth column +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors 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); + +/** +* Retrieves the output +* +* @param[in] pComposeMatrixFromColumnVectors - ComposeMatrixFromColumnVectors instance. +* @param[out] pResult - the output +* @return error code or 0 (success) +*/ +LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixfromcolumnvectors_getoutputresult(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pResult); + /************************************************************************************************************************* Class definition for ConstantNode **************************************************************************************************************************/ diff --git a/Autogenerated/Source/lib3mf_interfaces.hpp b/Autogenerated/Source/lib3mf_interfaces.hpp index c722461d2..426d407d6 100644 --- a/Autogenerated/Source/lib3mf_interfaces.hpp +++ b/Autogenerated/Source/lib3mf_interfaces.hpp @@ -141,6 +141,7 @@ class IComposeVectorNode; class IDecomposeVectorNode; class IComposeMatrixNode; class IComposeMatrixFromRowVectorsNode; +class IComposeMatrixFromColumnVectors; class IConstantNode; class IConstVecNode; class IConstMatNode; @@ -4167,28 +4168,28 @@ class IComposeMatrixFromRowVectorsNode : public virtual IImplicitNode { } /** - * IComposeMatrixFromRowVectorsNode::GetInputRow0 - Retrieves the input for the first row + * IComposeMatrixFromRowVectorsNode::GetInputA - Retrieves the input for the first row * @return the input for the first row */ - virtual IImplicitPort * GetInputRow0() = 0; + virtual IImplicitPort * GetInputA() = 0; /** - * IComposeMatrixFromRowVectorsNode::GetInputRow1 - Retrieves the input for the second row + * IComposeMatrixFromRowVectorsNode::GetInputB - Retrieves the input for the second row * @return the input for the second row */ - virtual IImplicitPort * GetInputRow1() = 0; + virtual IImplicitPort * GetInputB() = 0; /** - * IComposeMatrixFromRowVectorsNode::GetInputRow2 - Retrieves the input for the third row + * IComposeMatrixFromRowVectorsNode::GetInputC - Retrieves the input for the third row * @return the input for the third row */ - virtual IImplicitPort * GetInputRow2() = 0; + virtual IImplicitPort * GetInputC() = 0; /** - * IComposeMatrixFromRowVectorsNode::GetInputRow3 - Retrieves the input for the fourth row + * IComposeMatrixFromRowVectorsNode::GetInputD - Retrieves the input for the fourth row * @return the input for the fourth row */ - virtual IImplicitPort * GetInputRow3() = 0; + virtual IImplicitPort * GetInputD() = 0; /** * IComposeMatrixFromRowVectorsNode::GetOutputResult - Retrieves the output @@ -4201,6 +4202,56 @@ class IComposeMatrixFromRowVectorsNode : public virtual IImplicitNode { typedef IBaseSharedPtr PIComposeMatrixFromRowVectorsNode; +/************************************************************************************************************************* + Class interface for ComposeMatrixFromColumnVectors +**************************************************************************************************************************/ + +class IComposeMatrixFromColumnVectors : public virtual IImplicitNode { +public: + /** + * IComposeMatrixFromColumnVectors::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" + } + + /** + * IComposeMatrixFromColumnVectors::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 + * @return the input for the second column + */ + virtual IImplicitPort * GetInputB() = 0; + + /** + * IComposeMatrixFromColumnVectors::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 + * @return the input for the fourth column + */ + virtual IImplicitPort * GetInputD() = 0; + + /** + * IComposeMatrixFromColumnVectors::GetOutputResult - Retrieves the output + * @return the output + */ + virtual IImplicitPort * GetOutputResult() = 0; + +}; + +typedef IBaseSharedPtr PIComposeMatrixFromColumnVectors; + + /************************************************************************************************************************* Class interface for ConstantNode **************************************************************************************************************************/ diff --git a/Autogenerated/Source/lib3mf_interfacewrapper.cpp b/Autogenerated/Source/lib3mf_interfacewrapper.cpp index 90feb46b6..895489a65 100644 --- a/Autogenerated/Source/lib3mf_interfacewrapper.cpp +++ b/Autogenerated/Source/lib3mf_interfacewrapper.cpp @@ -11979,14 +11979,14 @@ Lib3MFResult lib3mf_composematrixnode_getoutputresult(Lib3MF_ComposeMatrixNode p /************************************************************************************************************************* Class implementation for ComposeMatrixFromRowVectorsNode **************************************************************************************************************************/ -Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow0(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0) +Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputa(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow0) { IBase* pIBaseClass = (IBase *)pComposeMatrixFromRowVectorsNode; PLib3MFInterfaceJournalEntry pJournalEntry; try { if (m_GlobalJournal.get() != nullptr) { - pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromRowVectorsNode, "ComposeMatrixFromRowVectorsNode", "GetInputRow0"); + pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromRowVectorsNode, "ComposeMatrixFromRowVectorsNode", "GetInputA"); } if (pRow0 == nullptr) throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); @@ -11995,7 +11995,7 @@ Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow0(Lib3MF_ComposeM if (!pIComposeMatrixFromRowVectorsNode) throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); - pBaseRow0 = pIComposeMatrixFromRowVectorsNode->GetInputRow0(); + pBaseRow0 = pIComposeMatrixFromRowVectorsNode->GetInputA(); *pRow0 = (IBase*)(pBaseRow0); if (pJournalEntry.get() != nullptr) { @@ -12015,14 +12015,14 @@ Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow0(Lib3MF_ComposeM } } -Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow1(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1) +Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputb(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow1) { IBase* pIBaseClass = (IBase *)pComposeMatrixFromRowVectorsNode; PLib3MFInterfaceJournalEntry pJournalEntry; try { if (m_GlobalJournal.get() != nullptr) { - pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromRowVectorsNode, "ComposeMatrixFromRowVectorsNode", "GetInputRow1"); + pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromRowVectorsNode, "ComposeMatrixFromRowVectorsNode", "GetInputB"); } if (pRow1 == nullptr) throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); @@ -12031,7 +12031,7 @@ Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow1(Lib3MF_ComposeM if (!pIComposeMatrixFromRowVectorsNode) throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); - pBaseRow1 = pIComposeMatrixFromRowVectorsNode->GetInputRow1(); + pBaseRow1 = pIComposeMatrixFromRowVectorsNode->GetInputB(); *pRow1 = (IBase*)(pBaseRow1); if (pJournalEntry.get() != nullptr) { @@ -12051,14 +12051,14 @@ Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow1(Lib3MF_ComposeM } } -Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow2(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2) +Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputc(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow2) { IBase* pIBaseClass = (IBase *)pComposeMatrixFromRowVectorsNode; PLib3MFInterfaceJournalEntry pJournalEntry; try { if (m_GlobalJournal.get() != nullptr) { - pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromRowVectorsNode, "ComposeMatrixFromRowVectorsNode", "GetInputRow2"); + pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromRowVectorsNode, "ComposeMatrixFromRowVectorsNode", "GetInputC"); } if (pRow2 == nullptr) throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); @@ -12067,7 +12067,7 @@ Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow2(Lib3MF_ComposeM if (!pIComposeMatrixFromRowVectorsNode) throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); - pBaseRow2 = pIComposeMatrixFromRowVectorsNode->GetInputRow2(); + pBaseRow2 = pIComposeMatrixFromRowVectorsNode->GetInputC(); *pRow2 = (IBase*)(pBaseRow2); if (pJournalEntry.get() != nullptr) { @@ -12087,14 +12087,14 @@ Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow2(Lib3MF_ComposeM } } -Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow3(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3) +Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputd(Lib3MF_ComposeMatrixFromRowVectorsNode pComposeMatrixFromRowVectorsNode, Lib3MF_ImplicitPort * pRow3) { IBase* pIBaseClass = (IBase *)pComposeMatrixFromRowVectorsNode; PLib3MFInterfaceJournalEntry pJournalEntry; try { if (m_GlobalJournal.get() != nullptr) { - pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromRowVectorsNode, "ComposeMatrixFromRowVectorsNode", "GetInputRow3"); + pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromRowVectorsNode, "ComposeMatrixFromRowVectorsNode", "GetInputD"); } if (pRow3 == nullptr) throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); @@ -12103,7 +12103,7 @@ Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getinputrow3(Lib3MF_ComposeM if (!pIComposeMatrixFromRowVectorsNode) throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); - pBaseRow3 = pIComposeMatrixFromRowVectorsNode->GetInputRow3(); + pBaseRow3 = pIComposeMatrixFromRowVectorsNode->GetInputD(); *pRow3 = (IBase*)(pBaseRow3); if (pJournalEntry.get() != nullptr) { @@ -12160,6 +12160,190 @@ Lib3MFResult lib3mf_composematrixfromrowvectorsnode_getoutputresult(Lib3MF_Compo } +/************************************************************************************************************************* + Class implementation for ComposeMatrixFromColumnVectors +**************************************************************************************************************************/ +Lib3MFResult lib3mf_composematrixfromcolumnvectors_getinputa(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn0) +{ + IBase* pIBaseClass = (IBase *)pComposeMatrixFromColumnVectors; + + PLib3MFInterfaceJournalEntry pJournalEntry; + try { + if (m_GlobalJournal.get() != nullptr) { + pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromColumnVectors, "ComposeMatrixFromColumnVectors", "GetInputA"); + } + if (pColumn0 == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + IBase* pBaseColumn0(nullptr); + IComposeMatrixFromColumnVectors* pIComposeMatrixFromColumnVectors = dynamic_cast(pIBaseClass); + if (!pIComposeMatrixFromColumnVectors) + throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); + + pBaseColumn0 = pIComposeMatrixFromColumnVectors->GetInputA(); + + *pColumn0 = (IBase*)(pBaseColumn0); + if (pJournalEntry.get() != nullptr) { + pJournalEntry->addHandleResult("Column0", *pColumn0); + 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_composematrixfromcolumnvectors_getinputb(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn1) +{ + IBase* pIBaseClass = (IBase *)pComposeMatrixFromColumnVectors; + + PLib3MFInterfaceJournalEntry pJournalEntry; + try { + if (m_GlobalJournal.get() != nullptr) { + pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromColumnVectors, "ComposeMatrixFromColumnVectors", "GetInputB"); + } + if (pColumn1 == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + IBase* pBaseColumn1(nullptr); + IComposeMatrixFromColumnVectors* pIComposeMatrixFromColumnVectors = dynamic_cast(pIBaseClass); + if (!pIComposeMatrixFromColumnVectors) + throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); + + pBaseColumn1 = pIComposeMatrixFromColumnVectors->GetInputB(); + + *pColumn1 = (IBase*)(pBaseColumn1); + if (pJournalEntry.get() != nullptr) { + pJournalEntry->addHandleResult("Column1", *pColumn1); + 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_composematrixfromcolumnvectors_getinputc(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn2) +{ + IBase* pIBaseClass = (IBase *)pComposeMatrixFromColumnVectors; + + PLib3MFInterfaceJournalEntry pJournalEntry; + try { + if (m_GlobalJournal.get() != nullptr) { + pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromColumnVectors, "ComposeMatrixFromColumnVectors", "GetInputC"); + } + if (pColumn2 == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + IBase* pBaseColumn2(nullptr); + IComposeMatrixFromColumnVectors* pIComposeMatrixFromColumnVectors = dynamic_cast(pIBaseClass); + if (!pIComposeMatrixFromColumnVectors) + throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); + + pBaseColumn2 = pIComposeMatrixFromColumnVectors->GetInputC(); + + *pColumn2 = (IBase*)(pBaseColumn2); + if (pJournalEntry.get() != nullptr) { + pJournalEntry->addHandleResult("Column2", *pColumn2); + 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_composematrixfromcolumnvectors_getinputd(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pColumn3) +{ + IBase* pIBaseClass = (IBase *)pComposeMatrixFromColumnVectors; + + PLib3MFInterfaceJournalEntry pJournalEntry; + try { + if (m_GlobalJournal.get() != nullptr) { + pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromColumnVectors, "ComposeMatrixFromColumnVectors", "GetInputD"); + } + if (pColumn3 == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + IBase* pBaseColumn3(nullptr); + IComposeMatrixFromColumnVectors* pIComposeMatrixFromColumnVectors = dynamic_cast(pIBaseClass); + if (!pIComposeMatrixFromColumnVectors) + throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); + + pBaseColumn3 = pIComposeMatrixFromColumnVectors->GetInputD(); + + *pColumn3 = (IBase*)(pBaseColumn3); + if (pJournalEntry.get() != nullptr) { + pJournalEntry->addHandleResult("Column3", *pColumn3); + 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_composematrixfromcolumnvectors_getoutputresult(Lib3MF_ComposeMatrixFromColumnVectors pComposeMatrixFromColumnVectors, Lib3MF_ImplicitPort * pResult) +{ + IBase* pIBaseClass = (IBase *)pComposeMatrixFromColumnVectors; + + PLib3MFInterfaceJournalEntry pJournalEntry; + try { + if (m_GlobalJournal.get() != nullptr) { + pJournalEntry = m_GlobalJournal->beginClassMethod(pComposeMatrixFromColumnVectors, "ComposeMatrixFromColumnVectors", "GetOutputResult"); + } + if (pResult == nullptr) + throw ELib3MFInterfaceException (LIB3MF_ERROR_INVALIDPARAM); + IBase* pBaseResult(nullptr); + IComposeMatrixFromColumnVectors* pIComposeMatrixFromColumnVectors = dynamic_cast(pIBaseClass); + if (!pIComposeMatrixFromColumnVectors) + throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); + + pBaseResult = pIComposeMatrixFromColumnVectors->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 ConstantNode **************************************************************************************************************************/ @@ -22085,16 +22269,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_getinputrow0") - *ppProcAddress = (void*) &lib3mf_composematrixfromrowvectorsnode_getinputrow0; - if (sProcName == "lib3mf_composematrixfromrowvectorsnode_getinputrow1") - *ppProcAddress = (void*) &lib3mf_composematrixfromrowvectorsnode_getinputrow1; - if (sProcName == "lib3mf_composematrixfromrowvectorsnode_getinputrow2") - *ppProcAddress = (void*) &lib3mf_composematrixfromrowvectorsnode_getinputrow2; - if (sProcName == "lib3mf_composematrixfromrowvectorsnode_getinputrow3") - *ppProcAddress = (void*) &lib3mf_composematrixfromrowvectorsnode_getinputrow3; + 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_constantnode_setconstant") *ppProcAddress = (void*) &lib3mf_constantnode_setconstant; if (sProcName == "lib3mf_constantnode_getconstant") diff --git a/Autogenerated/Source/lib3mf_types.hpp b/Autogenerated/Source/lib3mf_types.hpp index a2304ec27..a80775966 100644 --- a/Autogenerated/Source/lib3mf_types.hpp +++ b/Autogenerated/Source/lib3mf_types.hpp @@ -285,6 +285,7 @@ typedef Lib3MFHandle Lib3MF_ComposeVectorNode; typedef Lib3MFHandle Lib3MF_DecomposeVectorNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixNode; typedef Lib3MFHandle Lib3MF_ComposeMatrixFromRowVectorsNode; +typedef Lib3MFHandle Lib3MF_ComposeMatrixFromColumnVectors; typedef Lib3MFHandle Lib3MF_ConstantNode; typedef Lib3MFHandle Lib3MF_ConstVecNode; typedef Lib3MFHandle Lib3MF_ConstMatNode; diff --git a/AutomaticComponentToolkit/lib3mf.xml b/AutomaticComponentToolkit/lib3mf.xml index 584bf5a0d..7aa4015f0 100644 --- a/AutomaticComponentToolkit/lib3mf.xml +++ b/AutomaticComponentToolkit/lib3mf.xml @@ -2269,20 +2269,20 @@ - + description="Composes a 4x4 matrix from four row vectors A,B,C,D"> + - + - + - + @@ -2292,6 +2292,31 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Include/API/lib3mf_composematrixfromcolumnvectors.hpp b/Include/API/lib3mf_composematrixfromcolumnvectors.hpp new file mode 100644 index 000000000..d821d3891 --- /dev/null +++ b/Include/API/lib3mf_composematrixfromcolumnvectors.hpp @@ -0,0 +1,117 @@ +/*++ + +Copyright (C) 2023 3MF Consortium (Original Author) + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Abstract: This is the class declaration of CComposeMatrixFromColumnVectors + +*/ + + +#ifndef __LIB3MF_COMPOSEMATRIXFROMCOLUMNVECTORS +#define __LIB3MF_COMPOSEMATRIXFROMCOLUMNVECTORS + +#include "lib3mf_interfaces.hpp" + +// Parent classes +#include "lib3mf_implicitnode.hpp" +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable : 4250) +#endif + +// Include custom headers here. + + +namespace Lib3MF { +namespace Impl { + + +/************************************************************************************************************************* + Class declaration of CComposeMatrixFromColumnVectors +**************************************************************************************************************************/ + +class CComposeMatrixFromColumnVectors : public virtual IComposeMatrixFromColumnVectors, public virtual CImplicitNode { +private: + + /** + * Put private members here. + */ + +protected: + + /** + * Put protected members here. + */ + +public: + CComposeMatrixFromColumnVectors(NMR::PModelImplicitNode pImplicitNode); + /** + * Put additional public members here. They will not be visible in the external API. + */ + + + /** + * Public member functions to implement. + */ + + /** + * IComposeMatrixFromColumnVectors::GetInputA - Retrieves the input for the first column + * @return the input for the first column + */ + IImplicitPort * GetInputA() override; + + /** + * IComposeMatrixFromColumnVectors::GetInputB - Retrieves the input for the second column + * @return the input for the second column + */ + IImplicitPort * GetInputB() override; + + /** + * IComposeMatrixFromColumnVectors::GetInputC - Retrieves the input for the third column + * @return the input for the third column + */ + IImplicitPort * GetInputC() override; + + /** + * IComposeMatrixFromColumnVectors::GetInputD - Retrieves the input for the fourth column + * @return the input for the fourth column + */ + IImplicitPort * GetInputD() override; + + /** + * IComposeMatrixFromColumnVectors::GetOutputResult - Retrieves the output + * @return the output + */ + IImplicitPort * GetOutputResult() override; + +}; + +} // namespace Impl +} // namespace Lib3MF + +#ifdef _MSC_VER +#pragma warning(pop) +#endif +#endif // __LIB3MF_COMPOSEMATRIXFROMCOLUMNVECTORS diff --git a/Include/API/lib3mf_composematrixfromrowvectorsnode.hpp b/Include/API/lib3mf_composematrixfromrowvectorsnode.hpp index 7c598278f..942878ad9 100644 --- a/Include/API/lib3mf_composematrixfromrowvectorsnode.hpp +++ b/Include/API/lib3mf_composematrixfromrowvectorsnode.hpp @@ -80,25 +80,25 @@ class CComposeMatrixFromRowVectorsNode : public virtual IComposeMatrixFromRowVec * IComposeMatrixFromRowVectorsNode::GetInputRow0 - Retrieves the input for the first row * @return the input for the first row */ - IImplicitPort * GetInputRow0() override; + IImplicitPort * GetInputA() override; /** * IComposeMatrixFromRowVectorsNode::GetInputRow1 - Retrieves the input for the second row * @return the input for the second row */ - IImplicitPort * GetInputRow1() override; + IImplicitPort * GetInputB() override; /** * IComposeMatrixFromRowVectorsNode::GetInputRow2 - Retrieves the input for the third row * @return the input for the third row */ - IImplicitPort * GetInputRow2() override; + IImplicitPort * GetInputC() override; /** * IComposeMatrixFromRowVectorsNode::GetInputRow3 - Retrieves the input for the fourth row * @return the input for the fourth row */ - IImplicitPort * GetInputRow3() override; + IImplicitPort * GetInputD() override; /** * IComposeMatrixFromRowVectorsNode::GetOutputMatrix - Retrieves the output diff --git a/Include/API/lib3mf_nodeiterator.hpp b/Include/API/lib3mf_nodeiterator.hpp index 59618bbf7..4839fa5c6 100644 --- a/Include/API/lib3mf_nodeiterator.hpp +++ b/Include/API/lib3mf_nodeiterator.hpp @@ -61,6 +61,7 @@ namespace Lib3MF */ NMR::PImplicitNodes m_pNodes; + IImplicitNode * implicitNodeFromModelImplicitNode(NMR::PModelImplicitNode pNode); protected: /** * Put protected members here. diff --git a/Source/API/lib3mf_composematrixfromcolumnvectors.cpp b/Source/API/lib3mf_composematrixfromcolumnvectors.cpp new file mode 100644 index 000000000..af0bee142 --- /dev/null +++ b/Source/API/lib3mf_composematrixfromcolumnvectors.cpp @@ -0,0 +1,73 @@ +/*++ + +Copyright (C) 2023 3MF Consortium (Original Author) + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Abstract: This is a stub class definition of CComposeMatrixFromColumnVectors + +*/ + +#include "lib3mf_composematrixfromcolumnvectors.hpp" +#include "lib3mf_interfaceexception.hpp" + +// Include custom headers here. + + +using namespace Lib3MF::Impl; + +/************************************************************************************************************************* + Class definition of CComposeMatrixFromColumnVectors +**************************************************************************************************************************/ + +CComposeMatrixFromColumnVectors::CComposeMatrixFromColumnVectors(NMR::PModelImplicitNode pImplicitNode) + : CImplicitNode{pImplicitNode} +{ + CImplicitNode::m_pImplicitNode = pImplicitNode; +} + +IImplicitPort * CComposeMatrixFromColumnVectors::GetInputA() +{ + return FindInputOrThrow(NMR::InputNames::A); +} + +IImplicitPort * CComposeMatrixFromColumnVectors::GetInputB() +{ + return FindInputOrThrow(NMR::InputNames::B); +} + +IImplicitPort * CComposeMatrixFromColumnVectors::GetInputC() +{ + return FindInputOrThrow(NMR::InputNames::C); +} + +IImplicitPort * CComposeMatrixFromColumnVectors::GetInputD() +{ + return FindInputOrThrow(NMR::InputNames::D); +} + +IImplicitPort * CComposeMatrixFromColumnVectors::GetOutputResult() +{ + return FindOutputOrThrow(NMR::OutputNames::result); +} + diff --git a/Source/API/lib3mf_composematrixfromrowvectorsnode.cpp b/Source/API/lib3mf_composematrixfromrowvectorsnode.cpp index 36d633750..f32f3a8a1 100644 --- a/Source/API/lib3mf_composematrixfromrowvectorsnode.cpp +++ b/Source/API/lib3mf_composematrixfromrowvectorsnode.cpp @@ -40,29 +40,29 @@ using namespace Lib3MF::Impl; Class definition of CComposeMatrixFromRowVectorsNode **************************************************************************************************************************/ -Lib3MF::Impl::CComposeMatrixFromRowVectorsNode:: +CComposeMatrixFromRowVectorsNode:: CComposeMatrixFromRowVectorsNode(NMR::PModelImplicitNode pImplicitNode) : CImplicitNode{pImplicitNode} { CImplicitNode::m_pImplicitNode = pImplicitNode; } -IImplicitPort* CComposeMatrixFromRowVectorsNode::GetInputRow0() +IImplicitPort* CComposeMatrixFromRowVectorsNode::GetInputA() { return FindInputOrThrow(NMR::InputNames::A); } -IImplicitPort * CComposeMatrixFromRowVectorsNode::GetInputRow1() +IImplicitPort * CComposeMatrixFromRowVectorsNode::GetInputB() { return FindInputOrThrow(NMR::InputNames::B); } -IImplicitPort * CComposeMatrixFromRowVectorsNode::GetInputRow2() +IImplicitPort * CComposeMatrixFromRowVectorsNode::GetInputC() { return FindInputOrThrow(NMR::InputNames::C); } -IImplicitPort * CComposeMatrixFromRowVectorsNode::GetInputRow3() +IImplicitPort * CComposeMatrixFromRowVectorsNode::GetInputD() { return FindInputOrThrow(NMR::InputNames::D); } diff --git a/Source/API/lib3mf_nodeiterator.cpp b/Source/API/lib3mf_nodeiterator.cpp index b5c9ac4cc..05397d8a9 100644 --- a/Source/API/lib3mf_nodeiterator.cpp +++ b/Source/API/lib3mf_nodeiterator.cpp @@ -32,6 +32,55 @@ Abstract: This is a stub class definition of CNodeIterator #include "lib3mf_interfaceexception.hpp" // Include custom headers here. +#include "lib3mf_additionnode.hpp" +#include "lib3mf_subtractionnode.hpp" +#include "lib3mf_multiplicationnode.hpp" +#include "lib3mf_divisionnode.hpp" +#include "lib3mf_constantnode.hpp" +#include "lib3mf_constvecnode.hpp" +#include "lib3mf_constmatnode.hpp" +#include "lib3mf_composevectornode.hpp" +#include "lib3mf_decomposevectornode.hpp" +#include "lib3mf_composematrixnode.hpp" +#include "lib3mf_composematrixfromcolumnvectors.hpp" +#include "lib3mf_composematrixfromrowvectorsnode.hpp" +#include "lib3mf_dotnode.hpp" +#include "lib3mf_crossnode.hpp" +#include "lib3mf_matvecmultiplicationnode.hpp" +#include "lib3mf_transposenode.hpp" +#include "lib3mf_inversenode.hpp" +#include "lib3mf_sinnode.hpp" +#include "lib3mf_cosnode.hpp" +#include "lib3mf_tannode.hpp" +#include "lib3mf_arcsinnode.hpp" +#include "lib3mf_arccosnode.hpp" +#include "lib3mf_arctannode.hpp" +#include "lib3mf_arctan2node.hpp" +#include "lib3mf_minnode.hpp" +#include "lib3mf_maxnode.hpp" +#include "lib3mf_absnode.hpp" +#include "lib3mf_fmodnode.hpp" +#include "lib3mf_pownode.hpp" +#include "lib3mf_sqrtnode.hpp" +#include "lib3mf_expnode.hpp" +#include "lib3mf_lognode.hpp" +#include "lib3mf_log2node.hpp" +#include "lib3mf_log10node.hpp" +#include "lib3mf_selectnode.hpp" +#include "lib3mf_clampnode.hpp" +#include "lib3mf_sinhnode.hpp" +#include "lib3mf_coshnode.hpp" +#include "lib3mf_tanhnode.hpp" +#include "lib3mf_roundnode.hpp" +#include "lib3mf_ceilnode.hpp" +#include "lib3mf_floornode.hpp" +#include "lib3mf_signnode.hpp" +#include "lib3mf_fractnode.hpp" +#include "lib3mf_functioncallnode.hpp" +#include "lib3mf_meshnode.hpp" +#include "lib3mf_lengthnode.hpp" +#include "lib3mf_resourceidnode.hpp" + using namespace Lib3MF::Impl; @@ -42,7 +91,174 @@ using namespace Lib3MF::Impl; IImplicitNode * CNodeIterator::GetCurrent() { throwIfInvalidIndex(); - return new CImplicitNode(m_pNodes->at(static_cast(getCurrentIndex()))); + auto pModelNode = m_pNodes->at(static_cast(getCurrentIndex())); + auto pNode = implicitNodeFromModelImplicitNode(pModelNode); + if (!pNode) + throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDPARAM); + return pNode; +} + +// enum class eImplicitNodeType : Lib3MF_int32 { +// Addition = 1, /** Adds to values (scalar or vector) */ +// Subtraction = 2, /** Subtracts two values (scalar or vector) */ +// Multiplication = 3, /** Multiplies two values (scalar or vector) */ +// Division = 4, /** Divides two values (scalar or vector) */ +// Constant = 5, /** A constant scalar value */ +// ConstVec = 6, /** A constant vector value */ +// ConstMat = 7, /** A constant matrix value */ +// 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 */ +// 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 */ +// Transpose = 16, /** Transposes a matrix */ +// Inverse = 17, /** Computes the inverse of a matrix */ +// Sinus = 18, /** Calculates the sinus */ +// Cosinus = 19, /** Calculates the cosinus */ +// Tan = 20, /** Calculates the tangent */ +// ArcSin = 21, /** Calculates the arcsinus */ +// ArcCos = 22, /** Calculates the arccosinus */ +// ArcTan = 23, /** Calculates the arctangent */ +// ArcTan2 = 24, /** Calculates the arctangent */ +// Min = 25, /** Calculates the minimum tow values */ +// Max = 26, /** Calculates the maximum of two values */ +// Abs = 27, /** Calcul the absolute value */ +// Fmod = 28, /** Calculates the modulo of two values */ +// Pow = 29, /** Calculates the power A^B */ +// Sqrt = 30, /** Calculates the square root */ +// Exp = 31, /** Exponential function */ +// Log = 32, /** Natural logarithmus */ +// Log2 = 33, /** Logarithmus to the base 2 */ +// Log10 = 34, /** Logarithmus to the base 10 */ +// Select = 35, /** If A is less B returns C, else D */ +// Clamp = 36, /** Clamps the input value to min and max */ +// Sinh = 37, /** Calculates the hyperbolic sine */ +// Cosh = 38, /** Calculates the hyperbolic cosine */ +// Tanh = 39, /** Calculates the hyperbolic tangent */ +// Round = 40, /** Rounds a scalar value to the nearest integer */ +// Ceil = 41, /** Rounds a scalar value up to the nearest integer */ +// Floor = 42, /** Rounds a scalar value down to the nearest integer */ +// Sign = 43, /** Returns the sign */ +// Fract = 44, /** Returns the fractional part */ +// 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.) */ +// }; + +IImplicitNode* Lib3MF::Impl::CNodeIterator::implicitNodeFromModelImplicitNode( + NMR::PModelImplicitNode pNode) +{ + if (!pNode) + throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDPARAM); + + + switch (pNode->getNodeType()) + { + case eImplicitNodeType::Addition: + return new CAdditionNode(pNode); + case eImplicitNodeType::Subtraction: + return new CSubtractionNode(pNode); + case eImplicitNodeType::Multiplication: + return new CMultiplicationNode(pNode); + case eImplicitNodeType::Division: + return new CDivisionNode(pNode); + case eImplicitNodeType::Constant: + return new CConstantNode(pNode); + case eImplicitNodeType::ConstVec: + return new CConstVecNode(pNode); + case eImplicitNodeType::ConstMat: + return new CConstMatNode(pNode); + case eImplicitNodeType::ComposeVector: + return new CComposeVectorNode(pNode); + case eImplicitNodeType::DecomposeVector: + return new CDecomposeVectorNode(pNode); + case eImplicitNodeType::ComposeMatrix: + return new CComposeMatrixNode(pNode); + case eImplicitNodeType::ComposeMatrixFromColumnVectors: + return new CComposeMatrixFromColumnVectors(pNode); + case eImplicitNodeType::ComposeMatrixFromRowVectors: + return new CComposeMatrixFromRowVectorsNode(pNode); + case eImplicitNodeType::Dot: + return new CDotNode(pNode); + case eImplicitNodeType::Cross: + return new CCrossNode(pNode); + case eImplicitNodeType::MatVecMultiplication: + return new CMatVecMultiplicationNode(pNode); + case eImplicitNodeType::Transpose: + return new CTransposeNode(pNode); + case eImplicitNodeType::Inverse: + return new CInverseNode(pNode); + case eImplicitNodeType::Sinus: + return new CSinNode(pNode); + case eImplicitNodeType::Cosinus: + return new CCosNode(pNode); + case eImplicitNodeType::Tan: + return new CTanNode(pNode); + case eImplicitNodeType::ArcSin: + return new CArcSinNode(pNode); + case eImplicitNodeType::ArcCos: + return new CArcCosNode(pNode); + case eImplicitNodeType::ArcTan: + return new CArcTanNode(pNode); + case eImplicitNodeType::ArcTan2: + return new CArcTan2Node(pNode); + case eImplicitNodeType::Min: + return new CMinNode(pNode); + case eImplicitNodeType::Max: + return new CMaxNode(pNode); + case eImplicitNodeType::Abs: + return new CAbsNode(pNode); + case eImplicitNodeType::Fmod: + return new CFmodNode(pNode); + case eImplicitNodeType::Pow: + return new CPowNode(pNode); + case eImplicitNodeType::Sqrt: + return new CSqrtNode(pNode); + case eImplicitNodeType::Exp: + return new CExpNode(pNode); + case eImplicitNodeType::Log: + return new CLogNode(pNode); + case eImplicitNodeType::Log2: + return new CLog2Node(pNode); + case eImplicitNodeType::Log10: + return new CLog10Node(pNode); + case eImplicitNodeType::Select: + return new CSelectNode(pNode); + case eImplicitNodeType::Clamp: + return new CClampNode(pNode); + case eImplicitNodeType::Sinh: + return new CSinhNode(pNode); + case eImplicitNodeType::Cosh: + return new CCoshNode(pNode); + case eImplicitNodeType::Tanh: + return new CTanhNode(pNode); + case eImplicitNodeType::Round: + return new CRoundNode(pNode); + case eImplicitNodeType::Ceil: + return new CCeilNode(pNode); + case eImplicitNodeType::Floor: + return new CFloorNode(pNode); + case eImplicitNodeType::Sign: + return new CSignNode(pNode); + case eImplicitNodeType::Fract: + return new CFractNode(pNode); + case eImplicitNodeType::FunctionCall: + return new CFunctionCallNode(pNode); + case eImplicitNodeType::Mesh: + return new CMeshNode(pNode); + case eImplicitNodeType::Length: + return new CLengthNode(pNode); + case eImplicitNodeType::Resource: + return new CResourceIdNode(pNode); + + default: + throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDPARAM); + } + } Lib3MF::Impl::CNodeIterator::CNodeIterator(NMR::PImplicitNodes pNodes) diff --git a/Tests/CPP_Bindings/Source/UnitTest_Utilities.cpp b/Tests/CPP_Bindings/Source/UnitTest_Utilities.cpp index 60266f8a0..f2b9abb24 100644 --- a/Tests/CPP_Bindings/Source/UnitTest_Utilities.cpp +++ b/Tests/CPP_Bindings/Source/UnitTest_Utilities.cpp @@ -97,10 +97,13 @@ namespace Lib3MF EXPECT_EQ(node1->GetNodeType(), node2->GetNodeType()); EXPECT_EQ(node1->GetDisplayName(), node2->GetDisplayName()); - auto constantNode1 = std::dynamic_pointer_cast(node1); - auto constantNode2 = std::dynamic_pointer_cast(node2); - if(constantNode1 != nullptr && constantNode2 != nullptr) + + // if(constantNode1 != nullptr && constantNode2 != nullptr) + if (node1->GetNodeType() == Lib3MF::eImplicitNodeType::Constant) { + auto constantNode1 = std::dynamic_pointer_cast(node1); + auto constantNode2 = std::dynamic_pointer_cast(node2); + ASSERT_NE(constantNode1, nullptr); EXPECT_EQ(constantNode1->GetConstant(), constantNode2->GetConstant()); }