Merge branch 'gles'
[neverball] / putt / main.c
index 1a8c171..1c173da 100644 (file)
 
 /*---------------------------------------------------------------------------*/
 
-#ifdef WIN32
-#pragma comment(lib, "SDL_ttf.lib")
-#pragma comment(lib, "SDL_mixer.lib")
-#pragma comment(lib, "SDL_image.lib")
-#pragma comment(lib, "SDL.lib")
-#pragma comment(lib, "SDLmain.lib")
-#pragma comment(lib, "opengl32.lib")
-#endif
-
-/*---------------------------------------------------------------------------*/
-
 #include <SDL.h>
-#include <SDL_ttf.h>
-#include <SDL_mixer.h>
-#include <SDL_image.h>
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "image.h"
 #include "state.h"
 #include "config.h"
+#include "video.h"
 #include "course.h"
 #include "hole.h"
 #include "game.h"
 #include "gui.h"
+#include "fs.h"
 
 #include "st_conf.h"
 #include "st_all.h"
 
-#define TITLE "Neverputt"
+const char TITLE[] = "Neverputt " VERSION;
+const char ICON[] = "icon/neverputt.png";
 
 /*---------------------------------------------------------------------------*/
 
-static int shot(void)
-{
-    static char filename[MAXSTR];
-    static int  num = 0;
+static int shot_pending;
 
-    sprintf(filename, "screen%02d.png", num++);
+static void shot_prep(void)
+{
+    shot_pending = 1;
+}
 
-    image_snap(filename);
+static void shot_take(void)
+{
+    static char filename[MAXSTR];
 
-    return 1;
+    if (shot_pending)
+    {
+        sprintf(filename, "Screenshots/screen%05d.png", config_screenshot());
+        image_snap(filename);
+        shot_pending = 0;
+    }
 }
 
 /*---------------------------------------------------------------------------*/
 
 static void toggle_wire(void)
 {
+#if !ENABLE_OPENGLES
     static int wire = 0;
 
     if (wire)
@@ -84,6 +81,7 @@ static void toggle_wire(void)
         glDisable(GL_LIGHTING);
         wire = 1;
     }
+#endif
 }
 /*---------------------------------------------------------------------------*/
 
@@ -91,6 +89,7 @@ static int loop(void)
 {
     SDL_Event e;
     int d = 1;
+    int c;
 
     while (d && SDL_PollEvent(&e))
     {
@@ -107,32 +106,94 @@ static int loop(void)
             break;
 
         case SDL_MOUSEBUTTONDOWN:
-            d = st_click((e.button.button == SDL_BUTTON_LEFT) ? -1 : 1, 1);
+            d = st_click(e.button.button, 1);
             break;
 
         case SDL_MOUSEBUTTONUP:
-            d = st_click((e.button.button == SDL_BUTTON_LEFT) ? -1 : 1, 0);
+            d = st_click(e.button.button, 0);
             break;
 
         case SDL_KEYDOWN:
-            switch (e.key.keysym.sym)
+
+            c = e.key.keysym.sym;
+
+            if (config_tst_d(CONFIG_KEY_FORWARD, c))
+                st_stick(config_get_d(CONFIG_JOYSTICK_AXIS_Y), -1.0f);
+
+            else if (config_tst_d(CONFIG_KEY_BACKWARD, c))
+                st_stick(config_get_d(CONFIG_JOYSTICK_AXIS_Y), +1.0f);
+
+            else if (config_tst_d(CONFIG_KEY_LEFT, c))
+                st_stick(config_get_d(CONFIG_JOYSTICK_AXIS_X), -1.0f);
+
+            else if (config_tst_d(CONFIG_KEY_RIGHT, c))
+                st_stick(config_get_d(CONFIG_JOYSTICK_AXIS_X), +1.0f);
+
+            else switch (c)
             {
-            case SDLK_F10: d = shot();                break;
+            case SDLK_F10: shot_prep();               break;
             case SDLK_F9:  config_tgl_d(CONFIG_FPS);  break;
             case SDLK_F8:  config_tgl_d(CONFIG_NICE); break;
             case SDLK_F7:  toggle_wire();             break;
 
+            case SDLK_RETURN:
+                d = st_buttn(config_get_d(CONFIG_JOYSTICK_BUTTON_A), 1);
+                break;
+            case SDLK_ESCAPE:
+                d = st_buttn(config_get_d(CONFIG_JOYSTICK_BUTTON_EXIT), 1);
+                break;
+
             default:
                 d = st_keybd(e.key.keysym.sym, 1);
             }
             break;
 
+        case SDL_KEYUP:
+
+            c = e.key.keysym.sym;
+
+            if (config_tst_d(CONFIG_KEY_FORWARD, c))
+                st_stick(config_get_d(CONFIG_JOYSTICK_AXIS_Y), 0.0f);
+
+            else if (config_tst_d(CONFIG_KEY_BACKWARD, c))
+                st_stick(config_get_d(CONFIG_JOYSTICK_AXIS_Y), 0.0f);
+
+            else if (config_tst_d(CONFIG_KEY_LEFT, c))
+                st_stick(config_get_d(CONFIG_JOYSTICK_AXIS_X), 0.0f);
+
+            else if (config_tst_d(CONFIG_KEY_RIGHT, c))
+                st_stick(config_get_d(CONFIG_JOYSTICK_AXIS_X), 0.0f);
+
+            else switch (c)
+            {
+            case SDLK_RETURN:
+                d = st_buttn(config_get_d(CONFIG_JOYSTICK_BUTTON_A), 0);
+                break;
+            case SDLK_ESCAPE:
+                d = st_buttn(config_get_d(CONFIG_JOYSTICK_BUTTON_EXIT), 0);
+                break;
+
+            default:
+                d = st_keybd(e.key.keysym.sym, 0);
+            }
+            break;
+
         case SDL_ACTIVEEVENT:
             if (e.active.state == SDL_APPINPUTFOCUS)
-            {
-                if (e.active.gain == 0)
+                if (e.active.gain == 0 && video_get_grab())
                     goto_pause(&st_over, 0);
-            }
+            break;
+
+        case SDL_JOYAXISMOTION:
+            st_stick(e.jaxis.axis, JOY_VALUE(e.jaxis.value));
+            break;
+
+        case SDL_JOYBUTTONDOWN:
+            d = st_buttn(e.jbutton.button, 1);
+            break;
+
+        case SDL_JOYBUTTONUP:
+            d = st_buttn(e.jbutton.button, 0);
             break;
         }
     }
@@ -142,106 +203,80 @@ static int loop(void)
 int main(int argc, char *argv[])
 {
     int camera = 0;
-    SDL_Surface *icon;
+    SDL_Joystick *joy = NULL;
+
+    if (!fs_init(argv[0]))
+    {
+        fprintf(stderr, "Failure to initialize virtual file system: %s\n",
+                fs_error());
+        return 1;
+    }
 
     srand((int) time(NULL));
 
-    lang_init("neverball", CONFIG_LOCALE);
+    lang_init("neverball");
+    config_paths(argc > 1 ? argv[1] : NULL);
+    fs_mkdir("Screenshots");
 
-    if (config_data_path((argc > 1 ? argv[1] : NULL), COURSE_FILE))
+    if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_JOYSTICK) == 0)
     {
-        if (config_user_path(NULL))
+        config_init();
+        config_load();
+
+        /* Cache Neverball's camera setting. */
+
+        camera = config_get_d(CONFIG_CAMERA);
+
+        /* Initialize the joystick. */
+
+        if (config_get_d(CONFIG_JOYSTICK) && SDL_NumJoysticks() > 0)
         {
-            if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) == 0)
+            joy = SDL_JoystickOpen(config_get_d(CONFIG_JOYSTICK_DEVICE));
+            if (joy)
             {
-                config_init();
-                config_load();
-
-                /* Cache Neverball's camera setting. */
-
-                camera = config_get_d(CONFIG_CAMERA);
-
-                /* Initialize the audio. */
-
-                audio_bind(AUD_BIRDIE,  1, "snd/birdie.ogg");
-                audio_bind(AUD_BOGEY,   1, "snd/bogey.ogg");
-                audio_bind(AUD_BUMP,    1, "snd/bink.wav");
-                audio_bind(AUD_DOUBLE,  1, "snd/double.ogg");
-                audio_bind(AUD_EAGLE,   1, "snd/eagle.ogg");
-                audio_bind(AUD_JUMP,    2, "snd/jump.ogg");
-                audio_bind(AUD_MENU,    2, "snd/menu.wav");
-                audio_bind(AUD_ONE,     1, "snd/one.ogg");
-                audio_bind(AUD_PAR,     1, "snd/par.ogg");
-                audio_bind(AUD_PENALTY, 1, "snd/penalty.ogg");
-                audio_bind(AUD_PLAYER1, 1, "snd/player1.ogg");
-                audio_bind(AUD_PLAYER2, 1, "snd/player2.ogg");
-                audio_bind(AUD_PLAYER3, 1, "snd/player3.ogg");
-                audio_bind(AUD_PLAYER4, 1, "snd/player4.ogg");
-                audio_bind(AUD_SWITCH,  2, "snd/switch.wav");
-                audio_bind(AUD_SUCCESS, 1, "snd/success.ogg");
-
-                audio_init();
-
-                /* Require 16-bit double buffer with 16-bit depth buffer. */
-
-                SDL_GL_SetAttribute(SDL_GL_RED_SIZE,     5);
-                SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE,   5);
-                SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE,    5);
-                SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE,  16);
-                SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-
-#ifndef __APPLE__
-                icon = IMG_Load(config_data("icon/neverputt.png"));
-
-                if (icon)
-                {
-                    SDL_WM_SetIcon(icon, NULL);
-                    SDL_FreeSurface(icon);
-                }
-#endif /* __APPLE__ */
+                SDL_JoystickEventState(SDL_ENABLE);
+                set_joystick(joy);
+            }
+        }
 
-                /* Initialize the video. */
+        /* Initialize the audio. */
 
-                if (config_mode(config_get_d(CONFIG_FULLSCREEN),
-                                config_get_d(CONFIG_WIDTH),
-                                config_get_d(CONFIG_HEIGHT)))
-                {
-                    int t1, t0 = SDL_GetTicks();
+        audio_init();
+
+        /* Initialize the video. */
 
-                    SDL_WM_SetCaption(TITLE, TITLE);
+        if (video_init(TITLE, ICON))
+        {
+            int t1, t0 = SDL_GetTicks();
 
-                    /* Run the main game loop. */
+            /* Run the main game loop. */
 
-                    init_state(&st_null);
-                    goto_state(&st_title);
+            init_state(&st_null);
+            goto_state(&st_title);
 
-                    while (loop())
-                        if ((t1 = SDL_GetTicks()) > t0)
-                        {
-                            st_timer((t1 - t0) / 1000.f);
-                            st_paint();
-                            SDL_GL_SwapBuffers();
+            while (loop())
+                if ((t1 = SDL_GetTicks()) > t0)
+                {
+                    st_timer((t1 - t0) / 1000.f);
+                    st_paint(0.001f * t1);
+                    shot_take();
+                    SDL_GL_SwapBuffers();
 
-                            t0 = t1;
+                    t0 = t1;
 
-                            if (config_get_d(CONFIG_NICE))
-                                SDL_Delay(1);
-                        }
+                    if (config_get_d(CONFIG_NICE))
+                        SDL_Delay(1);
                 }
-                else fprintf(stderr, "%s: %s\n", argv[0], SDL_GetError());
+        }
 
-                /* Restore Neverball's camera setting. */
+        /* Restore Neverball's camera setting. */
 
-                config_set_d(CONFIG_CAMERA, camera);
-                config_save();
+        config_set_d(CONFIG_CAMERA, camera);
+        config_save();
 
-                SDL_Quit();
-            }
-            else fprintf(stderr, "%s: %s\n", argv[0], SDL_GetError());
-        }
-        else fprintf(stderr, _("Failure to establish config directory\n"));
+        SDL_Quit();
     }
-    else fprintf(stderr, _("Failure to establish game data directory\n"));
+    else fprintf(stderr, "%s: %s\n", argv[0], SDL_GetError());
 
     return 0;
 }