From 3a30defc17ceeff181c775f6247f9bb2cff7fd74 Mon Sep 17 00:00:00 2001 From: Jan Orend <56254096+3dJan@users.noreply.github.com> Date: Wed, 13 Nov 2024 13:39:55 +0100 Subject: [PATCH 1/5] Rename InverseNode to AddInverseNode for consistency and clarity --- Autogenerated/Bindings/C/lib3mf.h | 8 +++--- Autogenerated/Bindings/C/lib3mf_types.h | 6 ++--- .../Bindings/CDynamic/lib3mf_dynamic.cc | 8 +++--- .../Bindings/CDynamic/lib3mf_dynamic.h | 10 +++---- .../Bindings/CDynamic/lib3mf_types.h | 6 ++--- Autogenerated/Bindings/CSharp/Lib3MF.cs | 8 +++--- Autogenerated/Bindings/Cpp/lib3mf_abi.hpp | 8 +++--- .../Bindings/Cpp/lib3mf_implicit.hpp | 14 +++++----- Autogenerated/Bindings/Cpp/lib3mf_types.hpp | 6 ++--- .../Bindings/CppDynamic/lib3mf_dynamic.h | 10 +++---- .../Bindings/CppDynamic/lib3mf_dynamic.hpp | 26 +++++++++---------- .../Bindings/CppDynamic/lib3mf_types.hpp | 6 ++--- Autogenerated/Bindings/Go/lib3mf.go | 10 +++---- Autogenerated/Bindings/Go/lib3mf_dynamic.cc | 8 +++--- Autogenerated/Bindings/Go/lib3mf_dynamic.h | 10 +++---- Autogenerated/Bindings/Go/lib3mf_types.h | 6 ++--- .../Bindings/NodeJS/lib3mf_dynamic.cc | 8 +++--- .../Bindings/NodeJS/lib3mf_dynamic.h | 10 +++---- .../Bindings/NodeJS/lib3mf_nodewrapper.cc | 12 ++++----- .../Bindings/NodeJS/lib3mf_nodewrapper.h | 2 +- Autogenerated/Bindings/NodeJS/lib3mf_types.h | 6 ++--- Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas | 22 ++++++++-------- Autogenerated/Bindings/Python/Lib3MF.py | 14 +++++----- Autogenerated/Source/lib3mf_abi.hpp | 8 +++--- Autogenerated/Source/lib3mf_interfaces.hpp | 10 +++---- .../Source/lib3mf_interfacewrapper.cpp | 10 +++---- Autogenerated/Source/lib3mf_types.hpp | 6 ++--- AutomaticComponentToolkit/lib3mf.xml | 18 ++++++------- Include/API/lib3mf_implicitfunction.hpp | 2 +- Source/API/lib3mf_implicitfunction.cpp | 2 +- Tests/googletest | 1 + Tests/libressl | 1 + 32 files changed, 142 insertions(+), 140 deletions(-) create mode 160000 Tests/googletest create mode 160000 Tests/libressl diff --git a/Autogenerated/Bindings/C/lib3mf.h b/Autogenerated/Bindings/C/lib3mf.h index 6253b6f81..cae6e016e 100644 --- a/Autogenerated/Bindings/C/lib3mf.h +++ b/Autogenerated/Bindings/C/lib3mf.h @@ -787,7 +787,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_metadatagroup_removemetadata(Lib3MF_MetaData * @param[in] pName - the name of the metadata * @param[in] pValue - the value of the metadata * @param[in] pType - the type of the metadata -* @param[in] bMustPreserve - shuold the metadata be preserved +* @param[in] bMustPreserve - should the metadata be preserved * @param[out] pMetaData - a new instance of the metadata * @return error code or 0 (success) */ @@ -3508,7 +3508,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getinputm12(Lib3MF_Compose * Retrieves the input for the element 1 3 * * @param[in] pComposeMatrixNode - ComposeMatrixNode instance. -* @param[out] pM13 - the input for the m3 element +* @param[out] pM13 - the input for the m13 element * @return error code or 0 (success) */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getinputm13(Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pM13); @@ -3517,7 +3517,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getinputm13(Lib3MF_Compose * Retrieves the input for the element 2 0 * * @param[in] pComposeMatrixNode - ComposeMatrixNode instance. -* @param[out] pM20 - the input for the m2 element +* @param[out] pM20 - the input for the m20 element * @return error code or 0 (success) */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getinputm20(Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pM20); @@ -4297,7 +4297,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addtransposenode(Lib3MF_Imp * @param[out] pNode - the added node * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_inversenode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_InverseNode * pNode); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addinversenode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_InverseNode * pNode); /** * Add a SqrtNode diff --git a/Autogenerated/Bindings/C/lib3mf_types.h b/Autogenerated/Bindings/C/lib3mf_types.h index 696aec4eb..52b76837e 100644 --- a/Autogenerated/Bindings/C/lib3mf_types.h +++ b/Autogenerated/Bindings/C/lib3mf_types.h @@ -474,9 +474,9 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeArcCos = 22, /** Calculates the arccosinus */ eImplicitNodeTypeArcTan = 23, /** Calculates the arctangent */ eImplicitNodeTypeArcTan2 = 24, /** Calculates the arctangent */ - eImplicitNodeTypeMin = 25, /** Calculates the minimum tow values */ + eImplicitNodeTypeMin = 25, /** Calculates the minimum of two values */ eImplicitNodeTypeMax = 26, /** Calculates the maximum of two values */ - eImplicitNodeTypeAbs = 27, /** Calcul the absolute value */ + eImplicitNodeTypeAbs = 27, /** Calculates the absolute value */ eImplicitNodeTypeFmod = 28, /** Computes the remainder of the divison of the inputs (same behavior as C fmod) */ eImplicitNodeTypePow = 29, /** Calculates the power A^B */ eImplicitNodeTypeSqrt = 30, /** Calculates the square root */ @@ -484,7 +484,7 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeLog = 32, /** Natural logarithmus */ eImplicitNodeTypeLog2 = 33, /** Logarithmus to the base 2 */ eImplicitNodeTypeLog10 = 34, /** Logarithmus to the base 10 */ - eImplicitNodeTypeSelect = 35, /** If A is less B returns C, else D */ + eImplicitNodeTypeSelect = 35, /** If A is less than B returns C, else D */ eImplicitNodeTypeClamp = 36, /** Clamps the input value to min and max */ eImplicitNodeTypeSinh = 37, /** Calculates the hyperbolic sine */ eImplicitNodeTypeCosh = 38, /** Calculates the hyperbolic cosine */ diff --git a/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.cc b/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.cc index 2bef1bdf1..e15559ef4 100644 --- a/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.cc +++ b/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.cc @@ -440,7 +440,7 @@ Lib3MFResult InitLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable) pWrapperTable->m_ImplicitFunction_AddLog10Node = NULL; pWrapperTable->m_ImplicitFunction_AddLengthNode = NULL; pWrapperTable->m_ImplicitFunction_AddTransposeNode = NULL; - pWrapperTable->m_ImplicitFunction_InverseNode = NULL; + pWrapperTable->m_ImplicitFunction_AddInverseNode = NULL; pWrapperTable->m_ImplicitFunction_AddSqrtNode = NULL; pWrapperTable->m_ImplicitFunction_AddResourceIdNode = NULL; pWrapperTable->m_ImplicitFunction_AddAdditionNode = NULL; @@ -4233,12 +4233,12 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ImplicitFunction_InverseNode = (PLib3MFImplicitFunction_InverseNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_inversenode"); + pWrapperTable->m_ImplicitFunction_AddInverseNode = (PLib3MFImplicitFunction_AddInverseNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addinversenode"); #else // _WIN32 - pWrapperTable->m_ImplicitFunction_InverseNode = (PLib3MFImplicitFunction_InverseNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_inversenode"); + pWrapperTable->m_ImplicitFunction_AddInverseNode = (PLib3MFImplicitFunction_AddInverseNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addinversenode"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ImplicitFunction_InverseNode == NULL) + if (pWrapperTable->m_ImplicitFunction_AddInverseNode == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 diff --git a/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.h b/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.h index d7fcaf59a..0211b290f 100644 --- a/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.h +++ b/Autogenerated/Bindings/CDynamic/lib3mf_dynamic.h @@ -774,7 +774,7 @@ typedef Lib3MFResult (*PLib3MFMetaDataGroup_RemoveMetaDataPtr) (Lib3MF_MetaDataG * @param[in] pName - the name of the metadata * @param[in] pValue - the value of the metadata * @param[in] pType - the type of the metadata -* @param[in] bMustPreserve - shuold the metadata be preserved +* @param[in] bMustPreserve - should the metadata be preserved * @param[out] pMetaData - a new instance of the metadata * @return error code or 0 (success) */ @@ -3495,7 +3495,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM12Ptr) (Lib3MF_ComposeM * Retrieves the input for the element 1 3 * * @param[in] pComposeMatrixNode - ComposeMatrixNode instance. -* @param[out] pM13 - the input for the m3 element +* @param[out] pM13 - the input for the m13 element * @return error code or 0 (success) */ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM13Ptr) (Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pM13); @@ -3504,7 +3504,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM13Ptr) (Lib3MF_ComposeM * Retrieves the input for the element 2 0 * * @param[in] pComposeMatrixNode - ComposeMatrixNode instance. -* @param[out] pM20 - the input for the m2 element +* @param[out] pM20 - the input for the m20 element * @return error code or 0 (success) */ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM20Ptr) (Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pM20); @@ -4284,7 +4284,7 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddTransposeNodePtr) (Lib3MF_Impl * @param[out] pNode - the added node * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFImplicitFunction_InverseNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_InverseNode * pNode); +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddInverseNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_InverseNode * pNode); /** * Add a SqrtNode @@ -6836,7 +6836,7 @@ typedef struct { PLib3MFImplicitFunction_AddLog10NodePtr m_ImplicitFunction_AddLog10Node; PLib3MFImplicitFunction_AddLengthNodePtr m_ImplicitFunction_AddLengthNode; PLib3MFImplicitFunction_AddTransposeNodePtr m_ImplicitFunction_AddTransposeNode; - PLib3MFImplicitFunction_InverseNodePtr m_ImplicitFunction_InverseNode; + PLib3MFImplicitFunction_AddInverseNodePtr m_ImplicitFunction_AddInverseNode; PLib3MFImplicitFunction_AddSqrtNodePtr m_ImplicitFunction_AddSqrtNode; PLib3MFImplicitFunction_AddResourceIdNodePtr m_ImplicitFunction_AddResourceIdNode; PLib3MFImplicitFunction_AddAdditionNodePtr m_ImplicitFunction_AddAdditionNode; diff --git a/Autogenerated/Bindings/CDynamic/lib3mf_types.h b/Autogenerated/Bindings/CDynamic/lib3mf_types.h index 696aec4eb..52b76837e 100644 --- a/Autogenerated/Bindings/CDynamic/lib3mf_types.h +++ b/Autogenerated/Bindings/CDynamic/lib3mf_types.h @@ -474,9 +474,9 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeArcCos = 22, /** Calculates the arccosinus */ eImplicitNodeTypeArcTan = 23, /** Calculates the arctangent */ eImplicitNodeTypeArcTan2 = 24, /** Calculates the arctangent */ - eImplicitNodeTypeMin = 25, /** Calculates the minimum tow values */ + eImplicitNodeTypeMin = 25, /** Calculates the minimum of two values */ eImplicitNodeTypeMax = 26, /** Calculates the maximum of two values */ - eImplicitNodeTypeAbs = 27, /** Calcul the absolute value */ + eImplicitNodeTypeAbs = 27, /** Calculates the absolute value */ eImplicitNodeTypeFmod = 28, /** Computes the remainder of the divison of the inputs (same behavior as C fmod) */ eImplicitNodeTypePow = 29, /** Calculates the power A^B */ eImplicitNodeTypeSqrt = 30, /** Calculates the square root */ @@ -484,7 +484,7 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeLog = 32, /** Natural logarithmus */ eImplicitNodeTypeLog2 = 33, /** Logarithmus to the base 2 */ eImplicitNodeTypeLog10 = 34, /** Logarithmus to the base 10 */ - eImplicitNodeTypeSelect = 35, /** If A is less B returns C, else D */ + eImplicitNodeTypeSelect = 35, /** If A is less than B returns C, else D */ eImplicitNodeTypeClamp = 36, /** Clamps the input value to min and max */ eImplicitNodeTypeSinh = 37, /** Calculates the hyperbolic sine */ eImplicitNodeTypeCosh = 38, /** Calculates the hyperbolic cosine */ diff --git a/Autogenerated/Bindings/CSharp/Lib3MF.cs b/Autogenerated/Bindings/CSharp/Lib3MF.cs index 7292de8bf..dfe4a97bc 100644 --- a/Autogenerated/Bindings/CSharp/Lib3MF.cs +++ b/Autogenerated/Bindings/CSharp/Lib3MF.cs @@ -1611,8 +1611,8 @@ public class Lib3MFWrapper [DllImport("lib3mf.dll", EntryPoint = "lib3mf_implicitfunction_addtransposenode", CallingConvention=CallingConvention.Cdecl)] public unsafe extern static Int32 ImplicitFunction_AddTransposeNode (IntPtr Handle, byte[] AIdentifier, Int32 AConfiguration, byte[] ADisplayName, byte[] ATag, out IntPtr ANode); - [DllImport("lib3mf.dll", EntryPoint = "lib3mf_implicitfunction_inversenode", CallingConvention=CallingConvention.Cdecl)] - public unsafe extern static Int32 ImplicitFunction_InverseNode (IntPtr Handle, byte[] AIdentifier, byte[] ADisplayName, byte[] ATag, out IntPtr ANode); + [DllImport("lib3mf.dll", EntryPoint = "lib3mf_implicitfunction_addinversenode", CallingConvention=CallingConvention.Cdecl)] + public unsafe extern static Int32 ImplicitFunction_AddInverseNode (IntPtr Handle, byte[] AIdentifier, byte[] ADisplayName, byte[] ATag, out IntPtr ANode); [DllImport("lib3mf.dll", EntryPoint = "lib3mf_implicitfunction_addsqrtnode", CallingConvention=CallingConvention.Cdecl)] public unsafe extern static Int32 ImplicitFunction_AddSqrtNode (IntPtr Handle, byte[] AIdentifier, Int32 AConfiguration, byte[] ADisplayName, byte[] ATag, out IntPtr ANode); @@ -7038,14 +7038,14 @@ public CTransposeNode AddTransposeNode (String AIdentifier, eImplicitNodeConfigu return Internal.Lib3MFWrapper.PolymorphicFactory(newNode); } - public CInverseNode InverseNode (String AIdentifier, String ADisplayName, String ATag) + public CInverseNode AddInverseNode (String AIdentifier, String ADisplayName, String ATag) { byte[] byteIdentifier = Encoding.UTF8.GetBytes(AIdentifier + char.MinValue); byte[] byteDisplayName = Encoding.UTF8.GetBytes(ADisplayName + char.MinValue); byte[] byteTag = Encoding.UTF8.GetBytes(ATag + char.MinValue); IntPtr newNode = IntPtr.Zero; - CheckError(Internal.Lib3MFWrapper.ImplicitFunction_InverseNode (Handle, byteIdentifier, byteDisplayName, byteTag, out newNode)); + CheckError(Internal.Lib3MFWrapper.ImplicitFunction_AddInverseNode (Handle, byteIdentifier, byteDisplayName, byteTag, out newNode)); return Internal.Lib3MFWrapper.PolymorphicFactory(newNode); } diff --git a/Autogenerated/Bindings/Cpp/lib3mf_abi.hpp b/Autogenerated/Bindings/Cpp/lib3mf_abi.hpp index f79071d19..1e3907a69 100644 --- a/Autogenerated/Bindings/Cpp/lib3mf_abi.hpp +++ b/Autogenerated/Bindings/Cpp/lib3mf_abi.hpp @@ -787,7 +787,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_metadatagroup_removemetadata(Lib3MF_MetaData * @param[in] pName - the name of the metadata * @param[in] pValue - the value of the metadata * @param[in] pType - the type of the metadata -* @param[in] bMustPreserve - shuold the metadata be preserved +* @param[in] bMustPreserve - should the metadata be preserved * @param[out] pMetaData - a new instance of the metadata * @return error code or 0 (success) */ @@ -3508,7 +3508,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getinputm12(Lib3MF_Compose * Retrieves the input for the element 1 3 * * @param[in] pComposeMatrixNode - ComposeMatrixNode instance. -* @param[out] pM13 - the input for the m3 element +* @param[out] pM13 - the input for the m13 element * @return error code or 0 (success) */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getinputm13(Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pM13); @@ -3517,7 +3517,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getinputm13(Lib3MF_Compose * Retrieves the input for the element 2 0 * * @param[in] pComposeMatrixNode - ComposeMatrixNode instance. -* @param[out] pM20 - the input for the m2 element +* @param[out] pM20 - the input for the m20 element * @return error code or 0 (success) */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getinputm20(Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pM20); @@ -4297,7 +4297,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addtransposenode(Lib3MF_Imp * @param[out] pNode - the added node * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_inversenode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_InverseNode * pNode); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addinversenode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_InverseNode * pNode); /** * Add a SqrtNode diff --git a/Autogenerated/Bindings/Cpp/lib3mf_implicit.hpp b/Autogenerated/Bindings/Cpp/lib3mf_implicit.hpp index 3865faa33..3c9781447 100644 --- a/Autogenerated/Bindings/Cpp/lib3mf_implicit.hpp +++ b/Autogenerated/Bindings/Cpp/lib3mf_implicit.hpp @@ -3020,7 +3020,7 @@ class CImplicitFunction : public CFunction { inline PLog10Node AddLog10Node(const std::string & sIdentifier, const eImplicitNodeConfiguration eConfiguration, const std::string & sDisplayName, const std::string & sTag); inline PLengthNode AddLengthNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PTransposeNode AddTransposeNode(const std::string & sIdentifier, const eImplicitNodeConfiguration eConfiguration, const std::string & sDisplayName, const std::string & sTag); - inline PInverseNode InverseNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); + inline PInverseNode AddInverseNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PSqrtNode AddSqrtNode(const std::string & sIdentifier, const eImplicitNodeConfiguration eConfiguration, const std::string & sDisplayName, const std::string & sTag); inline PResourceIdNode AddResourceIdNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PAdditionNode AddAdditionNode(const std::string & sIdentifier, const eImplicitNodeConfiguration eConfiguration, const std::string & sDisplayName, const std::string & sTag); @@ -4737,7 +4737,7 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) * @param[in] sName - the name of the metadata * @param[in] sValue - the value of the metadata * @param[in] sType - the type of the metadata - * @param[in] bMustPreserve - shuold the metadata be preserved + * @param[in] bMustPreserve - should the metadata be preserved * @return a new instance of the metadata */ PMetaData CMetaDataGroup::AddMetaData(const std::string & sNameSpace, const std::string & sName, const std::string & sValue, const std::string & sType, const bool bMustPreserve) @@ -8165,7 +8165,7 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) /** * CComposeMatrixNode::GetInputM13 - Retrieves the input for the element 1 3 - * @return the input for the m3 element + * @return the input for the m13 element */ PImplicitPort CComposeMatrixNode::GetInputM13() { @@ -8180,7 +8180,7 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) /** * CComposeMatrixNode::GetInputM20 - Retrieves the input for the element 2 0 - * @return the input for the m2 element + * @return the input for the m20 element */ PImplicitPort CComposeMatrixNode::GetInputM20() { @@ -9320,16 +9320,16 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CImplicitFunction::InverseNode - Add a InverseNode + * CImplicitFunction::AddInverseNode - Add a InverseNode * @param[in] sIdentifier - the identifier of the node * @param[in] sDisplayName - the display name of the node * @param[in] sTag - the tag of the node * @return the added node */ - PInverseNode CImplicitFunction::InverseNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) + PInverseNode CImplicitFunction::AddInverseNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) { Lib3MFHandle hNode = nullptr; - CheckError(lib3mf_implicitfunction_inversenode(m_pHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hNode)); + CheckError(lib3mf_implicitfunction_addinversenode(m_pHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hNode)); if (!hNode) { CheckError(LIB3MF_ERROR_INVALIDPARAM); diff --git a/Autogenerated/Bindings/Cpp/lib3mf_types.hpp b/Autogenerated/Bindings/Cpp/lib3mf_types.hpp index 61ecedc56..c059421a5 100644 --- a/Autogenerated/Bindings/Cpp/lib3mf_types.hpp +++ b/Autogenerated/Bindings/Cpp/lib3mf_types.hpp @@ -475,9 +475,9 @@ namespace Lib3MF { ArcCos = 22, /** Calculates the arccosinus */ ArcTan = 23, /** Calculates the arctangent */ ArcTan2 = 24, /** Calculates the arctangent */ - Min = 25, /** Calculates the minimum tow values */ + Min = 25, /** Calculates the minimum of two values */ Max = 26, /** Calculates the maximum of two values */ - Abs = 27, /** Calcul the absolute value */ + Abs = 27, /** Calculates the absolute value */ Fmod = 28, /** Computes the remainder of the divison of the inputs (same behavior as C fmod) */ Pow = 29, /** Calculates the power A^B */ Sqrt = 30, /** Calculates the square root */ @@ -485,7 +485,7 @@ namespace Lib3MF { 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 */ + Select = 35, /** If A is less than 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 */ diff --git a/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.h b/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.h index ccdbec87a..217e55618 100644 --- a/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.h +++ b/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.h @@ -774,7 +774,7 @@ typedef Lib3MFResult (*PLib3MFMetaDataGroup_RemoveMetaDataPtr) (Lib3MF_MetaDataG * @param[in] pName - the name of the metadata * @param[in] pValue - the value of the metadata * @param[in] pType - the type of the metadata -* @param[in] bMustPreserve - shuold the metadata be preserved +* @param[in] bMustPreserve - should the metadata be preserved * @param[out] pMetaData - a new instance of the metadata * @return error code or 0 (success) */ @@ -3495,7 +3495,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM12Ptr) (Lib3MF_ComposeM * Retrieves the input for the element 1 3 * * @param[in] pComposeMatrixNode - ComposeMatrixNode instance. -* @param[out] pM13 - the input for the m3 element +* @param[out] pM13 - the input for the m13 element * @return error code or 0 (success) */ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM13Ptr) (Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pM13); @@ -3504,7 +3504,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM13Ptr) (Lib3MF_ComposeM * Retrieves the input for the element 2 0 * * @param[in] pComposeMatrixNode - ComposeMatrixNode instance. -* @param[out] pM20 - the input for the m2 element +* @param[out] pM20 - the input for the m20 element * @return error code or 0 (success) */ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM20Ptr) (Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pM20); @@ -4284,7 +4284,7 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddTransposeNodePtr) (Lib3MF_Impl * @param[out] pNode - the added node * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFImplicitFunction_InverseNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_InverseNode * pNode); +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddInverseNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_InverseNode * pNode); /** * Add a SqrtNode @@ -6836,7 +6836,7 @@ typedef struct { PLib3MFImplicitFunction_AddLog10NodePtr m_ImplicitFunction_AddLog10Node; PLib3MFImplicitFunction_AddLengthNodePtr m_ImplicitFunction_AddLengthNode; PLib3MFImplicitFunction_AddTransposeNodePtr m_ImplicitFunction_AddTransposeNode; - PLib3MFImplicitFunction_InverseNodePtr m_ImplicitFunction_InverseNode; + PLib3MFImplicitFunction_AddInverseNodePtr m_ImplicitFunction_AddInverseNode; PLib3MFImplicitFunction_AddSqrtNodePtr m_ImplicitFunction_AddSqrtNode; PLib3MFImplicitFunction_AddResourceIdNodePtr m_ImplicitFunction_AddResourceIdNode; PLib3MFImplicitFunction_AddAdditionNodePtr m_ImplicitFunction_AddAdditionNode; diff --git a/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.hpp b/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.hpp index 7dd954217..9beb11a14 100644 --- a/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.hpp +++ b/Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.hpp @@ -3044,7 +3044,7 @@ class CImplicitFunction : public CFunction { inline PLog10Node AddLog10Node(const std::string & sIdentifier, const eImplicitNodeConfiguration eConfiguration, const std::string & sDisplayName, const std::string & sTag); inline PLengthNode AddLengthNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PTransposeNode AddTransposeNode(const std::string & sIdentifier, const eImplicitNodeConfiguration eConfiguration, const std::string & sDisplayName, const std::string & sTag); - inline PInverseNode InverseNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); + inline PInverseNode AddInverseNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PSqrtNode AddSqrtNode(const std::string & sIdentifier, const eImplicitNodeConfiguration eConfiguration, const std::string & sDisplayName, const std::string & sTag); inline PResourceIdNode AddResourceIdNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag); inline PAdditionNode AddAdditionNode(const std::string & sIdentifier, const eImplicitNodeConfiguration eConfiguration, const std::string & sDisplayName, const std::string & sTag); @@ -4238,7 +4238,7 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) pWrapperTable->m_ImplicitFunction_AddLog10Node = nullptr; pWrapperTable->m_ImplicitFunction_AddLengthNode = nullptr; pWrapperTable->m_ImplicitFunction_AddTransposeNode = nullptr; - pWrapperTable->m_ImplicitFunction_InverseNode = nullptr; + pWrapperTable->m_ImplicitFunction_AddInverseNode = nullptr; pWrapperTable->m_ImplicitFunction_AddSqrtNode = nullptr; pWrapperTable->m_ImplicitFunction_AddResourceIdNode = nullptr; pWrapperTable->m_ImplicitFunction_AddAdditionNode = nullptr; @@ -8027,12 +8027,12 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ImplicitFunction_InverseNode = (PLib3MFImplicitFunction_InverseNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_inversenode"); + pWrapperTable->m_ImplicitFunction_AddInverseNode = (PLib3MFImplicitFunction_AddInverseNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addinversenode"); #else // _WIN32 - pWrapperTable->m_ImplicitFunction_InverseNode = (PLib3MFImplicitFunction_InverseNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_inversenode"); + pWrapperTable->m_ImplicitFunction_AddInverseNode = (PLib3MFImplicitFunction_AddInverseNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addinversenode"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ImplicitFunction_InverseNode == nullptr) + if (pWrapperTable->m_ImplicitFunction_AddInverseNode == nullptr) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 @@ -11500,8 +11500,8 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) if ( (eLookupError != 0) || (pWrapperTable->m_ImplicitFunction_AddTransposeNode == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; - eLookupError = (*pLookup)("lib3mf_implicitfunction_inversenode", (void**)&(pWrapperTable->m_ImplicitFunction_InverseNode)); - if ( (eLookupError != 0) || (pWrapperTable->m_ImplicitFunction_InverseNode == nullptr) ) + eLookupError = (*pLookup)("lib3mf_implicitfunction_addinversenode", (void**)&(pWrapperTable->m_ImplicitFunction_AddInverseNode)); + if ( (eLookupError != 0) || (pWrapperTable->m_ImplicitFunction_AddInverseNode == nullptr) ) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; eLookupError = (*pLookup)("lib3mf_implicitfunction_addsqrtnode", (void**)&(pWrapperTable->m_ImplicitFunction_AddSqrtNode)); @@ -13265,7 +13265,7 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) * @param[in] sName - the name of the metadata * @param[in] sValue - the value of the metadata * @param[in] sType - the type of the metadata - * @param[in] bMustPreserve - shuold the metadata be preserved + * @param[in] bMustPreserve - should the metadata be preserved * @return a new instance of the metadata */ PMetaData CMetaDataGroup::AddMetaData(const std::string & sNameSpace, const std::string & sName, const std::string & sValue, const std::string & sType, const bool bMustPreserve) @@ -16693,7 +16693,7 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) /** * CComposeMatrixNode::GetInputM13 - Retrieves the input for the element 1 3 - * @return the input for the m3 element + * @return the input for the m13 element */ PImplicitPort CComposeMatrixNode::GetInputM13() { @@ -16708,7 +16708,7 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) /** * CComposeMatrixNode::GetInputM20 - Retrieves the input for the element 2 0 - * @return the input for the m2 element + * @return the input for the m20 element */ PImplicitPort CComposeMatrixNode::GetInputM20() { @@ -17848,16 +17848,16 @@ inline CBase* CWrapper::polymorphicFactory(Lib3MFHandle pHandle) } /** - * CImplicitFunction::InverseNode - Add a InverseNode + * CImplicitFunction::AddInverseNode - Add a InverseNode * @param[in] sIdentifier - the identifier of the node * @param[in] sDisplayName - the display name of the node * @param[in] sTag - the tag of the node * @return the added node */ - PInverseNode CImplicitFunction::InverseNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) + PInverseNode CImplicitFunction::AddInverseNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) { Lib3MFHandle hNode = nullptr; - CheckError(m_pWrapper->m_WrapperTable.m_ImplicitFunction_InverseNode(m_pHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hNode)); + CheckError(m_pWrapper->m_WrapperTable.m_ImplicitFunction_AddInverseNode(m_pHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hNode)); if (!hNode) { CheckError(LIB3MF_ERROR_INVALIDPARAM); diff --git a/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp b/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp index 61ecedc56..c059421a5 100644 --- a/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp +++ b/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp @@ -475,9 +475,9 @@ namespace Lib3MF { ArcCos = 22, /** Calculates the arccosinus */ ArcTan = 23, /** Calculates the arctangent */ ArcTan2 = 24, /** Calculates the arctangent */ - Min = 25, /** Calculates the minimum tow values */ + Min = 25, /** Calculates the minimum of two values */ Max = 26, /** Calculates the maximum of two values */ - Abs = 27, /** Calcul the absolute value */ + Abs = 27, /** Calculates the absolute value */ Fmod = 28, /** Computes the remainder of the divison of the inputs (same behavior as C fmod) */ Pow = 29, /** Calculates the power A^B */ Sqrt = 30, /** Calculates the square root */ @@ -485,7 +485,7 @@ namespace Lib3MF { 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 */ + Select = 35, /** If A is less than 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 */ diff --git a/Autogenerated/Bindings/Go/lib3mf.go b/Autogenerated/Bindings/Go/lib3mf.go index 7a8592b92..517c76773 100644 --- a/Autogenerated/Bindings/Go/lib3mf.go +++ b/Autogenerated/Bindings/Go/lib3mf.go @@ -3600,12 +3600,12 @@ Lib3MFResult CCall_lib3mf_implicitfunction_addtransposenode(Lib3MFHandle library } -Lib3MFResult CCall_lib3mf_implicitfunction_inversenode(Lib3MFHandle libraryHandle, Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_InverseNode * pNode) +Lib3MFResult CCall_lib3mf_implicitfunction_addinversenode(Lib3MFHandle libraryHandle, Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_InverseNode * pNode) { if (libraryHandle == 0) return LIB3MF_ERROR_INVALIDCAST; sLib3MFDynamicWrapperTable * wrapperTable = (sLib3MFDynamicWrapperTable *) libraryHandle; - return wrapperTable->m_ImplicitFunction_InverseNode (pImplicitFunction, pIdentifier, pDisplayName, pTag, pNode); + return wrapperTable->m_ImplicitFunction_AddInverseNode (pImplicitFunction, pIdentifier, pDisplayName, pTag, pNode); } @@ -11366,10 +11366,10 @@ func (inst ImplicitFunction) AddTransposeNode(identifier string, configuration I return inst.wrapperRef.NewTransposeNode(node), nil } -// InverseNode add a InverseNode. -func (inst ImplicitFunction) InverseNode(identifier string, displayName string, tag string) (InverseNode, error) { +// AddInverseNode add a InverseNode. +func (inst ImplicitFunction) AddInverseNode(identifier string, displayName string, tag string) (InverseNode, error) { var node ref - ret := C.CCall_lib3mf_implicitfunction_inversenode(inst.wrapperRef.LibraryHandle, inst.Ref, (*C.char)(unsafe.Pointer(&[]byte(identifier)[0])), (*C.char)(unsafe.Pointer(&[]byte(displayName)[0])), (*C.char)(unsafe.Pointer(&[]byte(tag)[0])), &node) + ret := C.CCall_lib3mf_implicitfunction_addinversenode(inst.wrapperRef.LibraryHandle, inst.Ref, (*C.char)(unsafe.Pointer(&[]byte(identifier)[0])), (*C.char)(unsafe.Pointer(&[]byte(displayName)[0])), (*C.char)(unsafe.Pointer(&[]byte(tag)[0])), &node) if ret != 0 { return InverseNode{}, makeError(uint32(ret)) } diff --git a/Autogenerated/Bindings/Go/lib3mf_dynamic.cc b/Autogenerated/Bindings/Go/lib3mf_dynamic.cc index 2bef1bdf1..e15559ef4 100644 --- a/Autogenerated/Bindings/Go/lib3mf_dynamic.cc +++ b/Autogenerated/Bindings/Go/lib3mf_dynamic.cc @@ -440,7 +440,7 @@ Lib3MFResult InitLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable) pWrapperTable->m_ImplicitFunction_AddLog10Node = NULL; pWrapperTable->m_ImplicitFunction_AddLengthNode = NULL; pWrapperTable->m_ImplicitFunction_AddTransposeNode = NULL; - pWrapperTable->m_ImplicitFunction_InverseNode = NULL; + pWrapperTable->m_ImplicitFunction_AddInverseNode = NULL; pWrapperTable->m_ImplicitFunction_AddSqrtNode = NULL; pWrapperTable->m_ImplicitFunction_AddResourceIdNode = NULL; pWrapperTable->m_ImplicitFunction_AddAdditionNode = NULL; @@ -4233,12 +4233,12 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ImplicitFunction_InverseNode = (PLib3MFImplicitFunction_InverseNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_inversenode"); + pWrapperTable->m_ImplicitFunction_AddInverseNode = (PLib3MFImplicitFunction_AddInverseNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addinversenode"); #else // _WIN32 - pWrapperTable->m_ImplicitFunction_InverseNode = (PLib3MFImplicitFunction_InverseNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_inversenode"); + pWrapperTable->m_ImplicitFunction_AddInverseNode = (PLib3MFImplicitFunction_AddInverseNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addinversenode"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ImplicitFunction_InverseNode == NULL) + if (pWrapperTable->m_ImplicitFunction_AddInverseNode == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 diff --git a/Autogenerated/Bindings/Go/lib3mf_dynamic.h b/Autogenerated/Bindings/Go/lib3mf_dynamic.h index d7fcaf59a..0211b290f 100644 --- a/Autogenerated/Bindings/Go/lib3mf_dynamic.h +++ b/Autogenerated/Bindings/Go/lib3mf_dynamic.h @@ -774,7 +774,7 @@ typedef Lib3MFResult (*PLib3MFMetaDataGroup_RemoveMetaDataPtr) (Lib3MF_MetaDataG * @param[in] pName - the name of the metadata * @param[in] pValue - the value of the metadata * @param[in] pType - the type of the metadata -* @param[in] bMustPreserve - shuold the metadata be preserved +* @param[in] bMustPreserve - should the metadata be preserved * @param[out] pMetaData - a new instance of the metadata * @return error code or 0 (success) */ @@ -3495,7 +3495,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM12Ptr) (Lib3MF_ComposeM * Retrieves the input for the element 1 3 * * @param[in] pComposeMatrixNode - ComposeMatrixNode instance. -* @param[out] pM13 - the input for the m3 element +* @param[out] pM13 - the input for the m13 element * @return error code or 0 (success) */ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM13Ptr) (Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pM13); @@ -3504,7 +3504,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM13Ptr) (Lib3MF_ComposeM * Retrieves the input for the element 2 0 * * @param[in] pComposeMatrixNode - ComposeMatrixNode instance. -* @param[out] pM20 - the input for the m2 element +* @param[out] pM20 - the input for the m20 element * @return error code or 0 (success) */ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM20Ptr) (Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pM20); @@ -4284,7 +4284,7 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddTransposeNodePtr) (Lib3MF_Impl * @param[out] pNode - the added node * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFImplicitFunction_InverseNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_InverseNode * pNode); +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddInverseNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_InverseNode * pNode); /** * Add a SqrtNode @@ -6836,7 +6836,7 @@ typedef struct { PLib3MFImplicitFunction_AddLog10NodePtr m_ImplicitFunction_AddLog10Node; PLib3MFImplicitFunction_AddLengthNodePtr m_ImplicitFunction_AddLengthNode; PLib3MFImplicitFunction_AddTransposeNodePtr m_ImplicitFunction_AddTransposeNode; - PLib3MFImplicitFunction_InverseNodePtr m_ImplicitFunction_InverseNode; + PLib3MFImplicitFunction_AddInverseNodePtr m_ImplicitFunction_AddInverseNode; PLib3MFImplicitFunction_AddSqrtNodePtr m_ImplicitFunction_AddSqrtNode; PLib3MFImplicitFunction_AddResourceIdNodePtr m_ImplicitFunction_AddResourceIdNode; PLib3MFImplicitFunction_AddAdditionNodePtr m_ImplicitFunction_AddAdditionNode; diff --git a/Autogenerated/Bindings/Go/lib3mf_types.h b/Autogenerated/Bindings/Go/lib3mf_types.h index 696aec4eb..52b76837e 100644 --- a/Autogenerated/Bindings/Go/lib3mf_types.h +++ b/Autogenerated/Bindings/Go/lib3mf_types.h @@ -474,9 +474,9 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeArcCos = 22, /** Calculates the arccosinus */ eImplicitNodeTypeArcTan = 23, /** Calculates the arctangent */ eImplicitNodeTypeArcTan2 = 24, /** Calculates the arctangent */ - eImplicitNodeTypeMin = 25, /** Calculates the minimum tow values */ + eImplicitNodeTypeMin = 25, /** Calculates the minimum of two values */ eImplicitNodeTypeMax = 26, /** Calculates the maximum of two values */ - eImplicitNodeTypeAbs = 27, /** Calcul the absolute value */ + eImplicitNodeTypeAbs = 27, /** Calculates the absolute value */ eImplicitNodeTypeFmod = 28, /** Computes the remainder of the divison of the inputs (same behavior as C fmod) */ eImplicitNodeTypePow = 29, /** Calculates the power A^B */ eImplicitNodeTypeSqrt = 30, /** Calculates the square root */ @@ -484,7 +484,7 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeLog = 32, /** Natural logarithmus */ eImplicitNodeTypeLog2 = 33, /** Logarithmus to the base 2 */ eImplicitNodeTypeLog10 = 34, /** Logarithmus to the base 10 */ - eImplicitNodeTypeSelect = 35, /** If A is less B returns C, else D */ + eImplicitNodeTypeSelect = 35, /** If A is less than B returns C, else D */ eImplicitNodeTypeClamp = 36, /** Clamps the input value to min and max */ eImplicitNodeTypeSinh = 37, /** Calculates the hyperbolic sine */ eImplicitNodeTypeCosh = 38, /** Calculates the hyperbolic cosine */ diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.cc b/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.cc index 2bef1bdf1..e15559ef4 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.cc +++ b/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.cc @@ -440,7 +440,7 @@ Lib3MFResult InitLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable) pWrapperTable->m_ImplicitFunction_AddLog10Node = NULL; pWrapperTable->m_ImplicitFunction_AddLengthNode = NULL; pWrapperTable->m_ImplicitFunction_AddTransposeNode = NULL; - pWrapperTable->m_ImplicitFunction_InverseNode = NULL; + pWrapperTable->m_ImplicitFunction_AddInverseNode = NULL; pWrapperTable->m_ImplicitFunction_AddSqrtNode = NULL; pWrapperTable->m_ImplicitFunction_AddResourceIdNode = NULL; pWrapperTable->m_ImplicitFunction_AddAdditionNode = NULL; @@ -4233,12 +4233,12 @@ Lib3MFResult LoadLib3MFWrapperTable(sLib3MFDynamicWrapperTable * pWrapperTable, return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 - pWrapperTable->m_ImplicitFunction_InverseNode = (PLib3MFImplicitFunction_InverseNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_inversenode"); + pWrapperTable->m_ImplicitFunction_AddInverseNode = (PLib3MFImplicitFunction_AddInverseNodePtr) GetProcAddress(hLibrary, "lib3mf_implicitfunction_addinversenode"); #else // _WIN32 - pWrapperTable->m_ImplicitFunction_InverseNode = (PLib3MFImplicitFunction_InverseNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_inversenode"); + pWrapperTable->m_ImplicitFunction_AddInverseNode = (PLib3MFImplicitFunction_AddInverseNodePtr) dlsym(hLibrary, "lib3mf_implicitfunction_addinversenode"); dlerror(); #endif // _WIN32 - if (pWrapperTable->m_ImplicitFunction_InverseNode == NULL) + if (pWrapperTable->m_ImplicitFunction_AddInverseNode == NULL) return LIB3MF_ERROR_COULDNOTFINDLIBRARYEXPORT; #ifdef _WIN32 diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.h b/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.h index d7fcaf59a..0211b290f 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.h +++ b/Autogenerated/Bindings/NodeJS/lib3mf_dynamic.h @@ -774,7 +774,7 @@ typedef Lib3MFResult (*PLib3MFMetaDataGroup_RemoveMetaDataPtr) (Lib3MF_MetaDataG * @param[in] pName - the name of the metadata * @param[in] pValue - the value of the metadata * @param[in] pType - the type of the metadata -* @param[in] bMustPreserve - shuold the metadata be preserved +* @param[in] bMustPreserve - should the metadata be preserved * @param[out] pMetaData - a new instance of the metadata * @return error code or 0 (success) */ @@ -3495,7 +3495,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM12Ptr) (Lib3MF_ComposeM * Retrieves the input for the element 1 3 * * @param[in] pComposeMatrixNode - ComposeMatrixNode instance. -* @param[out] pM13 - the input for the m3 element +* @param[out] pM13 - the input for the m13 element * @return error code or 0 (success) */ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM13Ptr) (Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pM13); @@ -3504,7 +3504,7 @@ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM13Ptr) (Lib3MF_ComposeM * Retrieves the input for the element 2 0 * * @param[in] pComposeMatrixNode - ComposeMatrixNode instance. -* @param[out] pM20 - the input for the m2 element +* @param[out] pM20 - the input for the m20 element * @return error code or 0 (success) */ typedef Lib3MFResult (*PLib3MFComposeMatrixNode_GetInputM20Ptr) (Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pM20); @@ -4284,7 +4284,7 @@ typedef Lib3MFResult (*PLib3MFImplicitFunction_AddTransposeNodePtr) (Lib3MF_Impl * @param[out] pNode - the added node * @return error code or 0 (success) */ -typedef Lib3MFResult (*PLib3MFImplicitFunction_InverseNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_InverseNode * pNode); +typedef Lib3MFResult (*PLib3MFImplicitFunction_AddInverseNodePtr) (Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_InverseNode * pNode); /** * Add a SqrtNode @@ -6836,7 +6836,7 @@ typedef struct { PLib3MFImplicitFunction_AddLog10NodePtr m_ImplicitFunction_AddLog10Node; PLib3MFImplicitFunction_AddLengthNodePtr m_ImplicitFunction_AddLengthNode; PLib3MFImplicitFunction_AddTransposeNodePtr m_ImplicitFunction_AddTransposeNode; - PLib3MFImplicitFunction_InverseNodePtr m_ImplicitFunction_InverseNode; + PLib3MFImplicitFunction_AddInverseNodePtr m_ImplicitFunction_AddInverseNode; PLib3MFImplicitFunction_AddSqrtNodePtr m_ImplicitFunction_AddSqrtNode; PLib3MFImplicitFunction_AddResourceIdNodePtr m_ImplicitFunction_AddResourceIdNode; PLib3MFImplicitFunction_AddAdditionNodePtr m_ImplicitFunction_AddAdditionNode; diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc b/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc index 2ed51aabd..daeac9334 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc +++ b/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc @@ -16411,7 +16411,7 @@ void CLib3MFImplicitFunction::Init() NODE_SET_PROTOTYPE_METHOD(tpl, "AddLog10Node", AddLog10Node); NODE_SET_PROTOTYPE_METHOD(tpl, "AddLengthNode", AddLengthNode); NODE_SET_PROTOTYPE_METHOD(tpl, "AddTransposeNode", AddTransposeNode); - NODE_SET_PROTOTYPE_METHOD(tpl, "InverseNode", InverseNode); + NODE_SET_PROTOTYPE_METHOD(tpl, "AddInverseNode", AddInverseNode); NODE_SET_PROTOTYPE_METHOD(tpl, "AddSqrtNode", AddSqrtNode); NODE_SET_PROTOTYPE_METHOD(tpl, "AddResourceIdNode", AddResourceIdNode); NODE_SET_PROTOTYPE_METHOD(tpl, "AddAdditionNode", AddAdditionNode); @@ -17454,7 +17454,7 @@ void CLib3MFImplicitFunction::AddTransposeNode(const FunctionCallbackInfo } -void CLib3MFImplicitFunction::InverseNode(const FunctionCallbackInfo& args) +void CLib3MFImplicitFunction::AddInverseNode(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); HandleScope scope(isolate); @@ -17477,11 +17477,11 @@ void CLib3MFImplicitFunction::InverseNode(const FunctionCallbackInfo& arg Lib3MFHandle hReturnNode = nullptr; sLib3MFDynamicWrapperTable * wrapperTable = CLib3MFBaseClass::getDynamicWrapperTable(args.Holder()); if (wrapperTable == nullptr) - throw std::runtime_error("Could not get wrapper table for Lib3MF method InverseNode."); - if (wrapperTable->m_ImplicitFunction_InverseNode == nullptr) - throw std::runtime_error("Could not call Lib3MF method ImplicitFunction::InverseNode."); + throw std::runtime_error("Could not get wrapper table for Lib3MF method AddInverseNode."); + if (wrapperTable->m_ImplicitFunction_AddInverseNode == nullptr) + throw std::runtime_error("Could not call Lib3MF method ImplicitFunction::AddInverseNode."); Lib3MFHandle instanceHandle = CLib3MFBaseClass::getHandle(args.Holder()); - Lib3MFResult errorCode = wrapperTable->m_ImplicitFunction_InverseNode(instanceHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hReturnNode); + Lib3MFResult errorCode = wrapperTable->m_ImplicitFunction_AddInverseNode(instanceHandle, sIdentifier.c_str(), sDisplayName.c_str(), sTag.c_str(), &hReturnNode); CheckError(isolate, wrapperTable, instanceHandle, errorCode); Local instanceObjNode = CLib3MFInverseNode::NewInstance(args.Holder(), hReturnNode); args.GetReturnValue().Set(instanceObjNode); diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.h b/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.h index bbc2e8ffc..abc0e0a7f 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.h +++ b/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.h @@ -2202,7 +2202,7 @@ class CLib3MFImplicitFunction : public CLib3MFBaseClass { static void AddLog10Node(const v8::FunctionCallbackInfo& args); static void AddLengthNode(const v8::FunctionCallbackInfo& args); static void AddTransposeNode(const v8::FunctionCallbackInfo& args); - static void InverseNode(const v8::FunctionCallbackInfo& args); + static void AddInverseNode(const v8::FunctionCallbackInfo& args); static void AddSqrtNode(const v8::FunctionCallbackInfo& args); static void AddResourceIdNode(const v8::FunctionCallbackInfo& args); static void AddAdditionNode(const v8::FunctionCallbackInfo& args); diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_types.h b/Autogenerated/Bindings/NodeJS/lib3mf_types.h index 696aec4eb..52b76837e 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_types.h +++ b/Autogenerated/Bindings/NodeJS/lib3mf_types.h @@ -474,9 +474,9 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeArcCos = 22, /** Calculates the arccosinus */ eImplicitNodeTypeArcTan = 23, /** Calculates the arctangent */ eImplicitNodeTypeArcTan2 = 24, /** Calculates the arctangent */ - eImplicitNodeTypeMin = 25, /** Calculates the minimum tow values */ + eImplicitNodeTypeMin = 25, /** Calculates the minimum of two values */ eImplicitNodeTypeMax = 26, /** Calculates the maximum of two values */ - eImplicitNodeTypeAbs = 27, /** Calcul the absolute value */ + eImplicitNodeTypeAbs = 27, /** Calculates the absolute value */ eImplicitNodeTypeFmod = 28, /** Computes the remainder of the divison of the inputs (same behavior as C fmod) */ eImplicitNodeTypePow = 29, /** Calculates the power A^B */ eImplicitNodeTypeSqrt = 30, /** Calculates the square root */ @@ -484,7 +484,7 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeLog = 32, /** Natural logarithmus */ eImplicitNodeTypeLog2 = 33, /** Logarithmus to the base 2 */ eImplicitNodeTypeLog10 = 34, /** Logarithmus to the base 10 */ - eImplicitNodeTypeSelect = 35, /** If A is less B returns C, else D */ + eImplicitNodeTypeSelect = 35, /** If A is less than B returns C, else D */ eImplicitNodeTypeClamp = 36, /** Clamps the input value to min and max */ eImplicitNodeTypeSinh = 37, /** Calculates the hyperbolic sine */ eImplicitNodeTypeCosh = 38, /** Calculates the hyperbolic cosine */ diff --git a/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas b/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas index fdb5e2256..db3e9db51 100644 --- a/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas +++ b/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas @@ -1344,7 +1344,7 @@ TLib3MFModel = class; * @param[in] pName - the name of the metadata * @param[in] pValue - the value of the metadata * @param[in] pType - the type of the metadata - * @param[in] bMustPreserve - shuold the metadata be preserved + * @param[in] bMustPreserve - should the metadata be preserved * @param[out] pMetaData - a new instance of the metadata * @return error code or 0 (success) *) @@ -4136,7 +4136,7 @@ TLib3MFModel = class; * Retrieves the input for the element 1 3 * * @param[in] pComposeMatrixNode - ComposeMatrixNode instance. - * @param[out] pM13 - the input for the m3 element + * @param[out] pM13 - the input for the m13 element * @return error code or 0 (success) *) TLib3MFComposeMatrixNode_GetInputM13Func = function(pComposeMatrixNode: TLib3MFHandle; out pM13: TLib3MFHandle): TLib3MFResult; cdecl; @@ -4145,7 +4145,7 @@ TLib3MFModel = class; * Retrieves the input for the element 2 0 * * @param[in] pComposeMatrixNode - ComposeMatrixNode instance. - * @param[out] pM20 - the input for the m2 element + * @param[out] pM20 - the input for the m20 element * @return error code or 0 (success) *) TLib3MFComposeMatrixNode_GetInputM20Func = function(pComposeMatrixNode: TLib3MFHandle; out pM20: TLib3MFHandle): TLib3MFResult; cdecl; @@ -4936,7 +4936,7 @@ TLib3MFModel = class; * @param[out] pNode - the added node * @return error code or 0 (success) *) - TLib3MFImplicitFunction_InverseNodeFunc = function(pImplicitFunction: TLib3MFHandle; const pIdentifier: PAnsiChar; const pDisplayName: PAnsiChar; const pTag: PAnsiChar; out pNode: TLib3MFHandle): TLib3MFResult; cdecl; + TLib3MFImplicitFunction_AddInverseNodeFunc = function(pImplicitFunction: TLib3MFHandle; const pIdentifier: PAnsiChar; const pDisplayName: PAnsiChar; const pTag: PAnsiChar; out pNode: TLib3MFHandle): TLib3MFResult; cdecl; (** * Add a SqrtNode @@ -8650,7 +8650,7 @@ TLib3MFImplicitFunction = class(TLib3MFFunction) function AddLog10Node(const AIdentifier: String; const AConfiguration: TLib3MFImplicitNodeConfiguration; const ADisplayName: String; const ATag: String): TLib3MFLog10Node; function AddLengthNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFLengthNode; function AddTransposeNode(const AIdentifier: String; const AConfiguration: TLib3MFImplicitNodeConfiguration; const ADisplayName: String; const ATag: String): TLib3MFTransposeNode; - function InverseNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFInverseNode; + function AddInverseNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFInverseNode; function AddSqrtNode(const AIdentifier: String; const AConfiguration: TLib3MFImplicitNodeConfiguration; const ADisplayName: String; const ATag: String): TLib3MFSqrtNode; function AddResourceIdNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFResourceIdNode; function AddAdditionNode(const AIdentifier: String; const AConfiguration: TLib3MFImplicitNodeConfiguration; const ADisplayName: String; const ATag: String): TLib3MFAdditionNode; @@ -9374,7 +9374,7 @@ TLib3MFWrapper = class(TObject) FLib3MFImplicitFunction_AddLog10NodeFunc: TLib3MFImplicitFunction_AddLog10NodeFunc; FLib3MFImplicitFunction_AddLengthNodeFunc: TLib3MFImplicitFunction_AddLengthNodeFunc; FLib3MFImplicitFunction_AddTransposeNodeFunc: TLib3MFImplicitFunction_AddTransposeNodeFunc; - FLib3MFImplicitFunction_InverseNodeFunc: TLib3MFImplicitFunction_InverseNodeFunc; + FLib3MFImplicitFunction_AddInverseNodeFunc: TLib3MFImplicitFunction_AddInverseNodeFunc; FLib3MFImplicitFunction_AddSqrtNodeFunc: TLib3MFImplicitFunction_AddSqrtNodeFunc; FLib3MFImplicitFunction_AddResourceIdNodeFunc: TLib3MFImplicitFunction_AddResourceIdNodeFunc; FLib3MFImplicitFunction_AddAdditionNodeFunc: TLib3MFImplicitFunction_AddAdditionNodeFunc; @@ -9986,7 +9986,7 @@ TLib3MFWrapper = class(TObject) property Lib3MFImplicitFunction_AddLog10NodeFunc: TLib3MFImplicitFunction_AddLog10NodeFunc read FLib3MFImplicitFunction_AddLog10NodeFunc; property Lib3MFImplicitFunction_AddLengthNodeFunc: TLib3MFImplicitFunction_AddLengthNodeFunc read FLib3MFImplicitFunction_AddLengthNodeFunc; property Lib3MFImplicitFunction_AddTransposeNodeFunc: TLib3MFImplicitFunction_AddTransposeNodeFunc read FLib3MFImplicitFunction_AddTransposeNodeFunc; - property Lib3MFImplicitFunction_InverseNodeFunc: TLib3MFImplicitFunction_InverseNodeFunc read FLib3MFImplicitFunction_InverseNodeFunc; + property Lib3MFImplicitFunction_AddInverseNodeFunc: TLib3MFImplicitFunction_AddInverseNodeFunc read FLib3MFImplicitFunction_AddInverseNodeFunc; property Lib3MFImplicitFunction_AddSqrtNodeFunc: TLib3MFImplicitFunction_AddSqrtNodeFunc read FLib3MFImplicitFunction_AddSqrtNodeFunc; property Lib3MFImplicitFunction_AddResourceIdNodeFunc: TLib3MFImplicitFunction_AddResourceIdNodeFunc read FLib3MFImplicitFunction_AddResourceIdNodeFunc; property Lib3MFImplicitFunction_AddAdditionNodeFunc: TLib3MFImplicitFunction_AddAdditionNodeFunc read FLib3MFImplicitFunction_AddAdditionNodeFunc; @@ -16763,13 +16763,13 @@ implementation Result := TLib3MFPolymorphicFactory.Make(FWrapper, HNode); end; - function TLib3MFImplicitFunction.InverseNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFInverseNode; + function TLib3MFImplicitFunction.AddInverseNode(const AIdentifier: String; const ADisplayName: String; const ATag: String): TLib3MFInverseNode; var HNode: TLib3MFHandle; begin Result := nil; HNode := nil; - FWrapper.CheckError(Self, FWrapper.Lib3MFImplicitFunction_InverseNodeFunc(FHandle, PAnsiChar(AIdentifier), PAnsiChar(ADisplayName), PAnsiChar(ATag), HNode)); + FWrapper.CheckError(Self, FWrapper.Lib3MFImplicitFunction_AddInverseNodeFunc(FHandle, PAnsiChar(AIdentifier), PAnsiChar(ADisplayName), PAnsiChar(ATag), HNode)); if Assigned(HNode) then Result := TLib3MFPolymorphicFactory.Make(FWrapper, HNode); end; @@ -19331,7 +19331,7 @@ implementation FLib3MFImplicitFunction_AddLog10NodeFunc := LoadFunction('lib3mf_implicitfunction_addlog10node'); FLib3MFImplicitFunction_AddLengthNodeFunc := LoadFunction('lib3mf_implicitfunction_addlengthnode'); FLib3MFImplicitFunction_AddTransposeNodeFunc := LoadFunction('lib3mf_implicitfunction_addtransposenode'); - FLib3MFImplicitFunction_InverseNodeFunc := LoadFunction('lib3mf_implicitfunction_inversenode'); + FLib3MFImplicitFunction_AddInverseNodeFunc := LoadFunction('lib3mf_implicitfunction_addinversenode'); FLib3MFImplicitFunction_AddSqrtNodeFunc := LoadFunction('lib3mf_implicitfunction_addsqrtnode'); FLib3MFImplicitFunction_AddResourceIdNodeFunc := LoadFunction('lib3mf_implicitfunction_addresourceidnode'); FLib3MFImplicitFunction_AddAdditionNodeFunc := LoadFunction('lib3mf_implicitfunction_addadditionnode'); @@ -20728,7 +20728,7 @@ implementation AResult := ALookupMethod(PAnsiChar('lib3mf_implicitfunction_addtransposenode'), @FLib3MFImplicitFunction_AddTransposeNodeFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); - AResult := ALookupMethod(PAnsiChar('lib3mf_implicitfunction_inversenode'), @FLib3MFImplicitFunction_InverseNodeFunc); + AResult := ALookupMethod(PAnsiChar('lib3mf_implicitfunction_addinversenode'), @FLib3MFImplicitFunction_AddInverseNodeFunc); if AResult <> LIB3MF_SUCCESS then raise ELib3MFException.CreateCustomMessage(LIB3MF_ERROR_COULDNOTLOADLIBRARY, ''); AResult := ALookupMethod(PAnsiChar('lib3mf_implicitfunction_addsqrtnode'), @FLib3MFImplicitFunction_AddSqrtNodeFunc); diff --git a/Autogenerated/Bindings/Python/Lib3MF.py b/Autogenerated/Bindings/Python/Lib3MF.py index e3d29b734..8c37925cf 100644 --- a/Autogenerated/Bindings/Python/Lib3MF.py +++ b/Autogenerated/Bindings/Python/Lib3MF.py @@ -527,7 +527,7 @@ class FunctionTable: lib3mf_implicitfunction_addlog10node = None lib3mf_implicitfunction_addlengthnode = None lib3mf_implicitfunction_addtransposenode = None - lib3mf_implicitfunction_inversenode = None + lib3mf_implicitfunction_addinversenode = None lib3mf_implicitfunction_addsqrtnode = None lib3mf_implicitfunction_addresourceidnode = None lib3mf_implicitfunction_addadditionnode = None @@ -3594,11 +3594,11 @@ def _loadFunctionTableFromMethod(self, symbolLookupMethodAddress): methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.c_char_p, ImplicitNodeConfiguration, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)) self.lib.lib3mf_implicitfunction_addtransposenode = methodType(int(methodAddress.value)) - err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_implicitfunction_inversenode")), methodAddress) + err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_implicitfunction_addinversenode")), methodAddress) if err != 0: raise ELib3MFException(ErrorCodes.COULDNOTLOADLIBRARY, str(err)) methodType = ctypes.CFUNCTYPE(ctypes.c_int32, ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)) - self.lib.lib3mf_implicitfunction_inversenode = methodType(int(methodAddress.value)) + self.lib.lib3mf_implicitfunction_addinversenode = methodType(int(methodAddress.value)) err = symbolLookupMethod(ctypes.c_char_p(str.encode("lib3mf_implicitfunction_addsqrtnode")), methodAddress) if err != 0: @@ -5978,8 +5978,8 @@ def _loadFunctionTable(self): self.lib.lib3mf_implicitfunction_addtransposenode.restype = ctypes.c_int32 self.lib.lib3mf_implicitfunction_addtransposenode.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ImplicitNodeConfiguration, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)] - self.lib.lib3mf_implicitfunction_inversenode.restype = ctypes.c_int32 - self.lib.lib3mf_implicitfunction_inversenode.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)] + self.lib.lib3mf_implicitfunction_addinversenode.restype = ctypes.c_int32 + self.lib.lib3mf_implicitfunction_addinversenode.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)] self.lib.lib3mf_implicitfunction_addsqrtnode.restype = ctypes.c_int32 self.lib.lib3mf_implicitfunction_addsqrtnode.argtypes = [ctypes.c_void_p, ctypes.c_char_p, ImplicitNodeConfiguration, ctypes.c_char_p, ctypes.c_char_p, ctypes.POINTER(ctypes.c_void_p)] @@ -10950,12 +10950,12 @@ def AddTransposeNode(self, Identifier, Configuration, DisplayName, Tag): return NodeObject - def InverseNode(self, Identifier, DisplayName, Tag): + def AddInverseNode(self, Identifier, DisplayName, Tag): pIdentifier = ctypes.c_char_p(str.encode(Identifier)) pDisplayName = ctypes.c_char_p(str.encode(DisplayName)) pTag = ctypes.c_char_p(str.encode(Tag)) NodeHandle = ctypes.c_void_p() - self._wrapper.checkError(self, self._wrapper.lib.lib3mf_implicitfunction_inversenode(self._handle, pIdentifier, pDisplayName, pTag, NodeHandle)) + self._wrapper.checkError(self, self._wrapper.lib.lib3mf_implicitfunction_addinversenode(self._handle, pIdentifier, pDisplayName, pTag, NodeHandle)) if NodeHandle: NodeObject = self._wrapper._polymorphicFactory(NodeHandle) else: diff --git a/Autogenerated/Source/lib3mf_abi.hpp b/Autogenerated/Source/lib3mf_abi.hpp index f79071d19..1e3907a69 100644 --- a/Autogenerated/Source/lib3mf_abi.hpp +++ b/Autogenerated/Source/lib3mf_abi.hpp @@ -787,7 +787,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_metadatagroup_removemetadata(Lib3MF_MetaData * @param[in] pName - the name of the metadata * @param[in] pValue - the value of the metadata * @param[in] pType - the type of the metadata -* @param[in] bMustPreserve - shuold the metadata be preserved +* @param[in] bMustPreserve - should the metadata be preserved * @param[out] pMetaData - a new instance of the metadata * @return error code or 0 (success) */ @@ -3508,7 +3508,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getinputm12(Lib3MF_Compose * Retrieves the input for the element 1 3 * * @param[in] pComposeMatrixNode - ComposeMatrixNode instance. -* @param[out] pM13 - the input for the m3 element +* @param[out] pM13 - the input for the m13 element * @return error code or 0 (success) */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getinputm13(Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pM13); @@ -3517,7 +3517,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getinputm13(Lib3MF_Compose * Retrieves the input for the element 2 0 * * @param[in] pComposeMatrixNode - ComposeMatrixNode instance. -* @param[out] pM20 - the input for the m2 element +* @param[out] pM20 - the input for the m20 element * @return error code or 0 (success) */ LIB3MF_DECLSPEC Lib3MFResult lib3mf_composematrixnode_getinputm20(Lib3MF_ComposeMatrixNode pComposeMatrixNode, Lib3MF_ImplicitPort * pM20); @@ -4297,7 +4297,7 @@ LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addtransposenode(Lib3MF_Imp * @param[out] pNode - the added node * @return error code or 0 (success) */ -LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_inversenode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_InverseNode * pNode); +LIB3MF_DECLSPEC Lib3MFResult lib3mf_implicitfunction_addinversenode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_InverseNode * pNode); /** * Add a SqrtNode diff --git a/Autogenerated/Source/lib3mf_interfaces.hpp b/Autogenerated/Source/lib3mf_interfaces.hpp index dfda93cea..ac3083443 100644 --- a/Autogenerated/Source/lib3mf_interfaces.hpp +++ b/Autogenerated/Source/lib3mf_interfaces.hpp @@ -1192,7 +1192,7 @@ class IMetaDataGroup : public virtual IBase { * @param[in] sName - the name of the metadata * @param[in] sValue - the value of the metadata * @param[in] sType - the type of the metadata - * @param[in] bMustPreserve - shuold the metadata be preserved + * @param[in] bMustPreserve - should the metadata be preserved * @return a new instance of the metadata */ virtual IMetaData * AddMetaData(const std::string & sNameSpace, const std::string & sName, const std::string & sValue, const std::string & sType, const bool bMustPreserve) = 0; @@ -4249,13 +4249,13 @@ class IComposeMatrixNode : public virtual IImplicitNode { /** * IComposeMatrixNode::GetInputM13 - Retrieves the input for the element 1 3 - * @return the input for the m3 element + * @return the input for the m13 element */ virtual IImplicitPort * GetInputM13() = 0; /** * IComposeMatrixNode::GetInputM20 - Retrieves the input for the element 2 0 - * @return the input for the m2 element + * @return the input for the m20 element */ virtual IImplicitPort * GetInputM20() = 0; @@ -4990,13 +4990,13 @@ class IImplicitFunction : public virtual IFunction { virtual ITransposeNode * AddTransposeNode(const std::string & sIdentifier, const Lib3MF::eImplicitNodeConfiguration eConfiguration, const std::string & sDisplayName, const std::string & sTag) = 0; /** - * IImplicitFunction::InverseNode - Add a InverseNode + * IImplicitFunction::AddInverseNode - Add a InverseNode * @param[in] sIdentifier - the identifier of the node * @param[in] sDisplayName - the display name of the node * @param[in] sTag - the tag of the node * @return the added node */ - virtual IInverseNode * InverseNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) = 0; + virtual IInverseNode * AddInverseNode(const std::string & sIdentifier, const std::string & sDisplayName, const std::string & sTag) = 0; /** * IImplicitFunction::AddSqrtNode - Add a SqrtNode diff --git a/Autogenerated/Source/lib3mf_interfacewrapper.cpp b/Autogenerated/Source/lib3mf_interfacewrapper.cpp index c4e50c07e..183e16f8e 100644 --- a/Autogenerated/Source/lib3mf_interfacewrapper.cpp +++ b/Autogenerated/Source/lib3mf_interfacewrapper.cpp @@ -15127,14 +15127,14 @@ Lib3MFResult lib3mf_implicitfunction_addtransposenode(Lib3MF_ImplicitFunction pI } } -Lib3MFResult lib3mf_implicitfunction_inversenode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_InverseNode * pNode) +Lib3MFResult lib3mf_implicitfunction_addinversenode(Lib3MF_ImplicitFunction pImplicitFunction, const char * pIdentifier, const char * pDisplayName, const char * pTag, Lib3MF_InverseNode * pNode) { IBase* pIBaseClass = (IBase *)pImplicitFunction; PLib3MFInterfaceJournalEntry pJournalEntry; try { if (m_GlobalJournal.get() != nullptr) { - pJournalEntry = m_GlobalJournal->beginClassMethod(pImplicitFunction, "ImplicitFunction", "InverseNode"); + pJournalEntry = m_GlobalJournal->beginClassMethod(pImplicitFunction, "ImplicitFunction", "AddInverseNode"); pJournalEntry->addStringParameter("Identifier", pIdentifier); pJournalEntry->addStringParameter("DisplayName", pDisplayName); pJournalEntry->addStringParameter("Tag", pTag); @@ -15155,7 +15155,7 @@ Lib3MFResult lib3mf_implicitfunction_inversenode(Lib3MF_ImplicitFunction pImplic if (!pIImplicitFunction) throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDCAST); - pBaseNode = pIImplicitFunction->InverseNode(sIdentifier, sDisplayName, sTag); + pBaseNode = pIImplicitFunction->AddInverseNode(sIdentifier, sDisplayName, sTag); *pNode = (IBase*)(pBaseNode); if (pJournalEntry.get() != nullptr) { @@ -23443,8 +23443,8 @@ Lib3MFResult Lib3MF::Impl::Lib3MF_GetProcAddress (const char * pProcName, void * *ppProcAddress = (void*) &lib3mf_implicitfunction_addlengthnode; if (sProcName == "lib3mf_implicitfunction_addtransposenode") *ppProcAddress = (void*) &lib3mf_implicitfunction_addtransposenode; - if (sProcName == "lib3mf_implicitfunction_inversenode") - *ppProcAddress = (void*) &lib3mf_implicitfunction_inversenode; + if (sProcName == "lib3mf_implicitfunction_addinversenode") + *ppProcAddress = (void*) &lib3mf_implicitfunction_addinversenode; if (sProcName == "lib3mf_implicitfunction_addsqrtnode") *ppProcAddress = (void*) &lib3mf_implicitfunction_addsqrtnode; if (sProcName == "lib3mf_implicitfunction_addresourceidnode") diff --git a/Autogenerated/Source/lib3mf_types.hpp b/Autogenerated/Source/lib3mf_types.hpp index 61ecedc56..c059421a5 100644 --- a/Autogenerated/Source/lib3mf_types.hpp +++ b/Autogenerated/Source/lib3mf_types.hpp @@ -475,9 +475,9 @@ namespace Lib3MF { ArcCos = 22, /** Calculates the arccosinus */ ArcTan = 23, /** Calculates the arctangent */ ArcTan2 = 24, /** Calculates the arctangent */ - Min = 25, /** Calculates the minimum tow values */ + Min = 25, /** Calculates the minimum of two values */ Max = 26, /** Calculates the maximum of two values */ - Abs = 27, /** Calcul the absolute value */ + Abs = 27, /** Calculates the absolute value */ Fmod = 28, /** Computes the remainder of the divison of the inputs (same behavior as C fmod) */ Pow = 29, /** Calculates the power A^B */ Sqrt = 30, /** Calculates the square root */ @@ -485,7 +485,7 @@ namespace Lib3MF { 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 */ + Select = 35, /** If A is less than 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 */ diff --git a/AutomaticComponentToolkit/lib3mf.xml b/AutomaticComponentToolkit/lib3mf.xml index d08606821..170a50240 100644 --- a/AutomaticComponentToolkit/lib3mf.xml +++ b/AutomaticComponentToolkit/lib3mf.xml @@ -749,7 +749,7 @@ + description="should the metadata be preserved" /> @@ -1888,9 +1888,9 @@