Changeset 611

Timestamp:

09/09/16 15:21:47 (8 years ago)

Author:

Maciej Komosinski

Message:

Code formatting

Location:

cpp/frams/model

Files:

• model.cpp (modified) (2 diffs)
• model.h (modified) (3 diffs)

cpp/frams/model/model.cpp

@@ -997 +997 @@
                                 else
                                 { // abs.positioning -> calc. delta
-                                        if (check!=EDITING_CHECK)
+                                        if (check != EDITING_CHECK)
                                         {
                                                 // calc orient delta
@@ -1012 +1012 @@
                                         }
                                 }
-                                if (check!=LIVE_CHECK)
+                                if (check != LIVE_CHECK)
                                 {
                                         if (j->shape != Joint::SHAPE_FIXED)

cpp/frams/model/model.h

@@ -122 +122 @@
         /// used in internalCheck()
         enum CheckType {
-         EDITING_CHECK, ///< Used in Model::validate(). Default validation - does not modify elements of the Model.
-         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.
-         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.
+                EDITING_CHECK, ///< Used in Model::validate(). Default validation - does not modify elements of the Model.
+                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.
+                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.
         };
 protected:
@@ -310 +310 @@
         /// It also calls "validate" with all side effects.
         /// @return > 0 means "valid"
-        int close(bool building_live_model=false);
+        int close(bool building_live_model = false);
 
         /// Enable model building.
@@ -459 +459 @@
    For ball-and-stick-type Models, the new temporary Model is created (using Model::buildUsingSolidShapeTypes).
    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:
-   
+
    void fun(const Model& input) // 'input' can be any shape type
    {
-      SolidsShapeTypeModel converted(input); // 'converted' contains either 'input' or the new solids-type Model created from 'input'
-      functionAcceptingSolidsTypeModel(converted); // operator const Model&() is called automatically because of the function signature
-      int n=converted.getModel().getPartCount(); // getting the const Model& explicitly (converted.getPartCount() would fail)
+   SolidsShapeTypeModel converted(input); // 'converted' contains either 'input' or the new solids-type Model created from 'input'
+   functionAcceptingSolidsTypeModel(converted); // operator const Model&() is called automatically because of the function signature
+   int n=converted.getModel().getPartCount(); // getting the const Model& explicitly (converted.getPartCount() would fail)
    }
- */
+   */
 class SolidsShapeTypeModel
 {