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

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

File:

• cpp/frams/model/model.cpp (modified) (6 diffs)

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;
+                        }
+                }
         }
 }