Changeset 1994 in orxonox.OLD for orxonox/branches/dave/core/world.cc

Timestamp:

Jun 21, 2004, 12:39:11 AM (21 years ago)

Author:

dave

Message:

orxonox/branches/dave:[test the Shit]

File:

• orxonox/branches/dave/core/world.cc (modified) (11 diffs)

orxonox/branches/dave/core/world.cc

@@ -1 @@
-
 
 /* 
@@ -33 +32 @@
   lastNPC = null;
   lastEnv = null;
+  primitiveMove = 0;
+  step = 0;
 }
 
@@ -104 +105 @@
 
 /** 
+   \brief Remove Non-Player Character
+   \param player A reference to the new npc object
+   
+   Remove a new Non-Player-Character to the game.
+*/
+bool World::removeNPC(NPC* npc) {
+
+  npcList* npcRef = lastNPC;
+  npcList* lastRef = lastNPC;
+  while ( npcRef != null ) 
+    {
+      if ( npcRef->npc == npc ) {
+        cout << "found" << endl;
+        if ( npcRef == lastRef ) {
+          lastNPC = lastNPC->next;
+          delete npcRef;
+          npcRef = lastNPC;
+          lastRef = lastNPC;
+        }
+        else {
+          lastRef->next = npcRef->next;
+          delete npcRef;
+          npcRef = lastRef->next;
+        }
+        cout << "killed ..." << endl;
+      }
+      else {
+        lastRef = npcRef;
+        npcRef = npcRef->next;
+      }
+    }
+  cout << "npc left" << endl;
+}
+
+
+
+/** 
    \brief Add environmental object
    \param player A reference to the new env object
@@ -127 +165 @@
 
 
-/** 
-   \brief Remove Non-Player-Character
-   \param player A reference to the new npc object
-   
-   Remove a new Non-Player-Character to the game.
-*/
-bool World::removeNPC(NPC* npc) {
-  cout << "World::removeNPC not implemented yet" << endl;
-}
-
 
 
@@ -144 +172 @@
    Calls the draw function of all: Objects, Players, Environement. This is the core of all graphics here.
 */
-void World::drawWorld(void) 
-{
+void World::drawWorld(float Zahl1,float Zahl2) 
+{
+  glLoadIdentity();
+  gluLookAt(0.0, -14.0 + DataTank::yOffset, 15.0, 0.0, 0.0 + DataTank::yOffset, 0.0, 0.0, 1.0, 0.0);
+
+  //glRotatef(Zahl1,1.0,0.0,0.0);
+  //glRotatef(Zahl2,0.0,1.0,0.0);
+  
   /* first draw all players */
   playerList* tmpPlayer = lastPlayer;
@@ -151 +185 @@
   while( tmpPlayer != null ) 
     {
-      (*tmpPlayer->player).drawPlayer();
+      (*tmpPlayer->player).drawPlayer((float)Zahl1,(float)Zahl2);
       tmpPlayer = tmpPlayer->next;
     }
@@ -161 +195 @@
       tmpNPC = tmpNPC->next;
     }
+
   /* now draw the rest of the world: environement */
-  /* second draw all npcs */
   envList* tmpEnv = lastEnv;
   while( tmpEnv != null )
@@ -169 +203 @@
       tmpEnv = tmpEnv->next;
     }
-
-  /*
-  glColor3f(0.0, 1.0, 0.0);
+  
+  /* draw the ground grid  */
+  glColor3f(0.3, 0.3, 0.0); 
   glBegin(GL_LINES);
-  for (int x = 0; x <= 35; x += 5)
-    {
-      glVertex3f((float)x, -10.0, 0.0);
-      glVertex3f((float)x, 200.0, 0.0);
-
-      glVertex3f(-(float)x, -10.0, 0.0);
-      glVertex3f(-(float)x, 200.0, 0.0);
-    }
-  for (int x = -10; x<= 200; x += 5)
-    {
-      glVertex3f(-50.0, (float)x, 0.0);
-      glVertex3f(50.0, (float)x, 0.0);
+  /* for the moment, we've got only pseudo moving ground 
+  for (int y = 0; y < 60; y += 2)
+    {
+      for (int x = 0; x < 60; x += 2)
+        {
+          glVertex3f((float)(x - 30), (float)(y - 30), surface[x][y]);
+          glVertex3f((float)(x - 28), (float)(y - 30), surface[x+2][y]);
+        }
     }
   glEnd();
-  */
-  
-  
-  glColor3f(0.0, 1.0, 0.0);
   
   glBegin(GL_LINES);
@@ -201 +227 @@
         }
     }
-  glEnd();
-  
-  
-  glBegin(GL_LINES);
-  for (int y = 0; y < 60; y += 2)
-    {
-      for (int x = 0; x < 60; x += 2)
-        {
-          glVertex3f((float)(x - 30), (float)(y - 30), surface[x][y]);
-          glVertex3f((float)(x - 28), (float)(y - 30), surface[x+2][y]);
-        }
-    }
-  glEnd();
+  glEnd();*/
+
+  //primitiveMove+=0.07;
+  DataTank::yOffset += step;
+
+  tmpPlayer = lastPlayer;
+  while( tmpPlayer != null ) 
+    {
+      tmpPlayer->player->yCor += step;
+      tmpPlayer = tmpPlayer->next;
+    }
+
   
 }
@@ -231 +256 @@
 
 
+void World::setWorldStep(float step)
+{
+  this->step = step;
+  cout << "setting speed to " << step << endl;
+}
+
+
+
 /** 
    \brief Updates the world and all its objects
@@ -241 +274 @@
   
 
+}
+
+
+/* collision detection */
+/* fix: bad efficency: stupid brute force */
+
+void World::detectCollision() 
+{
+  //cout << "World::detectCollision" << endl;
+  float xOff, yOff, zOff, radius;
+  npcList* tmpNPC, *tmpRef;
+
+  //cout << "World::detectCollsions" << endl;
+  /* first: check if any player's shoots trigger a collision */
+  playerList* tmpPlayer = lastPlayer;
+  Player* player = tmpPlayer->player;
+  int state;
+  while( tmpPlayer != null ) 
+    {
+      tmpNPC = lastNPC;
+      while( tmpNPC != null )
+        {
+          //cout << "npc != null" << endl;
+          radius = tmpNPC->npc->collisionRadius;
+          //cout << "worki" << endl;
+          ShootLaser::shoot* shoota = tmpPlayer->player->shootLaser->lastShoot;
+          while( shoota != null )
+            {
+              xOff = shoota->xCor - tmpNPC->npc->xCor;
+              yOff = shoota->yCor - tmpNPC->npc->yCor;
+              zOff = shoota->zCor - tmpNPC->npc->zCor;
+              if ( sqrt(xOff*xOff + yOff*yOff + zOff*zOff) < radius ) 
+                {
+                  //cout << "COLLISION " << endl;
+                  int state = tmpNPC->npc->hit();
+                  /* state is a value that marks if the ship dies or not */
+                  /* if state == 0 the ship dies and we have to remove it */
+                  /*
+                  if ( state == 0 ) {
+                    tmpRef = tmpNPC;
+                    tmpNPC = tmpNPC->next;
+                    removeNPC(tmpRef->npc);
+                    break;
+                  }
+                  */
+                }
+              shoota = shoota->next;
+            }
+          //cout << "changing npc..." << endl;
+          tmpNPC = tmpNPC->next;
+          //cout << "..changing npc done" << endl;
+        }
+      //cout << "changing play..." << endl;
+      tmpPlayer = tmpPlayer->next;
+      //cout << "changing play done" << endl;
+    }
+
+  //cout << "World::detectCollisions middle" << endl;
+
+  /* second: check if any player hits an enemy */
+  tmpPlayer = lastPlayer;
+  while( tmpPlayer != null ) 
+    {
+      tmpNPC = lastNPC;
+      while( tmpNPC != null )
+        {
+          radius = tmpNPC->npc->collisionRadius + tmpPlayer->player->collisionRadius;
+          xOff = tmpPlayer->player->xCor - tmpNPC->npc->xCor;
+          yOff = tmpPlayer->player->yCor - tmpNPC->npc->yCor;
+          zOff = tmpPlayer->player->zCor - tmpNPC->npc->zCor;
+          if ( sqrt(xOff*xOff + yOff*yOff + zOff*zOff) < radius ) {
+            //cout << "COLLISION " << endl;
+            tmpNPC->npc->hit();
+          }
+          
+          tmpNPC = tmpNPC->next;
+        }
+      
+      tmpPlayer = tmpPlayer->next;
+    }
+  
+  
+
+  /* third: check if any enemy shoots a player */
+
+  //cout << "World::detectCollisions end" << endl;
 }