Changeset 1883 in orxonox.OLD for orxonox/trunk/core/world.cc

Timestamp:

May 10, 2004, 12:36:58 AM (21 years ago)

Author:

patrick

Message:

orxonox/trunk: added envoronment eg. little mountain - its time to talk about further development…

File:

• orxonox/trunk/core/world.cc (modified) (4 diffs)

orxonox/trunk/core/world.cc

@@ -32 +32 @@
   lastPlayer = null;
   lastNPC = null;
+  lastEnv = null;
 }
 
@@ -99 +100 @@
     }
   lastNPC = listMember;
+}
+
+
+/** 
+   \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) 
+{
+  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;
 }
 
@@ -137 +162 @@
     }
   /* now draw the rest of the world: environement */
+  /* second draw all npcs */
+  envList* tmpEnv = lastEnv;
+  while( tmpEnv != null )
+    {
+      (*tmpEnv->env).drawEnvironment();
+      tmpEnv = tmpEnv->next;
+    }
+
+  /*
   glColor3f(0.0, 1.0, 0.0);
   glBegin(GL_LINES);
-  glVertex3f(0.0, -10.0, 0.0);
-  glVertex3f(0.0, 200.0, 0.0);
-
-  glVertex3f(5.0, -10.0, 0.0);
-  glVertex3f(5.0, 200.0, 0.0);
-
-  glVertex3f(-5.0, -10.0, 0.0);
-  glVertex3f(-5.0, 200.0, 0.0);
-
-  glVertex3f(10.0, -10.0, 0.0);
-  glVertex3f(10.0, 200.0, 0.0);
-
-  glVertex3f(-10.0, -10.0, 0.0);
-  glVertex3f(-10.0, 200.0, 0.0);
-
-  glVertex3f(15.0, -10.0, 0.0);
-  glVertex3f(15.0, 200.0, 0.0);
-
-  glVertex3f(-15.0, -10.0, 0.0);
-  glVertex3f(-15.0, 200.0, 0.0);
-
-  glVertex3f(20.0, -10.0, 0.0);
-  glVertex3f(20.0, 200.0, 0.0);
-
-  glVertex3f(-20.0, -10.0, 0.0);
-  glVertex3f(-20.0, 200.0, 0.0);
-
-  glVertex3f(25.0, -10.0, 0.0);
-  glVertex3f(25.0, 200.0, 0.0);
-
-  glVertex3f(-25.0, -10.0, 0.0);
-  glVertex3f(-25.0, 200.0, 0.0);
+  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);
+    }
   glEnd();
-
-
+  */
+  
+  
+  glColor3f(0.0, 1.0, 0.0);
+  
+  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();
+  
+  
+  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();
+  
+}
+
+
+void World::initEnvironement()
+{
+
+ for (int x = 0; x < 60; x += 2)
+    {
+      for (int y = 0; y < 60; y += 2)
+        {
+          surface[x][y] = 0;
+        }
+    }
 }
 
@@ -217 +271 @@
     }
 
+
+  /* test addEnv */
+  cout << "addEnv test..." << endl;
+  envList* en = lastEnv;
+  while ( en != null )
+    {
+      cout << "env " << en->number << " was found" << endl;
+      en = en->next;
+    }
+
   /* test drawWorld() */
-  cout << "drawWorld()..." << endl;
-  drawWorld();
-
-  cout << "World::testThaTest() finished" << endl;
-}
+}