Changeset 2609 for GTP/trunk/Lib/Vis/Preprocessing/src/Mesh.h

Timestamp:

01/17/08 21:46:32 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Mesh.h (modified) (6 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/Mesh.h

@@ -62 +62 @@
 
 /** Mesh containing polygonal patches */
-class Mesh {
+class Mesh 
+{
 
 public:
 
   /// Default constructor
-  Mesh():mVertices(), mFaces(), mMaterial(NULL), mKdTree(NULL), mId(0) {}
+  Mesh(): mVertices(), mFaces(), mMaterial(NULL), mKdTree(NULL), mId(0) {}
 
   /// Constructor with container preallocation
-  Mesh(const int vertices, const int faces):
-    mFaces(),
-    mMaterial(NULL),
-    mKdTree(NULL),
-    mVertices(),
-    mIsConvex(false),
-    mIsWatertight(false),
-        mId(0)
-  {
-    mVertices.reserve(vertices);
-    mFaces.reserve(faces);
-  }
-
+  Mesh(const int vertices, const int faces);
   /** Constructor setting a unqiue mesh id.
   */
   Mesh(const int id);
-
   /** Setting unique mesh id and using preallocation.
   */
   Mesh(const int id, const int vertices, const int faces);
-
   /** Copy constructor making a deep copy of the faces.
   */
   Mesh(const Mesh &rhs);
-
   /** Assignement operator.
         @note does not copy id
@@ -116 +102 @@
   void AddFace(Face *face) 
   {
-    mFaces.push_back(face);
+          mFaces.push_back(face);
   }
 
   void ComputeBoundingBox();
-
   /** This function must be called after creating the mesh
         because it creates the local kd tree and the bounding box.
@@ -132 +117 @@
   void ApplyTransformation(const Matrix4x4 &m);
 
-  /** Axis aligned bounding box of the mesh in local mesh coordinates.
-  */
-  AxisAlignedBox3 mBox;
-  
-  /** Vertices forming the mesh.
-  */
+  /// Axis aligned bounding box of the mesh in local mesh coordinates.
+  AxisAlignedBox3 mBox; 
+  /// Vertices forming the mesh.
   VertexContainer mVertices;
-  
-  /** Patches forming the mesh.
-  */
+  /// Patches forming the mesh.
   FaceContainer mFaces;
-  
-  /** Global mesh material.
-  */
+  /// Global mesh material.
   Material *mMaterial;
-  
-  /** true if the mesh is a convex mesh.
-  */
+  /// true if the mesh is a convex mesh.
   bool mIsConvex;
-
-  /** true if the mesh is a convex mesh.
-  */
+  /// true if the mesh is a convex mesh.
   bool mIsWatertight;
 
@@ -202 +176 @@
   /** Returns unique mesh id.
   */
-  int GetId() const
-  {
-          return mId;
-  }
+  int GetId() const { return mId; }
 
 
@@ -245 +216 @@
 
 public:
-        MeshInstance(Mesh *mesh):Intersectable(), mMesh(mesh), mMaterial(NULL)
+        MeshInstance(Mesh *mesh): Intersectable(), mMesh(mesh), mMaterial(NULL)
         {
         }
@@ -315 +286 @@
 {
 public:
-  TransformedMeshInstance(Mesh *mesh);
-  
-  virtual AxisAlignedBox3 GetBox() const;
-   
-  
-  virtual int CastRay(Ray &ray);
-
-  virtual int CastRay(Ray &ray, const std::vector<int> &faces);
-
-  virtual int Type() const { return TRANSFORMED_MESH_INSTANCE; }
-
-  int GetRandomSurfacePoint(Vector3 &point, Vector3 &normal);
-
-  /** Transforms this mesh instance by m.
-  */
-  void ApplyWorldTransform(const Matrix4x4 &m);
-
-  /** Loads the transformation matrix into this mesh instance.
-  */
-  void LoadWorldTransform(const Matrix4x4 &m);
-
-  /** The transformation is returned in m.
-  */
-  void GetWorldTransform(Matrix4x4 &m) const;
-
-  /** Transforms a mesh according to the stored world transform.
-          @param transformedMesh returns the tranformed mesh.
-  */
-  void GetTransformedMesh(Mesh &transformedMesh) const;
-
-  Vector3 GetNormal(const int idx) const;
+        TransformedMeshInstance(Mesh *mesh);
+
+        virtual AxisAlignedBox3 GetBox() const;
+
+        virtual int CastRay(Ray &ray);
+
+        virtual int CastRay(Ray &ray, const std::vector<int> &faces);
+
+        virtual int Type() const { return TRANSFORMED_MESH_INSTANCE; }
+
+        int GetRandomSurfacePoint(Vector3 &point, Vector3 &normal);
+
+        /** Transforms this mesh instance by m.
+        */
+        void ApplyWorldTransform(const Matrix4x4 &m);
+        /** Loads the transformation matrix into this mesh instance.
+        */
+        void LoadWorldTransform(const Matrix4x4 &m);
+        /** The transformation is returned in m.
+        */
+        void GetWorldTransform(Matrix4x4 &m) const;
+        /** Transforms a mesh according to the stored world transform.
+                @param transformedMesh returns the tranformed mesh.
+        */
+        void GetTransformedMesh(Mesh &transformedMesh) const;
+
+        Vector3 GetNormal(const int idx) const;
 
 protected: