Changeset 10914

Timestamp:

01/05/10 12:10:21 (3 years ago)

Author:

robert

Message:

Fixed indentation

Files:

• OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp (modified) (6 diffs)

OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp

@@ -115 +115 @@
 
 /// Possible options:
-///             - noMatrixTransforms: set the plugin to apply matrices into the mesh vertices ("old behaviour") instead of restoring them ("new behaviour"). You may use this option to avoid a few rounding errors.
-///             - checkForEspilonIdentityMatrices: if noMatrixTransforms is \b not set, then consider "almost identity" matrices to be identity ones (in case of rounding errors).
-///             - restoreMatrixTransformsNoMeshes: makes an exception to the behaviour when 'noMatrixTransforms' is \b not set for mesh instances. When a mesh instance has a transform on it, the reader creates a MatrixTransform above the Geode. If you don't want the hierarchy to be modified, then you can use this option to merge the transform into vertices.
+///        - noMatrixTransforms: set the plugin to apply matrices into the mesh vertices ("old behaviour") instead of restoring them ("new behaviour"). You may use this option to avoid a few rounding errors.
+///        - checkForEspilonIdentityMatrices: if noMatrixTransforms is \b not set, then consider "almost identity" matrices to be identity ones (in case of rounding errors).
+///        - restoreMatrixTransformsNoMeshes: makes an exception to the behaviour when 'noMatrixTransforms' is \b not set for mesh instances. When a mesh instance has a transform on it, the reader creates a MatrixTransform above the Geode. If you don't want the hierarchy to be modified, then you can use this option to merge the transform into vertices.
 class ReaderWriter3DS : public osgDB::ReaderWriter
 {
@@ -409 +409 @@
     Lib3dsMeshInstanceNode * object = (node->type == LIB3DS_NODE_MESH_INSTANCE) ? reinterpret_cast<Lib3dsMeshInstanceNode *>(node) : NULL;
     Lib3dsMesh * mesh = lib3ds_file_mesh_for_node(f,node);
-    assert(!(mesh && !object));         // Node must be a LIB3DS_NODE_MESH_INSTANCE if a mesh exists
+    assert(!(mesh && !object));        // Node must be a LIB3DS_NODE_MESH_INSTANCE if a mesh exists
 
     // Retreive LOCAL transform
@@ -433 +433 @@
             // There can be a transform directly on a mesh instance (= as if a osg::MatrixTransform and a osg::Geode were merged together) in object->pos/rot/scl
             if (!pivoted) {
-                                meshMat = osg::Matrix::inverse(copyLib3dsMatrixToOsgMatrix(mesh->matrix));
+                meshMat = osg::Matrix::inverse(copyLib3dsMatrixToOsgMatrix(mesh->matrix));
             } else {
                 meshMat = osg::Matrix::inverse(copyLib3dsMatrixToOsgMatrix(mesh->matrix)) * osg::Matrix::translate(-pivot);
@@ -439 +439 @@
         }
         else {
-                        if (pivoted) {
-                                meshMat = osg::Matrix::inverse(copyLib3dsMatrixToOsgMatrix(mesh->matrix)) * osg::Matrix::translate(-pivot) * copyLib3dsMatrixToOsgMatrix(node->matrix);
-                        } else {
-                                meshMat = osg::Matrix::inverse(copyLib3dsMatrixToOsgMatrix(mesh->matrix)) * copyLib3dsMatrixToOsgMatrix(node->matrix);
-                        }
-                        osgNodeMatrix = osg::Matrix::identity();                // Not sure it's useful, but it's harmless ;)
+            if (pivoted) {
+                meshMat = osg::Matrix::inverse(copyLib3dsMatrixToOsgMatrix(mesh->matrix)) * osg::Matrix::translate(-pivot) * copyLib3dsMatrixToOsgMatrix(node->matrix);
+            } else {
+                meshMat = osg::Matrix::inverse(copyLib3dsMatrixToOsgMatrix(mesh->matrix)) * copyLib3dsMatrixToOsgMatrix(node->matrix);
+            }
+            osgNodeMatrix = osg::Matrix::identity();        // Not sure it's useful, but it's harmless ;)
         }
     }
@@ -476 +476 @@
         }
     } else {
-        assert(node->childs == NULL);           // Else we must have a group to put childs into
+        assert(node->childs == NULL);        // Else we must have a group to put childs into
     }
 
@@ -1127 +1127 @@
         return false;
     w.writeMaterials();
-    return true;        //w.good();
+    return true;    //w.good();
 }
 #endif    // ENABLE_3DS_WRITER