old style

Author: BotellaA

include/geode/model/representation/core/brep.h

@@ -59,12 +59,11 @@ namespace geode
      * @extends ModelBoundaries
      */
     class opengeode_model_api BRep : public Topology,
-                                     public AddComponents< 3,
-                                         Corners,
-                                         Lines,
-                                         Surfaces,
-                                         Blocks,
-                                         ModelBoundaries >,
+                                     public Corners3D,
+                                     public Lines3D,
+                                     public Surfaces3D,
+                                     public Blocks3D,
+                                     public ModelBoundaries3D,
                                      public Identifier
     {
     public:

include/geode/model/representation/core/section.h

@@ -56,10 +56,12 @@ namespace geode
      * @extends Surfaces
      * @extends ModelBoundaries
      */
-    class opengeode_model_api Section
-        : public Topology,
-          public AddComponents< 2, Corners, Lines, Surfaces, ModelBoundaries >,
-          public Identifier
+    class opengeode_model_api Section : public Topology,
+                                        public Corners2D,
+                                        public Lines2D,
+                                        public Surfaces2D,
+                                        public ModelBoundaries2D,
+                                        public Identifier
     {
     public:
         class opengeode_model_api BoundaryCornerRange

src/geode/model/representation/core/brep.cpp

@@ -420,14 +420,11 @@ namespace geode
 
     BRep::BRep( BRep&& brep )
         : Topology{ std::move( brep ) },
-          AddComponents< 3, Corners, Lines, Surfaces, Blocks, ModelBoundaries >{
-              std::move( static_cast< AddComponents< 3,
-                      Corners,
-                      Lines,
-                      Surfaces,
-                      Blocks,
-                      ModelBoundaries >& >( brep ) )
-          },
+          Corners3D{ std::move( brep ) },
+          Lines3D{ std::move( brep ) },
+          Surfaces3D{ std::move( brep ) },
+          Blocks3D{ std::move( brep ) },
+          ModelBoundaries3D{ std::move( brep ) },
           Identifier{ std::move( brep ) }
     {
     }

src/geode/model/representation/core/section.cpp

@@ -271,13 +271,10 @@ namespace geode
 
     Section::Section( Section&& section )
         : Topology{ std::move( section ) },
-          AddComponents< 2,
-              Corners,
-              Lines,
-              Surfaces,
-              ModelBoundaries >{ std::move( static_cast<
-              AddComponents< 2, Corners, Lines, Surfaces, ModelBoundaries >& >(
-              section ) ) },
+          Corners2D{ std::move( section ) },
+          Lines2D{ std::move( section ) },
+          Surfaces2D{ std::move( section ) },
+          ModelBoundaries2D{ std::move( section ) },
           Identifier{ std::move( section ) }
     {
     }