Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5215 in orxonox.OLD for trunk/src/lib/graphics/render2D


Ignore:
Timestamp:
Sep 22, 2005, 4:02:08 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: some more fixing of the Errors reported by valgrind
removed some stuff in patrick's collision-detection.
also changed Vector* to Vector in Rectangle (patrick tell me, if this is not ok - but i doubt it :))

Location:
trunk/src/lib/graphics/render2D
Files:
2 edited

Legend:

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

    r5214 r5215  
    438438 * use this to add a child to this node.
    439439 */
    440 void Element2D::addChild2D (Element2D* child, int parentingMod)
     440void Element2D::addChild2D (Element2D* child, int parentingMode)
    441441{
    442442  if( likely(child->parent != NULL))
     
    445445    child->parent->children->remove(child);
    446446  }
    447   child->parentMode = parentMode;
     447  if (parentingMode != E2D_PARENT_NONE)
     448    child->parentMode = parentingMode;
    448449  child->parent = this;
    449450  this->children->add(child);
  • trunk/src/lib/graphics/render2D/element_2d.h

    r5211 r5215  
    4242typedef enum
    4343{
     44  E2D_PARENT_NONE               =   0,
    4445  E2D_PARENT_LOCAL_ROTATE       =   1,    //!< Rotates all the children around their centers.
    4546  E2D_PARENT_ROTATE_MOVEMENT    =   2,    //!< Moves all the children around the center of their parent, without the rotation around their own centers.
     
    138139
    139140
    140     void addChild2D (Element2D* child, int parentingMode = E2D_DEFAULT_PARENTING_MODE);
     141    void addChild2D (Element2D* child, int parentingMode = E2D_PARENT_NONE);
    141142    void addChild2D (const char* childName);
    142143    void removeChild2D (Element2D* child);
Note: See TracChangeset for help on using the changeset viewer.