Changeset 5079 in orxonox.OLD for trunk

Timestamp:

Aug 19, 2005, 5:10:35 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: minor optimisations

Location:

trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (3 diffs)
• util/shell.cc (modified) (1 diff)
• util/track/track_manager.cc (modified) (1 diff)

trunk/src/lib/graphics/graphics_engine.cc

@@ -46 +46 @@
   this->maxFPS = 0;
 
+  this->geTextCFPS = NULL;
+  this->geTextMaxFPS = NULL;
+  this->geTextMinFPS = NULL;
+
   this->fullscreenFlag = 0;
 }
@@ -60 +64 @@
 {
   // delete what has to be deleted here
+  delete this->geTextCFPS;
+  delete this->geTextMaxFPS;
+  delete this->geTextMinFPS;
+
 
   delete Render2D::getInstance();
@@ -445 +453 @@
     {
 #ifndef NO_TEXT
-      this->geTextCFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_DYNAMIC, 0, 255, 0);
-      this->geTextCFPS->setAlignment(TEXT_ALIGN_LEFT);
-      this->geTextCFPS->setPosition2D(5, 5);
+if (this->geTextCFPS == NULL)
+{
+  this->geTextCFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_DYNAMIC, 0, 255, 0);
+  this->geTextCFPS->setAlignment(TEXT_ALIGN_LEFT);
+  this->geTextCFPS->setPosition2D(5, 5);
+}
+if (this->geTextMaxFPS == NULL)
+{
       this->geTextMaxFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_DYNAMIC, 0, 255, 0);
       this->geTextMaxFPS->setAlignment(TEXT_ALIGN_LEFT);
       this->geTextMaxFPS->setPosition2D(5, 35);
+}
+if (this->geTextMinFPS == NULL)
+{
       this->geTextMinFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 15, TEXT_DYNAMIC, 0, 255, 0);
       this->geTextMinFPS->setAlignment(TEXT_ALIGN_LEFT);
       this->geTextMinFPS->setPosition2D(5, 65);
+}
 #endif /* NO_TEXT */
     }

trunk/src/util/shell.cc

@@ -59 +59 @@
 {
   // delete what has to be deleted here
+  tIterator<Text>* textIterator = this->bufferText->getIterator();
+  Text* textElem = textIterator->nextElement();
+
+  while (textElem != NULL)
+  {
+    delete textElem;
+
+    textElem = textIterator->nextElement();
+  }
+  delete textIterator;
+  delete this->bufferText;
 
   Shell::singletonRef = NULL;

trunk/src/util/track/track_manager.cc

@@ -458 +458 @@
   delete this->firstTrackElem;
 
+  delete this->trackText;
   // the tracknode should be deleted here, but is deleted by pNode: -> null_parent