Changeset 5099 in orxonox.OLD for trunk

Timestamp:

Aug 22, 2005, 1:06:39 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Background for the Shell

Location:

trunk/src/util

Files:

• loading/load_param.cc (modified) (1 diff)
• loading/load_param.h (modified) (1 diff)
• shell.cc (modified) (2 diffs)

trunk/src/util/loading/load_param.cc

@@ -197 +197 @@
 LoadParamDescription::~LoadParamDescription()
 {
-  for(int i = 0; i < this->paramCount; i++)
+  if (this->types != NULL)
   {
-    delete this->types[i];
+    for(int i = 0; i < this->paramCount; i++)
+    {
+      delete []this->types[i];
+    }
   }
-  for(int i = 0; i < this->paramCount; i++)
+  if (this->defaultValues != NULL)
   {
-    delete this->defaultValues[i];
+    for(int i = 0; i < this->paramCount; i++)
+    {
+      delete []this->defaultValues[i];
+    }
   }
 

trunk/src/util/loading/load_param.h

@@ -135 +135 @@
         PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName()); \
     }
-
 
 // 2. TYPES

trunk/src/util/shell.cc

@@ -72 +72 @@
 Shell::~Shell ()
 {
-  // delete what has to be deleted here
+  // delete the displayable Buffers
   for (int i = 0; i < this->bufferDisplaySize; i++)
     delete this->bufferText[i];
   delete this->bufferText;
 
+  // delete the inputLine
   delete this->inputLineText;
   delete this->inputLine;
+
+  // delete all the Chars in the Buffers
+  tIterator<char>* charIterator = this->buffer->getIterator();
+  char* charElem = charIterator->nextElement();
+  while (charElem != NULL)
+  {
+    delete charElem;
+    charElem = charIterator->nextElement();
+  }
+  delete charIterator;
 
   Shell::singletonRef = NULL;
@@ -397 +408 @@
 void Shell::draw() const
 {
+  glPushMatrix();
+  // transform for alignment.
+  // setting the Blending effects
+
+  glColor4f(0.0f, 0.0f, 0.8f, .4);
+  glEnable(GL_BLEND);
+  glDisable(GL_TEXTURE_2D);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+
+//  glBindTexture(GL_TEXTURE_2D, this->texture);
+  glBegin(GL_QUADS);
+
+//  glTexCoord2f(this->texCoord.minU, this->texCoord.minV);
+  glVertex2f(this->getAbsCoor2D().x,   this->getAbsCoor2D().y  );
+
+//  glTexCoord2f(this->texCoord.maxU, this->texCoord.minV);
+  glVertex2f(this->getAbsCoor2D().x + 800, this->getAbsCoor2D().y  );
+
+//  glTexCoord2f(this->texCoord.maxU, this->texCoord.maxV);
+  glVertex2f(this->getAbsCoor2D().x + 800, this->getAbsCoor2D().y + 150);
+
+//  glTexCoord2f(this->texCoord.minU, this->texCoord.maxV);
+  glVertex2f(this->getAbsCoor2D().x, this->getAbsCoor2D().y + 150);
+
+  glEnd();
 }