diff --git a/src/sdl2/main.c b/src/sdl2/main.c
index dd5b8d43b2d16947a79291f66e1dc57d9fa9c38f..6044bfc7ecad9e6be1359b507714b3e2040a9422 100644 (file)
--- a/src/sdl2/main.c
+++ b/src/sdl2/main.c
-#include <SDL.h>
+#ifdef __EMSCRIPTEN__
+# include <emscripten.h>
+#endif
+
+#include <SDL2/SDL.h>
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h> // srand exit
#include "system.h"
#include "input.h"
+#include "cp866.h"
+
#include "my.h" // fexists
#include "player.h" // pl1 pl2
#include "menu.h" // G_keyf
#include "error.h" // logo
+#include "monster.h" // nomon
#include "files.h" // F_startup F_addwad F_initwads F_allocres
#include "config.h" // CFG_args CFG_load CFG_save
+#include "args.h" // ARG_parse
#include "memory.h" // M_startup
#include "game.h" // G_init G_act
#include "sound.h" // S_init S_done
#include "music.h" // S_initmusic S_updatemusic S_donemusic
#include "render.h" // R_init R_draw R_done
-#define TITLE_STR "DooM 2D (SDL2)"
+#define TITLE_STR "Doom 2D (SDL2)"
+static Uint32 ticks;
static int quit = 0;
static SDL_Window *window;
static SDL_GLContext context;
static SDL_Surface *surf;
+static videomode_t vlist;
+
+static const cfg_t arg[] = {
+ {"file", NULL, Y_FILES},
+ {"cheat", &cheat, Y_SW_ON},
+// {"vga", &shot_vga, Y_SW_ON},
+// {"musvol", &mus_vol, Y_WORD},
+ {"mon", &nomon, Y_SW_OFF},
+ {"warp", &_warp, Y_BYTE},
+// {"config", NULL, cfg_file, Y_STRING},
+ {NULL, NULL, 0} // end
+};
+
+static const cfg_t cfg[] = {
+// {"screenshot", &shot_vga, Y_SW_ON},
+// {"music_volume", &mus_vol, Y_WORD},
+// {"music_random", &music_random, Y_SW_ON},
+// {"music_time", &music_time, Y_DWORD},
+// {"music_fade", &music_fade, Y_DWORD},
+ {"pl1_left", &pl1.kl, Y_KEY},
+ {"pl1_right",&pl1.kr, Y_KEY},
+ {"pl1_up", &pl1.ku, Y_KEY},
+ {"pl1_down", &pl1.kd, Y_KEY},
+ {"pl1_jump", &pl1.kj, Y_KEY},
+ {"pl1_fire", &pl1.kf, Y_KEY},
+ {"pl1_next", &pl1.kwr, Y_KEY},
+ {"pl1_prev", &pl1.kwl, Y_KEY},
+ {"pl1_use", &pl1.kp, Y_KEY},
+ {"pl2_left", &pl2.kl, Y_KEY},
+ {"pl2_right", &pl2.kr, Y_KEY},
+ {"pl2_up", &pl2.ku, Y_KEY},
+ {"pl2_down", &pl2.kd, Y_KEY},
+ {"pl2_jump", &pl2.kj, Y_KEY},
+ {"pl2_fire", &pl2.kf, Y_KEY},
+ {"pl2_next", &pl2.kwr, Y_KEY},
+ {"pl2_prev", &pl2.kwl, Y_KEY},
+ {"pl2_use", &pl2.kp, Y_KEY},
+ {NULL, NULL, 0} // end
+};
+
+static void CFG_args (int argc, char **argv) {
+ const cfg_t *list[] = { arg, R_args(), S_args(), MUS_args() };
+ ARG_parse(argc, argv, 4, list);
+}
+
+static void CFG_load (void) {
+ const cfg_t *list[] = { cfg, R_conf(), S_conf(), MUS_conf() };
+ CFG_read_config("default.cfg", 4, list);
+ CFG_read_config("doom2d.cfg", 4, list);
+}
+
+static void CFG_save (void) {
+ const cfg_t *list[] = { cfg, R_conf(), S_conf(), MUS_conf() };
+ CFG_update_config("doom2d.cfg", "doom2d.cfg", 4, list, "generated by doom2d, do not modify");
+}
/* --- error.h --- */
void ERR_fatal (char *s, ...) {
va_list ap;
R_done();
+ MUS_done();
S_done();
- S_donemusic();
M_shutdown();
SDL_Quit();
puts("\nКРИТИЧЕСКАЯ ОШИБКА:");
}
void ERR_quit (void) {
- puts("Спасибо за то, что вы играли в Операцию \"Смятка\"!");
- //F_loadres(F_getresid("ENDOOM"),p,0,4000);
quit = 1;
}
/* --- system.h --- */
-static int Y_set_videomode_opengl (int w, int h, int fullscreen) {
+static int Y_resize_window (int w, int h, int fullscreen) {
assert(w > 0);
assert(h > 0);
- Uint32 flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_OPENGL;
- flags |= fullscreen ? SDL_WINDOW_FULLSCREEN : 0;
- // TODO set context version and type
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
- SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
- int x = SDL_WINDOWPOS_CENTERED;
- int y = SDL_WINDOWPOS_CENTERED;
- SDL_Window *win = SDL_CreateWindow(TITLE_STR, x, y, w, h, flags);
- if (win != NULL) {
- SDL_GLContext ctx = SDL_GL_CreateContext(win);
- if (ctx != NULL) {
- Y_unset_videomode();
- window = win;
- context = ctx;
- SDL_GL_MakeCurrent(window, context);
- } else {
- SDL_DestroyWindow(win);
- win = NULL;
+ assert(window != NULL);
+ if (surf != NULL) {
+ if (surf->w != w || surf->h != h) {
+ SDL_Surface *s = SDL_CreateRGBSurface(0, w, h, 8, 0, 0, 0, 0);
+ if (s != NULL) {
+ SDL_SetPaletteColors(s->format->palette, surf->format->palette->colors, 0, surf->format->palette->ncolors);
+ SDL_FreeSurface(surf);
+ surf = s;
+ }
}
}
- return win != NULL;
+ SDL_SetWindowSize(window, w, h);
+ Y_set_fullscreen(fullscreen);
+ return 1;
}
-static int Y_set_videomode_software (int w, int h, int fullscreen) {
+int Y_set_videomode_opengl (int w, int h, int fullscreen) {
assert(w > 0);
assert(h > 0);
- int x = SDL_WINDOWPOS_CENTERED;
- int y = SDL_WINDOWPOS_CENTERED;
- Uint32 flags = SDL_WINDOW_RESIZABLE;
- flags |= fullscreen ? SDL_WINDOW_FULLSCREEN : 0;
- SDL_Window *win = SDL_CreateWindow(TITLE_STR, x, y, w, h, flags);
- if (win != NULL) {
- SDL_Surface *s = SDL_CreateRGBSurface(0, w, h, 8, 0, 0, 0, 0);
- if (s != NULL) {
- Y_unset_videomode();
- window = win;
- surf = s;
- } else {
- SDL_DestroyWindow(win);
- win = NULL;
+ Uint32 flags;
+ SDL_Window *win;
+ SDL_GLContext ctx;
+ if (window != NULL && context != NULL) {
+ Y_resize_window(w, h, fullscreen);
+ win = window;
+ } else {
+ flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_OPENGL;
+ if (fullscreen) {
+ flags = flags | SDL_WINDOW_FULLSCREEN;
+ }
+ // TODO set context version and type
+#ifdef __EMSCRIPTEN__
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
+#else
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
+#endif
+ SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+ win = SDL_CreateWindow(TITLE_STR, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, w, h, flags);
+ if (win != NULL) {
+ ctx = SDL_GL_CreateContext(win);
+ if (ctx != NULL) {
+ Y_unset_videomode();
+ window = win;
+ context = ctx;
+ SDL_GL_MakeCurrent(window, context);
+ } else {
+ SDL_DestroyWindow(win);
+ win = NULL;
+ }
}
}
+ if (win == NULL) {
+ logo("Y_set_videomode_opengl: error: %s\n", SDL_GetError());
+ }
return win != NULL;
}
-static int Y_resize_window (int w, int h, int fullscreen) {
+int Y_set_videomode_software (int w, int h, int fullscreen) {
assert(w > 0);
assert(h > 0);
- assert(window != NULL);
- if (surf != NULL) {
- SDL_Surface *s = SDL_CreateRGBSurface(0, w, h, 8, 0, 0, 0, 0);
- if (s != NULL) {
- SDL_SetPaletteColors(s->format->palette, surf->format->palette->colors, 0, surf->format->palette->ncolors);
- SDL_FreeSurface(surf);
- surf = s;
+ Uint32 flags;
+ SDL_Surface *s;
+ SDL_Window *win;
+ if (window != NULL && surf != NULL) {
+ Y_resize_window(w, h, fullscreen);
+ win = window;
+ } else {
+ flags = SDL_WINDOW_RESIZABLE;
+ if (fullscreen) {
+ flags = flags | SDL_WINDOW_FULLSCREEN;
+ }
+ win = SDL_CreateWindow(TITLE_STR, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, w, h, flags);
+ if (win != NULL) {
+ s = SDL_CreateRGBSurface(0, w, h, 8, 0, 0, 0, 0);
+ if (s != NULL) {
+ Y_unset_videomode();
+ window = win;
+ surf = s;
+ } else {
+ SDL_DestroyWindow(win);
+ win = NULL;
+ }
}
}
- SDL_SetWindowSize(window, w, h);
- Y_set_fullscreen(fullscreen);
- return 1;
+ if (win == NULL) {
+ logo("Y_set_videomode_software: error: %s\n", SDL_GetError());
+ }
+ return win != NULL;
}
-int Y_set_videomode (int w, int h, int flags) {
- assert(w > 0);
- assert(h > 0);
- int fullscreen = (flags & SYSTEM_USE_FULLSCREEN) != 0;
- if (flags & SYSTEM_USE_OPENGL) {
- if (window != NULL && context != NULL) {
- return Y_resize_window(w, h, fullscreen);
- } else {
- return Y_set_videomode_opengl(w, h, fullscreen);
- }
+void Y_get_videomode (int *w, int *h) {
+ if (window != NULL) {
+ SDL_GetWindowSize(window, w, h);
} else {
- if (window != NULL && surf != NULL) {
- return Y_resize_window(w, h, fullscreen);
- } else {
- return Y_set_videomode_software(w, h, fullscreen);
- }
+ *w = 0;
+ *h = 0;
}
}
}
}
-int Y_set_fullscreen (int yes) {
+static void init_videomode_list (void) {
+ int i, j, k;
+ SDL_DisplayMode m;
+ int n = SDL_GetNumDisplayModes(0);
+ if (vlist.modes != NULL) {
+ free(vlist.modes);
+ vlist.modes = NULL;
+ vlist.n = 0;
+ }
+ if (n > 0) {
+ vlist.modes = malloc(n * sizeof(videomode_size_t));
+ if (vlist.modes != NULL) {
+ j = 0;
+ for (i = 0; i < n; i++) {
+ SDL_GetDisplayMode(0, i, &m);
+ k = 0;
+ while (k < j && (m.w != vlist.modes[k].w || m.h != vlist.modes[k].h)) {
+ k++;
+ }
+ if (k >= j) {
+ vlist.modes[j] = (videomode_size_t) {
+ .w = m.w,
+ .h = m.h
+ };
+ j++;
+ }
+ }
+ vlist.n = j;
+ }
+ }
+}
+
+const videomode_t *Y_get_videomode_list_opengl (int fullscreen) {
+ init_videomode_list();
+ return &vlist;
+}
+
+const videomode_t *Y_get_videomode_list_software (int fullscreen) {
+ init_videomode_list();
+ return &vlist;
+}
+
+void Y_set_fullscreen (int yes) {
if (window != NULL) {
SDL_SetWindowFullscreen(window, yes ? SDL_WINDOW_FULLSCREEN : 0);
}
- return yes;
}
int Y_get_fullscreen (void) {
Y_repaint_rect(0, 0, surf->w, surf->h);
}
+void Y_enable_text_input (void) {
+ SDL_StartTextInput();
+}
+
+void Y_disable_text_input (void) {
+ SDL_StopTextInput();
+}
+
/* --- main --- */
static int sdl_to_key (int code) {
static void window_event_handler (SDL_WindowEvent *ev) {
switch (ev->event) {
case SDL_WINDOWEVENT_RESIZED:
- if (window != NULL && ev->windowID == SDL_GetWindowID(window)) {
- R_set_videomode(ev->data1, ev->data2, Y_get_fullscreen());
- }
+ R_set_videomode(ev->data1, ev->data2, Y_get_fullscreen());
break;
case SDL_WINDOWEVENT_CLOSE:
ERR_quit();
}
}
-static void poll_events (void (*h)(int key, int down)) {
- int key;
+static int utf8_to_wchar (char *x) {
+ int i = 0;
+ byte *s = (byte*)x;
+ if (s[0] < 0x80) {
+ return s[0];
+ } else if (s[0] < 0xE0) {
+ if (s[0] - 192 >= 0 && s[1] >= 0x80 && s[1] < 0xE0) {
+ i = (s[0] - 192) * 64 + s[1] - 128;
+ }
+ } else if (s[0] < 0xF0) {
+ if (s[1] >= 0x80 && s[1] < 0xE0 && s[2] >= 0x80 && s[2] < 0xE0) {
+ i = ((s[0] - 224) * 64 + s[1] - 128) * 64 + s[2] - 128;
+ }
+ }
+ return i;
+}
+
+static void poll_events (void) {
+ int key, down, uch, ch;
SDL_Event ev;
while (SDL_PollEvent(&ev)) {
switch (ev.type) {
ERR_quit();
break;
case SDL_WINDOWEVENT:
- window_event_handler(&ev.window);
+ if (ev.window.windowID == SDL_GetWindowID(window)) {
+ window_event_handler(&ev.window);
+ }
break;
case SDL_KEYDOWN:
case SDL_KEYUP:
+ down = ev.type == SDL_KEYDOWN;
key = sdl_to_key(ev.key.keysym.scancode);
- I_press(key, ev.type == SDL_KEYDOWN);
- if (h != NULL) {
- (*h)(key, ev.type == SDL_KEYDOWN);
+ I_press(key, down);
+ GM_key(key, down);
+ break;
+ case SDL_TEXTINPUT:
+ uch = utf8_to_wchar(ev.text.text);
+ ch = cp866_utoc(uch);
+ if (ch >= 0) {
+ GM_input(ch);
}
break;
}
}
}
+static void step (void) {
+ poll_events();
+ MUS_update();
+ Uint32 t = SDL_GetTicks();
+ if (t - ticks > DELAY) {
+ ticks = t;
+ G_act();
+ }
+ R_draw();
+}
+
int main (int argc, char **argv) {
char *pw;
- Uint32 t, ticks;
+ CFG_args(argc, argv);
logo("system: initialize SDL2\n");
if (SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO | SDL_INIT_EVENTS) == -1) {
logo("system: failed to init SDL2: %s\n", SDL_GetError());
return 1;
}
- //SDL_WM_SetCaption("Doom 2D v1.351", "Doom 2D");
// Player 1 defaults
pl1.ku = KEY_KP_8;
pl1.kd = KEY_KP_5;
pl2.kp = KEY_E;
srand(SDL_GetTicks());
F_startup();
+ CFG_load();
#ifndef WIN32
pw = "/usr/share/doom2d-rembo/doom2d.wad";
#else
} else {
F_addwad("doom2d.wad");
}
- CFG_args(argc, argv);
- CFG_load();
F_initwads();
M_startup();
F_allocres();
S_init();
- S_initmusic();
+ MUS_init();
R_init();
G_init();
ticks = SDL_GetTicks();
+#ifdef __EMSCRIPTEN__
+ emscripten_set_main_loop(step, 0, 1);
+#else
while (!quit) {
- poll_events(&G_keyf);
- S_updatemusic();
- t = SDL_GetTicks();
- if (t - ticks > DELAY) {
- ticks = t;
- G_act();
- }
- R_draw();
+ step();
}
+#endif
CFG_save();
R_done();
- S_donemusic();
+ MUS_done();
S_done();
M_shutdown();
SDL_Quit();