Changeset 932 for cpp/frams/model

Timestamp:

05/28/20 18:00:45 (4 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

Location:

cpp/frams/model

Files:

• defassign-f0-SDK.h (modified) (4 diffs)
• f0-SDK-classes.h (modified) (2 diffs)
• model.h (modified) (2 diffs)
• modelparts.cpp (modified) (3 diffs)
• modelparts.h (modified) (4 diffs)

cpp/frams/model/defassign-f0-SDK.h

@@ -25 +25 @@
 vcolor.z=1.0;
 }
+
 
 
@@ -119 +120 @@
 
 
+
 void Neuro::defassign()
 {
@@ -126 +128 @@
 vis_style="neuro";
 }
+
 
 
@@ -184 +187 @@
 
 
+

cpp/frams/model/f0-SDK-classes.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -172 +172 @@
  {"Vstyle",2,0,"vis_style","s 0 0 neuro",FIELD(vis_style),},
  {"getInputCount",0,1+2,"input count","d",GETONLY(inputCount),},
- {"getInputNeuroDef",0,1+2,"get input neuron","p oNeuroDef(d)",PROCEDURE(p_getInputNeuroDef),},
- {"getInputNeuroIndex",0,1+2,"get input neuron index","p d(d)",PROCEDURE(p_getInputNeuroIndex),},
- {"getInputWeight",0,1+2,"get input weight","p f(d)",PROCEDURE(p_getInputWeight),},
+ {"getInputNeuroDef",0,0,"get input neuron","p oNeuroDef(d)",PROCEDURE(p_getInputNeuroDef),},
+ {"getInputNeuroIndex",0,0,"get input neuron index","p d(d)",PROCEDURE(p_getInputNeuroIndex),},
+ {"getInputWeight",0,0,"get input weight","p f(d)",PROCEDURE(p_getInputWeight),},
  {"classObject",0,1+2,"neuron class","oNeuroClass",GETONLY(classObject),},
  {0,0,0,}

cpp/frams/model/model.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -93 +93 @@
 
 public:
-        enum ShapeType { SHAPE_UNKNOWN, SHAPE_ILLEGAL, SHAPE_BALL_AND_STICK, SHAPE_SOLIDS };
+        enum ShapeType { SHAPE_BALL_AND_STICK = 0, SHAPE_SOLIDS = 1, SHAPE_UNKNOWN, SHAPE_ILLEGAL };
         /// used in internalCheck()
         enum CheckType {

cpp/frams/model/modelparts.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -98 +98 @@
 NeuroClass::NeuroClass(ParamEntry *_props, SString _description,
         int _prefinputs, int _prefoutput, int _preflocation,
-        int *_vectordata, bool own_vd, int vhints)
+        int *_vectordata, bool own_vd, int vhints, int sup_shapes)
         :ownedvectordata(own_vd),
         name(_props->name), longname(_props->id), description(_description),
@@ -105 +105 @@
         prefoutput(_prefoutput),
         preflocation(_preflocation),
+        supported_shape_types(sup_shapes),
         vectordata(_vectordata),
         visualhints(vhints), impl_count(0),/*impl(0),*/active(1), genactive(0)

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()
         {