Changeset 932 for cpp/frams/model/modelparts.h

Timestamp:

05/28/20 18:00:45 (5 years ago)

Author:

Maciej Komosinski

Message:

Neuron classes now have a property (a bit field) that says whether each neuron class supports model shape BALL_AND_STICK, SOLIDS, or both

File:

• cpp/frams/model/modelparts.h (modified) (4 diffs)

cpp/frams/model/modelparts.h

@@ -124 +124 @@
         class Pt3D d;           ///< position delta between parts
         class Pt3D rot; ///< orientation delta between parts expressed as 3 angles
-        enum Shape { SHAPE_BALL_AND_STICK = 0, ///<  old Framsticks compatible, creates a physical rod between parts (cylinder or cuboid), do not mix with part.shape>0
-                     SHAPE_FIXED = 1, ///< merge parts into one physical entity
-                     SHAPE_HINGE_X = 2, ///< hinge connection, revolving around X axis defined by hinge_pos and hinge_rot
-                     SHAPE_HINGE_XY = 3 }; ///< double hinge connection, revolving around X and Y axes defined by hinge_pos and hinge_rot
+        enum Shape {
+                SHAPE_BALL_AND_STICK = 0, ///<  old Framsticks compatible, creates a physical rod between parts (cylinder or cuboid), do not mix with part.shape>0
+                SHAPE_FIXED = 1, ///< merge parts into one physical entity
+                SHAPE_HINGE_X = 2, ///< hinge connection, revolving around X axis defined by hinge_pos and hinge_rot
+                SHAPE_HINGE_XY = 3 ///< double hinge connection, revolving around X and Y axes defined by hinge_pos and hinge_rot
+        };
         paInt shape;///< values of type Shape (paInt for integration with Param)
         class Pt3D hinge_pos; ///< hinge position (relative to part1) for HINGE_X and HINGE_XY
@@ -199 +201 @@
         paInt prefinputs, prefoutput;
         paInt preflocation;
+
+        static constexpr int SUPPORTED_SHAPE_BALL_AND_STICK = 1;
+        static constexpr int SUPPORTED_SHAPE_SOLIDS = 2;
+        static constexpr int SUPPORTED_SHAPE_ALL = SUPPORTED_SHAPE_BALL_AND_STICK | SUPPORTED_SHAPE_SOLIDS;
+        paInt supported_shape_types; //< bitfield of 'Model::shape' values: NeuroClass::SUPPORTED_SHAPE_xxx = 1 << Model::SHAPE_xxx
         int *vectordata;
         paInt visualhints;
@@ -212 +219 @@
         NeuroClass();
         NeuroClass(ParamEntry *_props, SString _description,
-                int _prefinputs, int _prefoutput, int _preflocation, int *_vectordata, bool own_vd = 1, int vhints = 0);
+                int _prefinputs, int _prefoutput, int _preflocation, int *_vectordata, bool own_vd = 1, int vhints = 0, int sup_shapes = NeuroClass::SUPPORTED_SHAPE_ALL);
         /** class name for use in Neuro::setClassName(), Neuro::setDetails() (former 'moredata' field),
                 eg. "N","-",G" */
@@ -248 +255 @@
                 }
                 */
+        int getSupportedShapeTypes() { return (int)supported_shape_types; }
         int *getSymbolGlyph()
         {