Changeset 611 for cpp/frams/model


Ignore:
Timestamp:
09/09/16 15:21:47 (4 years ago)
Author:
Maciej Komosinski
Message:

Code formatting

Location:
cpp/frams/model
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/model/model.cpp

    r610 r611  
    997997                                else
    998998                                { // abs.positioning -> calc. delta
    999                                         if (check!=EDITING_CHECK)
     999                                        if (check != EDITING_CHECK)
    10001000                                        {
    10011001                                                // calc orient delta
     
    10121012                                        }
    10131013                                }
    1014                                 if (check!=LIVE_CHECK)
     1014                                if (check != LIVE_CHECK)
    10151015                                {
    10161016                                        if (j->shape != Joint::SHAPE_FIXED)
  • cpp/frams/model/model.h

    r610 r611  
    122122        /// used in internalCheck()
    123123        enum CheckType {
    124          EDITING_CHECK, ///< Used in Model::validate(). Default validation - does not modify elements of the Model.
    125          FINAL_CHECK,   ///< Used in Model::close() when a Model is built from a genotype. Like EDITING_CHECK, but also calculates Joint::d and Joint::rot.
    126          LIVE_CHECK     ///< used in Model::close() when a Model is built from a Creature. Like FINAL_CHECK but does not limit joint length which could make some liveModels invalid.
     124                EDITING_CHECK, ///< Used in Model::validate(). Default validation - does not modify elements of the Model.
     125                FINAL_CHECK,   ///< Used in Model::close() when a Model is built from a genotype. Like EDITING_CHECK, but also calculates Joint::d and Joint::rot.
     126                LIVE_CHECK     ///< used in Model::close() when a Model is built from a Creature. Like FINAL_CHECK but does not limit joint length which could make some liveModels invalid.
    127127        };
    128128protected:
     
    310310        /// It also calls "validate" with all side effects.
    311311        /// @return > 0 means "valid"
    312         int close(bool building_live_model=false);
     312        int close(bool building_live_model = false);
    313313
    314314        /// Enable model building.
     
    459459   For ball-and-stick-type Models, the new temporary Model is created (using Model::buildUsingSolidShapeTypes).
    460460   Useful for making the solids-only code work for both solids Models and ball-and-stick Models, without if's and special cases, like in this example:
    461    
     461
    462462   void fun(const Model& input) // 'input' can be any shape type
    463463   {
    464       SolidsShapeTypeModel converted(input); // 'converted' contains either 'input' or the new solids-type Model created from 'input'
    465       functionAcceptingSolidsTypeModel(converted); // operator const Model&() is called automatically because of the function signature
    466       int n=converted.getModel().getPartCount(); // getting the const Model& explicitly (converted.getPartCount() would fail)
     464   SolidsShapeTypeModel converted(input); // 'converted' contains either 'input' or the new solids-type Model created from 'input'
     465   functionAcceptingSolidsTypeModel(converted); // operator const Model&() is called automatically because of the function signature
     466   int n=converted.getModel().getPartCount(); // getting the const Model& explicitly (converted.getPartCount() would fail)
    467467   }
    468  */
     468   */
    469469class SolidsShapeTypeModel
    470470{
Note: See TracChangeset for help on using the changeset viewer.