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

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…

Location:

orxonox/trunk/core

Files:

• Makefile (modified) (1 diff)
• environment.cc (added)
• environment.h (added)
• orxonox.cc (modified) (5 diffs)
• player.cc (modified) (1 diff)
• world.cc (modified) (4 diffs)
• world.h (modified) (3 diffs)

orxonox/trunk/core/Makefile

@@ -40 +40 @@
         player.o \
         world.o \
-        input_output.o
+        input_output.o \
+        environment.o
 
 TARGET = orxonox

orxonox/trunk/core/orxonox.cc

@@ -26 +26 @@
 /* class definition header */
 #include "orxonox.h"
+#include "environment.h"
 
 
@@ -70 +71 @@
 {
   glutInit(&argc, argv);
-  glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB);
+  glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);
+  glEnable(GL_DEPTH_TEST);
   glutInitWindowSize(500, 500);
   //glutFullScreen();
@@ -93 +95 @@
   glClearColor(0.0, 0.0, 0.0, 0.0);
   world = new World;
+  (*world).initEnvironement();
   Player* localPlayer = new Player;
   io = new InputOutput(world, localPlayer);
   (*world).addPlayer(localPlayer);
-  //  (*localPlayer).addIO(io);
-
-  //glutIgnoreKeyRepeat(1);                 /* for win32 */
-  //glutSetKeyRepeat(GLUT_KEY_REPEAT_OFF);  /* for linux X11 */
+  Environment *env = new Environment;
+  (*world).addEnv(env);
+  
+
   glutSpecialFunc(specFunc); 
   glutSpecialUpFunc(releaseKey);
@@ -144 +147 @@
     break;
   case 27:
+  case 'q':
     quitGame();
     break;
@@ -208 +212 @@
 void Orxonox::display() 
 {
-  glClear(GL_COLOR_BUFFER_BIT);
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
   glColor3f(0.0, 0.5, 0.6);

orxonox/trunk/core/player.cc

@@ -78 +78 @@
 
 
-  cout << "x: " << xCor << " y: " << yCor << endl;
+  //cout << "x: " << xCor << " y: " << yCor << endl;
 }

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;
-}
+}

orxonox/trunk/core/world.h

@@ -5 +5 @@
 #define WORLD_H
 
+#include <stdlib.h>
+
 #include "npc.h"
 #include "player.h"
+#include "environment.h"
 #include "stdincl.h"
 
@@ -36 +39 @@
   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);
@@ -43 +54 @@
   bool removeNPC(NPC* npc);
 
+  bool addEnv(Environment* env);
 
   void drawWorld(void);
+  void initEnvironement(void);
   void updateWorld(void);
   void testThaTest(void);
+
+ private:
+  float surface[120][120];