Changeset 544 for cpp/frams/_demos


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

Location:
cpp/frams/_demos
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/_demos/geometry/geometrytestutils.cpp

    r382 r544  
    244244        part->vcolor = Pt3D(1.0, 1.0, 0.0);
    245245       
    246         model.addNewJoint(anchor, part, Joint::SHAPE_SOLID);
     246        model.addNewJoint(anchor, part, Joint::SHAPE_FIXED);
    247247}
    248248
     
    258258        part->p = center;
    259259        part->vcolor = Pt3D(1.0, 0.0, 0.0);
    260         model.addNewJoint(anchor, part, Joint::SHAPE_SOLID);
     260        model.addNewJoint(anchor, part, Joint::SHAPE_FIXED);
    261261       
    262262        part = model.addNewPart(Part::SHAPE_CUBOID);
     
    265265        part->p = center;
    266266        part->vcolor = Pt3D(0.0, 1.0, 0.0);
    267         model.addNewJoint(anchor, part, Joint::SHAPE_SOLID);
     267        model.addNewJoint(anchor, part, Joint::SHAPE_FIXED);
    268268       
    269269        part = model.addNewPart(Part::SHAPE_CUBOID);
     
    272272        part->p = center;
    273273        part->vcolor = Pt3D(0.0, 0.0, 1.0);
    274         model.addNewJoint(anchor, part, Joint::SHAPE_SOLID);
     274        model.addNewJoint(anchor, part, Joint::SHAPE_FIXED);
    275275}
    276276
     
    282282        target.moveElementsFrom(source);
    283283       
    284         target.addNewJoint(targetAnchor, sourceAnchor, Joint::SHAPE_SOLID);
     284        target.addNewJoint(targetAnchor, sourceAnchor, Joint::SHAPE_FIXED);
    285285}
    286286
  • cpp/frams/_demos/part_shapes.cpp

    r534 r544  
    3030                p2->setOrient(p1->o.transform(rotation)); //rotation transformed by p1's orientation
    3131
    32                 m.addNewJoint(p1, p2, Joint::SHAPE_SOLID); //all parts must be connected
     32                m.addNewJoint(p1, p2, Joint::SHAPE_FIXED); //all parts must be connected
    3333        }
    3434
     
    4545                        p2->scale = Pt3D(prev.distanceTo(next)*0.5, 0.05, 0.05);// distance*0.5 because scale is "radius", not cylinder length
    4646
    47                         m.addNewJoint(p1, p2, Joint::SHAPE_SOLID); //all parts must be connected
     47                        m.addNewJoint(p1, p2, Joint::SHAPE_FIXED); //all parts must be connected
    4848                }
    4949                p1 = p2;
  • cpp/frams/_demos/shapeconvert.cpp

    r534 r544  
    7575        }
    7676
    77         if (m.getShape() != Model::SHAPE_OLD)
     77        if (m.getShapeType() != Model::SHAPE_BALL_AND_STICK)
    7878        {
    79                 logPrintf("", "shapeconvert", LOG_ERROR, "Only old style shapes can be converted");
     79                logPrintf("", "shapeconvert", LOG_ERROR, "Only ball-and-stick models can be converted");
    8080                return 3;
    8181        }
Note: See TracChangeset for help on using the changeset viewer.