Changeset 2068 in orxonox.OLD for orxonox/branches/chris/src

Timestamp:

Jul 5, 2004, 10:43:49 AM (20 years ago)

Author:

chris

Message:

orxonox/branches/chris: First snippet of the totally revamped base system… perhaps a bit confusing at the moment, but when finished theoretically you only have to subclass the worldentity and track classes to create the game content (even the menu will be a WorldEntity I suppose)

Location:

orxonox/branches/chris/src

Files:

• camera.cc (added)
• camera.h (added)
• command_node.cc (modified) (1 diff)
• data_tank.cc (modified) (1 diff)
• data_tank.h (modified) (1 diff)
• input_output.cc (deleted)
• input_output.h (deleted)
• orxonox.cc (modified) (7 diffs)
• orxonox.h (modified) (2 diffs)
• track.cc (added)
• track.h (added)
• vector.cc (modified) (1 diff)
• vector.h (modified) (1 diff)
• world.cc (modified) (3 diffs)
• world.h (modified) (2 diffs)
• world_entity.cc (modified) (3 diffs)
• world_entity.h (modified) (2 diffs)

orxonox/branches/chris/src/command_node.cc

@@ -157 +157 @@
                                 break;
                         default:
-                                        // TO DO: Send other events to orxonox sysevent handler
+                                Orxonox *orx = Orxonox::getInstance();
+                                orx->event_handler (&event);
                                 break;
                 }

orxonox/branches/chris/src/data_tank.cc

@@ -19 +19 @@
 using namespace std;
 
-float DataTank::xOffset = 0;
-float DataTank::yOffset = 0;
-float DataTank::zOffset = 0;
-
 DataTank::DataTank () {}
 DataTank::~DataTank () {}

orxonox/branches/chris/src/data_tank.h

@@ -10 +10 @@
   ~DataTank ();
 
-  static float xOffset;
-  static float yOffset;
-  static float zOffset;
-
 };
 

orxonox/branches/chris/src/orxonox.cc

@@ -21 +21 @@
    ### File Specific:
    main-programmer: Patrick Boenzli
-   co-programmer:
+   co-programmer: Christian Meyer
 */
+
+#ifdef __WIN32__
+#include <windows.h>
+#endif
 
 #include <iostream>
@@ -51 +55 @@
 
 Orxonox::~Orxonox () 
-{}
-
-
-/* this is a singleton class to prevent dublicates */
+{
+        Orxonox::singleton_ref = NULL;
+        if( world != NULL) delete world;
+        if( localinput != NULL) delete world;
+        if( localcamera != NULL) delete camera;
+        if( resources != NULL) delete resources;
+}
+
+
+/* this is a singleton class to prevent duplicates */
 Orxonox* Orxonox::singleton_ref = 0;
 World* Orxonox::world = 0;
-InputOutput* Orxonox::io = 0;
-Player* Orxonox::localPlayer = 0;
 bool Orxonox::pause = false;
-bool Orxonox::inputEnabled = false;
-bool Orxonox::upWeGo = false;
-bool Orxonox::downWeGo = false;
-bool Orxonox::rightWeGo = false;
-bool Orxonox::leftWeGo = false;
-bool Orxonox::shoot1 = false;
-int Orxonox::fps = 0;
-int Orxonox::alpha = 0;
-int Orxonox::beta = 0;
-//int Orxonox::offsetX = 0;
-//int Orxonox::offsetY = 0;
 
 
@@ -80 +77 @@
 }
 
-
-int Orxonox::globalInit (int argc, char** argv) 
-{
+void Orxonox::get_config_file (int argc, char** argv)
+{
+        char* path;
+        #ifdef __WIN32__
+        path = getenv("");
+        #else
+        path = getenv("HOME");
+        #endif
+        
+        if( path != NULL) strcpy (configfilename, path);
+        strcat (configfilename, "/.orxonox.conf");
+}
+
+int Orxonox::init (int argc, char** argv)
+{
+                // parse command line
+                // config file
+                
+        get_config_file (argc, argv);
+        
+                // initialize SDL
+  printf("> Initializing SDL\n");
   if( SDL_Init (SDL_INIT_EVERYTHING) == -1)
   {
@@ -89 +105 @@
   }
   
+        // initialize everything
+  printf("> Initializing video\n");
+        if( init_video () == -1) return -1;
+  printf("> Initializing sound\n");
+        if( init_sound () == -1) return -1;
+  printf("> Initializing input\n");
+        if( init_input () == -1) return -1;
+  printf("> Initializing networking\n");
+        if( init_networking () == -1) return -1;
+  printf("> Initializing resources\n");
+        if( init_resources () == -1) return -1;
+  printf("> Initializing world\n");
+        if( init_world () == -1) return -1;
+        
+        return 0;
+}
+
+int Orxonox::init_video () 
+{
   // Set video mode
   // TO DO: parse arguments for settings
@@ -117 +152 @@
   // OpenGL stuff
   // (Is this all we initialize globally???)
+  glClearColor(0.0, 0.0, 0.0, 0.0);
   glEnable(GL_DEPTH_TEST);
   glShadeModel(GL_FLAT);
   
-//  glutInit(&argc, argv);
-//  glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);
-//  glutInitWindowSize(500, 500);
-//  //glutFullScreen();
-//  glutInitWindowPosition(100, 100);
-//  glutCreateWindow("OrxonoX");
-//  /* window event dispatchers */
-//  glutDisplayFunc(display);
-//  glutReshapeFunc(reshape);
-//  glutKeyboardFunc(keyboard);
-//  glutKeyboardUpFunc(upKeyboard);
-//
-//  glutTimerFunc(1000, timeSlice, 0);
-//  cout << "measuring performance...";
-
-}
-
-
-int Orxonox::menuInit (void)
-{
-  glClearColor(0.0, 0.0, 0.0, 0.0);
-}
-
-
-int Orxonox::gameInit (void) 
-{
-  glClearColor(0.0, 0.0, 0.0, 0.0);
-  
-  /* world init, shouldnt be done here later */
-  world = new World;
-  (*world).initEnvironement();
-  localPlayer = new Player;
-  localPlayer->setPosition(0.0, -10.0, 3.0);
-  localPlayer->setCollisionRadius(2.0);
-  io = new InputOutput(world, localPlayer);
-  (*world).addPlayer(localPlayer);
-  Environment *env = new Environment;
-  (*world).addEnv(env);
-  NPC* npc = new NPC;
-  npc->setPosition(3.0, 0.0, 3.0);
-  npc->setCollisionRadius(1.0);
-  world->addNPC(npc);
-
-  NPC* npc2 = new NPC;
-  npc2->setPosition(-2.0, 10.0, 3.0);
-  npc2->setCollisionRadius(1.0);
-  world->addNPC(npc2);
-
-  glutSpecialFunc(specFunc); 
-  glutSpecialUpFunc(releaseKey);
-
-  glutIdleFunc(continousRedraw);
-  //cout << "Orxonox::gameInit" << endl;
-}
-
-
-/* this is the time triggered function. heart beat*/
-
-void Orxonox::timeSlice(int value)
-{
-  cout << "got " << fps << " fps" << endl;
-  /* this is very very unsafe: io could be uninit */
-  io->setPlayerStep(19.2/fps); /* set player to propper speed */
-  localPlayer->shootLaser->setShootStep(20.0/fps); /* set shoot speed */
-  world->setWorldStep(7.0/fps); /* set the speed of the terrain moving away */
-  fps = 0;
-  inputEnabled = true;
-  glutTimerFunc(1000, timeSlice, 0);
-}
-
-
-
-void Orxonox::keyboard(unsigned char key, int x, int y)
-{
-  switch(key) {
-
-    /* perspectiv control */
-  case 'w':
-    beta -= 1;
-    break;
-  case 's':
-    beta += 1;
-    break;
-  case 'a':
-    alpha -= 1;
-    break;
-  case 'd':
-    alpha += 1;
-    break;
-
-    /* game controls */
-  case 'p':
-    if (pause) 
-      {
-        cout << "unset pause" << endl;
-        glutIdleFunc(continousRedraw);
-        pause = false;
-      }
-    else 
-      {
-        cout << "set pause" << endl;
-        glutIdleFunc(NULL);
-        pause = true;
-      }
-    break;
-  case 32:
-    shoot1 = true;
-    break;
-  case 27:
-  case 'q':
-    quitGame();
-    break;
-  }
-}
-
-
-void Orxonox::upKeyboard(unsigned char key, int x, int y) 
-{
-  switch(key) {
-  case 32:
-    shoot1 = false;
-    break;
-  }
-}
-
+  // create camera
+  localcamera = new Camera();
+  
+  return 0;
+}
+
+int Orxonox::init_sound () 
+{
+        printf("Not yet implemented\n");
+        return 0;
+}
+
+int Orxonox::init_input () 
+{
+        // create localinput
+        localinput = new CommandNode( configfilename);
+        
+        return 0;
+}
+
+
+int Orxonox::init_networking () 
+{
+        printf("Not yet implemented\n");
+        return 0;
+}
+
+int Orxonox::init_resources () 
+{
+        printf("Not yet implemented\n");
+        return 0;
+}
+
+int Orxonox::init_world () 
+{
+        printf("Not yet implemented\n");
+        return 0;
+}
 
 void Orxonox::quitGame() 
 {
+        bQuitOrxonox = true;
   //cout << "finished garbage colletion, quitting..." << endl;
-  exit(0);
-}
-
-
-void Orxonox::releaseKey(int key, int x, int y) 
-{  
-  switch(key) {
-  case GLUT_KEY_UP:
-    upWeGo = false;
-    break;
-  case GLUT_KEY_DOWN:
-    downWeGo = false;
-    break;
-  case GLUT_KEY_RIGHT:
-    rightWeGo = false;
-    break;
-  case GLUT_KEY_LEFT:
-    leftWeGo = false;
-    break;
-  }
-}
-
-
-/** 
-   \brief special keys function. called by glut
-   
-   Here are all special key function defined.
-*/
-void Orxonox::specFunc(int key, int x, int y)
-{
-  switch(key) {
-    /* spacecraft controls */
-  case GLUT_KEY_UP:
-    upWeGo = true;
-    break;
-  case GLUT_KEY_DOWN:
-    downWeGo = true;
-    break;
-  case GLUT_KEY_RIGHT:
-    rightWeGo = true;
-    break;
-  case GLUT_KEY_LEFT:
-    leftWeGo = true;
-    break;
-  }
-}
-
-
-void Orxonox::display() 
-{
-  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-  glColor3f(0.0, 0.5, 0.6);
-  glLoadIdentity();
-  gluLookAt(0.0, -14.0, 15.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0);
-  (*world).drawWorld();
-
-  SDL_Flip( screen);
-}
-
-
-void Orxonox::continousRedraw()
-{
-  /* increment the frames-per-second counter*/
-  fps++;
-  /* check for collisions */
-  world->detectCollision();
-
-  /* check for input to pass it over */
-  if ( !pause && inputEnabled && 
-       (rightWeGo || leftWeGo || upWeGo || downWeGo || shoot1)) 
-    {
-      if (upWeGo)
-        (*io).goUp();
-      if (downWeGo)
-      (*io).goDown();
-      if (rightWeGo)
-        (*io).goRight();
-      if (leftWeGo)
-      (*io).goLeft();
-      if (shoot1) 
-        (*io).shoot();
-    }
-  /* request repaint */
-  glutPostRedisplay();
-  //cout << "Orxonox::continousRedraw" << endl;
-}
-
-
-void Orxonox::reshape (int w, int h)
-{
-  glViewport(0, 0, (GLsizei) w, (GLsizei) h);
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
-  glFrustum(-1.0, 1.0, -1.0, 1.0, 1.5, 200.0);
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity(); //pb why a second time?
-}
-
-
-void Orxonox::testTheShit() 
-{
-  //Player* pl = new Player;
-  //(*pl).setPosition(1, 1, 1);
-  //(*world).addPlayer(pl);
-  
-  //NPC* nl = new NPC;
-  //(*world).addNPC(nl);
-  //(*world).addNPC(nl);
-  //(*world).addNPC(nl);
-  //(*world).addNPC(nl);
-  //(*world).addNPC(nl);
-  //(*world).addNPC(nl);
-  //(*world).testThaTest();
-}
-
+}
 void Orxonox::mainLoop()
 {
@@ -370 +205 @@
   while( !bQuitOrxonox)
   {
+        // Network
+        synchronize();
     // Process input
+    handle_input();
     // Process time
+    time_slice();
     // Process collision
+    collision();
     // Draw
     display();
   }
+}
+
+void Orxonox::event_handler (SDL_Event* event)
+{
+        // Handle special events such as reshape, quit, focus changes
+}
+
+void Orxonox::synchronize ()
+{
+        // Get remote input
+        // Update synchronizables
+}
+
+void Orxonox::handle_input ()
+{
+        // localinput
+                localinput.process();
+        // remoteinput
+}
+
+void Orxonox::time_slice ()
+{
+        Uint32 curframe = SDL_GetTicks();
+        if( !pause)
+        {
+                world->time_slice (curframe - lastframe);
+                world->update ();
+                localcamera->time_slice (curframe - lastframe);
+        }
+        lastframe = curframe;
+}
+
+void Orxonox::collision ()
+{
+        world->collide ();
+}
+
+void Orxonox::display ()
+{
+                // clear buffer
+        glClear( GL_COLOR_BUFFER_BIT, GL_DEPTH_BUFFER_BIT);
+                // set camera
+        localcamera->apply ();
+                // draw world
+        world->draw ();
+                // draw HUD
+                // flip buffers
+        SDL_Flip( screen);
+}
+
+Camera* Orxonox::get_camera ()
+{
+        return localcamera;
+}
+
+Camera* Orxonox::get_world ()
+{
+        return world;
 }
 
@@ -381 +279 @@
 {  
   Orxonox *orx = Orxonox::getInstance();
-  if( (*orx).globalInit(argc, argv) == -1)
-  {
-    printf("! Global initialization failed\n");
+  
+  if( (*orx).init(argc, argv) == -1)
+  {
+    printf("! Orxonox initialization failed\n");
     return -1;
   }
-  
-  //(*orx).menuInit(); pb: directly jump to the game, no menu
-  
-  if( (*orx).gameInit() == -1)
-  {
-    printf("! Game initialization failed\n");
-    return -1;
-  }
-
+
+        lastframe = SDL_GetTicks();
+        
   (*orx).mainLoop();
   
   return 0;
 }
-

orxonox/branches/chris/src/orxonox.h

@@ -6 +6 @@
 
 class World;
-class InputOutput;
-class Player;
-
 
 class Orxonox {
@@ -16 +13 @@
   Orxonox ();
   ~Orxonox ();
+  
+  static char configfilename[256];
   static World* world;
-  static InputOutput* io;
-  static Player* localPlayer;
+  static DataTank* resources;
+  static CommandNode* localinput;
+  static Camera* localcamera;
+  static SDL_Surface* screen;
+  
   static bool bQuitOrxonox;
   static bool pause;
-  static bool inputEnabled;
-  static bool upWeGo;
-  static bool downWeGo;
-  static bool rightWeGo;
-  static bool leftWeGo;
-  static bool shoot1;
-  static int fps;
+        static Uint32 lastframe;
 
-  static int alpha;
-  static int beta;
-  static int offsetX;
-  static int offsetY;
+        static void get_config_file (int argc, char** argv);
+        
+                // main loop functions
+  static void synchronize ();
+  static void handle_input ();
+  static void time_slice ();
+  static void collision ();
+  static void display ();
+  
+        // subsystem initialization
+  int init_video ();
+  int init_sound ();
+  int init_input ();
+  int init_networking ();
+  int init_resources ();
+  int init_world ();
 
-  static void timeSlice(int value);
-
-  static SDL_Surface* screen;
+  static void event_handler (SDL_Event* event);
   
  public:
-  static Orxonox* getInstance (void);
+  static Orxonox* getInstance ();
+  static void quitGame();
 
-  int globalInit (int argc, char** argv);
-  int menuInit (void);
-  int gameInit (void);
-  
+  int init (int argc, char** argv);
+        
+        Camera* get_camera();
+        World* get_world();
+        
   void mainLoop();
-
-  void testTheShit(void);
-  static void display (void);
-  static void continousRedraw(void);
-  static void reshape (int w, int h);
-  static void keyboard(unsigned char key, int x, int y);
-  static void upKeyboard(unsigned char key, int x, int y);
-  static void releaseKey(int key, int x, int y);
-  static void specFunc(int key, int x, int y);
-  static void quitGame(void); 
 };
 

orxonox/branches/chris/src/vector.cc

@@ -266 +266 @@
 
 /**
+   \brief fills the specified buffer with a 4x4 glmatrix
+   \param buffer: Pointer to an array of 16 floats
+   
+   Use this to get the rotation in a gl-compatible format
+*/
+void Rotation::glmatrix (float* buffer)
+{
+        buffer[0] = m[0];
+        buffer[1] = m[3];
+        buffer[2] = m[6];
+        buffer[3] = m[0];
+        buffer[4] = m[1];
+        buffer[5] = m[4];
+        buffer[6] = m[7];
+        buffer[7] = m[0];
+        buffer[8] = m[2];
+        buffer[9] = m[5];
+        buffer[10] = m[8];
+        buffer[11] = m[0];
+        buffer[12] = m[0];
+        buffer[13] = m[0];
+        buffer[14] = m[0];
+        buffer[15] = m[1];
+}
+
+
+/**
    \brief rotates the vector by the given rotation
    \param v: a vector

orxonox/branches/chris/src/vector.h

@@ -58 +58 @@
   ~Rotation () {}
   
+  glmatrix (float* buffer);
 };
 

orxonox/branches/chris/src/world.cc

@@ -12 +12 @@
    ### File Specific:
    main-programmer: Patrick Boenzli
-   co-programmer:
+   co-programmer: Christian Meyer
 */
 
@@ -18 +18 @@
 #include <stdlib.h>
 #include <cmath>
-#include <GL/glut.h>
 
 #include "npc.h"
@@ -39 +38 @@
    This creates a new empty world!
 */
-World::World () {
-  lastPlayer = null;
-  lastNPC = null;
-  lastEnv = null;
-  primitiveMove = 0;
-  step = 0;
+World::World ()
+{
+        entities = new List<WorldEntitites>();
 }
 
 
-World::~World () {}
-
-
-/** 
-   \brief Add Player
-   \param player A reference to the new player object
-   
-   Add a new Player to the game. Player has to be initialised previously 
-*/
-bool World::addPlayer(Player* player) 
+World::~World ()
 {
-  playerList* listMember = new playerList;
-  listMember->player = player;
-  if ( lastPlayer != null ) 
-    {
-      listMember->number = lastPlayer->number + 1;
-      listMember->next = lastPlayer;
-    }
-  else 
-    {
-      listMember->number = 0;
-      listMember->next = null;
-    }
-  lastPlayer = listMember;
+        delete entities;
 }
 
-
-/** 
-   \brief Remove Player
-   \param player A reference to the new npc object
-   
-   Remove a new Player to the game.
-*/
-bool World::removePlayer(Player* player) {
-  cout << "World::removeNPC not implemented yet" << endl;
+template<class T> T* World::spawn<T>(Location* loc, WorldEntity* owner)
+{
+        T* entity = new T();
+        entities->add ((WorldEntity*)entity, LIST_ADD_NEXT);
+        return entity;
 }
 
-Player* World::getLocalPlayer() 
+World::collide ()
 {
-  return localPlayer;
+        List<WorldEntity> *a, *b;
+        WorldEntity *aobj, *bobj;
+        
+        a = entities->get_next();
+        
+        while( a != NULL)
+        {
+                aobj = a->get_object();
+                if( aobj->bCollide && aobj->collisioncluster != NULL)
+                {
+                        b = a->get_next();
+                        while( b != NULL)
+                        {
+                                bobj = b->get_object();
+                                if( bobj->bCollide && bobj->collisioncluster != NULL)
+                                {
+                                        Uint32 ahitflg, bhitflg;
+                                        if check_collision ( aobj->place, aobj->collisioncluster, &ahitflg, bobj->place, bobj->collisioncluster, &bhitflg);
+                                        {
+                                                aobj->collide (bobj, ahitflg, bhitflg);
+                                                bobj->collide (aobj, bhitflg, ahitflg);
+                                        }
+                                }
+                                b = b->get_next();
+                        }
+                }
+                a = a->get_next();
+        }
 }
 
-
-/** 
-   \brief Add Non-Player-Character
-   \param player A reference to the new npc object
-   
-   Add a new Non-Player-Character to the game. Player has to be initialised previously 
-*/
-bool World::addNPC(NPC* npc) 
+void World::draw ()
 {
-  npcList* listMember = new npcList;
-  listMember->npc = npc;
-  if ( lastNPC != null ) 
-    {
-      listMember->number = lastNPC->number + 1;
-      listMember->next = lastNPC;
-    }
-  else 
-    {
-      listMember->number = 0;
-      listMember->next = null;
-    }
-  lastNPC = listMember;
+        // draw geometry
+        
+        // draw entities
+        List<WorldEntity> *l;
+        WorldEntity* entity;
+        
+        l = entities->get_next();  
+        while( l != NULL) 
+        { 
+                entity = l->get_object();
+                if(     entity->bDraw) entity->draw();
+          l = l->get_next();
+        }
 }
 
-
-/** 
-   \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;
+void World::update ()
+{
 }
 
-
-
-/** 
-   \brief Add environmental object
-   \param player A reference to the new env object
-   
-   Add a new Environment to the world. Env has to be initialised before.
-*/
-bool World::addEnv(Environment* env) 
+void World::time_slice (Uint32 deltaT)
 {
-  envList* listMember = new envList;
-  listMember->env = env;
-  if ( lastEnv != null ) 
-    {
-      listMember->number = lastEnv->number + 1;
-      listMember->next = lastEnv;
-    }
-  else 
-    {
-      listMember->number = 0;
-      listMember->next = null;
-    }
-  lastEnv = listMember;
+        List<WorldEntity> *l;
+        WorldEntity* entity;
+        float seconds = deltaT;
+        
+        seconds /= 1000;
+        
+        l = entities->get_next();  
+        while( l != NULL) 
+        { 
+                entity = l->get_object();
+                entity->tick (seconds);
+          l = l->get_next();
+        }
 }
-
-
-
-
-/** 
-   \brief Draws the World and all Objects contained
-   
-   Calls the draw function of all: Objects, Players, Environement. This is the core of all graphics here.
-*/
-void World::drawWorld(void) 
-{
-
-  glLoadIdentity();
-  gluLookAt(0.0, -14.0 + DataTank::yOffset, 15.0, 0.0, 0.0 + DataTank::yOffset, 0.0, 0.0, 1.0, 0.0);
-  /* first draw all players */
-  playerList* tmpPlayer = lastPlayer;
-  Player* player = tmpPlayer->player;
-  while( tmpPlayer != null ) 
-    {
-      tmpPlayer->player->paint();
-      tmpPlayer = tmpPlayer->next;
-    }
-  /* second draw all npcs */
-  npcList* tmpNPC = lastNPC;
-  while( tmpNPC != null )
-    {
-      (*tmpNPC->npc).paint();
-      tmpNPC = tmpNPC->next;
-    }
-
-  /* now draw the rest of the world: environement */
-  envList* tmpEnv = lastEnv;
-  while( tmpEnv != null )
-    {
-      (*tmpEnv->env).drawEnvironment();
-      tmpEnv = tmpEnv->next;
-    }
-  
-  /* draw the ground grid  */
-  glColor3f(0.0, 1.0, 0.0); 
-  glBegin(GL_LINES);
-  /* 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();
-  
-  glBegin(GL_LINES);
-  for (int x = 0; x < 60; x += 2)
-    {
-      for (int y = 0; y < 60; y += 2)
-        {
-          glVertex3f((float)(x - 30), (float)(y - 30), surface[x][y]);
-          glVertex3f((float)(x - 30), (float)(y - 28), surface[x][y+2]);
-        }
-    }
-  glEnd();
-
-  //primitiveMove+=0.07;
-  DataTank::yOffset += step;
-
-  tmpPlayer = lastPlayer;
-  while( tmpPlayer != null ) 
-    {
-      tmpPlayer->player->yCor += step;
-      tmpPlayer = tmpPlayer->next;
-    }
-
-
-}
-
-
-void World::initEnvironement()
-{
-
- for (int x = 0; x < 60; x += 2)
-    {
-      for (int y = 0; y < 60; y += 2)
-        {
-          surface[x][y] = 0;
-        }
-    }
-}
-
-
-void World::setWorldStep(float step)
-{
-  //cout << "World::setWorldStep(" << step << ");" << endl;
-  this->step = step;
-  //cout << "setting speed to " << step << endl;
-}
-
-
-
-/** 
-   \brief Updates the world and all its objects
-   
-   Calculates the new state of the world. User-input and AI of
-   the enemies are accounted for.
-*/
-void World::updateWorld(void) 
-{
-  
-
-}
-
-
-/* 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;
-}
-
-
-
-/** 
-   \brief Routine for testing purposes.
-   
-   testing, testing, testing...
-*/
-void World::testThaTest(void) 
-{
-  cout << "World::testThaTest() called" << endl;
-  /* test addPlayer */
-  cout << "addPlayer test..." << endl;
-  playerList* pl = lastPlayer;
-  while ( pl != null )
-    {
-      cout << "player " << pl->number << " was found" << endl;
-      pl = pl->next;
-    }
-
-  /* test addNPC */
-  cout << "addNPC test..." << endl;
-  npcList* nl = lastNPC;
-  while ( nl != null )
-    {
-      cout << "npc " << nl->number << " was found" << endl;
-      nl = nl->next;
-    }
-
-
-  /* test addEnv */
-  cout << "addEnv test..." << endl;
-  envList* en = lastEnv;
-  while ( en != null )
-    {
-      cout << "env " << en->number << " was found" << endl;
-      en = en->next;
-    }
-
-  /* test drawWorld() */
-}

orxonox/branches/chris/src/world.h

@@ -2 +2 @@
 #ifndef WORLD_H
 #define WORLD_H
-
-class Player;
-class NPC;
-class Environment;
-
 
 class World {
@@ -14 +9 @@
   ~World ();
 
-  float primitiveMove;
+        template<class T> T* spawn<T>(Location* loc, WorldEntity* owner);       // template to be able to spawn any derivation of WorldEntity
 
-  /* for easier use: map the first two player here */
-  Player *localPlayer;
-  Player *player1;
-  Player *player2;
-
-  /* a list of all players */
-  struct playerList {
-    playerList* next;
-    Player* player;
-    int number;
-  };
-  playerList* lastPlayer;
-
-  /* a list of all non-player-characters */
-  struct npcList {
-    npcList* next;
-    NPC* npc;
-    int number;
-  };
-  npcList* lastNPC;
-
-  /* a list of all environmental objects */
-  struct envList {
-    envList* next;
-    Environment* env;
-    int number;
-  };
-  envList* lastEnv;
-
-
-
-
-  bool addPlayer(Player* player);
-  bool removePlayer(Player* player);
-  Player* getLocalPlayer();
-  bool addNPC(NPC* npc);
-  bool removeNPC(NPC* npc);
-  bool addEnv(Environment* env);
-
-  void drawWorld(void);
-  void initEnvironement(void);
-  void setWorldStep(float step);
-  void updateWorld(void);
-  void detectCollision(void);
-  void testThaTest(void);
-
+        void time_slice (Uint32 deltaT);
+        void collide ();
+        void draw ();
+        void update (); // maps Locations to Placements
+        void calc_camera_pos (Location* loc, Placement* plc);
+        
  private:
-  float surface[120][120];
-  float step;
-
+ 
+        List<WorldEntity>* entities;
+        
+                // base level data
+        Track* track;
+        Uint32 tracklen;
+        Vector* pathnodes;
 
 };

orxonox/branches/chris/src/world_entity.cc

@@ -13 +13 @@
    ### File Specific:
    main-programmer: Patrick Boenzli
-   co-programmer: ...
+   co-programmer: Christian Meyer
 */
 
@@ -120 +120 @@
    This is a central function of an entity: call it to let the entity painted to the screen. Just override this function with whatever you want to be drawn.
 */
-void WorldEntity::paint() 
+void WorldEntity::draw() 
 {
-  cout << "WorldEntity::paint()" << endl;
+  cout << "WorldEntity::draw()" << endl;
 }
 
@@ -131 +131 @@
    \param loc: place where the collision happens
 */
-void WorldEntity::collide(WorldEntity* we, Vector loc) {}
+void WorldEntity::collide(WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags) {}
 
 /**

orxonox/branches/chris/src/world_entity.h

@@ -29 +29 @@
   void removeAbility(Ability* ability);
 
-  virtual void tick(float time);
-  virtual void paint();
-  /* virtual void actionEvent(Event* event); */
-  virtual void collide(WorldEntity* we, Vector loc);
-  virtual void hit(WorldEntity* weapon, Vector loc);
-  virtual void destroy();
+  virtual void tick (float time);
+  virtual void draw ();
+  virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);
+  virtual void hit (WorldEntity* weapon, Vector loc);
+  virtual void destroy ();
   virtual void command (Command* cmd);
+  virtual void get_lookat (Location* locbuf);
 
   virtual void entityPreEnter();
@@ -42 +42 @@
   virtual void entityPostQuit();
 
- 
+  bool bCollide;
+  bool bDraw;
 
  private:
-  Vector* position;
-  Vector* orientation;
+        WorldEntity* owner;
+        CollisionCluster* collisioncluster;
+        Placement place;
+        Location loc;
   /* List of abilities */ 
   float health;