Changeset 2640 in orxonox.OLD for orxonox/trunk

Timestamp:

Oct 25, 2004, 2:01:06 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk/src - BUGFIX: input node now redirected to the right story_entity. This should fix the display player visibility problem, encountered on some systems

Location:

orxonox/trunk/src

Files:

• Makefile.in (modified) (1 diff)
• player.cc (modified) (1 diff)
• world.cc (modified) (6 diffs)
• world.h (modified) (4 diffs)

orxonox/trunk/src/Makefile.in

@@ -159 +159 @@
 HEADERS = $(noinst_HEADERS)
 
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in ChangeLog INSTALL \
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in INSTALL \
         Makefile.am
 SOURCES = $(orxonox_SOURCES)

orxonox/trunk/src/player.cc

@@ -71 +71 @@
 
 void Player::draw ()
-{
+{ 
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();

orxonox/trunk/src/world.cc

@@ -50 +50 @@
 World::~World ()
 {
-  unload ();
+  Orxonox *orx = Orxonox::getInstance();
+  orx->get_localinput()->unbind (localPlayer);
   delete entities;
 }
@@ -72 +73 @@
   this->bQuitCurrentGame = true;
   this->localCamera->setWorld(NULL);
+  this->~World();
 }
 
@@ -111 +113 @@
             // create a player
             WorldEntity* myPlayer = (WorldEntity*) this->spawn<Player>();
-            
+            this->localPlayer = myPlayer;           
+
             // bind input
             Orxonox *orx = Orxonox::getInstance();
@@ -142 +145 @@
             // create a player
             WorldEntity* myPlayer = (WorldEntity*) this->spawn<Player>();
+            this->localPlayer = myPlayer;
             
             // bind input
@@ -394 +398 @@
 }
 
+void World::debug()
+{
+  List<WorldEntity> *l;
+  WorldEntity* entity;
+  
+  printf("counting all entities\n");
+  l = entities->get_next();  
+  while( l != NULL ) 
+    { 
+      entity = l->get_object();
+      if( entity->bDraw ) printf("got an entity\n");
+      l = l->get_next();
+    }
+}
+
 
 void World::mainLoop()
@@ -403 +422 @@
   while(!this->bQuitOrxonox && !this->bQuitCurrentGame) /* pause pause pause ?!?!?*/
     {
+      //debug routine
+      //debug();
       // Network
       synchronize();

orxonox/trunk/src/world.h

@@ -68 +68 @@
   int debugWorldNr;
 
+  WorldEntity* localPlayer;
+  
   void mainLoop();
   void synchronize();
@@ -74 +76 @@
   void collision();
   void display();
+  void debug();
 };
 
@@ -89 +92 @@
 template<typename T> T* World::spawn(Location* loc = NULL, WorldEntity* owner = NULL)
 {
-        Location zeroloc;
-        T* entity = new T();
-        entities->add ((WorldEntity*)entity, LIST_ADD_NEXT);
-        if( loc == NULL)
-        {
-          zeroloc.dist = 0;
-          zeroloc.part = 0;
-                zeroloc.pos = Vector();
-                zeroloc.rot = Quaternion();
-                loc = &zeroloc;
-        }
-        entity->init (loc, owner);
-        if (entity->bFree)
-        {
-                track[loc->part].map_coords( loc, entity->get_placement());
-        }
-        entity->post_spawn ();
-        return entity;
+  Location zeroloc;
+  T* entity = new T();
+  entities->add ((WorldEntity*)entity, LIST_ADD_NEXT);
+  if( loc == NULL)
+    {
+      zeroloc.dist = 0;
+      zeroloc.part = 0;
+      zeroloc.pos = Vector();
+      zeroloc.rot = Quaternion();
+      loc = &zeroloc;
+    }
+  entity->init (loc, owner);
+  if (entity->bFree)
+    {
+      track[loc->part].map_coords( loc, entity->get_placement());
+    }
+  entity->post_spawn ();
+  return entity;
 }
 
@@ -123 +126 @@
 template<typename T> T* World::spawn(Placement* plc, WorldEntity* owner = NULL)
 {
-        T* entity = new T();
-        entities->add ((WorldEntity*)entity, LIST_ADD_NEXT);
-        entity->init (plc, owner);
-        if (!entity->bFree)
-        {
-                printf("Can't spawn unfree entity with placement\n"); 
-                entities->remove( (WorldEntity*)entity, LIST_FIND_FW);
-                return NULL;
-        }
-        entity->post_spawn ();
-        return entity;
+  T* entity = new T();
+  entities->add ((WorldEntity*)entity, LIST_ADD_NEXT);
+  entity->init (plc, owner);
+  if (!entity->bFree)
+    {
+      printf("Can't spawn unfree entity with placement\n"); 
+      entities->remove( (WorldEntity*)entity, LIST_FIND_FW);
+      return NULL;
+    }
+  entity->post_spawn ();
+  return entity;
 }