Changeset 1872 in orxonox.OLD for orxonox/trunk/core/orxonox.cc

Timestamp:

May 6, 2004, 10:50:39 PM (21 years ago)

Author:

patrick

Message:

orxonox/trunk: play the square - its possible now…

File:

• orxonox/trunk/core/orxonox.cc (modified) (11 diffs)

orxonox/trunk/core/orxonox.cc

@@ -24 +24 @@
 */
 
-
-
-
-
-
 /* class definition header */
 #include "orxonox.h"
-#include "data_tank.h"
-
-/* standard headers */
-#include <iostream>
-#include <cstdio>
-
-/* openGL Headers */
-#include <GL/glut.h>
+
 
 using namespace std;
@@ -44 +32 @@
 
 
-Orxonox::Orxonox () {}
+Orxonox::Orxonox () 
+{
+  pause = false;
+}
 
 
@@ -53 +44 @@
 /* this is a singleton class to prevent dublicates */
 Orxonox* Orxonox::singleton_ref = 0;
+World* Orxonox::world = 0;
+InputOutput* Orxonox::io = 0;
+bool Orxonox::pause = false;
+
+
 Orxonox* Orxonox::getInstance (void)
 {
@@ -59 +55 @@
   return singleton_ref;
 }
-
 
 
@@ -69 +64 @@
   glutInitWindowPosition(100, 100);
   glutCreateWindow("orxOnox");
+  glShadeModel(GL_FLAT);
   /* window event dispatchers */
   glutDisplayFunc(display);
   glutReshapeFunc(reshape);
   glutKeyboardFunc(keyboard);
+}
+
+
+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 = new World;
+  Player* localPlayer = new Player;
+  io = new InputOutput(world, localPlayer);
+  (*world).addPlayer(localPlayer);
+  //  (*localPlayer).addIO(io);
+
   glutSpecialFunc(specFunc); 
-}
-
-
-
-int Orxonox::menuInit (void)
-{
-  glClearColor(0.0, 0.0, 0.0, 0.0);
-}
-
-
-
-int Orxonox::gameInit (void) 
-{
-
+
+  //for testing purps only
+  //testTheShit();
 }
 
@@ -94 +97 @@
 {
   switch(key) {
+
+  case 'p':
+    if (pause) 
+      {
+        cout << "unset pause" << endl;
+        glutIdleFunc(continousRedraw);
+        pause = false;
+      }
+    else 
+      {
+        cout << "set pause" << endl;
+        glutIdleFunc(NULL);
+        pause = true;
+      }
+    break;
   case 27:
     exit(0);
@@ -101 +119 @@
 
 
+/** 
+   \brief special keys function. called by glut
+   
+   Here are all special key function defined.
+*/
 void Orxonox::specFunc(int key, int x, int y)
 {
@@ -106 +129 @@
   case GLUT_KEY_UP:
     cout << "key_up" << endl;
+    (*io).goUp();
     break;
   case GLUT_KEY_DOWN:
     cout << "key_down" << endl;
+    (*io).goDown();
     break;
   case GLUT_KEY_RIGHT:
     cout << "key_right" << endl;
+    (*io).goRight();
     break;
   case GLUT_KEY_LEFT:
     cout << "key_left" << endl;
+    (*io).goLeft();
     break;
   }
@@ -120 +147 @@
 
 
-void Orxonox::display (void) 
+void Orxonox::display() 
 {
   glClear(GL_COLOR_BUFFER_BIT);
+  (*world).drawWorld();
   glutSwapBuffers();
 } 
 
+
+void Orxonox::continousRedraw()
+{
+  glutPostRedisplay();
+}
 
 
@@ -139 +172 @@
 
 
+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();
+}
+
 
 int main (int argc, char** argv) 
@@ -144 +193 @@
   Orxonox *orx = Orxonox::getInstance();
   (*orx).globalInit(argc, argv);
-  (*orx).menuInit();
-
-  World* wd = new World;
-  Player* pl = new Player;
-  (*wd).addPlayer(pl);
-  (*wd).addPlayer(pl);
-  (*wd).addPlayer(pl);
-  (*wd).addPlayer(pl);
-
-  NPC* nl = new NPC;
-  (*wd).addNPC(nl);
-  (*wd).addNPC(nl);
-  (*wd).addNPC(nl);
-  (*wd).addNPC(nl);
-  (*wd).addNPC(nl);
-  (*wd).addNPC(nl);
-  (*wd).testThaTest();
+  //(*orx).menuInit(); pb: directly jump to the game, no menu
+  (*orx).gameInit();
 
   glutMainLoop();