Changeset 9092 in orxonox.OLD for branches/presentation/src/lib/graphics

Timestamp:

Jul 4, 2006, 2:38:00 AM (18 years ago)

Author:

bensch

Message:

cmath (valgrinded)

Location:

branches/presentation/src/lib/graphics

Files:

• importer/primitive_model.cc (modified) (1 diff)
• spatial_separation/quadtree.cc (modified) (5 diffs)
• spatial_separation/quadtree_node.cc (modified) (1 diff)

branches/presentation/src/lib/graphics/importer/primitive_model.cc

@@ -18 +18 @@
 #include "primitive_model.h"
 
-#include <math.h>
 #include "vector.h"
 #include "debug.h"

branches/presentation/src/lib/graphics/spatial_separation/quadtree.cc

@@ -52 +52 @@
 
   /* make an array with access to the leafs of the Quad-Tree */
-  this->nodes = new QuadtreeNode*[(int)pow(4, treeDepth)];
+  this->nodes = new QuadtreeNode*[(int)pow(4.0, treeDepth)];
   int index = 0; //new int; *index = 0; // !!changed by bensch!!
-  for(int i = 0; i < (int)pow(2, treeDepth); ++i)
+  for(int i = 0; i < (int)pow(2.0, treeDepth); ++i)
   {
     this->rootNode->buildHashTable(this->nodes, &index);
@@ -70 +70 @@
   this->offset->x = xOff;
   this->offset->z = yOff;
-  this->maxIndex = (int)pow(2, this->treeDepth);
+  this->maxIndex = (int)pow(2.0, this->treeDepth);
 }
 
@@ -103 +103 @@
 void Quadtree::revertHashTable(QuadtreeNode** nodes)
 {
-  int                  len         = (int)pow(2, this->treeDepth);          //!< the length of a quadtree side
+  int                  len         = (int)pow(2.0, this->treeDepth);          //!< the length of a quadtree side
   int                  iterator    = 0;                                     //!< iterator used for mapping
   QuadtreeNode*        tmpNode     = NULL;                                  //!< temp saving place
@@ -132 +132 @@
 void Quadtree::sortHashTable(QuadtreeNode** nodes)
 {
-  int                  len         = (int)pow(2, this->treeDepth);          //!< the length of a quadtree side
+  int                  len         = (int)pow(2.0, this->treeDepth);          //!< the length of a quadtree side
   float                a;                                                   //!< temp place for float a
   float                b;                                                   //!< temp place for float b
@@ -207 +207 @@
 {
   //this->rootNode->drawTree();
-  for(int i = 0; i < (int)pow(4, this->treeDepth); ++i)
+  for(int i = 0; i < (int)pow(4.0, this->treeDepth); ++i)
   {
     this->nodes[i]->draw();

branches/presentation/src/lib/graphics/spatial_separation/quadtree_node.cc

@@ -164 +164 @@
 
   /*              offset              #of elements in a row            #of rows in a quadtree          */
-  int threshold = this->nodeIter + (int)pow(2, this->maxDepth) * (int)pow(2, maxDepth - treeDepth - 1);
+  int threshold = this->nodeIter + (int)pow(2.0, this->maxDepth) * (int)pow(2.0, maxDepth - treeDepth - 1);
   int loopLimit = (*index < threshold)?2:4;