Changeset 6295 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

Dec 26, 2005, 3:01:14 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new GUI-functionality

Location:

trunk/src/lib/graphics

Files:

• importer/material.cc (modified) (1 diff)
• render2D/element_2d.cc (modified) (10 diffs)

trunk/src/lib/graphics/importer/material.cc

@@ -75 +75 @@
 {
   // setting diffuse color
-  //  glColor3f (diffuse[0], diffuse[1], diffuse[2]);
+  glColor3f (diffuse[0], diffuse[1], diffuse[2]);
   glMaterialfv(GL_FRONT, GL_DIFFUSE, this->diffuse);
 

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

@@ -25 +25 @@
 #include "graphics_engine.h"
 #include "load_param.h"
-#include "parser/tinyxml/tinyxml.h"
 #include "class_list.h"
 
@@ -42 +41 @@
 
 /**
- * standard constructor
+ * @brief standard constructor
  * @param parent the parent to set for this Element2D
  *
@@ -60 +59 @@
 
 /**
- * standard deconstructor
+ * @brief standard deconstructor
  *
  * There are two general ways to delete an Element2D
@@ -97 +96 @@
 
 /**
- * initializes a Element2D
+ * @brief initializes a Element2D
  */
 void Element2D::init()
@@ -121 +120 @@
 
 /**
- * Loads the Parameters of an Element2D from...
+ * @brief Loads the Parameters of an Element2D from...
  * @param root The XML-element to load from
  */
@@ -160 +159 @@
 
   // cycling properties
-  if (root != NULL)
-  {
-    LOAD_PARAM_START_CYCLE(root, element);
-    {
-      LoadParam_CYCLE(element, "parent", this, Element2D, addChild2D)
-          .describe("adds a new Child to the current Node.");
-    }
-    LOAD_PARAM_END_CYCLE(element);
-  }
+  LOAD_PARAM_START_CYCLE(root, element);
+  {
+    LoadParam_CYCLE(element, "parent", this, Element2D, addChild2D)
+        .describe("adds a new Child to the current Node.");
+  }
+  LOAD_PARAM_END_CYCLE(element);
 }
 
@@ -511 +507 @@
 void Element2D::addChild2D (Element2D* child)
 {
+  assert(child != NULL);
   if( likely(child->parent != NULL))
   {
@@ -662 +659 @@
 void Element2D::eraseChild(Element2D* child)
 {
+  assert (this != NULL && child != NULL);
   std::list<Element2D*>::iterator childIT = std::find(this->children.begin(), this->children.end(), child);
   this->children.erase(childIT);
@@ -667 +665 @@
 
 /**
- *  sets the mode of this parent manually
+ * @brief sets the mode of this parent manually
  * @param parentMode a String representing this parentingMode
  */
@@ -1051 +1049 @@
 
 /**
- *  creates the one and only NullElement2D
- * @param absCoordinate the cordinate of the Parent (normally Vector(0,0,0))
+ * @brief creates the one and only NullElement2D
  */
 NullElement2D::NullElement2D () : Element2D(NULL, E2D_LAYER_BELOW_ALL)