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.323 by root, Sun Nov 18 01:48:39 2018 UTC vs.
Revision 1.329 by root, Sun Nov 18 13:07:51 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>
… …
204struct 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}; 211};
211 212
212typedef cf_layout *DC__Layout; 213typedef cf_layout *DC__Layout;
213 214
214static DC__Font default_font; 215static DC__Font default_font;
… …
295 maprow *row; 296 maprow *row;
296}; 297};
297 298
298typedef mapgrid *DC__Map; 299typedef mapgrid *DC__Map;
299 300
300static char * 301template<typename T>
302static void
301prepend (char *ptr, int sze, int inc) 303prepend (T *&ptr, int sze, int inc)
302{ 304{
303 char *p; 305 T *p;
304 306
305 New (0, p, sze + inc, char); 307 New (0, p, sze + inc, T);
306 Zero (p, inc, char); 308 Zero (p, inc, T);
307 Move (ptr, p + inc, sze, char); 309 Move (ptr, p + inc, sze, T);
308 Safefree (ptr); 310 Safefree (ptr);
309 311
310 return p; 312 ptr = p;
311} 313}
312 314
313static char * 315template<typename T>
316static void
314append (char *ptr, int sze, int inc) 317append (T *&ptr, int sze, int inc)
315{ 318{
316 Renew (ptr, sze + inc, char); 319 Renew (ptr, sze + inc, T);
317 Zero (ptr + sze, inc, char); 320 Zero (ptr + sze, inc, T);
318
319 return ptr;
320} 321}
321
322#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
323#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
324 322
325static void 323static void
326need_facenum (struct mapgrid *self, faceid face) 324need_facenum (struct mapgrid *self, faceid face)
327{ 325{
328 while (self->faces <= face) 326 while (self->faces <= face)
329 { 327 {
330 Append (tileid, self->face2tile, self->faces, self->faces); 328 append (self->face2tile, self->faces, self->faces);
331 self->faces *= 2; 329 self->faces *= 2;
332 } 330 }
333} 331}
334 332
335static void 333static void
336need_texid (struct mapgrid *self, int texid) 334need_texid (struct mapgrid *self, int texid)
337{ 335{
338 while (self->texs <= texid) 336 while (self->texs <= texid)
339 { 337 {
340 Append (maptex, self->tex, self->texs, self->texs); 338 append (self->tex, self->texs, self->texs);
341 self->texs *= 2; 339 self->texs *= 2;
342 } 340 }
343} 341}
344 342
345static maprow * 343static maprow *
346map_get_row (mapgrid *self, int y) 344map_get_row (mapgrid *self, int y)
347{ 345{
348 if (0 > y) 346 if (0 > y)
349 { 347 {
350 int extend = - y + MAP_EXTEND_Y; 348 int extend = - y + MAP_EXTEND_Y;
351 Prepend (maprow, self->row, self->rows, extend); 349 prepend (self->row, self->rows, extend);
352 350
353 self->rows += extend; 351 self->rows += extend;
354 self->y += extend; 352 self->y += extend;
355 y += extend; 353 y += extend;
356 } 354 }
357 else if (y >= self->rows) 355 else if (y >= self->rows)
358 { 356 {
359 int extend = y - self->rows + MAP_EXTEND_Y; 357 int extend = y - self->rows + MAP_EXTEND_Y;
360 Append (maprow, self->row, self->rows, extend); 358 append (self->row, self->rows, extend);
361 self->rows += extend; 359 self->rows += extend;
362 } 360 }
363 361
364 return self->row + y; 362 return self->row + y;
365} 363}
… …
375 } 373 }
376 374
377 if (row->c0 > x) 375 if (row->c0 > x)
378 { 376 {
379 int extend = row->c0 - x + MAP_EXTEND_X; 377 int extend = row->c0 - x + MAP_EXTEND_X;
380 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 378 prepend (row->col, row->c1 - row->c0, extend);
381 row->c0 -= extend; 379 row->c0 -= extend;
382 } 380 }
383 else if (x >= row->c1) 381 else if (x >= row->c1)
384 { 382 {
385 int extend = x - row->c1 + MAP_EXTEND_X; 383 int extend = x - row->c1 + MAP_EXTEND_X;
386 Append (mapcell, row->col, row->c1 - row->c0, extend); 384 append (row->col, row->c1 - row->c0, extend);
387 row->c1 += extend; 385 row->c1 += extend;
388 } 386 }
389 387
390 return row->col + (x - row->c0); 388 return row->col + (x - row->c0);
391} 389}
… …
1368 tc_restore (); 1366 tc_restore ();
1369 1367
1370DC::Layout 1368DC::Layout
1371new (SV *klass) 1369new (SV *klass)
1372 CODE: 1370 CODE:
1373 New (0, RETVAL, 1, struct cf_layout); 1371 RETVAL = new cf_layout;
1374 1372
1375 RETVAL->pl = pango_layout_new (opengl_context); 1373 RETVAL->pl = pango_layout_new (opengl_context);
1376 RETVAL->r = 1.; 1374 RETVAL->r = 1.;
1377 RETVAL->g = 1.; 1375 RETVAL->g = 1.;
1378 RETVAL->b = 1.; 1376 RETVAL->b = 1.;
1379 RETVAL->a = 1.; 1377 RETVAL->a = 1.;
1380 RETVAL->base_height = MIN_FONT_HEIGHT; 1378 RETVAL->base_height = MIN_FONT_HEIGHT;
1381 RETVAL->font = 0; 1379 RETVAL->font = 0;
1382 RETVAL->rc = rc_alloc ();
1383 1380
1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1381 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1385 layout_update_font (RETVAL); 1382 layout_update_font (RETVAL);
1386 OUTPUT: 1383 OUTPUT:
1387 RETVAL 1384 RETVAL
1388 1385
1389void 1386void
1390DESTROY (DC::Layout self) 1387DESTROY (DC::Layout self)
1391 CODE: 1388 CODE:
1392 g_object_unref (self->pl); 1389 g_object_unref (self->pl);
1393 rc_free (self->rc);
1394 Safefree (self); 1390 delete self;
1395 1391
1396void 1392void
1397set_text (DC::Layout self, SV *text_) 1393set_text (DC::Layout self, SV *text_)
1398 CODE: 1394 CODE:
1399{ 1395{
… …
1653} 1649}
1654 1650
1655void 1651void
1656render (DC::Layout self, float x, float y, int flags = 0) 1652render (DC::Layout self, float x, float y, int flags = 0)
1657 CODE: 1653 CODE:
1658 rc_clear (self->rc); 1654 self->rc.clear ();
1659 pango_opengl_render_layout_subpixel ( 1655 pango_opengl_render_layout_subpixel (
1660 self->pl, 1656 self->pl,
1661 self->rc, 1657 &self->rc,
1662 x * PANGO_SCALE, y * PANGO_SCALE, 1658 x * PANGO_SCALE, y * PANGO_SCALE,
1663 self->r, self->g, self->b, self->a, 1659 self->r, self->g, self->b, self->a,
1664 flags 1660 flags
1665 ); 1661 );
1666 // we assume that context_change actually clears/frees stuff 1662 // we assume that context_change actually clears/frees stuff
… …
1677 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1673 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1678 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1674 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1679 glEnable (GL_ALPHA_TEST); 1675 glEnable (GL_ALPHA_TEST);
1680 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1676 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1681 1677
1682 rc_draw (self->rc); 1678 self->rc.draw ();
1683 1679
1684 glDisable (GL_ALPHA_TEST); 1680 glDisable (GL_ALPHA_TEST);
1685 glDisable (GL_BLEND); 1681 glDisable (GL_BLEND);
1686 glDisable (GL_TEXTURE_2D); 1682 glDisable (GL_TEXTURE_2D);
1687} 1683}
… …
2057 self->ox += dx; self->x += dx; 2053 self->ox += dx; self->x += dx;
2058 self->oy += dy; self->y += dy; 2054 self->oy += dy; self->y += dy;
2059 2055
2060 while (self->y < 0) 2056 while (self->y < 0)
2061 { 2057 {
2062 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2058 prepend (self->row, self->rows, MAP_EXTEND_Y);
2063 2059
2064 self->rows += MAP_EXTEND_Y; 2060 self->rows += MAP_EXTEND_Y;
2065 self->y += MAP_EXTEND_Y; 2061 self->y += MAP_EXTEND_Y;
2066 } 2062 }
2067} 2063}
… …
2223draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2219draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2224 CODE: 2220 CODE:
2225{ 2221{
2226 int x, y, z; 2222 int x, y, z;
2227 2223
2228 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2224 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2230 smooth_key skey;
2231 int pl_x, pl_y; 2225 int pl_x, pl_y;
2232 maptex pl_tex; 2226 maptex pl_tex;
2233 rc_t *rc = rc_alloc (); 2227 rc_t rc;
2234 rc_t *rc_ov = rc_alloc (); 2228 rc_t rc_ov;
2235 rc_key_t key; 2229 rc_key_t key;
2236 rc_array_t *arr; 2230 rc_t::array_t *arr;
2237 2231
2238 pl_tex.name = 0; 2232 pl_tex.name = 0;
2239 2233
2240 // that's current max. sorry. 2234 // that's current max. sorry.
2241 if (sw > 255) sw = 255; 2235 if (sw > 255) sw = 255;
2242 if (sh > 255) sh = 255; 2236 if (sh > 255) sh = 255;
2243
2244 // clear key, in case of extra padding
2245 memset (&skey, 0, sizeof (skey));
2246 2237
2247 memset (&key, 0, sizeof (key)); 2238 memset (&key, 0, sizeof (key));
2248 key.r = 255; 2239 key.r = 255;
2249 key.g = 255; 2240 key.g = 255;
2250 key.b = 255; 2241 key.b = 255;
… …
2256 my += self->y; 2247 my += self->y;
2257 2248
2258 // first pass: determine smooth_max 2249 // first pass: determine smooth_max
2259 // rather ugly, if you ask me 2250 // rather ugly, if you ask me
2260 // could also be stored inside mapcell and updated on change 2251 // could also be stored inside mapcell and updated on change
2261 memset (smooth_max, 0, sizeof (smooth_max)); 2252 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2262 2253
2263 for (y = 0; y < sh; y++) 2254 for (y = 0; y < sh; y++)
2264 if (0 <= y + my && y + my < self->rows) 2255 if (0 <= y + my && y + my < self->rows)
2265 { 2256 {
2266 maprow *row = self->row + (y + my); 2257 maprow *row = self->row + (y + my);
… …
2281 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2272 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2273 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2283 2274
2284 for (z = 0; z <= 2; z++) 2275 for (z = 0; z <= 2; z++)
2285 { 2276 {
2277 std::bitset<256> smooth_level; // one bit for every possible smooth level
2278 smooth_key skey;
2286 smooth_hash smooth; 2279 smooth_hash smooth;
2287 memset (smooth_level, 0, sizeof (smooth_level));
2288 key.texname = -1; 2280 key.texname = -1;
2289 2281
2290 for (y = 0; y < sh; y++) 2282 for (y = 0; y < sh; y++)
2291 if (0 <= y + my && y + my < self->rows) 2283 if (0 <= y + my && y + my < self->rows)
2292 { 2284 {
… …
2309 2301
2310 if (!tex.name) 2302 if (!tex.name)
2311 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2303 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2312 2304
2313 key.texname = tex.name; 2305 key.texname = tex.name;
2314 arr = rc_array (rc, &key); 2306 arr = &rc.array (key);
2315 } 2307 }
2316 2308
2317 px = (x + 1) * Th - tex.w; 2309 px = (x + 1) * Th - tex.w;
2318 py = (y + 1) * Tw - tex.h; 2310 py = (y + 1) * Tw - tex.h;
2319 2311
… …
2323 pl_y = py; 2315 pl_y = py;
2324 pl_tex = tex; 2316 pl_tex = tex;
2325 continue; 2317 continue;
2326 } 2318 }
2327 2319
2328 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2320 arr->t2f_v3f (0 , 0 , px , py , 0);
2329 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2321 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2330 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2322 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2331 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2323 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2332 2324
2333 // update smooth hash 2325 // update smooth hash
2334 if (tex.smoothtile) 2326 if (tex.smoothtile)
2335 { 2327 {
2336 skey.tile = tex.smoothtile; 2328 skey.tile = tex.smoothtile;
2337 skey.level = tex.smoothlevel; 2329 skey.level = tex.smoothlevel;
2338 2330
2339 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2331 smooth_level[tex.smoothlevel] = 1;
2340 2332
2341 // add bits to current tile and all neighbours. skey.x|y is 2333 // add bits to current tile and all neighbours. skey.x|y is
2342 // shifted +1|+1 so we always stay positive. 2334 // shifted +1|+1 so we always stay positive.
2343 2335
2344 // bits is ___n cccc CCCC bbbb 2336 // bits is ___n cccc CCCC bbbb
… …
2374 { 2366 {
2375 // overlays such as the speech bubble, probably more to come 2367 // overlays such as the speech bubble, probably more to come
2376 if (cell->flags & 1) 2368 if (cell->flags & 1)
2377 { 2369 {
2378 rc_key_t key_ov = key; 2370 rc_key_t key_ov = key;
2379 maptex tex = self->tex [TEXID_SPEECH]; 2371 maptex tex = self->tex[TEXID_SPEECH];
2380 rc_array_t *arr;
2381 int px = x * Tw + Tw * 2 / 32; 2372 int px = x * Tw + Tw * 2 / 32;
2382 int py = y * Th - Th * 6 / 32; 2373 int py = y * Th - Th * 6 / 32;
2383 2374
2384 key_ov.texname = tex.name; 2375 key_ov.texname = tex.name;
2385 arr = rc_array (rc_ov, &key_ov); 2376 rc_t::array_t &arr = rc_ov.array (key_ov);
2386 2377
2387 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2378 arr.t2f_v3f (0 , 0 , px , py , 0);
2388 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0); 2379 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2389 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0); 2380 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2390 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0); 2381 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2391 } 2382 }
2392 } 2383 }
2393 } 2384 }
2394 } 2385 }
2395 2386
2396 rc_draw (rc); 2387 rc.draw ();
2397 rc_clear (rc); 2388 rc.clear ();
2398 2389
2399 // go through all smoothlevels, lowest to highest, then draw. 2390 // go through all smoothlevels, lowest to highest, then draw.
2400 // this is basically counting sort 2391 // this is basically counting sort
2401 { 2392 {
2402 int w, b; 2393 int w, b;
2403 2394
2404 glEnable (GL_TEXTURE_2D); 2395 glEnable (GL_TEXTURE_2D);
2405 glBegin (GL_QUADS); 2396 glBegin (GL_QUADS);
2406 for (w = 0; w < 256 / 32; ++w) 2397 for (int level = 0; level < smooth_level.size (); ++level)
2398 if (smooth_level[level])
2399 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2407 { 2400 {
2408 uint32_t smask = smooth_level [w]; 2401 smooth_key &skey = it->first;
2409 if (smask) 2402 IV bits = it->second;
2410 for (b = 0; b < 32; ++b) 2403
2411 if (smask & (((uint32_t)1) << b)) 2404 if (!(bits & 0x1000)
2405 && skey.level == level
2406 && level > smooth_max [skey.x][skey.y])
2412 { 2407 {
2413 int level = (w << 5) | b; 2408 maptex tex = self->tex [skey.tile];
2409 int px = (((int)skey.x) - 1) * Tw;
2410 int py = (((int)skey.y) - 1) * Th;
2411 int border = bits & 15;
2412 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2413 float dx = tex.s * .0625f; // 16 images/row
2414 float dy = tex.t * .5f ; // 2 images/column
2415
2414 HE *he; 2416 if (tex.name)
2415
2416 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2417 { 2417 {
2418 smooth_key &skey = it->first; 2418 // this time avoiding texture state changes
2419 IV bits = it->second; 2419 // save gobs of state changes.
2420 2420 if (key.texname != tex.name)
2421 if (!(bits & 0x1000)
2422 && skey.level == level
2423 && level > smooth_max [skey.x][skey.y])
2424 { 2421 {
2425 maptex tex = self->tex [skey.tile];
2426 int px = (((int)skey.x) - 1) * Tw;
2427 int py = (((int)skey.y) - 1) * Th;
2428 int border = bits & 15;
2429 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2430 float dx = tex.s * .0625f; // 16 images/row
2431 float dy = tex.t * .5f ; // 2 images/column
2432
2433 if (tex.name)
2434 {
2435 // this time avoiding texture state changes
2436 // save gobs of state changes.
2437 if (key.texname != tex.name)
2438 {
2439 self->tex [skey.tile].unused = 0; 2422 self->tex [skey.tile].unused = 0;
2440 2423
2441 glEnd (); 2424 glEnd ();
2442 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2425 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2443 glBegin (GL_QUADS); 2426 glBegin (GL_QUADS);
2444 } 2427 }
2445 2428
2446 if (border) 2429 if (border)
2447 { 2430 {
2448 float ox = border * dx; 2431 float ox = border * dx;
2449 2432
2450 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2433 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2451 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th); 2434 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th); 2435 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2453 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py ); 2436 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2454 } 2437 }
2455 2438
2456 if (corner) 2439 if (corner)
2457 { 2440 {
2458 float ox = corner * dx; 2441 float ox = corner * dx;
2459 2442
2460 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2461 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th); 2444 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2462 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th); 2445 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2463 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py ); 2446 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2464 }
2465 }
2466 } 2447 }
2467 } 2448 }
2468 } 2449 }
2469 } 2450 }
2470 2451
2471 glEnd (); 2452 glEnd ();
2472 glDisable (GL_TEXTURE_2D); 2453 glDisable (GL_TEXTURE_2D);
2473 key.texname = -1; 2454 key.texname = -1;
2474 } 2455 }
… …
2479 maptex tex = pl_tex; 2460 maptex tex = pl_tex;
2480 int px = pl_x + sdx; 2461 int px = pl_x + sdx;
2481 int py = pl_y + sdy; 2462 int py = pl_y + sdy;
2482 2463
2483 key.texname = tex.name; 2464 key.texname = tex.name;
2484 arr = rc_array (rc, &key); 2465 rc_t::array_t &arr = rc.array (key);
2485 2466
2486 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2467 arr.t2f_v3f (0 , 0 , px , py , 0);
2487 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2468 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2488 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2469 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2489 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2470 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2490 2471
2491 rc_draw (rc); 2472 rc.draw ();
2492 } 2473 }
2493 2474
2494 rc_draw (rc_ov); 2475 rc_ov.draw ();
2495 rc_clear (rc_ov); 2476 rc_ov.clear ();
2496 2477
2497 glDisable (GL_BLEND); 2478 glDisable (GL_BLEND);
2498 rc_free (rc);
2499 rc_free (rc_ov);
2500 2479
2501 // top layer: overlays such as the health bar 2480 // top layer: overlays such as the health bar
2502 for (y = 0; y < sh; y++) 2481 for (y = 0; y < sh; y++)
2503 if (0 <= y + my && y + my < self->rows) 2482 if (0 <= y + my && y + my < self->rows)
2504 { 2483 {

Diff Legend

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