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

Timestamp:

12/16/14 01:51:06 (10 years ago)

Author:

Maciej Komosinski

Message:

• Model validation checks part/joint shapes for consistency (old/new)
• Model::getShape() returns new/old style
• Model shape conversion (old to new) and sample usage in shapeconvert.cpp

File:

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

cpp/frams/model/modelparts.h

@@ -70 +70 @@
 static SString getDefaultStyle();
 Part(double _mass,double _size,double _density,double _friction,double _ingest,double _assim)
-        :PartBase(getDefaultStyle()),mass(_mass),size(_size),density(_density),friction(_friction),ingest(_ingest),assim(_assim)
+          :PartBase(getDefaultStyle()),mass(_mass),size(_size),density(_density),friction(_friction),ingest(_ingest),assim(_assim)
         {}
 void defassign();
@@ -86 +86 @@
 paInt shape;///default=old framsticks compatible, do not mix with shapes>0
 enum Shape {SHAPE_DEFAULT=0, SHAPE_ELLIPSOID=1, SHAPE_CUBOID=2, SHAPE_CYLINDER=3};
-double mass,size,density,friction,ingest,assim;
+double mass,size,density,friction,ingest,assim,hollow;
 Pt3D scale;
 Pt3D food;