Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5404 in orxonox.OLD for trunk/src


Ignore:
Timestamp:
Oct 19, 2005, 1:16:20 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: removed old unused functionality, and added some comments

Location:
trunk/src/lib
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/graphics/render2D/element_2d.cc

    r5403 r5404  
    840840/**
    841841 * draws all the Elements from this element2D downwards
    842  * @param layer the maximal Layer to draw.
    843  */
    844 void Element2D::draw2D(E2D_LAYER layer) const
     842 * @param layer the maximal Layer to draw. @see E2D_LAYER
     843 */
     844void Element2D::draw2D(short layer) const
    845845{
    846846  if (this->visible)
  • trunk/src/lib/graphics/render2D/element_2d.h

    r5403 r5404  
    2525
    2626  E2D_LAYER_COUNT               =     4,         //!< The count of Layers.
    27 
    28   E2D_LAYER_EXTERN              =    -1,         //!< In a Layers handeled externally.
    29 
    30   E2D_LAYER_ALL                 =     5,
    3127} E2D_LAYER;
    3228#define E2D_DEFAULT_LAYER       E2D_LAYER_MEDIUM
     29#define E2D_LAYER_ALL           4
    3330
    3431typedef enum
     
    6259};
    6360
    64 //! A class for ...
     61//! A class for 2D-elements
     62/**
     63 * this class mainly tries to imitate PNode in its functionality, but on a 2D-level
     64 * it extends PNode in the Sense of the tick-ability/draw-alility layering (and size)
     65 *
     66 * Layering: Layers are sorted into the Tree. e.g:
     67 * the roor is in the lowest Layer, the leaves in the highest (of each branche)
     68 * the first child of each node is in the lowest layer of all children, the last in the highest
     69 * -> the tree is sorted on insertion of a new Child: @see Element2D::addChild2D()
     70 */
    6571class Element2D : virtual public BaseObject {
    6672
     
    110116    virtual void draw() const = 0;
    111117    void tick2D(float dt);
    112     void draw2D(E2D_LAYER layer) const;
     118    void draw2D(short layer) const;
    113119
    114120    // LIKE PNODE
  • trunk/src/lib/graphics/render2D/render_2d.cc

    r5401 r5404  
    6464 * @param layer the Layer to draw (if E2D_LAYER_ALL then all layers will be drawn)
    6565 */
    66 void Render2D::draw(E2D_LAYER layer) const
     66void Render2D::draw(short layer) const
    6767{
    6868  GraphicsEngine::enter2DMode();
  • trunk/src/lib/graphics/render2D/render_2d.h

    r5401 r5404  
    2323
    2424    void tick(float dt);
    25     void draw(E2D_LAYER layer) const;
     25    void draw(short layer) const;
    2626
    2727  private:
  • trunk/src/lib/gui/gl_gui/glgui_button.cc

    r5399 r5404  
    5252  this->label = new Text();
    5353  this->label->setParent2D(this);
    54   this->label->setLayer(E2D_LAYER_EXTERN);
    5554}
    5655
  • trunk/src/lib/gui/gl_gui/glgui_widget.cc

    r5399 r5404  
    5151  this->setVisibility(GLGUI_WIDGET_DEFAULT_VISIBLE);
    5252  this->setParent2D((Element2D*)NULL);
    53   this->setLayer(E2D_LAYER_EXTERN);
    5453
    5554  this->backMat = NULL;
Note: See TracChangeset for help on using the changeset viewer.