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

Timestamp:

May 8, 2004, 1:12:33 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: perspective view, key-repeat bug fixed

File:

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

orxonox/trunk/core/orxonox.cc

@@ -54 +54 @@
 bool Orxonox::rightWeGo = false;
 bool Orxonox::leftWeGo = false;
+int Orxonox::alpha = 0;
+int Orxonox::beta = 0;
+//int Orxonox::offsetX = 0;
+//int Orxonox::offsetY = 0;
 
 Orxonox* Orxonox::getInstance (void)
@@ -68 +72 @@
   glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB);
   glutInitWindowSize(500, 500);
+  //glutFullScreen();
   glutInitWindowPosition(100, 100);
   glutCreateWindow("orxOnox");
@@ -93 +98 @@
   //  (*localPlayer).addIO(io);
 
-  glutIgnoreKeyRepeat(1);                 /* for win32 */
-  glutSetKeyRepeat(GLUT_KEY_REPEAT_OFF);  /* for linux X11 */
+  //glutIgnoreKeyRepeat(1);                 /* for win32 */
+  //glutSetKeyRepeat(GLUT_KEY_REPEAT_OFF);  /* for linux X11 */
   glutSpecialFunc(specFunc); 
   glutSpecialUpFunc(releaseKey);
@@ -107 +112 @@
 {
   switch(key) {
+
+    /* perspectiv control */
+  case 'w':
+    beta -= 1;
+    break;
+  case 's':
+    beta += 1;
+    break;
+  case 'a':
+    alpha -= 1;
+    break;
+  case 'd':
+    alpha += 1;
+    break;
+
+    /* game controls */
 
   case 'p':
@@ -131 +152 @@
 void Orxonox::quitGame() 
 {
-  glutSetKeyRepeat(GLUT_KEY_REPEAT_DEFAULT); /*do not remove or you will have
-                                          no repeating keys anymore...*/
+  //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;
   exit(0);
@@ -165 +187 @@
 {
   switch(key) {
+
+    /* spacecraft controls */
+    
   case GLUT_KEY_UP:
     upWeGo = true;
@@ -184 +209 @@
 {
   glClear(GL_COLOR_BUFFER_BIT);
+
+  glColor3f(0.0, 0.5, 0.6);
+  glLoadIdentity();
+  gluLookAt(0.0, -14.0, 15.0, 0.0 + alpha, 0.0 + beta, 0.0, 0.0, 1.0, 0.0);
   (*world).drawWorld();
+
   glutSwapBuffers();
 } 
@@ -203 +233 @@
   }
   /* request repaint */
+
+  //cout << "contiousRedraw" << endl;
   glutPostRedisplay();
 }
@@ -212 +244 @@
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
-  glOrtho(-50.0, 50.0, -50.0, 50.0, -1.0, 1.0);
+  //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?
@@ -220 +254 @@
 void Orxonox::testTheShit() 
 {
-  Player* pl = new Player;
-  (*pl).setPosition(1, 1, 1);
-  (*world).addPlayer(pl);
+  //Player* pl = new Player;
+  //(*pl).setPosition(1, 1, 1);
+  //(*world).addPlayer(pl);
   
   //NPC* nl = new NPC;