Changeset 5430 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

Oct 24, 2005, 9:21:15 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: static definitions

Location:

trunk/src/lib/graphics

Files:

• importer/abstract_model.h (modified) (2 diffs)
• importer/model.cc (modified) (1 diff)
• spatial_separation/quadtree.cc (modified) (1 diff)
• spatial_separation/quadtree.h (modified) (2 diffs)
• spatial_separation/quadtree_node.cc (modified) (1 diff)
• spatial_separation/quadtree_node.h (modified) (2 diffs)

trunk/src/lib/graphics/importer/abstract_model.h

@@ -116 +116 @@
 } sAnimState;
 
-
+//! Model Information definitions
 typedef struct
 {
-  unsigned int     numVertices;
-  unsigned int     numTriangles;
-  unsigned int     numNormals;
+  unsigned int     numVertices;          //!< number of Vertices in the Model
+  unsigned int     numTriangles;         //!< number of triangles in the Model
+  unsigned int     numNormals;           //!< how many Normals in the Model
   unsigned int     numTexCoor;
 
-  const float*     pVertices;
-  sTriangleExt*    pTriangles;
-  const float*     pNormals;
-  const float*     pTexCoor;
+  const float*     pVertices;            //!< array of the Vertives
+  sTriangleExt*    pTriangles;           //!< array of all triangles
+  const float*     pNormals;             //!< array of the Normals
+  const float*     pTexCoor;             //!< array of the Texture Coordinates
 
 } modelInfo;
@@ -140 +140 @@
     virtual ~AbstractModel() {}
 
-    inline modelInfo* getModelInfo() const { return this->pModelInfo; }
+    inline const modelInfo* getModelInfo() const { return this->pModelInfo; }
 
 
   protected:
-    modelInfo*     pModelInfo;      //!< Reference to the modelInfo defined in abstract_model.h
-    Quadtree*      quadtreel;       //!< Reference to the quadtree of the object, NULL if not defined
+    modelInfo*     pModelInfo;      //!< Reference to the modelInfo
 };
 
-
-
-
-
 #endif /* _ABSTRACT_MODEL_H */

trunk/src/lib/graphics/importer/model.cc

@@ -21 +21 @@
 
 #include "stdlibincl.h"
-#include <math.h>
-
 #include <stdarg.h>
 

trunk/src/lib/graphics/spatial_separation/quadtree.cc

@@ -31 +31 @@
  *  standard constructor
  */
-Quadtree::Quadtree (modelInfo* pModelInfo, const int treeDepth)
+Quadtree::Quadtree (const modelInfo* pModelInfo, const int treeDepth)
 {
   this->setClassID(CL_QUADTREE, "Quadtree");

trunk/src/lib/graphics/spatial_separation/quadtree.h

@@ -24 +24 @@
 
   public:
-    Quadtree(modelInfo* pModelInfo, const int treeDepth);
+    Quadtree(const modelInfo* pModelInfo, const int treeDepth);
     virtual ~Quadtree();
 
@@ -42 +42 @@
     QuadtreeNode*                   rootNode;              //!< reference to the root node of the quadtree
     QuadtreeNode**                  nodes;                 //!< reference to all quadtree nodes (only leafs of the quad tree)
-    modelInfo*                      pModelInfo;            //!< reference to the modelInfo of the object
+    const modelInfo*                pModelInfo;            //!< reference to the modelInfo of the object
     int                             treeDepth;             //!< depth of the tree
 

trunk/src/lib/graphics/spatial_separation/quadtree_node.cc

@@ -68 +68 @@
  *  standard constructor
  */
-QuadtreeNode::QuadtreeNode(modelInfo* pModelInfo, Quadtree* quadtree, const int maxDepth)
+QuadtreeNode::QuadtreeNode(const modelInfo* pModelInfo, Quadtree* quadtree, const int maxDepth)
 {
   /* save all important variables localy */

trunk/src/lib/graphics/spatial_separation/quadtree_node.h

@@ -32 +32 @@
                  Rectangle* rect, int treeDepth, const int maxDepth, int index
                 );
-    QuadtreeNode(modelInfo* pModelInfo, Quadtree* quadtree, const int maxDepth);
+    QuadtreeNode(const modelInfo* pModelInfo, Quadtree* quadtree, const int maxDepth);
     virtual ~QuadtreeNode();
 
@@ -82 +82 @@
     unsigned int                    numTriangles;       //!< number of triangles of the Node
     unsigned int                    numVertices;        //!< number of vertices of the node
-    modelInfo*                      pModelInfo;         //!< reference to the modelInfo of the object
+    const modelInfo*                pModelInfo;         //!< reference to the modelInfo of the object
     Rectangle*                      pDimension;         //!< pointer to the local rectangle properties