Changeset 5078 in orxonox.OLD for trunk

Timestamp:

Aug 19, 2005, 5:02:38 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Shell is running, but only in orxonox-world, not all-over
I do not know why this behaviour occurs, but maybe it is because of some errors in other pointers…
who knows

Location:

trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (1 diff)
• lib/graphics/render2D/render_2d.cc (modified) (1 diff)
• lib/graphics/text_engine.cc (modified) (2 diffs)
• lib/graphics/text_engine.h (modified) (1 diff)
• orxonox.cc (modified) (3 diffs)
• story_entities/world.cc (modified) (3 diffs)
• util/resource_manager.cc (modified) (1 diff)
• util/shell.cc (modified) (3 diffs)

trunk/src/lib/graphics/graphics_engine.cc

@@ -451 +451 @@
       this->geTextMaxFPS->setAlignment(TEXT_ALIGN_LEFT);
       this->geTextMaxFPS->setPosition2D(5, 35);
-      this->geTextMinFPS = TextEngine::getInstance()->createText("fonts/arial_black.ttf", 35, TEXT_DYNAMIC, 0, 255, 0);
+      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);

trunk/src/lib/graphics/render2D/render_2d.cc

@@ -88 +88 @@
 void Render2D::moveToLayer(Element2D* element2D, E2D_LAYER to)
 {
-  this->element2DList[(int)log2(element2D->getLayer())]->remove(element2D);
-  this->element2DList[(int)log2(to)]->add(element2D);
+  if (element2D->getLayer() != to)
+  {
+    this->element2DList[(int)log2(element2D->getLayer())]->remove(element2D);
+    this->element2DList[(int)log2(to)]->add(element2D);
+  }
 }
 

trunk/src/lib/graphics/text_engine.cc

@@ -813 +813 @@
 /**
  *  creates a new Text with a certain font.
-   \see Font::Font
-   \see Text::Text
+   @see Font::Font
+   @see Text::Text
 */
 Text* TextEngine::createText(const char* fontFile, unsigned int fontSize, int textType, Uint8 r, Uint8 g, Uint8 b)
@@ -831 +831 @@
 
   return new Text(tmpFont, TEXT_DYNAMIC);
-}
-
-/**
- *  deletes all the Text, and tries to delete all allocated fonts
-*/
-void TextEngine::flush()
-{
-  tIterator<BaseObject>* textIterator = ClassList::getList(CL_TEXT)->getIterator();
-  Text* text = dynamic_cast<Text*>(textIterator->nextElement());
-  while( text != NULL)
-    {
-      delete text;
-      text = dynamic_cast<Text*>(textIterator->nextElement());
-    }
-  delete textIterator;
 }
 

trunk/src/lib/graphics/text_engine.h

@@ -218 +218 @@
                    Uint8 b = FONT_DEFAULT_COLOR_B);
 
-  void flush();
-
   void debug() const;
 

trunk/src/orxonox.cc

@@ -80 +80 @@
 Orxonox::~Orxonox ()
 {
-  delete this->iniParser;
-  delete this->configFileName;
-
   delete GraphicsEngine::getInstance(); // deleting the Graphics
   delete TextEngine::getInstance();
@@ -94 +91 @@
   delete GarbageCollector::getInstance();
   FastFactory::deleteAll();
-  delete Shell::getInstance();
 
   delete EventHandler::getInstance();
+  delete this->iniParser;
+  delete this->configFileName;
 
   ClassList::debug();
@@ -259 +257 @@
 int Orxonox::initMisc()
 {
-  Shell::getInstance();
   return 0;
 }

trunk/src/story_entities/world.cc

@@ -115 +115 @@
 World::~World ()
 {
+  delete Shell::getInstance();
   PRINTF(3)("World::~World() - deleting current world\n");
 
@@ -130 +131 @@
 
   // external engines initialized by the orxonox-class get deleted
-  TextEngine::getInstance()->flush();
   SoundEngine::getInstance()->flushAllBuffers();
   SoundEngine::getInstance()->flushAllSources();
@@ -195 +195 @@
 
   /* init the world interface */
+  Shell::getInstance();
 
   LightManager::getInstance();

trunk/src/util/resource_manager.cc

@@ -559 +559 @@
                     subMatch = true;
                 }
-              else if (enumRes->modelSize =- *(int*)param1)
+              else if (enumRes->ttfSize == *(int*)param1)
                 subMatch = true;
               if(subMatch)

trunk/src/util/shell.cc

@@ -41 +41 @@
   //this->bufferDisplaySize = 0;
   this->setBufferSize(100);
-  // this->setBufferDisplaySize(1);
-
+  this->setBufferDisplaySize(1);
+
+//  this->inputLineText = TextEngine::getInstance()->createText("fonts/earth.ttf", 10, TEXT_DYNAMIC, 0, 255, 0);
+//  this->inputLineText->setText(NULL);
 
   //this->addBufferLineStatic("asjflksjdvklasmv %s", "doom");
@@ -81 +83 @@
     newText->setText("");
     this->bufferText->add(newText);
-    // add the Text here
   }
 }
@@ -137 +138 @@
 void Shell::addBufferLine(const char* line, va_list arguments)
 {
-//  vsprintf(this->bufferArray, line, arguments);
-
-//  char* newLine = new char[strlen(this->bufferArray)+1];
-//  strcpy(newLine, this->bufferArray);
-
-//  this->buffer->add(newLine);
-
-//    if (this->buffer->getSize() > this->bufferSize)
-//    {
-//      delete this->buffer->firstElement();
-//      this->buffer->remove(this->buffer->firstElement());
-//    }
-
-//  this->bufferText->firstElement()->setText(newLine);
+   vsprintf(this->bufferArray, line, arguments);
+
+   char* newLine = new char[strlen(this->bufferArray)+1];
+   strcpy(newLine, this->bufferArray);
+
+//   this->buffer->add(newLine);
+//
+//   if (this->buffer->getSize() > this->bufferSize)
+//   {
+//     delete this->buffer->firstElement();
+//     this->buffer->remove(this->buffer->firstElement());
+//   }
+
+  this->bufferText->firstElement()->setText(newLine);
+//  this->inputLineText->setText(line);
 }