X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgl%2Frender.c;h=426f43ccc1eb7ce1cf5d53723721cfe66bc5dacb;hb=cedb3138dd71d6e297c9b82af7cf2053ab73ea09;hp=b5da71f4c4949fe01456cc8fb2677e08866919f1;hpb=b7c39e0d9229a7616c63cf545cdd9576b9bf3e2c;p=flatwaifu.git diff --git a/src/gl/render.c b/src/gl/render.c index b5da71f..426f43c 100644 --- a/src/gl/render.c +++ b/src/gl/render.c @@ -1,5 +1,6 @@ #include "glob.h" #include "render.h" +#include "system.h" #include "files.h" #include "memory.h" #include "misc.h" @@ -26,9 +27,10 @@ #else # include #endif -#include // malloc free abs -#include // assert -#include +#include +#include +#include +#include #define VGA_TRANSPARENT_COLOR 0 #define DEFAULT_SKY_COLOR 0x97 @@ -80,7 +82,6 @@ int SCRW = 320; // public int SCRH = 200; // public static int gamma; static int fullscreen; -static SDL_Surface *surf; static rgb playpal[256]; static byte bright[256]; static GLuint lastTexture; @@ -254,6 +255,14 @@ static void R_node_free (node *n) { } } +static void R_cache_get_max_texture_size (int *w, int *h) { + GLint size = 0; + glGetIntegerv(GL_MAX_TEXTURE_SIZE, &size); + size = min(max(size, 0), 512); // more can be buggy on older hardware + *w = size; + *h = size; +} + static void R_gl_bind_texture (GLuint id) { if (id != lastTexture) { glBindTexture(GL_TEXTURE_2D, id); @@ -261,24 +270,23 @@ static void R_gl_bind_texture (GLuint id) { } static cache *R_cache_new (void) { - GLuint id = 0; - GLint size = 0; + int w, h; + GLuint id; cache *c = NULL; - glGetIntegerv(GL_MAX_TEXTURE_SIZE, &size); - size = size < 512 ? size : 512; // more can be buggy on older hardware - if (size) { + R_cache_get_max_texture_size(&w, &h); + if (w && h) { glGenTextures(1, &id); if (id) { R_gl_bind_texture(id); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, size, size, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); c = malloc(sizeof(cache)); if (c != NULL) { *c = (cache) { .id = id, - .root.r = size - 1, - .root.b = size - 1 + .root.r = w - 1, + .root.b = h - 1 }; } else { glDeleteTextures(1, &id); @@ -310,46 +318,49 @@ static node *R_cache_alloc (cache *root, int w, int h) { node *n = NULL; cache *p = NULL; cache *c = root; - // TODO return null if required size greater than maximum - while (c && !n) { - n = R_node_alloc(&c->root, w, h); - if (n) { - assert(n->leaf); - n->base = c; - } - p = c; - c = c->next; - } - if (!n) { - c = R_cache_new(); - if (c) { - p->next = c; + int maxw, maxh; + R_cache_get_max_texture_size(&maxw, &maxh); + if (w <= maxw && h <= maxh) { + while (c && !n) { n = R_node_alloc(&c->root, w, h); if (n) { assert(n->leaf); n->base = c; } + p = c; + c = c->next; + } + if (!n) { + c = R_cache_new(); + if (c) { + p->next = c; + n = R_node_alloc(&c->root, w, h); + if (n) { + assert(n->leaf); + n->base = c; + } + } } } if (n) { //logo("new node %p {%i:%i:%i:%i}\n", n, n->l, n->t, n->r, n->b); } else { - logo("new node failed\n"); + logo("new node failed {%i:%i}\n", w, h); } return n; } -static void R_cache_update (node *n, const void *data, int w, int h) { +static void R_cache_update (node *n, const void *data, int x, int y, int w, int h) { assert(n); assert(n->leaf); assert(n->base); assert(data); - int nw = n->r - n->l + 1; - int nh = n->b - n->t + 1; - assert(w == nw); - assert(h == nh); + assert(x >= 0); + assert(y >= 0); + assert(n->l + x + w - 1 <= n->r); + assert(n->t + y + h - 1 <= n->b); R_gl_bind_texture(n->base->id); - glTexSubImage2D(GL_TEXTURE_2D, 0, n->l, n->t, nw, nh, GL_RGBA, GL_UNSIGNED_BYTE, data); + glTexSubImage2D(GL_TEXTURE_2D, 0, n->l + x, n->t + y, w, h, GL_RGBA, GL_UNSIGNED_BYTE, data); } /* Generic helpers */ @@ -481,7 +492,7 @@ static rgba *R_extract_rgba_spr (vgaimg *v) { static image R_gl_create_image (const rgba *buf, int w, int h) { node *n = R_cache_alloc(root, w, h); if (n) { - R_cache_update(n, buf, w, h); + R_cache_update(n, buf, 0, 0, w, h); } return (image) { .n = n, @@ -493,6 +504,9 @@ static image R_gl_create_image (const rgba *buf, int w, int h) { static image R_gl_get_special_image (int id, rgba *(*fn)(vgaimg*)) { image img; + //char name[8]; + //F_getresname(name, id); + //logo("load image: %.8s\n", name); vgaimg *v = R_getvga(id); if (v != NULL) { rgba *buf = (*fn)(v); @@ -1430,7 +1444,7 @@ void R_draw (void) { break; } GM_draw(); - SDL_GL_SwapBuffers(); + Y_swap_buffers(); } void R_alloc (void) { @@ -1439,7 +1453,6 @@ void R_alloc (void) { logo("R_alloc: load graphics\n"); /* Game */ scrnh[0] = R_gl_loadimage("TITLEPIC"); - assert(scrnh[0].n); scrnh[1] = R_gl_loadimage("INTERPIC"); scrnh[2] = R_gl_loadimage("ENDPIC"); for (i = 0; i < 2; i++) { @@ -1645,7 +1658,7 @@ void R_alloc (void) { mslotr = R_gl_loadimage("M_LSRGHT"); // walls for (i = 1; i < ANIT; i++) { - for (j = 0; anm[i - 1][j]; j++) { + for (j = 0; j < 5 && anm[i - 1][j]; j++) { anip[i][j] = R_gl_loadimage(anm[i - 1][j]); } for(; j < 5; j++) { @@ -1659,28 +1672,55 @@ void R_alloc (void) { } } -void R_init (void) { - Uint32 flags = SDL_OPENGL; +static void R_reload_textures (void); + +void R_set_videomode (int w, int h, int fullscreen) { + assert(w > 0); + assert(h > 0); + int was = Y_videomode_setted(); + int flags = SYSTEM_USE_OPENGL; if (fullscreen) { - flags = flags | SDL_FULLSCREEN; + flags |= SYSTEM_USE_FULLSCREEN; } - if (SCRW <= 0 || SCRH <= 0) { - ERR_failinit("Invalid screen size %ix%i\n", SCRW, SCRH); + if (root != NULL) { + R_cache_free(root, 0); + root = NULL; } - if (surf == NULL) { - R_init_playpal(); // only onece - } - surf = SDL_SetVideoMode(SCRW, SCRH, 0, flags); - if (surf == NULL) { - ERR_failinit("Unable to set video mode: %s\n", SDL_GetError()); + int res = Y_set_videomode(w, h, flags); + if (res == 0) { + if (was == 0) { + ERR_failinit("Unable to set video mode\n"); + } + } else { + Y_get_videomode(&SCRW, &SCRH); + root = R_cache_new(); + assert(root); + R_alloc(); + R_reload_textures(); } +} + +void R_toggle_fullscreen (void) { + R_cache_free(root, 0); + Y_set_fullscreen(!Y_get_fullscreen()); + fullscreen = Y_get_fullscreen(); + Y_get_videomode(&SCRW, &SCRH); root = R_cache_new(); assert(root); R_alloc(); + R_reload_textures(); +} + +void R_init (void) { + logo("R_init: intialize opengl render\n"); + R_init_playpal(); + R_set_videomode(SCRW, SCRH, fullscreen); } void R_done (void) { R_cache_free(root, 1); + Y_unset_videomode(); + root = NULL; } void R_setgamma (int g) { @@ -1691,13 +1731,6 @@ int R_getgamma (void) { return gamma; } -void R_toggle_fullscreen (void) { - fullscreen = !fullscreen; - if (surf) { - R_init(); // recreate window - } -} - void R_get_name (int n, char s[8]) { assert(n >= 0 && n < 256); if (walp[n].res == -1) { @@ -1725,6 +1758,20 @@ int R_get_special_id (int n) { return walp[n].res == -2 ? (intptr_t)walp[n].n : -1; } +static void R_reload_textures (void) { + int i; + char s[8]; + for (i = 0; i < max_textures; i++) { + R_get_name(i, s); + if (walp[i].res >= 0) { + walp[i] = R_gl_getimage(walp[i].res); + } + } + if (horiz.n) { + horiz = R_gl_getimage(horiz.res); + } +} + void R_begin_load (void) { int i; for (i = 0; i < 256; i++) { @@ -1793,6 +1840,7 @@ void R_end_load (void) { if (k >= 256) { k = j; j += 1; + max_textures += 1; walp[k] = R_gl_getimage(g); walf[k] = g & 0x8000 ? 1 : 0; }