Changeset 3629 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Mar 22, 2005, 11:15:54 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: some changes in the storyentity framework: added a preLoad() function, since there is some stuff to be initialized before load(). written some comments to level loading doxygen stuff. now the worldinterface works

Location:

orxonox/trunk/src/world_entities

Files:

• projectile.cc (modified) (2 diffs)
• test_gun.cc (modified) (2 diffs)
• weapon.h (modified) (2 diffs)

orxonox/trunk/src/world_entities/projectile.cc

@@ -42 +42 @@
 Projectile::~Projectile () 
 {
-
+  /* 
+     do not delete the test projectModel, since it is pnode 
+     and will be cleaned out by world 
+  */
+  //delete this->projectileModel;
 }
 
@@ -78 +82 @@
   this->getAbsDir().matrix (matrix);
   glMultMatrixf((float*)matrix);  
-  this->model->draw();
+  //this->model->draw();
+  PRINTF(1)("draw draw draw draw draw draw \n");
+  this->projectileModel->draw();
 
   glPopMatrix();

orxonox/trunk/src/world_entities/test_gun.cc

@@ -25 +25 @@
 
 #include "vector.h"
+#include "list.h"
 
 using namespace std;
@@ -77 +78 @@
 {
   printf("TestGun::fire() - firing weapon now ---------------------------\n");
-  //this->myWorld;
+  //WorldEntity* pj = new Projectile();
+  //this->worldEntities->add(pj);
 }
 

orxonox/trunk/src/world_entities/weapon.h

@@ -69 +69 @@
   virtual void draw(void);
 
+ protected:
+  tList<WorldEntity>* worldEntities;
 
  private:
@@ -76 +78 @@
   Projectile* projectile;
   //WeaponSound sound;
-  tList<WorldEntity>* worldEntities;
-
 };