Changeset 269

Timestamp:

12/16/14 01:51:06 (9 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

Location:

cpp/frams

Files:

• Makefile-GDK (modified) (2 diffs)
• Makefile-GDK-files (modified) (1 diff)
• _demos/shapeconvert.cpp (added)
• model/model.cpp (modified) (6 diffs)
• model/model.h (modified) (3 diffs)
• model/modelparts.h (modified) (2 diffs)

cpp/frams/Makefile-GDK

@@ -5 +5 @@
 include frams/Makefile-GDK-files
 
-GDK_TESTS=genoconv_test gdk_test geno_test genooper_test genooper_test_fTest neuro_test loader_test serial_test multiline_f0_test f0_variants_test full_props part_shapes neuro_layout_test geometry_apices_test geometry_info_test geometry_surface_test geometry_volume_test
+GDK_TESTS=genoconv_test gdk_test geno_test genooper_test genooper_test_fTest neuro_test loader_test serial_test multiline_f0_test f0_variants_test full_props shapeconvert part_shapes neuro_layout_test geometry_apices_test geometry_info_test geometry_surface_test geometry_volume_test
 
 gdk_tests: $(GDK_TESTS)
 
 GDK_BUILD_CONFIG= -include frams/config/gdk_build_config.h
-CXXFLAGS= -I$(CURDIR) -DLINUX $(GDK_BUILD_CONFIG) -Wno-parentheses -Wno-overloaded-virtual -Wno-format -g
+CXXFLAGS= -I$(CURDIR) -std=gnu++11 -DLINUX $(GDK_BUILD_CONFIG) -Wno-parentheses -Wno-overloaded-virtual -Wno-format -g
 
 #############################################
@@ -47 +47 @@
         $(CXX) $(FULL_PROPS_OBJS) $(LDFLAGS) -o $@
 
+shapeconvert: $(SHAPECONVERT_OBJS)
+        $(CXX) $(SHAPECONVERT_OBJS) $(LDFLAGS) -o $@
+
 part_shapes: $(PART_SHAPES_OBJS)
         $(CXX) $(PART_SHAPES_OBJS) $(LDFLAGS) -o $@

cpp/frams/Makefile-GDK-files

@@ -47 +47 @@
 FULL_PROPS_OBJS= frams/_demos/full_props.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o  frams/virtfile/stdiofile.o $(GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS)
 
+SHAPECONVERT_OBJS= frams/_demos/shapeconvert.o frams/errmgr/stdouterr.o frams/virtfile/virtfile.o  frams/virtfile/stdiofile.o $(GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS)
+
 SERIAL_TEST_OBJS= frams/_demos/serial_test.o frams/virtfile/virtfile.o  $(GDK_OBJS) $(GENOCONV_GDK_OBJS)
 

cpp/frams/model/model.cpp

@@ -29 +29 @@
 f0map=0;
 f0genoknown=1;
+shape=SHAPE_UNKNOWN;
 }
 
@@ -874 +875 @@
 int i,k;
 int ret=1;
+shape=SHAPE_UNKNOWN;
 if ((parts.size()==0)&&(neurons.size()==0)) return 0;
 if (parts.size()==0)
@@ -903 +905 @@
         if (p->p.y+p->size > bbmax.y) bbmax.y=p->p.y+p->size;
         if (p->p.z+p->size > bbmax.z) bbmax.z=p->p.z+p->size;
+        if (shape==SHAPE_UNKNOWN)
+                shape=(p->shape==Part::SHAPE_DEFAULT)?SHAPE_OLD:SHAPE_NEW;
+        else if (shape!=SHAPE_ILLEGAL)
+                {
+                if ((p->shape==Part::SHAPE_DEFAULT) ^ (shape==SHAPE_OLD))
+                        {
+                        shape=SHAPE_ILLEGAL;
+                        FMprintf("Model","internalCheck",FMLV_WARN,"Inconsistent part shapes (mixed old and new shapes)");
+                        }
+                }
         }
 size=bbmax-bbmin;
@@ -983 +995 @@
                          i,(const char*)geno.getName());
                 ret=0;
+                }
+        if (shape!=SHAPE_ILLEGAL)
+                {
+                if ((j->shape==Joint::SHAPE_DEFAULT) ^ (shape==SHAPE_OLD))
+                        {
+                        shape==SHAPE_ILLEGAL;
+                        FMprintf("Model","internalCheck",FMLV_WARN,"Inconsistent joint shapes (mixed old and new shapes)");
+                        }
                 }
         }
@@ -1082 +1102 @@
                 }
         }
+if (shape==SHAPE_ILLEGAL)
+        ret=0;
 return ret;
 }
@@ -1258 +1280 @@
         tmpp-=j->part1->p;
         j->d=j->part2->o.revTransform(tmpp);
+        }
+}
+
+void Model::buildUsingNewShapes(const Model& old, Part::Shape default_shape, float thickness)
+{
+for(int i=0;i<old.getJointCount();i++)
+        {
+        Joint *oj=old.getJoint(i);
+        Part *p = addNewPart(default_shape);
+        p->p=(oj->part1->p+oj->part2->p)/2;
+        Orient o;
+        o.lookAt(oj->part1->p-oj->part2->p);
+        p->rot=o.getAngles();
+        p->scale.x=oj->part1->p.distanceTo(oj->part2->p)/2;
+        p->scale.y = thickness;
+        p->scale.z = thickness;
+        }
+for(int i=0;i<old.getPartCount();i++)
+        {
+        Part *op=old.getPart(i);
+        for(int j=0;j<old.getJointCount();j++)
+                {
+                Joint *oj=old.getJoint(j);
+                if ((oj->part1==op)||(oj->part2==op))
+                        {
+                        for(int j2=j+1;j2<old.getJointCount();j2++)
+                                {
+                                Joint *oj2=old.getJoint(j2);
+                                if ((oj2->part1==op)||(oj2->part2==op))
+                                        {
+                                        Joint *newj=addNewJoint(getPart(j),getPart(j2),Joint::SHAPE_SOLID);
+                                        }
+                                }
+                        break;
+                        }
+                }
         }
 }

cpp/frams/model/model.h

@@ -117 +117 @@
 
 int checklevel;
+
+  public:
+enum Shape {SHAPE_UNKNOWN,SHAPE_ILLEGAL,SHAPE_OLD,SHAPE_NEW};
+  protected:
+Shape shape;
 
 void updateNeuroRefno(); // set Neuro::refno for all neurons
@@ -150 +155 @@
 int isValid() const {return buildstatus==valid;}
 int getErrorPosition(bool includingwarnings=false);
+Shape getShape() {return shape;}
 
 void updateRefno(); // set ::refno for all elements
@@ -387 +393 @@
 
 void disturb(double amount);
+
+void buildUsingNewShapes(const Model& src_old_shapes, Part::Shape default_shape = Part::SHAPE_CYLINDER, float thickness = 0.2);
 
 #ifdef EASYMAPDEBUG

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;