Changeset 7164 in orxonox.OLD

Timestamp:

Feb 18, 2006, 5:32:35 PM (18 years ago)

Author:

bensch

Message:

deleted unused stuff

Location:

trunk/src/lib

Files:

• Makefile.am (modified) (1 diff)
• event/event_handler.cc (modified) (6 diffs)
• event/event_handler.h (modified) (2 diffs)
• graphics/shader.cc (modified) (7 diffs)
• graphics/shader.h (modified) (2 diffs)
• lang/class_list.cc (modified) (1 diff)
• util/array.h (deleted)
• util/t_stack.h (deleted)

trunk/src/lib/Makefile.am

@@ -19 +19 @@
                 lang/class_list.h \
                 util/substring.h \
-                util/array.h \
-                util/list.h \
-                util/t_stack.h \
+                util/multi_type.h \
                 util/color.h \
                 util/helper_functions.h \
-                util/multi_type.h \
                 util/executor/executor.h \
                 util/executor/executor_specials.h \
                 util/executor/functor_list.h \
                 util/count_pointer.h \
+                util/list.h \
                 coord/p_node.h \
                 data/data_tank.h \

trunk/src/lib/event/event_handler.cc

@@ -26 +26 @@
 #include "class_list.h"
 
-#include "t_stack.h"
-
 using namespace std;
 
@@ -51 +49 @@
   this->state = ES_GAME;
   this->keyMapper = NULL;
-  this->stateStack = NULL;
   this->eventsGrabbed = false;
 }
@@ -78 +75 @@
     }
   }
-  delete this->stateStack;
   delete this->keyMapper;
 
@@ -99 +95 @@
     this->keyMapper->loadKeyBindings(iniParser);
   }
-  if (this->stateStack == NULL)
-    this->stateStack = new tStack<short>;
 }
 
@@ -109 +103 @@
 void EventHandler::pushState(elState state)
 {
-  if (likely(state != ES_NULL && state != ES_ALL && this->stateStack != NULL))
-  {
-    this->stateStack->push(this->state);
+  if (likely(state != ES_NULL && state != ES_ALL ))
+  {
+    this->stateStack.push(this->state);
     this->setState(state);
   }
@@ -126 +120 @@
 elState EventHandler::popState()
 {
-  if (unlikely(this->stateStack == NULL))
-    return ES_NULL;
-  elState state = (elState)this->stateStack->pop();
+  elState state =  (elState)stateStack.top();
+  this->stateStack.pop();
   if (state == ES_NULL)
   {

trunk/src/lib/event/event_handler.h

@@ -11 +11 @@
 #include "key_mapper.h"
 #include "event_def.h"
+#include <stack>
 
 // FORWARD DECLARATION
 class EventListener;
-template<class T> class tStack;
 class IniParser;
 
@@ -59 +59 @@
   EventListener*             listeners[ES_NUMBER][EV_NUMBER]; //!< a list of registered listeners.
   elState                    state;                           //!< the state of the event handlder.
-  tStack<short>*             stateStack;                      //!< a stack for the States we are in.
+  std::stack<short>          stateStack;                      //!< a stack for the States we are in.
   KeyMapper*                 keyMapper;                       //!< reference to the key mapper.
 

trunk/src/lib/graphics/shader.cc

@@ -22 +22 @@
 #include <stdio.h>
 #include "debug.h"
-#include "array.h"
 
 #include "resource_manager.h"
@@ -126 +125 @@
 
 
-  tArray<char*>* program = fileReadArray(fileName);
-  if (program == NULL)
-    return false;
+  std::vector<char*>* program = fileReadArray(fileName);
 
   if (type == SHADER_VERTEX && GLEW_ARB_vertex_shader)
@@ -149 +146 @@
   {
     GLint status = 0;
-    glShaderSourceARB(shader, program->getCount(), (const char**)program->getArray(), NULL);
+    glShaderSourceARB(shader, program->size(), (const char**)&(*program)[0], NULL);
     glCompileShaderARB(shader);
     // checking on error.
@@ -158 +155 @@
       glAttachObjectARB(this->shaderProgram, shader);
   }
-  for (unsigned int i=0; i< program->getCount(); i++)
-    delete[] program->getArray()[i];
+  for (unsigned int i=0; i< program->size(); i++)
+    delete[] (*program)[i];
   delete program;
 }
@@ -190 +187 @@
 
 
-tArray<char*>* Shader::fileReadArray(const char* fileName)
+std::vector<char*>* Shader::fileReadArray(const char* fileName)
 {
   FILE*    stream;           //< The stream we use to read the file.
@@ -199 +196 @@
     return NULL;
   }
-  tArray<char*>* file = new tArray<char*>;
+  std::vector<char*>* file = new std::vector<char*>;
 
   char lineBuffer[PARSELINELENGHT];
@@ -207 +204 @@
     addString = new char[strlen(lineBuffer)+1];
     strcpy(addString, lineBuffer);
-    file->addEntry(addString);
+    file->push_back(addString);
   }
   fclose(stream);
-  file->finalizeArray();
   return file;
 }

trunk/src/lib/graphics/shader.h

@@ -9 +9 @@
 #include "base_object.h"
 #include "glincl.h"
+#include <vector>
 
-template<class T> class tArray;
 
 typedef enum
@@ -38 +38 @@
 
   char* fileRead(const char* fileName);
-  tArray<char*>* fileReadArray(const char* fileName);
+  std::vector<char*>* fileReadArray(const char* fileName);
 
   static bool checkShaderAbility();

trunk/src/lib/lang/class_list.cc

@@ -182 +182 @@
 ClassList* ClassList::getClassList(ClassID classID)
 {
-  std::vector<ClassList>::iterator classIT = std::find (ClassList::classList->begin(), ClassList::classList->end(), classID);
+  std::vector<ClassList>::iterator classIT =
+       std::find (ClassList::classList->begin(), ClassList::classList->end(), classID);
   return (likely(classIT != classList->end()))? &(*classIT) : NULL;
 }