Changeset 139 for cpp/frams/_demos

Timestamp:

02/20/14 17:49:28 (11 years ago)

Author:

sz

Message:

class renaming + minor corrections

Location:

cpp/frams/_demos

Files:

• genooper_test.cpp (modified) (2 diffs)
• part_shapes.cpp (modified) (1 diff)

cpp/frams/_demos/genooper_test.cpp

@@ -26 +26 @@
         gm.p_report(NULL, NULL);
 
-        const char* src = (argc > 1) ? argv[1] : "/*9*/RRR";
+        const char* src = (argc > 1) ? argv[1] : "/*9*/UUU";
         Geno gsrc(src, -1, "First");
         printGenAndTitle(gsrc, "source genotype (gsrc)");
@@ -42 +42 @@
         printGenAndTitle(ginvalid, "invalid");
 
-        Geno fixed = gm.Validate(ginvalid);
-        printGenAndTitle(fixed, "validated");
+        Geno gvalidated = gm.Validate(ginvalid);
+        printGenAndTitle(gvalidated, "validated");
 
-        printf("\nHTMLized: %s\n", (const char*)gm.HTMLize((const char*)fixed.getGene()));
+        printf("\nHTMLized: %s\n", (const char*)gm.HTMLize((const char*)gvalidated.getGene()));
 
         return 0;

cpp/frams/_demos/part_shapes.cpp

@@ -9 +9 @@
 int main()
 {
-Model *m=new Model;
-Part *p1,*p2;
-Joint *j;
+        Model m;
+        Part *p1, *p2;
+        Joint *j;
 
-m->open();
+        m.open();
 
-// chain of ellipsoids - subsequent parts are placed relative to the previous part's orientation and location
-p1=m->addNewPart(Part::SHAPE_ELLIPSOID); //initial part
-p1->scale=Pt3D(1.0,0.7,0.4);
+        // chain of ellipsoids - subsequent parts are placed relative to the previous part's orientation and location
+        p1 = m.addNewPart(Part::SHAPE_ELLIPSOID); //initial part
+        p1->scale = Pt3D(1.0, 0.7, 0.4);
 
-Orient rotation=Orient_1; //must be initialized explicitly because the default Orient constructor does not initialize anything
-rotation.rotate(Pt3D(0.1,0.2,0.3));
+        Orient rotation = Orient_1; //must be initialized explicitly because the default Orient constructor does not initialize anything
+        rotation.rotate(Pt3D(0.1, 0.2, 0.3));
 
-for(int N=10;N>0;N--,p1=p2)
+        for (int N = 10; N > 0; N--, p1 = p2)
         {
-        p2=m->addNewPart(Part::SHAPE_ELLIPSOID);
-        p2->scale=p1->scale*0.9; //each part is smaller than its predecessor
-        
-        Pt3D advance(p1->scale.x,0,0); //advance by previous part's ellipsoid x radius
-        p2->p = p1->p + p1->o.transform(advance); //advance vector transformed by p1 orientation == in p1 local coordinates
-        p2->setOrient(p1->o.transform(rotation)); //rotation transformed by p1 orientation
+                p2 = m.addNewPart(Part::SHAPE_ELLIPSOID);
+                p2->scale = p1->scale*0.9; //each part is smaller than its predecessor
 
-        m->addNewJoint(p1,p2,Joint::SHAPE_SOLID); //all parts must be connected
+                Pt3D advance(p1->scale.x, 0, 0); //advance by previous part's ellipsoid x radius
+                p2->p = p1->p + p1->o.transform(advance); //advance vector transformed by p1's orientation (i.e., in p1's local coordinates)
+                p2->setOrient(p1->o.transform(rotation)); //rotation transformed by p1's orientation
+
+                m.addNewJoint(p1, p2, Joint::SHAPE_SOLID); //all parts must be connected
         }
 
-// chain of cyllinders - line segments between points calculated from the parametric formula P(a)=(2-2*cos(a),2*sin(a)) (circle with r=2)
-Pt3D prev,next;
-p1=m->getPart(0);
-for(float a=0;a<M_PI;a+=M_PI/10)
+        // chain of cyllinders - line segments between points calculated from the parametric formula P(a)=(2-2*cos(a),2*sin(a)) (circle with r=2)
+        Pt3D prev, next;
+        p1 = m.getPart(0);
+        for (float a = 0; a<M_PI; a += M_PI / 10)
         {
-        Pt3D next(2-2*cos(a),0,2*sin(a));
-        if (a>0)
+                Pt3D next(2 - 2 * cos(a), 0, 2 * sin(a));
+                if (a>0)
                 {
-                p2=m->addNewPart(Part::SHAPE_CYLINDER);
-                p2->setPositionAndRotationFromAxis(prev,next);
-                p2->scale=Pt3D(prev.distanceTo(next)*0.5,0.05,0.05);// distance*0.5 because scale is "radius", not cylinder length
+                        p2 = m.addNewPart(Part::SHAPE_CYLINDER);
+                        p2->setPositionAndRotationFromAxis(prev, next);
+                        p2->scale = Pt3D(prev.distanceTo(next)*0.5, 0.05, 0.05);// distance*0.5 because scale is "radius", not cylinder length
 
-                m->addNewJoint(p1,p2,Joint::SHAPE_SOLID); //all parts must be connected
+                        m.addNewJoint(p1, p2, Joint::SHAPE_SOLID); //all parts must be connected
                 }
-        p1=p2;
-        prev=next;
+                p1 = p2;
+                prev = next;
         }
 
-m->close();
-puts((const char*)m->getF0Geno().toString());
-// the genotype can be fed directly to the genotype viewer, like this:
-// part_shapes | theater -g -vpart_shapes -
+        m.close();
+        puts((const char*)m.getF0Geno().toString());
+        // the genotype can be fed directly to the genotype viewer, like this:
+        // part_shapes | theater -g -vpart_shapes -
 }