Changeset 259 for cpp/frams/genetics/f9/conv_f9.h

Timestamp:

12/05/14 08:09:47 (9 years ago)

Author:

Maciej Komosinski

Message:

Added support for genetic mapping in f9

File:

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

cpp/frams/genetics/f9/conv_f9.h

@@ -21 +21 @@
 struct XYZ_LOC
 {
-        int x,y,z; //coordinates xyz of a vertex - represented as int's so that it is easy and safe to check identity. Could also be done using lists of Model's Parts, but that would involve comparing floats
-        XYZ_LOC() {x=y=z=0;}
-        void add(int delta[3]) {x+=delta[0]; y+=delta[1]; z+=delta[2];}
-        bool same_coordinates(const XYZ_LOC &loc) {return x==loc.x && y==loc.y && z==loc.z;}
+        int x, y, z; //coordinates xyz of a vertex - represented as int's so that it is easy and safe to check identity. Could also be done using lists of Model's Parts, but that would involve comparing floats
+        XYZ_LOC() { x = y = z = 0; }
+        void add(int delta[3]) { x += delta[0]; y += delta[1]; z += delta[2]; }
+        bool same_coordinates(const XYZ_LOC &loc) { return x == loc.x && y == loc.y && z == loc.z; }
 };
 
 
 // The f9->f0 converter
-class GenoConv_f90: public GenoConverter
+class GenoConv_f90 : public GenoConverter
 {
 public:
@@ -39 +39 @@
 protected:
         //auxiliary methods
-        int addSegment(Model &m,vector<XYZ_LOC> &vertices,const XYZ_LOC &new_vertex,int recently_added);
-        int findVertexAt(vector<XYZ_LOC> &vertices,const XYZ_LOC &new_vertex);
-        int addNewVertex(Model &m,vector<XYZ_LOC> &punkty,const XYZ_LOC &nowypunkt);
+        int addSegment(Model &m, int genenr, vector<XYZ_LOC> &vertices, const XYZ_LOC &new_vertex, int recently_added);
+        int findVertexAt(vector<XYZ_LOC> &vertices, const XYZ_LOC &new_vertex);
+        int addNewVertex(Model &m, vector<XYZ_LOC> &punkty, const XYZ_LOC &nowypunkt);
         void setColors(Model &m); //sets fixed (independent from genes) colors and widths on a model, purely for aesthetic purposes
         void perturbPartLocations(Model &m); //deterministic "body noise", see APPLY_DETERMINISTIC_BODY_NOISE