Changeset 168 for cpp/frams/genetics/f9/conv_f9.cpp

Timestamp:

03/11/14 14:45:29 (10 years ago)

Author:

sz

Message:

reformatting

File:

• cpp/frams/genetics/f9/conv_f9.cpp (modified) (8 diffs)

cpp/frams/genetics/f9/conv_f9.cpp

@@ -13 +13 @@
 {
         name = "Turtle3D-ortho encoding";
-        in_format  = '9';
+        in_format = '9';
         out_format = '0';
         mapsupport = 0; //would be easy and nice to add!
@@ -19 +19 @@
 
 
-const char* turtle_commands_f9 ="LRDUBF";
+const char* turtle_commands_f9 = "LRDUBF";
 
 //const char* turtle_commandsX_f9="-+0000";
@@ -31 +31 @@
         Model m;
         m.open();
-        int recently_added=addSegment(m,vertices,current,0xDead);
-        for(int i=0;i<in.len();i++)
+        int recently_added = addSegment(m, vertices, current, 0xDead);
+        for (int i = 0; i < in.len(); i++)
         {
-                char command=in[i];
-                char *ptr=strchr((char*)turtle_commands_f9,command);
+                char command = in[i];
+                char *ptr = strchr((char*)turtle_commands_f9, command);
                 if (ptr)
                 {
-                        int delta[]={0,0,0};
-                        int pos=ptr-turtle_commands_f9;
-                        int axis=pos/2;
-                        int dir=pos%2;
-                        (*(delta+axis))+=dir*2-1; //+1 or -1 in the given axis
+                        int delta[] = { 0, 0, 0 };
+                        int pos = ptr - turtle_commands_f9;
+                        int axis = pos / 2;
+                        int dir = pos % 2;
+                        (*(delta + axis)) += dir * 2 - 1; //+1 or -1 in the given axis
                         current.add(delta);
-                        recently_added=addSegment(m,vertices,current,recently_added);
+                        recently_added = addSegment(m, vertices, current, recently_added);
                 }
         }
@@ -57 +57 @@
 }
 
-int GenoConv_f90::addSegment(Model &m,vector<XYZ_LOC> &vertices,const XYZ_LOC &new_vertex,int recently_added)
+int GenoConv_f90::addSegment(Model &m, vector<XYZ_LOC> &vertices, const XYZ_LOC &new_vertex, int recently_added)
 {
-        if (vertices.size()<1) //empty model?
+        if (vertices.size() < 1) //empty model?
         {
-                return addNewVertex(m,vertices,new_vertex);
-        } else
+                return addNewVertex(m, vertices, new_vertex);
+        }
+        else
         {
-                int vertex_here=findVertexAt(vertices,new_vertex);
-                if (vertex_here<0) //need to create a new Part
+                int vertex_here = findVertexAt(vertices, new_vertex);
+                if (vertex_here < 0) //need to create a new Part
                 {
-                        vertex_here=addNewVertex(m,vertices,new_vertex);
+                        vertex_here = addNewVertex(m, vertices, new_vertex);
                 } //else there already exists a Part in new_vertex; new Joint may or may not be needed
-                Part *p1=m.getPart(recently_added);
-                Part *p2=m.getPart(vertex_here);
-                if (m.findJoint(p1,p2)<0 && m.findJoint(p2,p1)<0) //new Joint needed? should always be true if we just created a new Part (vertex_here was <0)
+                Part *p1 = m.getPart(recently_added);
+                Part *p2 = m.getPart(vertex_here);
+                if (m.findJoint(p1, p2) < 0 && m.findJoint(p2, p1) < 0) //new Joint needed? should always be true if we just created a new Part (vertex_here was <0)
                 {
-                        m.addNewJoint(p1,p2);
+                        m.addNewJoint(p1, p2);
                 }
                 return vertex_here;
@@ -79 +80 @@
 }
 
-int GenoConv_f90::findVertexAt(vector<XYZ_LOC> &vertices,const XYZ_LOC &vertex)
+int GenoConv_f90::findVertexAt(vector<XYZ_LOC> &vertices, const XYZ_LOC &vertex)
 {
-        for(int i=0;i<vertices.size();i++)
+        for (int i = 0; i < vertices.size(); i++)
                 if (vertices[i].same_coordinates(vertex)) return i;
         return -1;
@@ -87 +88 @@
 
 
-int GenoConv_f90::addNewVertex(Model &m,vector<XYZ_LOC> &vertices,const XYZ_LOC &new_vertex)
+int GenoConv_f90::addNewVertex(Model &m, vector<XYZ_LOC> &vertices, const XYZ_LOC &new_vertex)
 {
-        Part *p=new Part;
-        p->p.x=new_vertex.x;
-        p->p.y=new_vertex.y;
-        p->p.z=new_vertex.z;
+        Part *p = new Part;
+        p->p.x = new_vertex.x;
+        p->p.y = new_vertex.y;
+        p->p.z = new_vertex.z;
         m.addPart(p);
 
         vertices.push_back(new_vertex);
-        return vertices.size()-1;
+        return vertices.size() - 1;
 }
 
-double mix(int *colortab,int maxind,double ind)
+double mix(int *colortab, int maxind, double ind)
 {
-        int indpre=(int)ind;
-        int indpost=indpre+1;
-        if (indpost>maxind) indpost=maxind;
-        int v1=colortab[indpre];
-        int v2=colortab[indpost];
-        double d1=ind-indpre;
-        double d2=indpost-ind;
-        double v=indpre==indpost?v1:d2*v1+d1*v2; //d1+d2==1
+        int indpre = (int)ind;
+        int indpost = indpre + 1;
+        if (indpost > maxind) indpost = maxind;
+        int v1 = colortab[indpre];
+        int v2 = colortab[indpost];
+        double d1 = ind - indpre;
+        double d2 = indpost - ind;
+        double v = indpre == indpost ? v1 : d2*v1 + d1*v2; //d1+d2==1
         return v;
 }
@@ -115 +116 @@
 {
         //a rainbow on Joints: from the first one red, through middle green, to blue or violet - last
-        static int r[]={1,1,0,0,0,1};
-        static int g[]={0,1,1,1,0,0};
-        static int b[]={0,0,0,1,1,1};
-        int maxind=ARRAY_LENGTH(r)-1;
+        static int r[] = { 1, 1, 0, 0, 0, 1 };
+        static int g[] = { 0, 1, 1, 1, 0, 0 };
+        static int b[] = { 0, 0, 0, 1, 1, 1 };
+        int maxind = ARRAY_LENGTH(r) - 1;
 
-        int joints_count=m.getJointCount();
-        for(int i=0;i<joints_count;i++)
+        int joints_count = m.getJointCount();
+        for (int i = 0; i < joints_count; i++)
         {
-                Joint *j=m.getJoint(i);
-                double x=joints_count<2?0:(double)i/(joints_count-1); //0..1, postion in the rainbow
-                double ind=x*maxind;
-                j->vcolor.x=mix(r,maxind,ind);
-                j->vcolor.y=mix(g,maxind,ind);
-                j->vcolor.z=mix(b,maxind,ind);
+                Joint *j = m.getJoint(i);
+                double x = joints_count < 2 ? 0 : (double)i / (joints_count - 1); //0..1, postion in the rainbow
+                double ind = x*maxind;
+                j->vcolor.x = mix(r, maxind, ind);
+                j->vcolor.y = mix(g, maxind, ind);
+                j->vcolor.z = mix(b, maxind, ind);
         }
 
-        int parts_count=m.getPartCount();
+        int parts_count = m.getPartCount();
         SList jlist;
-        for(int i=0;i<parts_count;i++)
+        for (int i = 0; i<parts_count; i++)
         {
-                Part *p=m.getPart(i);
+                Part *p = m.getPart(i);
                 jlist.clear();
-                int count=m.findJoints(jlist,p);
-                Pt3D averagecolor(0,0,0); //Parts will get averaged colors from all attached Joints
-                FOREACH(Joint*,j,jlist)
-                        averagecolor+=j->vcolor;
-                if (count>5) count=5; //avoid too fat...
-                p->vsize=0.3+count/15.0; //the more Joints is attached to a Part, the fatter it is
-                p->vcolor=averagecolor/count;
+                int count = m.findJoints(jlist, p);
+                Pt3D averagecolor(0, 0, 0); //Parts will get averaged colors from all attached Joints
+                FOREACH(Joint*, j, jlist)
+                        averagecolor += j->vcolor;
+                p->vcolor = averagecolor / count;
+                if (count>5) count = 5; //avoid too fat...
+                p->vsize = 0.3 + count / 15.0; //the more Joints is attached to a Part, the fatter it is
         }
 }
@@ -149 +150 @@
 void GenoConv_f90::perturbPartLocations(Model &m) //deterministic "body noise", see APPLY_DETERMINISTIC_BODY_NOISE
 {
-        for(int i=0;i<m.getPartCount();i++)
+        for (int i = 0; i < m.getPartCount(); i++)
         {
-                Part *p=m.getPart(i);
+                Part *p = m.getPart(i);
                 Pt3D noise(
-                        ((i+1)  %10)-4.5  ,
-                        ((3*i+5)%10)-4.5  ,
-                        ((7*i+2)%10)-4.5
+                        ((i + 1) % 10) - 4.5,
+                        ((3 * i + 5) % 10) - 4.5,
+                        ((7 * i + 2) % 10) - 4.5
                         ); //-4.5 .. 4.5 in each axis
-                p->p+=noise/1000;
+                p->p += noise / 1000;
         }
 }