Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9689 in orxonox.OLD for branches


Ignore:
Timestamp:
Aug 22, 2006, 3:35:18 PM (18 years ago)
Author:
bensch
Message:

new_class_id: glgui adapted

Location:
branches/new_class_id/src/lib/gui/gl
Files:
45 edited

Legend:

Unmodified
Added
Removed

  • branches/new_class_id/src/lib/gui/gl/glgui_bar.cc

    r8991 r9689  
    2323{
    2424
     25  NewObjectListDefinition(GLGuiBar);
    2526  /**
    2627   * @brief standard constructor
    … …  
    4445  void GLGuiBar::init()
    4546  {
    46     this->setClassID(CL_GLGUI_BAR, "GLGuiBar");
     47    this->registerObject(this, GLGuiBar::_objectList);
    4748
    4849    this->setFrontColor(_changedValueColor, true);

  • branches/new_class_id/src/lib/gui/gl/glgui_bar.h

    r8991 r9689  
    2121  class GLGuiBar : public GLGuiWidget
    2222  {
    23 
     23    NewObjectListDeclaration(GLGuiBar);
    2424  public:
    2525    GLGuiBar();

  • branches/new_class_id/src/lib/gui/gl/glgui_box.cc

    r9656 r9689  
    2222namespace OrxGui
    2323{
     24  NewObjectListDefinition(GLGuiBox);
    2425  /**
    2526   * standard constructor
    … …  
    5253  void GLGuiBox::init()
    5354  {
    54     this->setClassID(CL_GLGUI_BOX, "GLGuiBox");
     55    this->registerObject(this, GLGuiBox::_objectList);
    5556  }
    5657
    … …  
    149150    while (itC != this->_children.end())
    150151    {
    151       if ((*itC)->isA(CL_GLGUI_CONTAINER))
     152      if ((*itC)->isA(GLGuiContainer::classID()))
    152153        static_cast<GLGuiContainer*>(*itC)->showAll();
    153154      else
    … …  
    164165    while (itC != this->_children.end())
    165166    {
    166       if ((*itC)->isA(CL_GLGUI_CONTAINER))
     167      if ((*itC)->isA(GLGuiContainer::classID()))
    167168        static_cast<GLGuiContainer*>(*itC)->hideAll();
    168169      else

  • branches/new_class_id/src/lib/gui/gl/glgui_box.h

    r9656 r9689  
    1919  class GLGuiBox : public GLGuiContainer
    2020  {
    21 
     21    NewObjectListDeclaration(GLGuiBox);
    2222  public:
    2323    GLGuiBox(OrxGui::Orientation orientation = OrxGui::Vertical);

  • branches/new_class_id/src/lib/gui/gl/glgui_button.cc

    r9406 r9689  
    2323namespace OrxGui
    2424{
     25  NewObjectListDefinition(GLGuiButton);
    2526  /**
    2627   * standard constructor
    … …  
    5051  void GLGuiButton::init()
    5152  {
    52     this->setClassID(CL_GLGUI_BUTTON, "GLGuiButton");
     53    this->registerObject(this, GLGuiButton::_objectList);
    5354
    5455    this->setSelectable(true);

  • branches/new_class_id/src/lib/gui/gl/glgui_button.h

    r9406 r9689  
    3131  class GLGuiButton : public GLGuiWidget
    3232  {
    33 
     33    NewObjectListDeclaration(GLGuiButton);
    3434    public:
    3535      GLGuiButton(const std::string& label);

  • branches/new_class_id/src/lib/gui/gl/glgui_checkbutton.cc

    r9406 r9689  
    2222namespace OrxGui
    2323{
    24 
     24  NewObjectListDefinition(GLGuiCheckButton);
    2525
    2626  /**
    … …  
    4949  void GLGuiCheckButton::init()
    5050  {
    51     this->setClassID(CL_GLGUI_CHECKBUTTON, "GLGuiCheckButton");
     51    this->registerObject(this, GLGuiCheckButton::_objectList);
    5252  }
    5353

  • branches/new_class_id/src/lib/gui/gl/glgui_checkbutton.h

    r9406 r9689  
    2121  class GLGuiCheckButton : public GLGuiButton
    2222  {
    23 
     23    NewObjectListDeclaration(GLGuiCheckButton);
    2424  public:
    2525    GLGuiCheckButton(const std::string& label = "", bool active = false);

  • branches/new_class_id/src/lib/gui/gl/glgui_colorselector.h

    r8145 r9689  
    2121  class GLGui : public GLGui
    2222  {
    23 
     23    NewObjectListDeclaration(GLGuiColorSelector);
    2424  public:
    2525    GLGui();

  • branches/new_class_id/src/lib/gui/gl/glgui_container.cc

    r9656 r9689  
    2020namespace OrxGui
    2121{
    22 
     22  NewObjectListDefinition(GLGuiContainer);
    2323  /**
    2424   * standard constructor
    … …  
    4141  void GLGuiContainer::init()
    4242  {
    43     this->setClassID(CL_GLGUI_CONTAINER, "GLGuiContainer");
     43    this->registerObject(this, GLGuiContainer::_objectList);
    4444
    4545    this->setBackgroundTexture("gui_container_background.png");

  • branches/new_class_id/src/lib/gui/gl/glgui_container.h

    r9656 r9689  
    2020  class GLGuiContainer : public GLGuiWidget
    2121  {
    22 
     22    NewObjectListDeclaration(GLGuiContainer);
    2323  public:
    2424    GLGuiContainer();

  • branches/new_class_id/src/lib/gui/gl/glgui_cursor.cc

    r8619 r9689  
    2323namespace OrxGui
    2424{
    25 
     25  NewObjectListDefinition(GLGuiCursor);
    2626  /**
    2727   * standard constructor
    … …  
    5555  void GLGuiCursor::init()
    5656  {
    57     this->setClassID(CL_GLGUI_CURSOR, "GLGuiCursor");
     57    this->registerObject(this, GLGuiCursor::_objectList);
    5858
    5959    this->setBackgroundColor(Color(1.0, 1.0, 1.0, 1.0));

  • branches/new_class_id/src/lib/gui/gl/glgui_cursor.h

    r8324 r9689  
    2626  class GLGuiCursor : public GLGuiWidget, public EventListener
    2727  {
    28 
     28    NewObjectListDeclaration(GLGuiCursor);
    2929  public:
    3030    GLGuiCursor();

  • branches/new_class_id/src/lib/gui/gl/glgui_fixedposition_box.cc

    r9656 r9689  
    2323namespace OrxGui
    2424{
     25  NewObjectListDefinition(GLGuiFixedpositionBox);
    2526  /**
    2627   * standard constructor
    … …  
    2930      : GLGuiBox(orientation)
    3031  {
     32    this->registerObject(this, GLGuiFixedpositionBox::_objectList);
     33
    3134    this->subscribeEvent(ES_ALL, EV_VIDEO_RESIZE);
    3235    this->setPosition(position);

  • branches/new_class_id/src/lib/gui/gl/glgui_fixedposition_box.h

    r9656 r9689  
    2121  class GLGuiFixedpositionBox : public OrxGui::GLGuiBox, EventListener
    2222  {
    23 
     23    NewObjectListDeclaration(GLGuiFixedpositionBox);
    2424    public:
    2525      GLGuiFixedpositionBox(OrxGui::Position position = OrxGui::Center, OrxGui::Orientation orientation = OrxGui::Vertical);

  • branches/new_class_id/src/lib/gui/gl/glgui_frame.cc

    r9406 r9689  
    2121namespace OrxGui
    2222{
    23 
     23  NewObjectListDefinition(GLGuiFrame);
    2424  /**
    2525   * standard constructor
    … …  
    4444  void GLGuiFrame::init()
    4545  {
    46     this->setClassID(CL_GLGUI_FRAME, "GLGuiFrame");
     46    this->registerObject(this, GLGuiFrame::_objectList);
    4747    this->child = NULL;
    4848  }
    … …  
    7171    if (this->child != NULL)
    7272    {
    73       if (this->child->isA(CL_GLGUI_CONTAINER))
     73      if (this->child->isA(GLGuiContainer::classID()))
    7474        static_cast<GLGuiContainer*>(this->child)->showAll();
    7575      else
    … …  
    8383    if (this->child != NULL)
    8484    {
    85       if (this->child->isA(CL_GLGUI_CONTAINER))
     85      if (this->child->isA(GLGuiContainer::classID()))
    8686        static_cast<GLGuiContainer*>(this->child)->hideAll();
    8787      else

  • branches/new_class_id/src/lib/gui/gl/glgui_frame.h

    r8145 r9689  
    2020  class GLGuiFrame : public GLGuiContainer
    2121  {
    22 
     22    NewObjectListDeclaration(GLGuiFrame);
    2323  public:
    2424    GLGuiFrame();

  • branches/new_class_id/src/lib/gui/gl/glgui_handler.cc

    r9656 r9689  
    2323#include "glgui_cursor.h"
    2424
    25 #include "class_list.h"
    2625#include <cassert>
    2726
    … …  
    3534namespace OrxGui
    3635{
    37 
     36  NewObjectListDefinition(GLGuiHandler);
    3837  /**
    3938   * standard constructor
    … …  
    4140  GLGuiHandler::GLGuiHandler ()
    4241  {
    43     this->setClassID(CL_GLGUI_HANDLER, "GLGuiHandler");
     42    this->registerObject(this, GLGuiHandler::_objectList);
    4443    this->setName("GLGuiHandler");
    4544
    … …  
    117116  {
    118117    // retrieve Objects.
    119     const std::list<BaseObject*>* objects = ClassList::getList(CL_GLGUI_WIDGET);
    120 
    121     if (objects)
    122     {
    123       std::list<BaseObject*>::const_iterator it ;
    124       std::list<BaseObject*>::const_iterator currentIt = objects->end();
     118    NewObjectList<GLGuiWidget>::const_iterator it, currentIt;
     119    currentIt = GLGuiWidget::objectList().end();
     120
     121    if (GLGuiWidget::selected() != NULL)
     122    {
     123      it = std::find(GLGuiWidget::objectList().begin(), GLGuiWidget::objectList().end(), GLGuiWidget::selected());
     124      if (it != GLGuiWidget::objectList().end())
     125      {
     126        currentIt = it;
     127        it++;
     128      }
     129    }
     130    else
     131    {
     132      it = GLGuiWidget::objectList().begin();
     133    }
     134
     135    bool cycledOnce = false;
     136
     137    for (; it != currentIt; ++it)
     138    {
     139      if (it == GLGuiWidget::objectList().end() && !cycledOnce)
     140      {
     141        it = GLGuiWidget::objectList().begin();
     142        cycledOnce = true;
     143      }
     144
     145      if ((*it)->selectable() && (*it)->isVisible())
     146      {
     147        (*it)->select();
     148        return;
     149      }
     150    }
     151
     152  }
     153
     154  void GLGuiHandler::selectPrevious()
     155  {
     156    NewObjectList<GLGuiWidget>::const_iterator it, currentIt;
     157    currentIt = GLGuiWidget::objectList().begin();
    125158
    126159      if (GLGuiWidget::selected() != NULL)
    127160      {
    128         it = std::find(objects->begin(), objects->end(), GLGuiWidget::selected());
    129         if (it != objects->end())
    130         {
    131           currentIt = it;
    132           it++;
    133         }
    134       }
    135       else
    136       {
    137         it = objects->begin();
    138       }
    139 
    140       bool cycledOnce = false;
    141 
    142       for (; it != currentIt; ++it)
    143       {
    144         if (it == objects->end() && !cycledOnce)
    145         {
    146           it = objects->begin();
    147           cycledOnce = true;
    148         }
    149 
    150         if (dynamic_cast<GLGuiWidget*>(*it)->selectable() && dynamic_cast<GLGuiWidget*>(*it)->isVisible())
    151         {
    152           dynamic_cast<GLGuiWidget*>(*it)->select();
    153           return;
    154         }
    155       }
    156 
    157     }
    158     else
    159     {
    160       PRINTF(0)("NO GUI-ELEMENTS EXISTING\n");
    161     }
    162   }
    163 
    164   void GLGuiHandler::selectPrevious()
    165   {
    166     // retrieve Objects.
    167     const std::list<BaseObject*>* objects = ClassList::getList(CL_GLGUI_WIDGET);
    168 
    169     if (objects)
    170     {
    171       std::list<BaseObject*>::const_iterator it ;
    172       std::list<BaseObject*>::const_iterator currentIt = objects->begin();
    173 
    174       if (GLGuiWidget::selected() != NULL)
    175       {
    176         it = std::find(objects->begin(), objects->end(), GLGuiWidget::selected());
    177         if (it != objects->end())
     161        it = std::find(GLGuiWidget::objectList().begin(), GLGuiWidget::objectList().end(), GLGuiWidget::selected());
     162        if (it != GLGuiWidget::objectList().end())
    178163        {
    179164          currentIt = it;
    … …  
    183168      else
    184169      {
    185         it = objects->end();
     170        it = GLGuiWidget::objectList().end();
    186171      }
    187172
    … …  
    190175      for (; it != currentIt; --it)
    191176      {
    192         if (it == objects->end() && !cycledOnce)
     177        if (it == GLGuiWidget::objectList().end() && !cycledOnce)
    193178        {
    194179          --it ;
    … …  
    196181        }
    197182
    198         if (dynamic_cast<GLGuiWidget*>(*it)->selectable() && dynamic_cast<GLGuiWidget*>(*it)->isVisible())
    199         {
    200           dynamic_cast<GLGuiWidget*>(*it)->select();
     183        if ((*it)->selectable() && (*it)->isVisible())
     184        {
     185          (*it)->select();
    201186          return;
    202187        }
    203188      }
    204189
    205     }
    206     else
    207     {
    208       PRINTF(0)("NO GUI-ELEMENTS EXISTING\n");
    209     }
    210190  }
    211191
    … …  
    217197    {
    218198      case EV_MOUSE_MOTION:
    219         this->checkFocus();
    220         break;
     199      this->checkFocus();
     200      break;
    221201
    222202      case  EV_MOUSE_BUTTON_LEFT:
    223         if (GLGuiWidget::mouseFocused() != NULL && event.bPressed)
    224         {
    225           // if clickable select the Widget.
    226           if (GLGuiWidget::mouseFocused()->clickable())
    227           {
    228             Vector2D cursorPos = (this->_cursor != NULL) ? this->_cursor->getAbsCoor2D() : Vector2D(event.x, event.y);
    229             GLGuiWidget::mouseFocused()->select();
    230             GLGuiWidget::mouseFocused()->click(cursorPos - GLGuiWidget::mouseFocused()->getAbsCoor2D());
    231           }
    232         }
    233         else if (GLGuiWidget::selected() != NULL && !event.bPressed)
    234         {
    235           if (GLGuiWidget::selected()->clickable())
    236           {
    237             Vector2D cursorPos = (this->_cursor != NULL) ? this->_cursor->getAbsCoor2D() : Vector2D(event.x, event.y);
    238             GLGuiWidget::selected()->release(cursorPos - GLGuiWidget::selected()->getAbsCoor2D());
    239           }
    240         }
    241 
    242         break;
     203      if (GLGuiWidget::mouseFocused() != NULL && event.bPressed)
     204      {
     205        // if clickable select the Widget.
     206        if (GLGuiWidget::mouseFocused()->clickable())
     207        {
     208          Vector2D cursorPos = (this->_cursor != NULL) ? this->_cursor->getAbsCoor2D() : Vector2D(event.x, event.y);
     209          GLGuiWidget::mouseFocused()->select();
     210          GLGuiWidget::mouseFocused()->click(cursorPos - GLGuiWidget::mouseFocused()->getAbsCoor2D());
     211        }
     212      }
     213      else if (GLGuiWidget::selected() != NULL && !event.bPressed)
     214      {
     215        if (GLGuiWidget::selected()->clickable())
     216        {
     217          Vector2D cursorPos = (this->_cursor != NULL) ? this->_cursor->getAbsCoor2D() : Vector2D(event.x, event.y);
     218          GLGuiWidget::selected()->release(cursorPos - GLGuiWidget::selected()->getAbsCoor2D());
     219        }
     220      }
     221
     222      break;
    243223      case EV_LEAVE_STATE:
    244         if (GLGuiWidget::selected() != NULL)
    245           GLGuiWidget::selected()->unselect();
    246 
    247         if (GLGuiWidget::mouseFocused() != NULL)
    248           GLGuiWidget::mouseFocused()->breakMouseFocus();
    249         break;
     224      if (GLGuiWidget::selected() != NULL)
     225        GLGuiWidget::selected()->unselect();
     226
     227      if (GLGuiWidget::mouseFocused() != NULL)
     228        GLGuiWidget::mouseFocused()->breakMouseFocus();
     229      break;
    250230
    251231      case EV_VIDEO_RESIZE:
    252         if (this->_cursor != NULL)
    253           this->_cursor->setMaxBorders(Vector2D(event.resize.w, event.resize.h));
    254         this->_resolution = Vector2D(event.resize.w, event.resize.h);
    255         break;
     232      if (this->_cursor != NULL)
     233        this->_cursor->setMaxBorders(Vector2D(event.resize.w, event.resize.h));
     234      this->_resolution = Vector2D(event.resize.w, event.resize.h);
     235      break;
    256236
    257237      case SDLK_TAB:
    258         if (event.bPressed)
    259         {
    260           if (EventHandler::getInstance()->isPressed(SDLK_LSHIFT) || EventHandler::getInstance()->isPressed(SDLK_RSHIFT))
    261             this->selectPrevious();
    262           else
    263             this->selectNext();
    264         }
    265         break;
     238      if (event.bPressed)
     239      {
     240        if (EventHandler::getInstance()->isPressed(SDLK_LSHIFT) || EventHandler::getInstance()->isPressed(SDLK_RSHIFT))
     241          this->selectPrevious();
     242        else
     243          this->selectNext();
     244      }
     245      break;
    266246    }
    267247
    … …  
    304284  {
    305285    // CHECK THE COLLISIONS.
    306     const std::list<BaseObject*>* objects = ClassList::getList(CL_GLGUI_WIDGET);
    307 
    308     if (objects != NULL && this->_cursor != NULL)
    309     {
    310       for (std::list<BaseObject*>::const_iterator it = objects->begin(); it != objects->end(); it++)
    311       {
    312         GLGuiWidget* widget = dynamic_cast<GLGuiWidget*>(*it);
     286    if (this->_cursor != NULL)
     287    {
     288      for (NewObjectList<GLGuiWidget>::const_iterator it = GLGuiWidget::objectList().begin();
     289           it != GLGuiWidget::objectList().end();
     290          it++)
     291      {
     292        GLGuiWidget* widget = (*it);
    313293
    314294        if (widget->isVisible() &&

  • branches/new_class_id/src/lib/gui/gl/glgui_handler.h

    r9656 r9689  
    1919  class GLGuiHandler : public EventListener
    2020  {
    21 
     21    NewObjectListDeclaration(GLGuiHandler);
    2222  public:
    2323    /** @returns a Pointer to the only object of this Class */

  • branches/new_class_id/src/lib/gui/gl/glgui_image.cc

    r8619 r9689  
    2222namespace OrxGui
    2323{
    24 
     24  NewObjectListDefinition(GLGuiImage);
    2525  /**
    2626   * standard constructor
    … …  
    4545  void GLGuiImage::init()
    4646  {
    47     this->setClassID(CL_GLGUI_IMAGE, "GLGuiImage");
     47    this->registerObject(this, GLGuiImage::_objectList);
    4848
    4949    this->setForegroundColor(Color(1,1,1,1));

  • branches/new_class_id/src/lib/gui/gl/glgui_image.h

    r9406 r9689  
    2121  class GLGuiImage : public GLGuiWidget
    2222  {
    23 
     23    NewObjectListDeclaration(GLGuiImage);
    2424  public:
    2525    GLGuiImage();

  • branches/new_class_id/src/lib/gui/gl/glgui_inputline.cc

    r9406 r9689  
    2020namespace OrxGui
    2121{
     22  NewObjectListDefinition(GLGuiInputLine);
    2223  /**
    2324   * @brief standard constructor
    … …  
    4445  void GLGuiInputLine::init()
    4546  {
    46     this->setClassID(CL_GLGUI_INPUTLINE, "GLGuiInputLine");
     47    this->registerObject(this, GLGuiInputLine::_objectList);
    4748
    4849    this->setFocusable(true);

  • branches/new_class_id/src/lib/gui/gl/glgui_inputline.h

    r9406 r9689  
    2525  class GLGuiInputLine : public OrxGui::GLGuiWidget
    2626  {
    27 
     27    NewObjectListDeclaration(GLGuiInputLine);
    2828  public:
    2929    GLGuiInputLine();

  • branches/new_class_id/src/lib/gui/gl/glgui_mainwidget.cc

    r8145 r9689  
    2020namespace OrxGui
    2121{
    22 
     22  NewObjectListDefinition(GLGuiMainWidget);
    2323
    2424  /**
    … …  
    2727  GLGuiMainWidget::GLGuiMainWidget()
    2828  {
    29     this->setClassID(CL_GLGUI_MAIN_WIDGET, "GLGuiMainWidget");
     29    this->registerObject(this, GLGuiMainWidget::_objectList);
    3030    this->setName("GLGuiMainWidget");
    3131  }

  • branches/new_class_id/src/lib/gui/gl/glgui_mainwidget.h

    r8145 r9689  
    1515  class GLGuiMainWidget : public GLGuiWidget
    1616  {
    17 
     17    NewObjectListDeclaration(GLGuiMainWidget);
    1818  public:
    1919    virtual ~GLGuiMainWidget(void);

  • branches/new_class_id/src/lib/gui/gl/glgui_menu.cc

    r8145 r9689  
    2020namespace OrxGui
    2121{
    22 
     22  NewObjectListDefinition(GLGuiMenu);
    2323  /**
    2424   * standard constructor

  • branches/new_class_id/src/lib/gui/gl/glgui_menu.h

    r8145 r9689  
    1919  class GLGuiMenu : public GLGuiMenu
    2020  {
    21 
     21    NewObjectListDeclaration(GLGuiMenu);
    2222  public:
    2323    GLGuiMenu();

  • branches/new_class_id/src/lib/gui/gl/glgui_pushbutton.cc

    r8717 r9689  
    2323namespace OrxGui
    2424{
    25 
     25  NewObjectListDefinition(GLGuiPushButton);
    2626  /**
    2727   * @brief standard constructor
    … …  
    5858  void GLGuiPushButton::init()
    5959  {
    60     this->setClassID(CL_GLGUI_PUSHBUTTON, "GLGuiPushButton");
     60    this->registerObject(this, GLGuiPushButton::_objectList);
    6161  }
    6262

  • branches/new_class_id/src/lib/gui/gl/glgui_pushbutton.h

    r8717 r9689  
    2121  class GLGuiPushButton : public GLGuiButton
    2222  {
    23 
     23    NewObjectListDeclaration(GLGuiPushButton);
    2424  public:
    2525    GLGuiPushButton(const std::string& label = "");

  • branches/new_class_id/src/lib/gui/gl/glgui_slider.cc

    r9406 r9689  
    2323namespace OrxGui
    2424{
    25 
     25  NewObjectListDefinition(GLGuiSlider);
    2626  /**
    2727   * @brief standard constructor
    … …  
    4646  {
    4747
    48     this->setClassID(CL_GLGUI_SLIDER, "GLGuiSlider");
     48    this->registerObject(this, GLGuiSlider::_objectList);
    4949
    5050    this->setClickable(true);

  • branches/new_class_id/src/lib/gui/gl/glgui_slider.h

    r9406 r9689  
    2121  class GLGuiSlider : public GLGuiWidget
    2222  {
    23 
     23    NewObjectListDeclaration(GLGuiSlider);
    2424  public:
    2525    GLGuiSlider();

  • branches/new_class_id/src/lib/gui/gl/glgui_table.cc

    r8717 r9689  
    2323namespace OrxGui
    2424{
     25  NewObjectListDefinition(GLGuiTable);
    2526  /**
    2627   * @brief standard constructor
    … …  
    4748  void GLGuiTable::init()
    4849  {
    49     this->setClassID(CL_GLGUI_TABLE, "GLGuiTable");
     50    this->registerObject(this, GLGuiTable::_objectList);
    5051
    5152    this->setBorderTop(10);

  • branches/new_class_id/src/lib/gui/gl/glgui_table.h

    r8717 r9689  
    2525  class GLGuiTable : public OrxGui::GLGuiWidget
    2626  {
    27 
     27    NewObjectListDeclaration(GLGuiTable);
    2828  public:
    2929    GLGuiTable(unsigned int rows, unsigned int columns);

  • branches/new_class_id/src/lib/gui/gl/glgui_text.cc

    r9656 r9689  
    2222namespace OrxGui
    2323{
     24  NewObjectListDefinition(GLGuiText);
    2425  /**
    2526   * standard constructor
    … …  
    4344  void GLGuiText::init()
    4445  {
    45     this->setClassID(CL_GLGUI_TEXT, "GLGuiText");
     46    this->registerObject(this, GLGuiText::_objectList);
    4647
    4748    this->_text.setParent2D(this);

  • branches/new_class_id/src/lib/gui/gl/glgui_text.h

    r9656 r9689  
    2020  class GLGuiText : public GLGuiWidget
    2121  {
    22 
     22    NewObjectListDeclaration(GLGuiText);
    2323  public:
    2424    GLGuiText();

  • branches/new_class_id/src/lib/gui/gl/glgui_textfield.cc

    r9406 r9689  
    2222namespace OrxGui
    2323{
     24  NewObjectListDefinition(GLGuiTextfield);
    2425  /**
    2526   * standard constructor
    … …  
    4344  void GLGuiTextfield::init()
    4445  {
    45     this->setClassID(CL_GLGUI_TEXTFIELD, "GLGuiTextfield");
     46    this->registerObject(this, GLGuiTextfield::_objectList);
    4647
    4748    this->_text.setParent2D(this);

  • branches/new_class_id/src/lib/gui/gl/glgui_textfield.h

    r9406 r9689  
    2020  class GLGuiTextfield : public GLGuiWidget
    2121  {
    22 
     22    NewObjectListDeclaration(GLGuiTextfield);
    2323  public:
    2424    GLGuiTextfield();

  • branches/new_class_id/src/lib/gui/gl/glgui_widget.cc

    r9656 r9689  
    3131namespace OrxGui
    3232{
    33 
     33  NewObjectListDefinition(GLGuiWidget);
    3434  /**
    3535   * @brief standard constructor
    … …  
    9595  void GLGuiWidget::init()
    9696  {
    97     this->setClassID(CL_GLGUI_WIDGET, "GLGuiWidget");
     97    this->registerObject(this, GLGuiWidget::_objectList);
    9898
    9999    this->_focusable = false;

  • branches/new_class_id/src/lib/gui/gl/glgui_widget.h

    r9656 r9689  
    2121namespace OrxGui
    2222{
    23 
    2423  class GLGuiCursor;
    2524
    … …  
    3130  class GLGuiWidget : public Element2D
    3231  {
     32    NewObjectListDeclaration(GLGuiWidget);
    3333  public:
    3434    GLGuiWidget(GLGuiWidget* parent = NULL);

  • branches/new_class_id/src/lib/gui/gl/glgui_window.cc

    r8145 r9689  
    2020namespace OrxGui
    2121{
    22 
     22  NewObjectListDefinition(GLGuiWindow);
    2323  /**
    2424   * standard constructor
    … …  
    4343  void GLGuiWindow::init()
    4444  {
    45     this->setClassID(CL_GLGUI_WINDOW, "GLGuiWindow");
     45    this->registerObject(this, GLGuiWindow::_objectList);
    4646
    4747  }

  • branches/new_class_id/src/lib/gui/gl/glgui_window.h

    r8145 r9689  
    2020  class GLGuiWindow : public GLGuiContainer
    2121  {
    22 
     22    NewObjectListDeclaration(GLGuiWindow);
    2323  public:
    2424    GLGuiWindow();

  • branches/new_class_id/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc

    r9406 r9689  
    2525#include "util/loading/load_param.h"
    2626
     27#include "class_id.h"
    2728CREATE_FACTORY(GLMenuImageScreen, CL_GLMENU_IMAGE_SCREEN);
    28 
     29NewObjectListDefinitionID(GLMenuImageScreen, CL_GLMENU_IMAGE_SCREEN);
    2930
    3031/**
    … …  
    3334GLMenuImageScreen::GLMenuImageScreen(const TiXmlElement* root)
    3435{
    35   this->setClassID(CL_GLMENU_IMAGE_SCREEN, "GLMenuImageScreen");
     36  this->registerObject(this, GLMenuImageScreen::_objectList);
    3637  this->setName("GLMenuLoadScreen");
    3738  // Select Our VU Meter Background Texture
    … …  
    5859{
    5960  LoadParam(root, "BackgroundImage", this, GLMenuImageScreen, setBackgroundImage)
    60     .describe("sets the image to load onto the loadscreen");
     61  .describe("sets the image to load onto the loadscreen");
    6162
    6263  LoadParam(root, "BackgroundPS", this, GLMenuImageScreen, setPosScale)
    63     .describe("The Position and Scale of the Background Image in %(0-1.0). PosX, PosY, SizeX, SizeY");
     64  .describe("The Position and Scale of the Background Image in %(0-1.0). PosX, PosY, SizeX, SizeY");
    6465
    6566  LoadParam(root, "BarImage", this, GLMenuImageScreen, setBarImage)
    66     .describe("sets the image of the LoadingBar");
     67  .describe("sets the image of the LoadingBar");
    6768
    6869  LoadParam(root, "BarPS", this, GLMenuImageScreen, setBarPosScale)
    69     .describe("The Position and Scale of the Loading Bar in %(0-1.0). PosX, PosY, SizeX, SizeY");
     70  .describe("The Position and Scale of the Loading Bar in %(0-1.0). PosX, PosY, SizeX, SizeY");
    7071
    7172  LoadParam(root, "ElementCount", this, GLMenuImageScreen, setMaximum)
    72     .describe("The Count of elements to load into the bar (this is only a maximum value)");
     73  .describe("The Count of elements to load into the bar (this is only a maximum value)");
    7374}
    7475

  • branches/new_class_id/src/lib/gui/gl/glmenu/glmenu_imagescreen.h

    r8145 r9689  
    1515class GLMenuImageScreen : public BaseObject
    1616{
    17 
     17  NewObjectListDeclaration(GLMenuImageScreen);
    1818public:
    1919  GLMenuImageScreen (const TiXmlElement* root = NULL);

  • branches/new_class_id/src/lib/gui/gl/specials/glgui_notifier.cc

    r8619 r9689  
    2323namespace OrxGui
    2424{
    25 
     25  NewObjectListDefinition(GLGuiNotifier);
    2626  /**
    2727   * @brief standard constructor
    … …  
    2929  GLGuiNotifier::GLGuiNotifier ()
    3030  {
    31     this->setClassID(CL_GLGUI_NOTIFIER, "GLGuiNotifier");
     31    this->registerObject(this, GLGuiNotifier::_objectList);
    3232
    3333    // Element2D and generals

  • branches/new_class_id/src/lib/gui/gl/specials/glgui_notifier.h

    r8619 r9689  
    2424  class GLGuiNotifier : public GLGuiWidget
    2525  {
     26    NewObjectListDeclaration(GLGuiNotifier);
    2627  public:
    2728    GLGuiNotifier();
    … …  
    6768      MultiLineText*    text;
    6869
    69     } DisplayLine;
     70    }
     71    DisplayLine;
    7072
    7173
Note: See TracChangeset for help on using the changeset viewer.