Changeset 5068 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Aug 18, 2005, 3:51:43 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: added Shell Class to the utils.
This class should enable us to print all the output from orxonox directly onto the screen.
Also it should allow inputting some little Commands, so that we have more force over our little project

Also added a new Function to tList, removeLast, that is very quick in deleting the last element, as this is used inside of the Shell (deleting the Last Element is a major issue)

Location:

orxonox/trunk/src/lib

Files:

• graphics/render2D/element_2d.cc (modified) (1 diff)
• graphics/render2D/element_2d.h (modified) (3 diffs)
• graphics/render2D/render_2d.cc (modified) (1 diff)
• util/list.h (modified) (4 diffs)

orxonox/trunk/src/lib/graphics/render2D/element_2d.cc

@@ -55 +55 @@
 
   this->setVisibility(true);
+  this->setActiveness(true);
   this->setPosition2D(0,0);
   this->setAlignment(E2D_ALIGN_NONE);

orxonox/trunk/src/lib/graphics/render2D/element_2d.h

@@ -69 +69 @@
     /** @param visible true if the Element should be visible false otherwise (will not be rendered) */
     inline void setVisibility(bool visible) { this->visible = visible; };
+    /** @param active true if the Element should be active, false otherwise (will not be ticked) */
+    inline void setActiveness(bool active) { this->active = active; };
+
 
     /** @param bindNode the Node this 2D-element should follow. if NULL the Element will not follow anything */
@@ -76 +79 @@
     /** @returns the visibility state */
     inline bool isVisible() { return this->visible; };
+    /** @returns the active-State */
+    inline bool isActive() { return this->active; };
 
     virtual void tick(float dt);
@@ -91 +96 @@
 
   private:
-    bool                    visible;
-    E2D_LAYER               layer;
+    bool                    visible;          //!< If the given Element2D is visible.
+    bool                    active;           //!< If the given Element2D is active.
+    E2D_LAYER               layer;            //!< What layer this Element2D is on.
 };
 

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

@@ -105 +105 @@
     while (elem != NULL)
     {
-      elem->tick(dt);
+      if (elem->isActive())
+        elem->tick(dt);
       elem = iterator->nextElement();
     }

orxonox/trunk/src/lib/util/list.h

@@ -1 +1 @@
 /*!
-  \file list.h
-  \brief a File that includes a List-template
-*/
+ * @file list.h
+ * a File that includes a List-template
+ */
 
 #ifndef _LIST_H
@@ -132 +132 @@
   void add(T* entity);
   void remove(T* entity);
+  void removeLast();
   void flush();
   T* firstElement();
@@ -214 +215 @@
 {
   this->currentEl = this->first;
-  listElement<T>* te;
   while( this->currentEl != NULL)
     {
@@ -233 +233 @@
 }
 
+/**
+ * removes the Last Element of the List
+ */
+ template<class T>
+     inline void tList<T>::removeLast()
+{
+  if (this->last == NULL)
+    return;
+  else if (this->last == this->first)
+  {
+    delete this->first;
+    this->first = NULL;
+    this->last = NULL;
+    this->size--;
+  }
+  else
+  {
+    listElement<T>* delLast = this->last;
+    this->last->prev->next = NULL;
+    this->last = this->last->prev;
+    delete delLast;
+  }
+}
 
 /**