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

Timestamp:

May 20, 2004, 1:01:57 AM (21 years ago)

Author:

patrick

Message:

orxonox/trunk: added ability to shoot. so check out the new release and shoot the fuck up

File:

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

orxonox/trunk/core/orxonox.cc

@@ -26 +26 @@
 /* class definition header */
 #include "orxonox.h"
-#include "environment.h"
 
 
@@ -50 +49 @@
 World* Orxonox::world = 0;
 InputOutput* Orxonox::io = 0;
+Player* Orxonox::localPlayer = 0;
 bool Orxonox::pause = false;
 bool Orxonox::upWeGo = false;
@@ -55 +55 @@
 bool Orxonox::rightWeGo = false;
 bool Orxonox::leftWeGo = false;
+bool Orxonox::shoot1 = false;
 int Orxonox::alpha = 0;
 int Orxonox::beta = 0;
@@ -82 +83 @@
   glutReshapeFunc(reshape);
   glutKeyboardFunc(keyboard);
+  glutKeyboardUpFunc(upKeyboard);
 }
 
@@ -96 +98 @@
   world = new World;
   (*world).initEnvironement();
-  Player* localPlayer = new Player;
+  localPlayer = new Player;
   io = new InputOutput(world, localPlayer);
   (*world).addPlayer(localPlayer);
   Environment *env = new Environment;
   (*world).addEnv(env);
-  
 
   glutSpecialFunc(specFunc); 
   glutSpecialUpFunc(releaseKey);
 
-  //for testing purps only
-  //testTheShit();
   glutIdleFunc(continousRedraw);
+  //cout << "Orxonox::gameInit" << endl;
 }
 
@@ -131 +131 @@
 
     /* game controls */
-
   case 'p':
     if (pause) 
@@ -146 +145 @@
       }
     break;
+  case 32:
+    shoot1 = true;
+    break;
   case 27:
   case 'q':
@@ -154 +156 @@
 
 
+void Orxonox::upKeyboard(unsigned char key, int x, int y) 
+{
+  switch(key) {
+  case 32:
+    shoot1 = false;
+    break;
+  }
+}
+
+
 void Orxonox::quitGame() 
 {
-  //glutIgnoreKeyRepeat(0);                 /* for win32 */
-  //glutSetKeyRepeat(GLUT_KEY_REPEAT_DEFAULT); /*do not remove or you will have
-  //                                      no repeating keys anymore...*/
-  cout << "finished garbage colletion, quitting..." << endl;
+  //cout << "finished garbage colletion, quitting..." << endl;
   exit(0);
 }
@@ -191 +200 @@
 {
   switch(key) {
-
     /* spacecraft controls */
-    
   case GLUT_KEY_UP:
     upWeGo = true;
@@ -226 +233 @@
 {
   /* check for input to pass it over */
-  if ( !pause && (rightWeGo || leftWeGo || upWeGo || downWeGo)) {
+  if ( !pause && (rightWeGo || leftWeGo || upWeGo || downWeGo || shoot1)) {
     if (upWeGo)
       (*io).goUp();
@@ -235 +242 @@
     if (leftWeGo)
       (*io).goLeft();
+    if (shoot1) 
+      (*io).shoot();
   }
   /* request repaint */
-
-  //cout << "contiousRedraw" << endl;
   glutPostRedisplay();
+  //cout << "Orxonox::continousRedraw" << endl;
 }
 
@@ -248 +256 @@
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
-  //glOrtho(-50.0, 50.0, -50.0, 50.0, -1.0, 1.0); pb: //simple and working
   glFrustum(-1.0, 1.0, -1.0, 1.0, 1.5, 200.0);
-  //glFrustum(-10.0, 10.0, -5.0, 10.0, 0.0, 100.0);
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity(); //pb why a second time?