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

Timestamp:

Jul 3, 2005, 12:26:16 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: orxonox-events registered, solved an error in ClassList

Location:

orxonox/trunk/src/lib

Files:

• event/event.h (modified) (2 diffs)
• event/event_def.h (modified) (2 diffs)
• event/event_handler.cc (modified) (1 diff)
• graphics/graphics_engine.cc (modified) (1 diff)
• graphics/graphics_engine.h (modified) (1 diff)
• lang/class_list.cc (modified) (3 diffs)
• lang/class_list.h (modified) (1 diff)

orxonox/trunk/src/lib/event/event.h

@@ -1 @@
-/*! 
+/*!
     \file event.h
     \brief an abstract event
@@ -25 +25 @@
   int      type;                        //!< the type field
   bool     bPressed;                    //!< is true, if the button/mouse was pressed, false if released
-       
+
   Uint16   x;                           //!< x coordinate
   Uint16   y;                           //!< y coordinate
   Sint16   xRel;                        //!< relative x movement to last point
   Sint16   yRel;                        //!< relative y movement to last point
+
+  SDL_ResizeEvent resize;
 };
 

orxonox/trunk/src/lib/event/event_def.h

@@ -30 +30 @@
   EV_JOY_BUTTON,
 
+  EV_VIDEO_RESIZE                 = SDL_VIDEORESIZE,
+
   EV_UNKNOWN,
 
   EV_NUMBER,
-
-  EV_VIDEO_RESIZE                 = SDL_VIDEORESIZE
 };
 
@@ -47 +47 @@
     ES_ALL,            //!< you want to register events for all states
 
-    ES_NUMBER,         //!< the number of states
+    ES_NUMBER,          //!< the number of states
   };
 

orxonox/trunk/src/lib/event/event_handler.cc

@@ -252 +252 @@
           ev.type = EV_JOY_BUTTON;
           break;
+        case SDL_VIDEORESIZE:
+          ev.resize = event.resize;
+          break;
         default:
           ev.type = EV_UNKNOWN;

orxonox/trunk/src/lib/graphics/graphics_engine.cc

@@ -218 +218 @@
    \param resizeInfo SDL information about the size of the new screen size
 */
-int GraphicsEngine::resolutionChanged(SDL_ResizeEvent* resizeInfo)
-{
-  this->setResolution(resizeInfo->w, resizeInfo->h, this->bitsPerPixel);
+int GraphicsEngine::resolutionChanged(const SDL_ResizeEvent& resizeInfo)
+{
+  this->setResolution(resizeInfo.w, resizeInfo.h, this->bitsPerPixel);
 }
 

orxonox/trunk/src/lib/graphics/graphics_engine.h

@@ -46 +46 @@
     inline int getbbp() const { return this->bitsPerPixel; };
 
-    int resolutionChanged(SDL_ResizeEvent* resizeInfo);
+    int resolutionChanged(const SDL_ResizeEvent& resizeInfo);
 
     static void enter2DMode();

orxonox/trunk/src/lib/lang/class_list.cc

@@ -47 +47 @@
 ClassList::~ClassList ()
 {
+  delete this->objectList;
   --ClassList::classCount;
 }
@@ -65 +66 @@
 {
   ClassList* regClass;
+  PRINTF(5)("subscribe a %s\n", className );
 
   if(ClassList::first == NULL)
@@ -79 +81 @@
       }
 
-      if (tmp->next == NULL)
+      if (unlikely(tmp->next == NULL))
+      {
         tmp->next = regClass = new ClassList(classID, className);
+        break;
+      }
       tmp = tmp->next;
     }

orxonox/trunk/src/lib/lang/class_list.h

@@ -52 +52 @@
 
     // STATIC MEMBERS
-    static ClassList*        first;                  //!< The first Class in the List (should be BaseObject)
+    static ClassList*        first;                  //!< The first Class in the List
     static unsigned int      classCount;             //!< The Count of classes that have been registered (should match the lower description)
 };