From b726761fc221a85955424676fce8539c47212c51 Mon Sep 17 00:00:00 2001 From: Jordi Gonzalez Date: Fri, 23 Feb 2024 17:52:07 +0100 Subject: [PATCH 1/6] New namespace URL --- 3MF Boolean operations.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/3MF Boolean operations.md b/3MF Boolean operations.md index badf324..00b8658 100644 --- a/3MF Boolean operations.md +++ b/3MF Boolean operations.md @@ -13,9 +13,9 @@ -| **Version** | 1.0.0 | +| **Version** | 1.1.0 | | --- | --- | -| **Status** | Published | +| **Status** | Draft | ## Disclaimer @@ -57,7 +57,7 @@ This extension MUST be used only with Core specification 1.x. See [the 3MF Core Specification conventions](https://github.com/3MFConsortium/spec_core/blob/1.3.0/3MF%20Core%20Specification.md#document-conventions). -In this extension specification, as an example, the prefix "bo" maps to the xml-namespace "http://schemas.microsoft.com/3dmanufacturing/booleanoperations/2023/07". See [Appendix C. Standard Namespace](#appendix-c-standard-namespace). +In this extension specification, as an example, the prefix "bo" maps to the xml-namespace "http://schemas.3mf.io/3dmanufacturing/booleanoperations/2024/02". See [Appendix C. Standard Namespace](#appendix-c-standard-namespace). ## Language Notes @@ -178,9 +178,9 @@ See [the 3MF Core Specification glossary](https://github.com/3MFConsortium/spec_ ```xml - @@ -261,7 +261,7 @@ See [the 3MF Core Specification glossary](https://github.com/3MFConsortium/spec_ | | | | --- | --- | -| BooleanOperation | [http://schemas.microsoft.com/3dmanufacturing/booleanoperations/2023/07](http://schemas.microsoft.com/3dmanufacturing/booleanoperations/2023/07) | +| BooleanOperation | [http://schemas.3mf.io/3dmanufacturing/booleanoperations/2024/02](http://schemas.3mf.io/3dmanufacturing/booleanoperations/2024/02) | # Appendix D: Example file @@ -271,7 +271,7 @@ The diagram in [Chapter 1. Overview of Additions](https://github.com/3MFConsorti ```xml From a00e512688d444fcf9e30b7da7b721d0b37aafd7 Mon Sep 17 00:00:00 2001 From: Jordi Gonzalez Date: Fri, 23 Feb 2024 21:56:13 +0100 Subject: [PATCH 2/6] Update namespace url to 2023/10 --- 3MF Boolean operations.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/3MF Boolean operations.md b/3MF Boolean operations.md index 00b8658..0e3af00 100644 --- a/3MF Boolean operations.md +++ b/3MF Boolean operations.md @@ -57,7 +57,7 @@ This extension MUST be used only with Core specification 1.x. See [the 3MF Core Specification conventions](https://github.com/3MFConsortium/spec_core/blob/1.3.0/3MF%20Core%20Specification.md#document-conventions). -In this extension specification, as an example, the prefix "bo" maps to the xml-namespace "http://schemas.3mf.io/3dmanufacturing/booleanoperations/2024/02". See [Appendix C. Standard Namespace](#appendix-c-standard-namespace). +In this extension specification, as an example, the prefix "bo" maps to the xml-namespace "http://schemas.3mf.io/3dmanufacturing/booleanoperations/2023/10". See [Appendix C. Standard Namespace](#appendix-c-standard-namespace). ## Language Notes @@ -178,9 +178,9 @@ See [the 3MF Core Specification glossary](https://github.com/3MFConsortium/spec_ ```xml - @@ -261,7 +261,7 @@ See [the 3MF Core Specification glossary](https://github.com/3MFConsortium/spec_ | | | | --- | --- | -| BooleanOperation | [http://schemas.3mf.io/3dmanufacturing/booleanoperations/2024/02](http://schemas.3mf.io/3dmanufacturing/booleanoperations/2024/02) | +| BooleanOperation | [http://schemas.3mf.io/3dmanufacturing/booleanoperations/2023/10](http://schemas.3mf.io/3dmanufacturing/booleanoperations/2023/10) | # Appendix D: Example file @@ -271,7 +271,7 @@ The diagram in [Chapter 1. Overview of Additions](https://github.com/3MFConsorti ```xml From b027a00db19822b0e9f17b865a4066ed53e90ef6 Mon Sep 17 00:00:00 2001 From: Jordi Gonzalez Date: Fri, 23 Feb 2024 21:58:16 +0100 Subject: [PATCH 3/6] Update 3MF Boolean operations.md --- 3MF Boolean operations.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/3MF Boolean operations.md b/3MF Boolean operations.md index 0e3af00..c1fef6f 100644 --- a/3MF Boolean operations.md +++ b/3MF Boolean operations.md @@ -57,7 +57,7 @@ This extension MUST be used only with Core specification 1.x. See [the 3MF Core Specification conventions](https://github.com/3MFConsortium/spec_core/blob/1.3.0/3MF%20Core%20Specification.md#document-conventions). -In this extension specification, as an example, the prefix "bo" maps to the xml-namespace "http://schemas.3mf.io/3dmanufacturing/booleanoperations/2023/10". See [Appendix C. Standard Namespace](#appendix-c-standard-namespace). +In this extension specification, as an example, the prefix "bo" maps to the xml-namespace "http://schemas.3mf.io/3dmanufacturing/booleanoperations/2023/07". See [Appendix C. Standard Namespace](#appendix-c-standard-namespace). ## Language Notes @@ -178,9 +178,9 @@ See [the 3MF Core Specification glossary](https://github.com/3MFConsortium/spec_ ```xml - @@ -261,7 +261,7 @@ See [the 3MF Core Specification glossary](https://github.com/3MFConsortium/spec_ | | | | --- | --- | -| BooleanOperation | [http://schemas.3mf.io/3dmanufacturing/booleanoperations/2023/10](http://schemas.3mf.io/3dmanufacturing/booleanoperations/2023/10) | +| BooleanOperation | [http://schemas.3mf.io/3dmanufacturing/booleanoperations/2023/07](http://schemas.3mf.io/3dmanufacturing/booleanoperations/2023/07) | # Appendix D: Example file @@ -271,7 +271,7 @@ The diagram in [Chapter 1. Overview of Additions](https://github.com/3MFConsorti ```xml From 68c6518a748d797db1707f82193c0663809f4318 Mon Sep 17 00:00:00 2001 From: Jordi Gonzalez Date: Fri, 1 Mar 2024 15:04:18 +0100 Subject: [PATCH 4/6] Simplified referemces --- 3MF Boolean operations.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/3MF Boolean operations.md b/3MF Boolean operations.md index c1fef6f..439c6ca 100644 --- a/3MF Boolean operations.md +++ b/3MF Boolean operations.md @@ -318,6 +318,10 @@ The diagram in [Chapter 1. Overview of Additions](https://github.com/3MFConsorti # References -**CSG** Wikipedia, the free encyclopedia: [Constructive solid geometry](https://en.wikipedia.org/wiki/Constructive_solid_geometry) +**CSG** -See the [3MF Core Specification references](https://github.com/3MFConsortium/spec_core/blob/1.3.0/3MF%20Core%20Specification.md#references) for additional references. +Wikipedia, the free encyclopedia: Constructive solid geometry https://en.wikipedia.org/wiki/Constructive_solid_geometry + +**3MF Core Specification references** + +See the 3MF Core Specification references https://github.com/3MFConsortium/spec_core/blob/1.2.3/3MF%20Core%20Specification.md#references. \ No newline at end of file From fe48a87b264dae7cc4645bbe6b39d92f0b93ac89 Mon Sep 17 00:00:00 2001 From: Jordi Gonzalez Date: Thu, 7 Mar 2024 15:07:10 +0100 Subject: [PATCH 5/6] Not referencing alternatives --- 3MF Boolean operations.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3MF Boolean operations.md b/3MF Boolean operations.md index 439c6ca..7d5d564 100644 --- a/3MF Boolean operations.md +++ b/3MF Boolean operations.md @@ -119,7 +119,7 @@ Element \ The optional \ element contains one or more \ elements to perform an ordered sequence of boolean operations onto the referenced base object. -**objectid** - Selects the base object to apply the boolean operation. The object MUST be an object of type "model" defining a shape: mesh, booleanshape, or shapes defined in other 3MF extensions. It MUST NOT reference a components object. +**objectid** - Selects the base object to apply the boolean operation. The object MUST be an object of type "model" defining a shape: mesh, booleanshape, or shapes defined in other 3MF extensions. It MUST NOT reference a components object. When used in combination with [the 3MF Production extension](https://github.com/3MFConsortium/spec_production/blob/master/3MF%20Production%20Extension.md), it MUST NOT reference any object containing Alternatives. **operation** - The boolean operation to perform. The options for the boolean shapes are the following: @@ -160,7 +160,7 @@ Element \ The \ element selects a pre-defined object resource to perform a boolean operation to the base object referenced in the enclosing \ element. The boolean operation is applied in the sequence order of the \ element. -**objectid** - Selects the object with the mesh to apply the boolean operation. The object MUST be only a triangle mesh object of type "model", and MUST NOT contain shapes defined in any other extension. +**objectid** - Selects the object with the mesh to apply the boolean operation. The object MUST be only a triangle mesh object of type "model", and MUST NOT contain shapes defined in any other extension. When used in combination with [the 3MF Production extension](https://github.com/3MFConsortium/spec_production/blob/master/3MF%20Production%20Extension.md), it MUST NOT reference any object containing Alternatives. **transform** - The transform to apply to the selected object before the boolean operation. From 5a09b4301115a9c666fd55dd2e4af32e398d60c7 Mon Sep 17 00:00:00 2001 From: Jordi Gonzalez Date: Thu, 7 Mar 2024 17:46:24 +0100 Subject: [PATCH 6/6] Publish 1.1.0 --- 3MF Boolean operations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3MF Boolean operations.md b/3MF Boolean operations.md index 7d5d564..fee9b29 100644 --- a/3MF Boolean operations.md +++ b/3MF Boolean operations.md @@ -15,7 +15,7 @@ | **Version** | 1.1.0 | | --- | --- | -| **Status** | Draft | +| **Status** | Published | ## Disclaimer