Changeset 256 for cpp/frams

Timestamp:

11/18/14 17:04:37 (10 years ago)

Author:

Maciej Komosinski

Message:

Chambers in Foraminifera now have the proper orientation in 3D; simplified source

Location:

cpp/frams/genetics/fF

Files:

• conv_fF.cpp (modified) (4 diffs)
• conv_fF.h (modified) (2 diffs)

cpp/frams/genetics/fF/conv_fF.cpp

@@ -5 +5 @@
 #include "conv_fF.h"
 #include "fF_genotype.h"
-#include <frams/model/model.h>
 #include <common/nonstd_stl.h>
 #include <common/Convert.h>
@@ -26 +25 @@
 }
 
+Part *GenoConv_fF0::addNewPart(Model *m, const fF_chamber3d* c)
+{
+        Part *part = m->addNewPart(Part::SHAPE_ELLIPSOID);
+        part->p = Pt3D(c->centerX, c->centerY, c->centerZ);
+        Pt3D hole = Pt3D(c->holeX, c->holeY, c->holeZ);
+        Orient o;
+        o.lookAt(part->p - hole);
+        part->setOrient(o);
+        return part;
+}
+
 SString GenoConv_fF0::convert(SString &in, MultiMap *map)
 {
@@ -40 +50 @@
         m.vis_style = "foram"; //dedicated visual look for Foraminifera
 
-        // subsequent parts (chambers) are placed relative to the previous part's orientation and location
-        Part *p1, *p2;
-
         fF_chamber3d **chambers = new fF_chamber3d*[gp.number_of_chambers];
-
         for (int i = 0; i < gp.number_of_chambers; i++)
                 createSphere(i, chambers, radius, div_radius_length, gp.translation, gp.angle1, gp.angle2, gp.scalex, gp.scaley, gp.scalez);
 
-        p1 = m.addNewPart(Part::SHAPE_ELLIPSOID);
-        p1->p = Pt3D(chambers[0]->centerX, chambers[0]->centerY, chambers[0]->centerZ);
-
-
-        for (int i = 1; i < gp.number_of_chambers; i++, p1 = p2)
-        {
-                p2 = m.addNewPart(Part::SHAPE_ELLIPSOID);
+        Part *p1 = addNewPart(&m, chambers[0]);
+        for (int i = 1; i < gp.number_of_chambers; i++)
+        {
+                Part *p2 = addNewPart(&m, chambers[i]);
                 p2->scale = p1->scale.entrywiseProduct(Pt3D(gp.scalex, gp.scaley, gp.scalez)); //each part's scale is its predecessor's scale * scaling
-
-                p2->p = Pt3D(chambers[i]->centerX, chambers[i]->centerY, chambers[i]->centerZ);
-
                 m.addNewJoint(p1, p2, Joint::SHAPE_SOLID); //all parts must be connected
+                p1 = p2;
         }
 
         for (int i = 0; i < gp.number_of_chambers; i++)
                 delete chambers[i];
-        delete[]chambers;
+        delete[] chambers;
 
         m.close();
@@ -87 +88 @@
                 if (radius < fF_TOO_LITTLE) {
                         radius = fF_TOO_LITTLE;
-                        if (fabs(len) >(fF_TOO_MUCH * radius)) {
+                        if (fabs(len) > (fF_TOO_MUCH * radius)) {
                                 len = ((len < 0) ? (-1) : 1) * fF_TOO_MUCH * radius;
                         }

cpp/frams/genetics/fF/conv_fF.h

@@ -22 +22 @@
 #include <frams/util/sstring.h>
 #include <frams/genetics/genoconv.h>
+#include <frams/model/model.h>
 #include "fF_chamber3d.h"
 
@@ -53 +54 @@
         double* sines;
         void precompute_cos_and_sin();
+        Part *addNewPart(Model *m, const fF_chamber3d* c);
 };