Changeset 2860 in orxonox.OLD for orxonox/branches/dave/src/world.cc

Timestamp:

Nov 15, 2004, 11:13:21 PM (21 years ago)

Author:

dave

Message:

orxonox/branches/dave: das level hat jetzt form angenommen, stand:nach der Convention vom Samstag….

File:

• orxonox/branches/dave/src/world.cc (modified) (23 diffs)

orxonox/branches/dave/src/world.cc

@@ -22 +22 @@
 #include "command_node.h"
 #include "camera.h"
+#include "environment.h"
 
 using namespace std;
@@ -35 +36 @@
   this->worldName = name;
   this->debugWorldNr = -1;
-  this->entities = new List<WorldEntity>();
+  this->entities = new tList<WorldEntity>();
 }
 
@@ -42 +43 @@
   this->debugWorldNr = worldID;
   this->worldName = NULL;
-  this->entities = new List<WorldEntity>();
+  this->entities = new tList<WorldEntity>();
 }
 
@@ -74 +75 @@
   this->bQuitCurrentGame = true;
   this->localCamera->setWorld(NULL);
+  this->entities->clear();
+  Orxonox::getInstance()->get_localinput()->reset();
   this->~World();
 }
@@ -98 +101 @@
             this->pathnodes = new Vector[6];
             this->pathnodes[0] = Vector(0, 0, 0);
-            this->pathnodes[1] = Vector(-100, 40, 0);
-            this->pathnodes[2] = Vector(-100, 140, 0);
-            this->pathnodes[3] = Vector(0, 180, 0);
-            this->pathnodes[4] = Vector(100, 140, 0);
-            this->pathnodes[5] = Vector(100, 40, 0);
+            this->pathnodes[1] = Vector(1000, 0, 0);
+            //      this->pathnodes[2] = Vector(-100, 140, 0);
+            //      this->pathnodes[3] = Vector(0, 180, 0);
+            //      this->pathnodes[4] = Vector(100, 140, 0);
+            //      this->pathnodes[5] = Vector(100, 40, 0);
             
             // create the tracks
-            this->tracklen = 6;
-            this->track = new Track[6];
+            this->tracklen = 2;
+            this->track = new Track[2];
             for( int i = 0; i < this->tracklen; i++)
               {
@@ -113 +116 @@
             
             // create a player
-            //WorldEntity* myPlayer = (WorldEntity*) this->spawn<Player>();
             WorldEntity* myPlayer = new Player();
             this->spawn(myPlayer);
@@ -125 +127 @@
             this->localCamera = new Camera(this);
             this->getCamera()->bind (myPlayer); 
+
+            Placement* plc = new Placement;
+            plc->r = Vector(100, 10, 10);
+            plc->w = Quaternion();
+            WorldEntity* env = new Environment();
+            this->spawn(env, plc);
+
             break;
           }
@@ -174 +183 @@
   glNewList (objectList, GL_COMPILE);
   glLoadIdentity();
+  glColor3f(1.0,0,0);
+  glBegin(GL_QUADS);
+  float height [500][50];
+  Vector normal_vectors[500][50];
+  float size = 2;
+    for(int i=0;i<400;i+=1){
+                for(int j=0;j<50;j+=1){
+        normal_vectors[i][j].x=0;
+    normal_vectors[i][j].y=1;
+        normal_vectors[i][j].z=0;
+        
+        
+        
+        }
+        }
+        
+        
+        for ( int i = 0; i<400; i+=1)
+      {
+        for (int j = 0; j<50;j+=1)
+          {
+            //height[i][j] = rand()/20046 + (j-25)*(j-25)/30;
+            height[i][j]=(sin((float)j/3)*rand()*i/182400)*.2;
+          }
+      }
+         for(int a=0;a<2;a+=1){
+         for (int i=1;i<399 ;i+=1 ){
+                 for(int j=1;j<49;j+=1){
+                         height[i][j]=(height[i+1][j]+height[i][j+1]+height[i-1][j]+height[i][j-1])/4;
+
+                 }
+         }
+         }
+    //Berechnung von normalen Vektoren
+
+        for(int i=1;i<399;i+=1){
+    for(int j=1;j<49 ;j+=1)
+
+    {
+                Vector* v1 = new Vector (size*i,        size*(j-25),      height[i][j]-20 );
+            Vector* v2 = new Vector (size*(i+1),    size*(j-25),      height[i+1][j]-20);
+            Vector* v3 = new Vector (size*(i),    size*(j-24),  height[i][j+1]-20);
+            Vector* v4 = new Vector (size*(i-1),        size*(j-25),  height[i-1][j]-20);
+                Vector* v5 = new Vector (size*(i), size*(j-26), height[i][j-1]-20);
+                
+                Vector c1 = *v1 - *v2;
+            Vector c2 = *v1 - *v3;
+            Vector c3= *v1 - *v4;
+            Vector c4 = *v1 - *v5;
+            normal_vectors[i][j]=c1.cross(*v1-*v3)+c2.cross(*v1-*v4)+c3.cross(*v1-*v5)+c4.cross(*v1-*v2);
+                normal_vectors[i][j].normalize();
+            
+    
+        
+        
+        }
+        }
+        int snowheight=3;
+        for ( int i = 0; i<400; i+=1)
+      {
+        for (int j = 0; j<50;j+=1)
+          {       
+            Vector* v1 = new Vector (size*i,        size*(j-25),      height[i][j]-20 );
+            Vector* v2 = new Vector (size*(i+1),    size*(j-25),      height[i+1][j]-20);
+            Vector* v3 = new Vector (size*(i+1),    size*(j-24),  height[i+1][j+1]-20);
+            Vector* v4 = new Vector (size*(i),        size*(j-24),  height[i][j+1]-20);
+            float a[3];
+                if(height[i][j]<snowheight){
+                a[0]=0;
+                a[1]=1.0-height[i][j]/10-.3;
+                a[2]=0;
+                glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+                }
+                else{
+                a[0]=1.0;
+                a[1]=1.0;
+                a[2]=1.0;
+                glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+
+                }
+                glNormal3f(normal_vectors[i][j].x, normal_vectors[i][j].y, normal_vectors[i][j].z);
+            glVertex3f(v1->x, v1->y, v1->z);
+                if(height[i+1][j]<snowheight){
+                a[0]=0;
+                a[1] =1.0-height[i+1][j]/10-.3;
+                a[2]=0;
+                glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+            }
+                else{
+                a[0]=1.0;
+                a[1]=1.0;
+                a[2]=1.0;
+                glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+                
+                }
+                glNormal3f(normal_vectors[i+1][j].x, normal_vectors[i+1][j].y, normal_vectors[i+1][j].z);
+            glVertex3f(v2->x, v2->y, v2->z);
+                if(height[i+1][j+1]<snowheight){
+                a[0]=0;
+                a[1] =1.0-height[i+1][j+1]/10-.3;
+                a[2]=0;
+                glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+            }
+                else{
+                a[0]=1.0;
+                a[1]=1.0;
+                a[2]=1.0;
+                glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+                
+                
+                }
+                glNormal3f(normal_vectors[i+1][j+1].x, normal_vectors[i+1][j+1].y, normal_vectors[i+1][j+1].z);
+            glVertex3f(v3->x, v3->y, v3->z);
+                if(height[i][j+1]<snowheight){
+                a[0]=0;
+                a[1] =1.0-height[i+1][j+1]/10-.3;
+                a[2]=0;
+                glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+            }
+                else{
+                        a[0]=1.0;
+                a[1]=1.0;
+                a[2]=1.0;
+                        glMaterialfv(GL_FRONT,GL_DIFFUSE,a);
+                }
+                glNormal3f(normal_vectors[i][j+1].x, normal_vectors[i][j+1].y, normal_vectors[i][j+1].z);
+            glVertex3f(v4->x, v4->y, v4->z);
+
+          }
+      }
+glEnd();
+/*  
   glBegin(GL_LINES);
-  
   for( float x = -128.0; x < 128.0; x += 25.0)
     {
@@ -213 +353 @@
       
     }
-  
+  */  
   //draw track
+  glBegin(GL_LINES);
   glColor3f(0,1,1);
   for( int i = 0; i < tracklen; i++)
@@ -235 +376 @@
 void World::collide ()
 {
-  List<WorldEntity> *a, *b;
+  /*
+  List *a, *b;
   WorldEntity *aobj, *bobj;
-  
-  a = entities->get_next();
+   
+  a = entities;
   
   while( a != NULL)
     {
-      aobj = a->get_object();
+      aobj = a->nextElement();
       if( aobj->bCollide && aobj->collisioncluster != NULL)
         {
-          b = a->get_next();
+          b = a->nextElement();
           while( b != NULL )
             {
-              bobj = b->get_object();
+              bobj = b->nextElement();
               if( bobj->bCollide && bobj->collisioncluster != NULL )
                 {
@@ -260 +402 @@
                   }
                 }
-              b = b->get_next();
+              b = b->nextElement();
             }
         }
-      a = a->get_next();
-    }
+      a = a->enumerate();
+    }
+  */
 }
 
@@ -275 +418 @@
   
   // draw entities
-  List<WorldEntity> *l;
   WorldEntity* entity;
   
-  l = entities->get_next();  
-  while( l != NULL ) 
+  entity = this->entities->enumerate();
+  while( entity != NULL ) 
     { 
-      entity = l->get_object();
       if( entity->bDraw ) entity->draw();
-      l = l->get_next();
+      entity = this->entities->nextElement();
     }
   
@@ -303 +444 @@
 void World::update ()
 {
-  List<WorldEntity> *l;
+  //List<WorldEntity> *l;
   WorldEntity* entity;
   Location* loc;
@@ -309 +450 @@
   Uint32 t;
   
-  l = entities->get_next();  
-  while( l != NULL ) 
+  //  l = entities->enumerate(); 
+  entity = this->entities->enumerate();
+  while( entity != NULL ) 
     { 
-      entity = l->get_object();
+
       
       if( !entity->isFree() )
@@ -350 +492 @@
         }
       
-      l = l->get_next();
+      entity = entities->nextElement();
     }
   
@@ -361 +503 @@
 void World::time_slice (Uint32 deltaT)
 {
-  List<WorldEntity> *l;
+  //List<WorldEntity> *l;
   WorldEntity* entity;
   float seconds = deltaT;
@@ -367 +509 @@
   seconds /= 1000;
   
-  l = entities->get_next();  
-  while( l != NULL) 
+  entity = entities->enumerate(); 
+  while( entity != NULL) 
     { 
-      entity = l->get_object();
       entity->tick (seconds);
-      l = l->get_next();
-    }
-  
+      entity = entities->nextElement();
+    }
+
   for( int i = 0; i < tracklen; i++) track[i].tick (seconds);
 }
@@ -411 +552 @@
 void World::debug()
 {
-  List<WorldEntity> *l;
+  //List<WorldEntity> *l;
   WorldEntity* entity;
   
   printf("counting all entities\n");
-  l = entities->get_next();  
-  while( l != NULL ) 
+  printf("World::debug() - enumerate()\n");
+  entity = entities->enumerate();  
+  while( entity != NULL ) 
     { 
-      entity = l->get_object();
       if( entity->bDraw ) printf("got an entity\n");
-      l = l->get_next();
+      entity = entities->nextElement();
     }
 }
@@ -445 +586 @@
       // Draw
       display();
+  
+      //for(int i = 0; i < 1000000; i++){}
+
     }
   printf("World|Exiting the main loop\n");
@@ -477 +621 @@
     {
       Uint32 dt = currentFrame - this->lastFrame;
-      /*
+      
       if(dt > 0)
         {
@@ -485 +629 @@
       else
         {
-          printf("fps = 1000\n");
-        }
-      */
+          printf("fps = 1000 but 0ms!\n");
+        }
+      
       this->time_slice (dt);
       this->update ();
@@ -545 +689 @@
   Location* loc = NULL;
   WorldEntity* owner;
-  //T* entity = new T();
-  entities->add (entity, LIST_ADD_NEXT);
-  //if( loc == NULL)
-  //{
-      zeroloc.dist = 0;
-      zeroloc.part = 0;
-      zeroloc.pos = Vector();
-      zeroloc.rot = Quaternion();
-      loc = &zeroloc;
-      //}
+
+  entities->add (entity);
+  zeroloc.dist = 0;
+  zeroloc.part = 0;
+  zeroloc.pos = Vector();
+  zeroloc.rot = Quaternion();
+  loc = &zeroloc;
   entity->init (loc, owner);
   if (entity->bFree)
@@ -561 +702 @@
     }
   entity->post_spawn ();
+}
+
+
+void World::spawn(WorldEntity* entity, Location* loc)
+{
+  Location zeroLoc;
+  WorldEntity* owner;
+  this->entities->add (entity);
+  if( loc == NULL)
+    {
+      zeroLoc.dist = 0;
+      zeroLoc.part = 0;
+      zeroLoc.pos = Vector();
+      zeroLoc.rot = Quaternion();
+      loc = &zeroLoc;
+    }
+  entity->init (loc, owner);
+  if (entity->bFree)
+    {
+      this->track[loc->part].map_coords( loc, entity->get_placement());
+    }
+  entity->post_spawn ();
   //return entity;
 }
+
+
+void World::spawn(WorldEntity* entity, Placement* plc)
+{
+  Placement zeroPlc;
+  WorldEntity* owner;
+  if( plc == NULL)
+    {
+      zeroPlc.r = Vector();
+      zeroPlc.w = Quaternion();
+      plc = &zeroPlc;
+    }
+  this->entities->add (entity);
+  entity->init (plc, owner);
+  entity->post_spawn ();
+  //return entity;
+}