Changeset 10362 in orxonox.OLD for branches/playability.new/src/world_entities/world_entity.cc

Timestamp:

Jan 25, 2007, 3:05:01 AM (17 years ago)

Author:

patrick

Message:

merged playability. but got strange bug

Location:

branches/playability.new

Files:

• . (modified) (1 prop)
• src/world_entities/world_entity.cc (modified) (9 diffs)

branches/playability.new

@@ -10 +10 @@
 autom4te.cache
 aclocal.m4
+tags
+test.bmp
+config.sub
+config.guess
+OrxonoxPlayability.kdevses
+OrxonoxPlayability.kdevelop.pcs

@@ -10 +10 @@
 autom4te.cache
 aclocal.m4
+tags
+test.bmp
+config.sub
+config.guess
+OrxonoxPlayability.kdevses
+OrxonoxPlayability.kdevelop.pcs

branches/playability.new/src/world_entities/world_entity.cc

@@ -32 +32 @@
 
 #include "util/loading/load_param.h"
+#include "loading/load_param_xml.h"
+#include "util/loading/factory.h"
+
 #include "obb_tree.h"
 
 #include "elements/glgui_energywidget.h"
+#include "elements/glgui_energywidgetvertical.h"
 
 #include "state.h"
@@ -44 +48 @@
 #include "kill.h"
 #include "debug.h"
+
+#include "track/track.h"
 
 #include "projectiles/projectile.h"
@@ -86 +92 @@
   this->_bOnGround = false;
 
+  // Track of this entity
+  this->entityTrack = NULL;
+
   // registering default reactions:
   this->subscribeReaction(CoRe::CREngine::CR_OBJECT_DAMAGE, Projectile::staticClassID());
@@ -148 +157 @@
   .describe("the fileName of the object information file (optional)");
 
+  // Entity Attributes
   LoadParam(root, "maxHealth", this, WorldEntity, setHealthMax)
   .describe("The Maximum health that can be loaded onto this entity")
@@ -157 +167 @@
 
   LoadParam(root, "list", this, WorldEntity, toListS);
+
+
+  // Track
+  LoadParamXML(root, "Track", this, WorldEntity, addTrack)
+   .describe("creates and adds a track to this WorldEntity");
+}
+
+
+/**
+ * this functions adds a track to this workd entity. This can be usefull, if you like this WE to follow a some waypoints.
+ * here the track is created and further initializing left for the Track itself
+ */
+void WorldEntity::addTrack(const TiXmlElement* root)
+{
+  // The problem we have is most likely here. The track should be constructed WITH the XML-Code
+  this->entityTrack = new Track(root);
+  this->setParent(this->entityTrack->getTrackNode());
+  this->entityTrack->getTrackNode()->setParentMode(PNODE_ALL);
+  /*LOAD_PARAM_START_CYCLE(root, element);
+  {
+    PRINTF(4)("element is: %s\n", element->Value());
+    Factory::fabricate(element);
+  }
+  LOAD_PARAM_END_CYCLE(element);*/
+  
+
 }
 
@@ -613 +649 @@
 */
 void WorldEntity::tick(float time)
-{}
+{
+}
 
 
@@ -652 +689 @@
       this->models[0]->draw();
     }
+    
+    //if (this->entityTrack)
+       //this->entityTrack->drawGraph(0.02);
 
     //     if( this->aabbNode != NULL)
@@ -721 +761 @@
   if (this->healthWidget == NULL)
   {
-    this->healthWidget = new OrxGui::GLGuiEnergyWidget();
-    this->healthWidget->setDisplayedName(std::string(this->getClassName()) + " Energy:");
-    this->healthWidget->setSize2D(30,400);
-    this->healthWidget->setAbsCoor2D(10,100);
+    this->healthWidget = new OrxGui::GLGuiEnergyWidgetVertical();
+    //this->healthWidget->setDisplayedName("Health");
+    //this->healthWidget->setSize2D(100,20);
+    //this->healthWidget->setAbsCoor2D(100,200);
 
     this->updateHealthWidget();
@@ -773 +813 @@
 void WorldEntity::hit(float damage, WorldEntity* killer)
 {
+
   this->decreaseHealth(damage);
 

@@ -10 +10 @@
 autom4te.cache
 aclocal.m4
+tags
+test.bmp
+config.sub
+config.guess
+OrxonoxPlayability.kdevses
+OrxonoxPlayability.kdevelop.pcs