Changeset 6517 in orxonox.OLD for trunk/src

Timestamp:

Jan 17, 2006, 11:13:05 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: each BaseObject saves its TiXmlElement as a TiXmlNode*.
This will be good for
1.) sync in network
2.) saving entitites

Location:

trunk/src

Files:

• lib/lang/base_object.cc (modified) (4 diffs)
• lib/lang/base_object.h (modified) (4 diffs)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)
• world_entities/weapons/cannon.cc (modified) (1 diff)

trunk/src/lib/lang/base_object.cc

@@ -32 +32 @@
  * @param root the element to load from
  */
-BaseObject::BaseObject(const TiXmlElement* root)
+BaseObject::BaseObject()
 {
   this->className = "BaseObject";
@@ -39 +39 @@
   this->objectName = NULL;
   this->classList = NULL;
-
-  if (root)
-    this->loadParams(root);
+  this->xmlElem = NULL;
 
 //  ClassList::addToClassList(this, this->classID, "BaseObject");
@@ -56 +54 @@
   if (this->objectName)
     delete[] this->objectName;
+  if (this->xmlElem != NULL)
+    delete this->xmlElem;
 }
 
@@ -64 +64 @@
 void BaseObject::loadParams(const TiXmlElement* root)
 {
+  // all loadParams should sometime arrive here.
+  assert (root != NULL);
+
+  if (this->xmlElem != NULL)
+    delete this->xmlElem;
+  this->xmlElem = root->Clone();
   // name setup
   LoadParam(root, "name", this, BaseObject, setName)

trunk/src/lib/lang/base_object.h

@@ -18 +18 @@
 #include "stdincl.h"
 
+class TiXmlNode;
 class TiXmlElement;
 class ClassList;
@@ -25 +26 @@
 
  public:
-  BaseObject (const TiXmlElement* root = NULL);
+  BaseObject ();
   virtual ~BaseObject ();
 
@@ -49 +50 @@
   int       writeState(const byte* data, int length, int sender);
   int       readState(byte* data, int maxLength );
+
  protected:
   void setClassID(ClassID classID, const char* className);
 
-  private:
+ private:
     const char*        className;        //!< the name of the class
     long               classID;          //!< this is the id from the class_id.h enumeration
@@ -58 +60 @@
 
     ClassList*         classList;        //!< Pointer to the ClassList this Object is inside of
+
+    TiXmlNode*         xmlElem;          //!< The XML Element with wich this Object was loaded(saved).
 };
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -123 +123 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-  EventHandler::getInstance()->grabEvents(true);
+//  EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;

trunk/src/world_entities/weapons/cannon.cc

@@ -55 +55 @@
 {
   this->init();
-  this->loadParams(root);
+  if (root != NULL)
+    this->loadParams(root);
 }