ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.322 by root, Sun Nov 18 01:43:12 2018 UTC vs.
Revision 1.326 by root, Sun Nov 18 03:06:13 2018 UTC

… …
32#include <cstring> 32#include <cstring>
33#include <cstdio> 33#include <cstdio>
34#include <cstdlib> 34#include <cstdlib>
35 35
36#include <utility> 36#include <utility>
37#include <bitset>
37 38
38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
39 40
40#include <SDL.h> 41#include <SDL.h>
41#include <SDL_thread.h> 42#include <SDL_thread.h>
… …
199 } 200 }
200 201
201 return 0; 202 return 0;
202} 203}
203 204
204typedef struct cf_layout { 205struct cf_layout {
205 PangoLayout *pl; 206 PangoLayout *pl;
206 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
207 int base_height; 208 int base_height;
208 DC__Font font; 209 DC__Font font;
209 rc_t *rc; 210 rc_t rc;
210} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
211 214
212static DC__Font default_font; 215static DC__Font default_font;
213static PangoContext *opengl_context; 216static PangoContext *opengl_context;
214static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
215 218
… …
256} 259}
257 260
258typedef uint16_t tileid; 261typedef uint16_t tileid;
259typedef uint16_t faceid; 262typedef uint16_t faceid;
260 263
261typedef struct { 264struct maptex
265{
262 GLuint name; 266 GLuint name;
263 int w, h; 267 int w, h;
264 float s, t; 268 float s, t;
265 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
266 tileid smoothtile; 270 tileid smoothtile;
267 uint8_t smoothlevel; 271 uint8_t smoothlevel;
268 uint8_t unused; /* set to zero on use */ 272 uint8_t unused; /* set to zero on use */
269} maptex; 273};
270 274
271typedef struct { 275struct mapcell
276{
272 uint32_t player; 277 uint32_t player;
273 tileid tile[3]; 278 tileid tile[3];
274 uint16_t darkness; 279 uint16_t darkness;
275 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
276} mapcell; 281};
277 282
278typedef struct { 283struct maprow
284{
279 int32_t c0, c1; 285 int32_t c0, c1;
280 mapcell *col; 286 mapcell *col;
281} maprow; 287};
282 288
283typedef struct map { 289struct mapgrid {
284 int x, y, w, h; 290 int x, y, w, h;
285 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
286 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
287 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
288 294
289 int32_t rows; 295 int32_t rows;
290 maprow *row; 296 maprow *row;
291} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
292 300
293static char * 301static char *
294prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
295{ 303{
296 char *p; 304 char *p;
… …
314 322
315#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
316#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 324#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
317 325
318static void 326static void
319need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
320{ 328{
321 while (self->faces <= face) 329 while (self->faces <= face)
322 { 330 {
323 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
324 self->faces *= 2; 332 self->faces *= 2;
325 } 333 }
326} 334}
327 335
328static void 336static void
329need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
330{ 338{
331 while (self->texs <= texid) 339 while (self->texs <= texid)
332 { 340 {
333 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
334 self->texs *= 2; 342 self->texs *= 2;
335 } 343 }
336} 344}
337 345
338static maprow * 346static maprow *
339map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
340{ 348{
341 if (0 > y) 349 if (0 > y)
342 { 350 {
343 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
344 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
… …
382 390
383 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
384} 392}
385 393
386static mapcell * 394static mapcell *
387map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
388{ 396{
389 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
390} 398}
391 399
392static void 400static void
393map_clear (DC__Map self) 401map_clear (mapgrid *self)
394{ 402{
395 int r; 403 int r;
396 404
397 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
398 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
… …
416 (cell)->flags = 0; \ 424 (cell)->flags = 0; \
417 (cell)->player = 0; \ 425 (cell)->player = 0; \
418 } while (0) 426 } while (0)
419 427
420static void 428static void
421map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
422{ 430{
423 int x, y; 431 int x, y;
424 maprow *row; 432 maprow *row;
425 mapcell *cell; 433 mapcell *cell;
426 434
… …
1361 tc_restore (); 1369 tc_restore ();
1362 1370
1363DC::Layout 1371DC::Layout
1364new (SV *klass) 1372new (SV *klass)
1365 CODE: 1373 CODE:
1366 New (0, RETVAL, 1, struct cf_layout); 1374 RETVAL = new cf_layout;
1367 1375
1368 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1369 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1370 RETVAL->g = 1.; 1378 RETVAL->g = 1.;
1371 RETVAL->b = 1.; 1379 RETVAL->b = 1.;
1372 RETVAL->a = 1.; 1380 RETVAL->a = 1.;
1373 RETVAL->base_height = MIN_FONT_HEIGHT; 1381 RETVAL->base_height = MIN_FONT_HEIGHT;
1374 RETVAL->font = 0; 1382 RETVAL->font = 0;
1375 RETVAL->rc = rc_alloc ();
1376 1383
1377 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1378 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
1379 OUTPUT: 1386 OUTPUT:
1380 RETVAL 1387 RETVAL
1381 1388
1382void 1389void
1383DESTROY (DC::Layout self) 1390DESTROY (DC::Layout self)
1384 CODE: 1391 CODE:
1385 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1386 rc_free (self->rc);
1387 Safefree (self); 1393 delete self;
1388 1394
1389void 1395void
1390set_text (DC::Layout self, SV *text_) 1396set_text (DC::Layout self, SV *text_)
1391 CODE: 1397 CODE:
1392{ 1398{
… …
1646} 1652}
1647 1653
1648void 1654void
1649render (DC::Layout self, float x, float y, int flags = 0) 1655render (DC::Layout self, float x, float y, int flags = 0)
1650 CODE: 1656 CODE:
1651 rc_clear (self->rc); 1657 self->rc.clear ();
1652 pango_opengl_render_layout_subpixel ( 1658 pango_opengl_render_layout_subpixel (
1653 self->pl, 1659 self->pl,
1654 self->rc, 1660 &self->rc,
1655 x * PANGO_SCALE, y * PANGO_SCALE, 1661 x * PANGO_SCALE, y * PANGO_SCALE,
1656 self->r, self->g, self->b, self->a, 1662 self->r, self->g, self->b, self->a,
1657 flags 1663 flags
1658 ); 1664 );
1659 // we assume that context_change actually clears/frees stuff 1665 // we assume that context_change actually clears/frees stuff
… …
1670 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1676 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1671 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1677 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1672 glEnable (GL_ALPHA_TEST); 1678 glEnable (GL_ALPHA_TEST);
1673 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1679 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1674 1680
1675 rc_draw (self->rc); 1681 self->rc.draw ();
1676 1682
1677 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1678 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1679 glDisable (GL_TEXTURE_2D); 1685 glDisable (GL_TEXTURE_2D);
1680} 1686}
… …
1894PROTOTYPES: DISABLE 1900PROTOTYPES: DISABLE
1895 1901
1896DC::Map 1902DC::Map
1897new (SV *klass) 1903new (SV *klass)
1898 CODE: 1904 CODE:
1899 New (0, RETVAL, 1, struct map); 1905 New (0, RETVAL, 1, mapgrid);
1900 RETVAL->x = 0; 1906 RETVAL->x = 0;
1901 RETVAL->y = 0; 1907 RETVAL->y = 0;
1902 RETVAL->w = 0; 1908 RETVAL->w = 0;
1903 RETVAL->h = 0; 1909 RETVAL->h = 0;
1904 RETVAL->ox = 0; 1910 RETVAL->ox = 0;
… …
2216draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2222draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2217 CODE: 2223 CODE:
2218{ 2224{
2219 int x, y, z; 2225 int x, y, z;
2220 2226
2221 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2222 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2227 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2223 smooth_key skey;
2224 int pl_x, pl_y; 2228 int pl_x, pl_y;
2225 maptex pl_tex; 2229 maptex pl_tex;
2226 rc_t *rc = rc_alloc (); 2230 rc_t rc;
2227 rc_t *rc_ov = rc_alloc (); 2231 rc_t rc_ov;
2228 rc_key_t key; 2232 rc_key_t key;
2229 rc_array_t *arr; 2233 rc_t::array_t *arr;
2230 2234
2231 pl_tex.name = 0; 2235 pl_tex.name = 0;
2232 2236
2233 // that's current max. sorry. 2237 // that's current max. sorry.
2234 if (sw > 255) sw = 255; 2238 if (sw > 255) sw = 255;
2235 if (sh > 255) sh = 255; 2239 if (sh > 255) sh = 255;
2236
2237 // clear key, in case of extra padding
2238 memset (&skey, 0, sizeof (skey));
2239 2240
2240 memset (&key, 0, sizeof (key)); 2241 memset (&key, 0, sizeof (key));
2241 key.r = 255; 2242 key.r = 255;
2242 key.g = 255; 2243 key.g = 255;
2243 key.b = 255; 2244 key.b = 255;
… …
2249 my += self->y; 2250 my += self->y;
2250 2251
2251 // first pass: determine smooth_max 2252 // first pass: determine smooth_max
2252 // rather ugly, if you ask me 2253 // rather ugly, if you ask me
2253 // could also be stored inside mapcell and updated on change 2254 // could also be stored inside mapcell and updated on change
2254 memset (smooth_max, 0, sizeof (smooth_max)); 2255 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2255 2256
2256 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
2257 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
2258 { 2259 {
2259 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
… …
2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2275 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2276 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2276 2277
2277 for (z = 0; z <= 2; z++) 2278 for (z = 0; z <= 2; z++)
2278 { 2279 {
2280 std::bitset<256> smooth_level; // one bit for every possible smooth level
2281 smooth_key skey;
2279 smooth_hash smooth; 2282 smooth_hash smooth;
2280 memset (smooth_level, 0, sizeof (smooth_level));
2281 key.texname = -1; 2283 key.texname = -1;
2282 2284
2283 for (y = 0; y < sh; y++) 2285 for (y = 0; y < sh; y++)
2284 if (0 <= y + my && y + my < self->rows) 2286 if (0 <= y + my && y + my < self->rows)
2285 { 2287 {
… …
2302 2304
2303 if (!tex.name) 2305 if (!tex.name)
2304 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2306 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2305 2307
2306 key.texname = tex.name; 2308 key.texname = tex.name;
2307 arr = rc_array (rc, &key); 2309 arr = &rc.array (key);
2308 } 2310 }
2309 2311
2310 px = (x + 1) * Th - tex.w; 2312 px = (x + 1) * Th - tex.w;
2311 py = (y + 1) * Tw - tex.h; 2313 py = (y + 1) * Tw - tex.h;
2312 2314
… …
2316 pl_y = py; 2318 pl_y = py;
2317 pl_tex = tex; 2319 pl_tex = tex;
2318 continue; 2320 continue;
2319 } 2321 }
2320 2322
2321 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2323 arr->t2f_v3f (0 , 0 , px , py , 0);
2322 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2324 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2323 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2325 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2324 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2326 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2325 2327
2326 // update smooth hash 2328 // update smooth hash
2327 if (tex.smoothtile) 2329 if (tex.smoothtile)
2328 { 2330 {
2329 skey.tile = tex.smoothtile; 2331 skey.tile = tex.smoothtile;
2330 skey.level = tex.smoothlevel; 2332 skey.level = tex.smoothlevel;
2331 2333
2332 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2334 smooth_level[tex.smoothlevel] = 1;
2333 2335
2334 // add bits to current tile and all neighbours. skey.x|y is 2336 // add bits to current tile and all neighbours. skey.x|y is
2335 // shifted +1|+1 so we always stay positive. 2337 // shifted +1|+1 so we always stay positive.
2336 2338
2337 // bits is ___n cccc CCCC bbbb 2339 // bits is ___n cccc CCCC bbbb
… …
2367 { 2369 {
2368 // overlays such as the speech bubble, probably more to come 2370 // overlays such as the speech bubble, probably more to come
2369 if (cell->flags & 1) 2371 if (cell->flags & 1)
2370 { 2372 {
2371 rc_key_t key_ov = key; 2373 rc_key_t key_ov = key;
2372 maptex tex = self->tex [TEXID_SPEECH]; 2374 maptex tex = self->tex[TEXID_SPEECH];
2373 rc_array_t *arr;
2374 int px = x * Tw + Tw * 2 / 32; 2375 int px = x * Tw + Tw * 2 / 32;
2375 int py = y * Th - Th * 6 / 32; 2376 int py = y * Th - Th * 6 / 32;
2376 2377
2377 key_ov.texname = tex.name; 2378 key_ov.texname = tex.name;
2378 arr = rc_array (rc_ov, &key_ov); 2379 rc_t::array_t &arr = rc_ov.array (key_ov);
2379 2380
2380 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2381 arr.t2f_v3f (0 , 0 , px , py , 0);
2381 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0); 2382 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2382 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0); 2383 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2383 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0); 2384 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2384 } 2385 }
2385 } 2386 }
2386 } 2387 }
2387 } 2388 }
2388 2389
2389 rc_draw (rc); 2390 rc.draw ();
2390 rc_clear (rc); 2391 rc.clear ();
2391 2392
2392 // go through all smoothlevels, lowest to highest, then draw. 2393 // go through all smoothlevels, lowest to highest, then draw.
2393 // this is basically counting sort 2394 // this is basically counting sort
2394 { 2395 {
2395 int w, b; 2396 int w, b;
2396 2397
2397 glEnable (GL_TEXTURE_2D); 2398 glEnable (GL_TEXTURE_2D);
2398 glBegin (GL_QUADS); 2399 glBegin (GL_QUADS);
2399 for (w = 0; w < 256 / 32; ++w) 2400 for (int level = 0; level < smooth_level.size (); ++level)
2401 if (smooth_level[level])
2402 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2400 { 2403 {
2401 uint32_t smask = smooth_level [w]; 2404 smooth_key &skey = it->first;
2402 if (smask) 2405 IV bits = it->second;
2403 for (b = 0; b < 32; ++b) 2406
2404 if (smask & (((uint32_t)1) << b)) 2407 if (!(bits & 0x1000)
2408 && skey.level == level
2409 && level > smooth_max [skey.x][skey.y])
2405 { 2410 {
2406 int level = (w << 5) | b; 2411 maptex tex = self->tex [skey.tile];
2412 int px = (((int)skey.x) - 1) * Tw;
2413 int py = (((int)skey.y) - 1) * Th;
2414 int border = bits & 15;
2415 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2416 float dx = tex.s * .0625f; // 16 images/row
2417 float dy = tex.t * .5f ; // 2 images/column
2418
2407 HE *he; 2419 if (tex.name)
2408
2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2410 { 2420 {
2411 smooth_key &skey = it->first; 2421 // this time avoiding texture state changes
2412 IV bits = it->second; 2422 // save gobs of state changes.
2413 2423 if (key.texname != tex.name)
2414 if (!(bits & 0x1000)
2415 && skey.level == level
2416 && level > smooth_max [skey.x][skey.y])
2417 { 2424 {
2418 maptex tex = self->tex [skey.tile];
2419 int px = (((int)skey.x) - 1) * Tw;
2420 int py = (((int)skey.y) - 1) * Th;
2421 int border = bits & 15;
2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2423 float dx = tex.s * .0625f; // 16 images/row
2424 float dy = tex.t * .5f ; // 2 images/column
2425
2426 if (tex.name)
2427 {
2428 // this time avoiding texture state changes
2429 // save gobs of state changes.
2430 if (key.texname != tex.name)
2431 {
2432 self->tex [skey.tile].unused = 0; 2425 self->tex [skey.tile].unused = 0;
2433 2426
2434 glEnd (); 2427 glEnd ();
2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2428 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2436 glBegin (GL_QUADS); 2429 glBegin (GL_QUADS);
2437 } 2430 }
2438 2431
2439 if (border) 2432 if (border)
2440 { 2433 {
2441 float ox = border * dx; 2434 float ox = border * dx;
2442 2435
2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2436 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th); 2438 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py ); 2439 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2447 } 2440 }
2448 2441
2449 if (corner) 2442 if (corner)
2450 { 2443 {
2451 float ox = corner * dx; 2444 float ox = corner * dx;
2452 2445
2453 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2446 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th); 2447 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th); 2448 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py ); 2449 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2457 }
2458 }
2459 } 2450 }
2460 } 2451 }
2461 } 2452 }
2462 } 2453 }
2463 2454
2464 glEnd (); 2455 glEnd ();
2465 glDisable (GL_TEXTURE_2D); 2456 glDisable (GL_TEXTURE_2D);
2466 key.texname = -1; 2457 key.texname = -1;
2467 } 2458 }
… …
2472 maptex tex = pl_tex; 2463 maptex tex = pl_tex;
2473 int px = pl_x + sdx; 2464 int px = pl_x + sdx;
2474 int py = pl_y + sdy; 2465 int py = pl_y + sdy;
2475 2466
2476 key.texname = tex.name; 2467 key.texname = tex.name;
2477 arr = rc_array (rc, &key); 2468 rc_t::array_t &arr = rc.array (key);
2478 2469
2479 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2470 arr.t2f_v3f (0 , 0 , px , py , 0);
2480 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2471 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2481 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2472 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2482 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2473 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2483 2474
2484 rc_draw (rc); 2475 rc.draw ();
2485 } 2476 }
2486 2477
2487 rc_draw (rc_ov); 2478 rc_ov.draw ();
2488 rc_clear (rc_ov); 2479 rc_ov.clear ();
2489 2480
2490 glDisable (GL_BLEND); 2481 glDisable (GL_BLEND);
2491 rc_free (rc);
2492 rc_free (rc_ov);
2493 2482
2494 // top layer: overlays such as the health bar 2483 // top layer: overlays such as the health bar
2495 for (y = 0; y < sh; y++) 2484 for (y = 0; y < sh; y++)
2496 if (0 <= y + my && y + my < self->rows) 2485 if (0 <= y + my && y + my < self->rows)
2497 { 2486 {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines