Merged in make system changes from Bob Kuehne <rpk@sgi.com>

[flightgear.git] / Main / GLUTkey.c

diff --git a/Main/GLUTkey.c b/Main/GLUTkey.c
index 3eeebd7378a4934a339ad9111376f788193ea6e4..568e5b4f660c6167a7975e3fcac59838446fabee 100644 (file)
--- a/Main/GLUTkey.c
+++ b/Main/GLUTkey.c
@@ -24,29 +24,37 @@
  **************************************************************************/
 
 
-#include <stdio.h>
-
 #ifdef WIN32
 #  include <windows.h>                     
 #endif
 
 #include <GL/glut.h>
+#include <XGL/xgl.h>
+#include <stdio.h>
+
+#include <Main/GLUTkey.h>
+#include <Main/views.h>
+
+#include <Include/constants.h>
 
-#include "GLUTkey.h"
+#include <Aircraft/aircraft.h>
+#include <Weather/weather.h>
 
-#include "../constants.h"
 
-#include "../Aircraft/aircraft.h"
-#include "../Weather/weather.h"
+extern int show_hud;             /* HUD state */
+extern int displayInstruments;
 
-extern double goal_view_offset;
 
 /* Handle keyboard events */
 void GLUTkey(unsigned char k, int x, int y) {
-    struct control_params *c;
-    struct weather_params *w;
+    struct fgCONTROLS *c;
+    struct fgTIME *t;
+    struct fgVIEW *v;
+    struct fgWEATHER *w;
 
     c = &current_aircraft.controls;
+    t = &cur_time_params;
+    v = &current_view;
     w = &current_weather;
 
     printf("Key hit = %d", k);
@@ -55,32 +63,44 @@ void GLUTkey(unsigned char k, int x, int y) {
        printf(" SHIFTED\n");
        switch (k) {
        case 49: /* numeric keypad 1 */
-           goal_view_offset = FG_PI * 0.75;
+           v->goal_view_offset = FG_PI * 0.75;
            return;
        case 50: /* numeric keypad 2 */
-           goal_view_offset = FG_PI;
+           v->goal_view_offset = FG_PI;
            return;
        case 51: /* numeric keypad 3 */
-           goal_view_offset = FG_PI * 1.25;
+           v->goal_view_offset = FG_PI * 1.25;
            return;
        case 52: /* numeric keypad 4 */
-           goal_view_offset = FG_PI * 0.50;
+           v->goal_view_offset = FG_PI * 0.50;
            return;
        case 54: /* numeric keypad 6 */
-           goal_view_offset = FG_PI * 1.50;
+           v->goal_view_offset = FG_PI * 1.50;
            return;
        case 55: /* numeric keypad 7 */
-           goal_view_offset = FG_PI * 0.25;
+           v->goal_view_offset = FG_PI * 0.25;
            return;
        case 56: /* numeric keypad 8 */
-           goal_view_offset = 0.00;
+           v->goal_view_offset = 0.00;
            return;
        case 57: /* numeric keypad 9 */
-           goal_view_offset = FG_PI * 1.75;
+           v->goal_view_offset = FG_PI * 1.75;
            return;
-       case 90: /* Z */
+       case 72: /* H key */
+           show_hud = !show_hud;
+           return;
+       case 77: /* M key */
+           t->warp -= 60;
+           return;
+       case 84: /* T key */
+           t->warp_delta -= 30;
+           return;
+       case 87: /* W key */
+           displayInstruments = !displayInstruments;
+           return;
+       case 90: /* Z key */
            w->visibility /= 1.10;
-           glFogf(GL_FOG_END, w->visibility);
+           xglFogf(GL_FOG_END, w->visibility);
            printf("Fog density = %.4f\n", w->visibility);
            return;
        }
@@ -122,9 +142,15 @@ void GLUTkey(unsigned char k, int x, int y) {
        case 51: /* numeric keypad 3 (Pg Dn) */
            fgThrottleMove(0, -0.01);
            return;
-       case 122: /* z */
+       case 109: /* m key */
+           t->warp += 60;
+           return;
+       case 116: /* t key */
+           t->warp_delta += 30;
+           return;
+       case 122: /* z key */
            w->visibility *= 1.10;
-           glFogf(GL_FOG_END, w->visibility);
+           xglFogf(GL_FOG_END, w->visibility);
            printf("Fog density = %.4f\n", w->visibility);
            return;
        case 27: /* ESC */
@@ -137,9 +163,11 @@ void GLUTkey(unsigned char k, int x, int y) {
 
 /* Handle "special" keyboard events */
 void GLUTspecialkey(int k, int x, int y) {
-    struct control_params *c;
+    struct fgCONTROLS *c;
+    struct fgVIEW *v;
 
     c = &current_aircraft.controls;
+    v = &current_view;
 
     printf("Special key hit = %d", k);
 
@@ -147,28 +175,28 @@ void GLUTspecialkey(int k, int x, int y) {
        printf(" SHIFTED\n");
        switch (k) {
        case GLUT_KEY_END: /* numeric keypad 1 */
-           goal_view_offset = FG_PI * 0.75;
+           v->goal_view_offset = FG_PI * 0.75;
            return;
        case GLUT_KEY_DOWN: /* numeric keypad 2 */
-           goal_view_offset = FG_PI;
+           v->goal_view_offset = FG_PI;
            return;
        case GLUT_KEY_PAGE_DOWN: /* numeric keypad 3 */
-           goal_view_offset = FG_PI * 1.25;
+           v->goal_view_offset = FG_PI * 1.25;
            return;
        case GLUT_KEY_LEFT: /* numeric keypad 4 */
-           goal_view_offset = FG_PI * 0.50;
+           v->goal_view_offset = FG_PI * 0.50;
            return;
        case GLUT_KEY_RIGHT: /* numeric keypad 6 */
-           goal_view_offset = FG_PI * 1.50;
+           v->goal_view_offset = FG_PI * 1.50;
            return;
        case GLUT_KEY_HOME: /* numeric keypad 7 */
-           goal_view_offset = FG_PI * 0.25;
+           v->goal_view_offset = FG_PI * 0.25;
            return;
        case GLUT_KEY_UP: /* numeric keypad 8 */
-           goal_view_offset = 0.00;
+           v->goal_view_offset = 0.00;
            return;
        case GLUT_KEY_PAGE_UP: /* numeric keypad 9 */
-           goal_view_offset = FG_PI * 1.75;
+           v->goal_view_offset = FG_PI * 1.75;
            return;
        }
     } else {
@@ -215,9 +243,36 @@ void GLUTspecialkey(int k, int x, int y) {
 
 
 /* $Log$
-/* Revision 1.18  1997/08/22 21:34:38  curt
-/* Doing a bit of reorganizing and house cleaning.
+/* Revision 1.26  1998/01/19 19:27:07  curt
+/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+/* This should simplify things tremendously.
 /*
+ * Revision 1.25  1998/01/05 18:44:34  curt
+ * Add an option to advance/decrease time from keyboard.
+ *
+ * Revision 1.24  1997/12/30 16:36:46  curt
+ * Merged in Durk's changes ...
+ *
+ * Revision 1.23  1997/12/15 23:54:44  curt
+ * Add xgl wrappers for debugging.
+ * Generate terrain normals on the fly.
+ *
+ * Revision 1.22  1997/12/10 22:37:45  curt
+ * Prepended "fg" on the name of all global structures that didn't have it yet.
+ * i.e. "struct WEATHER {}" became "struct fgWEATHER {}"
+ *
+ * Revision 1.21  1997/08/27 21:32:23  curt
+ * Restructured view calculation code.  Added stars.
+ *
+ * Revision 1.20  1997/08/27 03:30:13  curt
+ * Changed naming scheme of basic shared structures.
+ *
+ * Revision 1.19  1997/08/25 20:27:21  curt
+ * Merged in initial HUD and Joystick code.
+ *
+ * Revision 1.18  1997/08/22 21:34:38  curt
+ * Doing a bit of reorganizing and house cleaning.
+ *
  * Revision 1.17  1997/07/19 22:34:02  curt
  * Moved PI definitions to ../constants.h
  * Moved random() stuff to ../Utils/ and renamed fg_random()