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

Timestamp:

Jun 7, 2004, 9:32:51 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: ground moves

Location:

orxonox/trunk/core

Files:

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

orxonox/trunk/core/environment.cc

@@ -28 +28 @@
 {
 
+
+  for (int x = 0; x < 10; x++)
+    {
+      for (int y = 0; y < 10; y++)
+        {
+          mountainTest[x][y] = 0;
+                                                 
+        }
+    }
+
   for (int x = 1; x < 9; x++)
     {
@@ -54 +64 @@
   
   glBegin(GL_LINES);
-  for (int x = 0; x < 10; x += 1)
+  for (int x = 0; x < 9; x += 1)
     {
-      for (int y = 0; y < 10; y += 1)
+      for (int y = 0; y < 9; y += 1)
         {
           glVertex3f((float)(2*x), (float)(2*y), mountainTest[x][y]);
@@ -66 +76 @@
   
   glBegin(GL_LINES);
-  for (int y = 0; y < 10; y += 1)
+  for (int y = 0; y < 9; y += 1)
     {
-      for (int x = 0; x < 10; x += 1)
+      for (int x = 0; x < 9; x += 1)
         {
           glVertex3f((float)(2*x), (float)(2*y), mountainTest[x][y]);

orxonox/trunk/core/orxonox.cc

@@ -134 +134 @@
 void Orxonox::timeSlice(int value)
 {
-  cout << "got " << fps << endl;
+  cout << "got " << fps << " fps" << endl;
   /* this is very very unsafe: io could be uninit */
   io->setPlayerStep(19.2 / fps); /* set player to propper speed */

orxonox/trunk/core/world.cc

@@ -32 +32 @@
   lastNPC = null;
   lastEnv = null;
+  primitiveMove = 0;
 }
 
@@ -163 +164 @@
       tmpNPC = tmpNPC->next;
     }
+
+  glPushMatrix();
+  glTranslatef(0.0, -primitiveMove, 0.0);
+
   /* now draw the rest of the world: environement */
   envList* tmpEnv = lastEnv;
@@ -170 +175 @@
       tmpEnv = tmpEnv->next;
     }
-
-  
-  glColor3f(0.0, 1.0, 0.0);
-  
+  
+  
+  /* 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();
+  glPopMatrix();
+ 
   glBegin(GL_LINES);
   for (int x = 0; x < 60; x += 2)
@@ -184 +202 @@
     }
   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();
-  
+
+
+  primitiveMove+=0.1;
 }
 

orxonox/trunk/core/world.h

@@ -20 +20 @@
   World ();
   ~World ();
+
+  float primitiveMove;
 
   /* for easier use: map the first two player here */