From 2a1febf29ea03a2016afd3b95ad36ed33b751d77 Mon Sep 17 00:00:00 2001 From: Jan Orend <56254096+3dJan@users.noreply.github.com> Date: Fri, 7 Jun 2024 13:24:59 +0200 Subject: [PATCH 1/2] Resource -> ConstResourceID --- Autogenerated/Bindings/C/lib3mf_types.h | 2 +- Autogenerated/Bindings/CDynamic/lib3mf_types.h | 2 +- Autogenerated/Bindings/CSharp/Lib3MF.cs | 2 +- Autogenerated/Bindings/Cpp/lib3mf_types.hpp | 2 +- Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp | 2 +- Autogenerated/Bindings/Go/lib3mf.go | 2 +- Autogenerated/Bindings/Go/lib3mf_types.h | 2 +- Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc | 2 +- Autogenerated/Bindings/NodeJS/lib3mf_types.h | 2 +- Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas | 6 +++--- Autogenerated/Bindings/Python/Lib3MF.py | 2 +- Autogenerated/Source/lib3mf_types.hpp | 2 +- AutomaticComponentToolkit/lib3mf.xml | 2 +- Source/API/lib3mf_implicitfunction.cpp | 2 +- Source/API/lib3mf_nodeiterator.cpp | 2 +- Source/Model/Classes/NMR_ImplicitNodeTypes.cpp | 4 ++-- Source/Model/Classes/NMR_Model.cpp | 2 +- Source/Model/Classes/NMR_ModelImplicitNode.cpp | 4 ++-- .../Volumetric2201/NMR_ModelReaderNode_Implicit_Node.cpp | 2 +- Source/Model/Writer/NMR_ModelWriterNode_Implicit.cpp | 4 ++-- 20 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Autogenerated/Bindings/C/lib3mf_types.h b/Autogenerated/Bindings/C/lib3mf_types.h index 497ede263..47bb640bc 100644 --- a/Autogenerated/Bindings/C/lib3mf_types.h +++ b/Autogenerated/Bindings/C/lib3mf_types.h @@ -497,7 +497,7 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeFunctionCall = 45, /** Calls a function */ eImplicitNodeTypeMesh = 46, /** Calculates the signed distance to a mesh */ eImplicitNodeTypeLength = 47, /** Calculates the length of a vector */ - eImplicitNodeTypeResource = 48, /** Selects a resource (function, mesh etc.) */ + eImplicitNodeTypeConstResourceID = 48, /** Selects a resource (function, mesh etc.) */ eImplicitNodeTypeVectorFromScalar = 49, /** Creates a vector from one scalar values */ eImplicitNodeTypeUnsignedMesh = 50, /** Calculates the unsigned distance to a mesh */ eImplicitNodeTypeMod = 51 /** Calculates the modulo of two values (same behaviour as glsl mod) */ diff --git a/Autogenerated/Bindings/CDynamic/lib3mf_types.h b/Autogenerated/Bindings/CDynamic/lib3mf_types.h index 497ede263..47bb640bc 100644 --- a/Autogenerated/Bindings/CDynamic/lib3mf_types.h +++ b/Autogenerated/Bindings/CDynamic/lib3mf_types.h @@ -497,7 +497,7 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeFunctionCall = 45, /** Calls a function */ eImplicitNodeTypeMesh = 46, /** Calculates the signed distance to a mesh */ eImplicitNodeTypeLength = 47, /** Calculates the length of a vector */ - eImplicitNodeTypeResource = 48, /** Selects a resource (function, mesh etc.) */ + eImplicitNodeTypeConstResourceID = 48, /** Selects a resource (function, mesh etc.) */ eImplicitNodeTypeVectorFromScalar = 49, /** Creates a vector from one scalar values */ eImplicitNodeTypeUnsignedMesh = 50, /** Calculates the unsigned distance to a mesh */ eImplicitNodeTypeMod = 51 /** Calculates the modulo of two values (same behaviour as glsl mod) */ diff --git a/Autogenerated/Bindings/CSharp/Lib3MF.cs b/Autogenerated/Bindings/CSharp/Lib3MF.cs index f5161a8c1..26c4261c4 100644 --- a/Autogenerated/Bindings/CSharp/Lib3MF.cs +++ b/Autogenerated/Bindings/CSharp/Lib3MF.cs @@ -207,7 +207,7 @@ public enum eImplicitNodeType { FunctionCall = 45, Mesh = 46, Length = 47, - Resource = 48, + ConstResourceID = 48, VectorFromScalar = 49, UnsignedMesh = 50, Mod = 51 diff --git a/Autogenerated/Bindings/Cpp/lib3mf_types.hpp b/Autogenerated/Bindings/Cpp/lib3mf_types.hpp index e3ab36dbb..c1a1b6ffc 100644 --- a/Autogenerated/Bindings/Cpp/lib3mf_types.hpp +++ b/Autogenerated/Bindings/Cpp/lib3mf_types.hpp @@ -498,7 +498,7 @@ namespace Lib3MF { FunctionCall = 45, /** Calls a function */ Mesh = 46, /** Calculates the signed distance to a mesh */ Length = 47, /** Calculates the length of a vector */ - Resource = 48, /** Selects a resource (function, mesh etc.) */ + ConstResourceID = 48, /** Selects a resource (function, mesh etc.) */ VectorFromScalar = 49, /** Creates a vector from one scalar values */ UnsignedMesh = 50, /** Calculates the unsigned distance to a mesh */ Mod = 51 /** Calculates the modulo of two values (same behaviour as glsl mod) */ diff --git a/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp b/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp index e3ab36dbb..c1a1b6ffc 100644 --- a/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp +++ b/Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp @@ -498,7 +498,7 @@ namespace Lib3MF { FunctionCall = 45, /** Calls a function */ Mesh = 46, /** Calculates the signed distance to a mesh */ Length = 47, /** Calculates the length of a vector */ - Resource = 48, /** Selects a resource (function, mesh etc.) */ + ConstResourceID = 48, /** Selects a resource (function, mesh etc.) */ VectorFromScalar = 49, /** Creates a vector from one scalar values */ UnsignedMesh = 50, /** Calculates the unsigned distance to a mesh */ Mod = 51 /** Calculates the modulo of two values (same behaviour as glsl mod) */ diff --git a/Autogenerated/Bindings/Go/lib3mf.go b/Autogenerated/Bindings/Go/lib3mf.go index 58256e1b7..19e20ce2e 100644 --- a/Autogenerated/Bindings/Go/lib3mf.go +++ b/Autogenerated/Bindings/Go/lib3mf.go @@ -5708,7 +5708,7 @@ const ( ImplicitNodeType_FunctionCall = 45 ImplicitNodeType_Mesh = 46 ImplicitNodeType_Length = 47 - ImplicitNodeType_Resource = 48 + ImplicitNodeType_ConstResourceID = 48 ImplicitNodeType_VectorFromScalar = 49 ImplicitNodeType_UnsignedMesh = 50 ImplicitNodeType_Mod = 51 diff --git a/Autogenerated/Bindings/Go/lib3mf_types.h b/Autogenerated/Bindings/Go/lib3mf_types.h index 497ede263..47bb640bc 100644 --- a/Autogenerated/Bindings/Go/lib3mf_types.h +++ b/Autogenerated/Bindings/Go/lib3mf_types.h @@ -497,7 +497,7 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeFunctionCall = 45, /** Calls a function */ eImplicitNodeTypeMesh = 46, /** Calculates the signed distance to a mesh */ eImplicitNodeTypeLength = 47, /** Calculates the length of a vector */ - eImplicitNodeTypeResource = 48, /** Selects a resource (function, mesh etc.) */ + eImplicitNodeTypeConstResourceID = 48, /** Selects a resource (function, mesh etc.) */ eImplicitNodeTypeVectorFromScalar = 49, /** Creates a vector from one scalar values */ eImplicitNodeTypeUnsignedMesh = 50, /** Calculates the unsigned distance to a mesh */ eImplicitNodeTypeMod = 51 /** Calculates the modulo of two values (same behaviour as glsl mod) */ diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc b/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc index 1f84240bc..7072a898c 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc +++ b/Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc @@ -23676,7 +23676,7 @@ void CLib3MFWrapper::New(const FunctionCallbackInfo& args) newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_FunctionCall"), Integer::New(isolate, 45)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_Mesh"), Integer::New(isolate, 46)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_Length"), Integer::New(isolate, 47)); - newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_Resource"), Integer::New(isolate, 48)); + newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_ConstResourceID"), Integer::New(isolate, 48)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_VectorFromScalar"), Integer::New(isolate, 49)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_UnsignedMesh"), Integer::New(isolate, 50)); newObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "eImplicitNodeType_Mod"), Integer::New(isolate, 51)); diff --git a/Autogenerated/Bindings/NodeJS/lib3mf_types.h b/Autogenerated/Bindings/NodeJS/lib3mf_types.h index 497ede263..47bb640bc 100644 --- a/Autogenerated/Bindings/NodeJS/lib3mf_types.h +++ b/Autogenerated/Bindings/NodeJS/lib3mf_types.h @@ -497,7 +497,7 @@ typedef enum eLib3MFImplicitNodeType { eImplicitNodeTypeFunctionCall = 45, /** Calls a function */ eImplicitNodeTypeMesh = 46, /** Calculates the signed distance to a mesh */ eImplicitNodeTypeLength = 47, /** Calculates the length of a vector */ - eImplicitNodeTypeResource = 48, /** Selects a resource (function, mesh etc.) */ + eImplicitNodeTypeConstResourceID = 48, /** Selects a resource (function, mesh etc.) */ eImplicitNodeTypeVectorFromScalar = 49, /** Creates a vector from one scalar values */ eImplicitNodeTypeUnsignedMesh = 50, /** Calculates the unsigned distance to a mesh */ eImplicitNodeTypeMod = 51 /** Calculates the modulo of two values (same behaviour as glsl mod) */ diff --git a/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas b/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas index a62948185..0a5718e04 100644 --- a/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas +++ b/Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas @@ -300,7 +300,7 @@ interface eImplicitNodeTypeFunctionCall, eImplicitNodeTypeMesh, eImplicitNodeTypeLength, - eImplicitNodeTypeResource, + eImplicitNodeTypeConstResourceID, eImplicitNodeTypeVectorFromScalar, eImplicitNodeTypeUnsignedMesh, eImplicitNodeTypeMod @@ -10841,7 +10841,7 @@ implementation eImplicitNodeTypeFunctionCall: Result := 45; eImplicitNodeTypeMesh: Result := 46; eImplicitNodeTypeLength: Result := 47; - eImplicitNodeTypeResource: Result := 48; + eImplicitNodeTypeConstResourceID: Result := 48; eImplicitNodeTypeVectorFromScalar: Result := 49; eImplicitNodeTypeUnsignedMesh: Result := 50; eImplicitNodeTypeMod: Result := 51; @@ -10900,7 +10900,7 @@ implementation 45: Result := eImplicitNodeTypeFunctionCall; 46: Result := eImplicitNodeTypeMesh; 47: Result := eImplicitNodeTypeLength; - 48: Result := eImplicitNodeTypeResource; + 48: Result := eImplicitNodeTypeConstResourceID; 49: Result := eImplicitNodeTypeVectorFromScalar; 50: Result := eImplicitNodeTypeUnsignedMesh; 51: Result := eImplicitNodeTypeMod; diff --git a/Autogenerated/Bindings/Python/Lib3MF.py b/Autogenerated/Bindings/Python/Lib3MF.py index 4dde3b5e5..165cd56d0 100644 --- a/Autogenerated/Bindings/Python/Lib3MF.py +++ b/Autogenerated/Bindings/Python/Lib3MF.py @@ -897,7 +897,7 @@ class ImplicitNodeType(CTypesEnum): FunctionCall = 45 Mesh = 46 Length = 47 - Resource = 48 + ConstResourceID = 48 VectorFromScalar = 49 UnsignedMesh = 50 Mod = 51 diff --git a/Autogenerated/Source/lib3mf_types.hpp b/Autogenerated/Source/lib3mf_types.hpp index e3ab36dbb..c1a1b6ffc 100644 --- a/Autogenerated/Source/lib3mf_types.hpp +++ b/Autogenerated/Source/lib3mf_types.hpp @@ -498,7 +498,7 @@ namespace Lib3MF { FunctionCall = 45, /** Calls a function */ Mesh = 46, /** Calculates the signed distance to a mesh */ Length = 47, /** Calculates the length of a vector */ - Resource = 48, /** Selects a resource (function, mesh etc.) */ + ConstResourceID = 48, /** Selects a resource (function, mesh etc.) */ VectorFromScalar = 49, /** Creates a vector from one scalar values */ UnsignedMesh = 50, /** Calculates the unsigned distance to a mesh */ Mod = 51 /** Calculates the modulo of two values (same behaviour as glsl mod) */ diff --git a/AutomaticComponentToolkit/lib3mf.xml b/AutomaticComponentToolkit/lib3mf.xml index 6fd23fa8a..8aa95ca26 100644 --- a/AutomaticComponentToolkit/lib3mf.xml +++ b/AutomaticComponentToolkit/lib3mf.xml @@ -1920,7 +1920,7 @@