Changeset 544 for cpp/frams/genetics


Ignore:
Timestamp:
07/28/16 01:09:29 (4 years ago)
Author:
Maciej Komosinski
Message:

Renamed:
Model::getShape() ==> Model::getShapeType()
Model::SHAPE_OLD ==> Model::SHAPE_BALL_AND_STICK
Model::SHAPE_NEW ==> Model::SHAPE_SOLIDS
Part::SHAPE_DEFAULT ==> Part::SHAPE_BALL_AND_STICK
Joint::SHAPE_DEFAULT ==> Joint::SHAPE_BALL_AND_STICK
Joint::SHAPE_SOLID ==> Joint::SHAPE_FIXED

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/genetics/fF/conv_fF.cpp

    r348 r544  
    5959                Part *p2 = addNewPart(&m, chambers[i]);
    6060                p2->scale = p1->scale.entrywiseProduct(Pt3D(gp.scalex, gp.scaley, gp.scalez)); //each part's scale is its predecessor's scale * scaling
    61                 m.addNewJoint(p1, p2, Joint::SHAPE_SOLID); //all parts must be connected
     61                m.addNewJoint(p1, p2, Joint::SHAPE_FIXED); //all parts must be connected
    6262                p1 = p2;
    6363        }
     
    6868
    6969        m.close();
    70         return m.getF0Geno().getGene();
     70        return m.getF0Geno().getGenes();
    7171}
    7272
Note: See TracChangeset for help on using the changeset viewer.