diff --git a/contributed_definitions/NXcsg.nxdl.xml b/base_classes/NXcsg.nxdl.xml similarity index 68% rename from contributed_definitions/NXcsg.nxdl.xml rename to base_classes/NXcsg.nxdl.xml index 941620273b..45ca439f09 100644 --- a/contributed_definitions/NXcsg.nxdl.xml +++ b/base_classes/NXcsg.nxdl.xml @@ -30,13 +30,16 @@ xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd" > - Constructive Solid Geometry base class, using :ref:`NXquadric` and :ref:`NXoff_geometry` + Constructive Solid Geometry (CSG) base class. + + Offers concepts for combining the definitions of leaf and + branching nodes of a CSG tree. One of the standard construction solid geometry set operations, - or if the CSG is a pointer to the geometry provided by an - :ref:`NXquadric` or an :ref:`NXoff_geometry`. Takes values: + or statement IS_QUADRIC or IS_MESH if the CSG is a pointer to an + instance of a geometry class. Takes values: @@ -53,8 +56,8 @@ minOccurs="0" maxOccurs="1"> - The first operand of constructive solid geometry - operation. Compulsory if 'operation' is UNION, INTERSECTION, + The first operand of constructive solid geometry operation. + Compulsory if 'operation' is UNION, INTERSECTION, DIFFERENCE or COMPLEMENT. @@ -64,8 +67,8 @@ minOccurs="0" maxOccurs="1"> - The second operand of constructive solid geometry - operation. Compulsory if 'operation' is UNION, INTERSECTION or + The second operand of constructive solid geometry operation. + Compulsory if 'operation' is UNION, INTERSECTION or DIFFERENCE. @@ -75,11 +78,14 @@ minOccurs="0" maxOccurs="1"> - Path to a field that is either an :ref:`NXquadric` (if - 'operation' = IS_QUADRIC) or an :ref:`NXoff_geometry` (if - 'operation' = IS_MESH) that defines the surface making up the - constructive solid geometry component. Compulsory if 'operation' - is IS_QUADRIC or IS_MESH. + Path to a field that is an instance of one of several possible geometry + classes: Specifically, :ref:`NXquadric` if 'operation' is IS_QUADRIC, + :ref:`NXoff_geometry`, or other primitive based base classes + if 'operation' is IS_MESH. + + The instance defines the surface making up the constructive solid + geometry component. This field is compulsory if 'operation' is + IS_QUADRIC or IS_MESH. diff --git a/contributed_definitions/NXquadric.nxdl.xml b/base_classes/NXquadric.nxdl.xml similarity index 98% rename from contributed_definitions/NXquadric.nxdl.xml rename to base_classes/NXquadric.nxdl.xml index b7a07611c8..2408178f5a 100644 --- a/contributed_definitions/NXquadric.nxdl.xml +++ b/base_classes/NXquadric.nxdl.xml @@ -29,7 +29,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd" > - definition of a quadric surface. + Definition of a quadric surface. - the head node for constructively defined geometry + The head node for constructively defined geometry. + + * `S. Ghebi <https://doi.org/10.1007/978-1-84800-115-2>`_ + * `L. H. Laidlaw <https://doi.org/10.1145/15886.15904>`_ + + for an introduction into the topic of modeling shapes with constructive + solid geometry (CSG). + - The geometries defined, made up of instances of :ref:`NXquadric` and :ref:`NXoff_geometry`. + The geometries defined, made up of e.g. instances of :ref:`NXquadric`, :ref:`NXoff_geometry`, + or instances of other base classes that define geometries.