Skip to content

Commit

Permalink
Merge branch 'develop' into toolpath_new
Browse files Browse the repository at this point in the history
  • Loading branch information
@netfabb
netfabb committed Aug 9, 2024
2 parents c852ea7 + 2601a62 commit 1b08236
Show file tree
Hide file tree
Showing 2,283 changed files with 827,284 additions and 5,099 deletions.
809 changes: 764 additions & 45 deletions .github/workflows/build.yml
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ Include/Model/COM/NMR_COMVersion.h
debug
.DS_Store
.vscode
.idea
cmake-build-*
21 changes: 15 additions & 6 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
[submodule "Tests/googletest"]
path = Tests/googletest
url = https://github.com/google/googletest.git
[submodule "Tests/libressl"]
path = Tests/libressl
url = https://github.com/3MFConsortium/forks-libressl-distribution.git
[submodule "submodules/AutomaticComponentToolkit"]
path = submodules/AutomaticComponentToolkit
url = https://github.com/Autodesk/AutomaticComponentToolkit.git
[submodule "submodules/fast_float"]
path = submodules/fast_float
url = https://github.com/fastfloat/fast_float.git
[submodule "submodules/zlib"]
path = submodules/zlib
url = https://github.com/madler/zlib.git
[submodule "submodules/cpp-base64"]
path = submodules/cpp-base64
url = https://github.com/ReneNyffenegger/cpp-base64.git
[submodule "submodules/libzip"]
path = submodules/libzip
url = https://github.com/nih-at/libzip.git
[submodule "submodules/googletest"]
path = submodules/googletest
url = https://github.com/google/googletest.git
7 changes: 6 additions & 1 deletion .readthedocs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
# Required
version: 2


build:
os: ubuntu-22.04
tools:
python: "3.7"

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: Documentation/conf.py
Expand All @@ -16,6 +22,5 @@ formats:
- htmlzip

python:
version: 3.7
install:
- requirements: Documentation/requirements.txt
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/C/lib3mf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down
6 changes: 3 additions & 3 deletions Autogenerated/Bindings/C/lib3mf_types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file with basic types in
order to allow an easy use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down Expand Up @@ -85,8 +85,8 @@ typedef void * Lib3MF_pvoid;

#define LIB3MF_VERSION_MAJOR 2
#define LIB3MF_VERSION_MINOR 3
#define LIB3MF_VERSION_MICRO 0
#define LIB3MF_VERSION_PRERELEASEINFO "develop"
#define LIB3MF_VERSION_MICRO 2
#define LIB3MF_VERSION_PRERELEASEINFO ""
#define LIB3MF_VERSION_BUILDINFO ""

/*************************************************************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/CDynamic/lib3mf_dynamic.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/CDynamic/lib3mf_dynamic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down
6 changes: 3 additions & 3 deletions Autogenerated/Bindings/CDynamic/lib3mf_types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file with basic types in
order to allow an easy use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down Expand Up @@ -85,8 +85,8 @@ typedef void * Lib3MF_pvoid;

#define LIB3MF_VERSION_MAJOR 2
#define LIB3MF_VERSION_MINOR 3
#define LIB3MF_VERSION_MICRO 0
#define LIB3MF_VERSION_PRERELEASEINFO "develop"
#define LIB3MF_VERSION_MICRO 2
#define LIB3MF_VERSION_PRERELEASEINFO ""
#define LIB3MF_VERSION_BUILDINFO ""

/*************************************************************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/CSharp/Lib3MF.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated CSharp file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/Cpp/lib3mf_abi.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/Cpp/lib3mf_implicit.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down
6 changes: 3 additions & 3 deletions Autogenerated/Bindings/Cpp/lib3mf_types.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file with basic types in
order to allow an easy use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down Expand Up @@ -84,8 +84,8 @@ typedef void * Lib3MF_pvoid;

#define LIB3MF_VERSION_MAJOR 2
#define LIB3MF_VERSION_MINOR 3
#define LIB3MF_VERSION_MICRO 0
#define LIB3MF_VERSION_PRERELEASEINFO "develop"
#define LIB3MF_VERSION_MICRO 2
#define LIB3MF_VERSION_PRERELEASEINFO ""
#define LIB3MF_VERSION_BUILDINFO ""

/*************************************************************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/CppDynamic/lib3mf_abi.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file in order to allow an easy
use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.2

*/

Expand Down
6 changes: 3 additions & 3 deletions Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file with basic types in
order to allow an easy use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down Expand Up @@ -84,8 +84,8 @@ typedef void * Lib3MF_pvoid;

#define LIB3MF_VERSION_MAJOR 2
#define LIB3MF_VERSION_MINOR 3
#define LIB3MF_VERSION_MICRO 0
#define LIB3MF_VERSION_PRERELEASEINFO "develop"
#define LIB3MF_VERSION_MICRO 2
#define LIB3MF_VERSION_PRERELEASEINFO ""
#define LIB3MF_VERSION_BUILDINFO ""

/*************************************************************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/Go/cfunc.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Autogenerated/Bindings/Go/lib3mf.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Autogenerated/Bindings/Go/lib3mf_dynamic.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/Go/lib3mf_dynamic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down
6 changes: 3 additions & 3 deletions Autogenerated/Bindings/Go/lib3mf_types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file with basic types in
order to allow an easy use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down Expand Up @@ -85,8 +85,8 @@ typedef void * Lib3MF_pvoid;

#define LIB3MF_VERSION_MAJOR 2
#define LIB3MF_VERSION_MINOR 3
#define LIB3MF_VERSION_MICRO 0
#define LIB3MF_VERSION_PRERELEASEINFO "develop"
#define LIB3MF_VERSION_MICRO 2
#define LIB3MF_VERSION_PRERELEASEINFO ""
#define LIB3MF_VERSION_BUILDINFO ""

/*************************************************************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/NodeJS/lib3mf_dynamic.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/NodeJS/lib3mf_dynamic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/NodeJS/lib3mf_nodeaddon.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++ Implementation file for the Node addon class
of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.2

*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++ Implementation file for the Node wrapper class
of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.2

*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/NodeJS/lib3mf_nodewrapper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++ Header file for the Node wrapper class
of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.2

*/

Expand Down
6 changes: 3 additions & 3 deletions Autogenerated/Bindings/NodeJS/lib3mf_types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file with basic types in
order to allow an easy use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down Expand Up @@ -85,8 +85,8 @@ typedef void * Lib3MF_pvoid;

#define LIB3MF_VERSION_MAJOR 2
#define LIB3MF_VERSION_MINOR 3
#define LIB3MF_VERSION_MICRO 0
#define LIB3MF_VERSION_PRERELEASEINFO "develop"
#define LIB3MF_VERSION_MICRO 2
#define LIB3MF_VERSION_PRERELEASEINFO ""
#define LIB3MF_VERSION_BUILDINFO ""

/*************************************************************************************************************************
Expand Down
6 changes: 3 additions & 3 deletions Autogenerated/Bindings/Pascal/Unit_Lib3MF.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
Abstract: This is an autogenerated Pascal Header file in order to allow an easy
use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.2

*)

Expand All @@ -55,8 +55,8 @@ interface
const
LIB3MF_VERSION_MAJOR = 2;
LIB3MF_VERSION_MINOR = 3;
LIB3MF_VERSION_MICRO = 0;
LIB3MF_VERSION_PRERELEASEINFO = 'develop';
LIB3MF_VERSION_MICRO = 2;
LIB3MF_VERSION_PRERELEASEINFO = '';
LIB3MF_VERSION_BUILDINFO = '';


Expand Down
6 changes: 3 additions & 3 deletions Autogenerated/Bindings/Python/Lib3MF.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
Abstract: This is an autogenerated Python file in order to allow an easy
use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.2

'''

Expand Down Expand Up @@ -58,7 +58,7 @@ def __str__(self):
class BindingVersion(enum.IntEnum):
MAJOR = 2
MINOR = 3
MICRO = 0
MICRO = 2

'''Definition Error Codes
'''
Expand Down Expand Up @@ -701,7 +701,7 @@ class BeamLatticeClipMode(CTypesEnum):
'''Definition of BeamLatticeBallMode
'''
class BeamLatticeBallMode(CTypesEnum):
None = 0
BeamLatticeBallModeNone = 0
Mixed = 1
All = 2
'''Definition of BinaryStreamPredictionType
Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Source/lib3mf_abi.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.2
*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Source/lib3mf_interfaceexception.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++ Implementation file with the basic internal
exception type in order to allow an easy use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.2

*/

Expand Down
Loading

0 comments on commit 1b08236

Please sign in to comment.