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

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:

• element_2d.cc (modified) (2 diffs)
• element_2d.h (modified) (2 diffs)

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

@@ -438 +438 @@
  * use this to add a child to this node.
  */
-void Element2D::addChild2D (Element2D* child, int parentingMod)
+void Element2D::addChild2D (Element2D* child, int parentingMode)
 {
   if( likely(child->parent != NULL))
@@ -445 +445 @@
     child->parent->children->remove(child);
   }
-  child->parentMode = parentMode;
+  if (parentingMode != E2D_PARENT_NONE)
+    child->parentMode = parentingMode;
   child->parent = this;
   this->children->add(child);

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

@@ -42 +42 @@
 typedef enum
 {
+  E2D_PARENT_NONE               =   0,
   E2D_PARENT_LOCAL_ROTATE       =   1,    //!< Rotates all the children around their centers.
   E2D_PARENT_ROTATE_MOVEMENT    =   2,    //!< Moves all the children around the center of their parent, without the rotation around their own centers.
@@ -138 +139 @@
 
 
-    void addChild2D (Element2D* child, int parentingMode = E2D_DEFAULT_PARENTING_MODE);
+    void addChild2D (Element2D* child, int parentingMode = E2D_PARENT_NONE);
     void addChild2D (const char* childName);
     void removeChild2D (Element2D* child);