Merge pull request #61 from 3MFConsortium/3djan/levelset

3djan/levelset
3MFConsortium · Apr 8, 2024 · 2789e57 · 2789e57
2 parents ad42043 + 6dab885
commit 2789e57
Show file tree

Hide file tree

Showing 6 changed files with 311 additions and 246 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on: [pull_request]
 name: Build
 jobs:
   build-linux:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     env:
       SPECNAME: "3MF Volumetric Extension"
     steps:

diff --git a/3MF Volumetric Extension.md b/3MF Volumetric Extension.md
diff --git a/Volumetric class diagram.puml b/Volumetric class diagram.puml
@@ -8,7 +8,7 @@ package Resources
     Class Object
     Class Mesh extends Object
 
-    Class BoundaryShape extends Object
+    Class LevelSet extends Object
     {
         functionid : resourceID
         channel : string
@@ -22,7 +22,7 @@ package Resources
     }
     Class VolumeData
     Mesh *-- VolumeData
-    BoundaryShape *-- VolumeData
+    LevelSet *-- VolumeData
 
     package Functions
     {
@@ -232,4 +232,44 @@ package Native
     Node_ *-- "0..1" Out
 }
 
+package VolumetricData
+{
+    Class VolumeData
+
+    Class Color
+    {
+        functionid : resourceID
+        minfeaturesize : double
+        fallbackvalue : double
+    }
+
+    Class Property
+    {
+        name : string
+        functionid : resourceID
+        minfeaturesize : double
+        fallbackvalue : double
+    }
+
+    Class Composite
+    {
+        basematerialid : resourceID
+    }
+
+    Class MaterialMapping
+    {
+        functionid : resourceID
+        minfeaturesize : double
+        fallbackvalue : double
+    }
+
+    VolumeData *-- "0..1" Color
+    VolumeData *-- "0..*" Property
+    VolumeData *-- "0..1" Composite
+    Composite *-- "1..*" MaterialMapping
+
+    Color o-- "1" Function
+    Property o-- "1" Function
+    MaterialMapping o-- "1" Function
+}
 @enduml
diff --git a/Volumetric class diagram/Volumetric class diagram.svg b/Volumetric class diagram/Volumetric class diagram.svg
diff --git a/images/fig_overview_implicit.png b/images/fig_overview_implicit.png
diff --git a/volumetric.xsd b/volumetric.xsd
@@ -32,7 +32,7 @@ xmlns:xml="http://www.w3.org/XML/1998/namespace" targetNamespace="http://schemas
 	<xs:complexType name="CT_Object">
 		<xs:sequence>
 			<xs:choice>
-				<xs:element ref="boundaryshape"/>
+				<xs:element ref="levelset"/>
 			</xs:choice>
 		</xs:sequence>
 	</xs:complexType>
@@ -256,7 +256,7 @@ xmlns:xml="http://www.w3.org/XML/1998/namespace" targetNamespace="http://schemas
 		<xs:anyAttribute namespace="##other" processContents="lax"/>
 	</xs:complexType>
 
-	<xs:complexType name="CT_BoundaryShape">
+	<xs:complexType name="CT_LevelSet">
 		<xs:sequence>
 			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="2147483647"/>
 		</xs:sequence>
@@ -470,5 +470,5 @@ xmlns:xml="http://www.w3.org/XML/1998/namespace" targetNamespace="http://schemas
 	<xs:element name="color" type="CT_Color"/>
 	<xs:element name="property" type="CT_Property"/>
 	<xs:element name="mesh" type="CT_Mesh"/>
-	<xs:element name="boundaryshape" type="CT_BoundaryShape"/>
+	<xs:element name="levelset" type="CT_LevelSet"/>
 </xs:schema>