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.324 by root, Sun Nov 18 01:58:53 2018 UTC vs.
Revision 1.332 by root, Mon Nov 19 00:56:08 2018 UTC

… …
76# include <netinet/in.h> 76# include <netinet/in.h>
77# include <netinet/tcp.h> 77# include <netinet/tcp.h>
78# include <inttypes.h> 78# include <inttypes.h>
79#endif 79#endif
80 80
81#if __GNUC__ >= 4 81#include "ecb.h"
82# define expect(expr,value) __builtin_expect ((expr),(value))
83#else
84# define expect(expr,value) (expr)
85#endif
86
87#define expect_false(expr) expect ((expr) != 0, 0)
88#define expect_true(expr) expect ((expr) != 0, 1)
89 82
90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
91 84
92/* this is used as fow flag as well, so has to have a different value */ 85/* this is used as fow flag as well, so has to have a different value */
93/* then anything that is computed by incoming darkness */ 86/* then anything that is computed by incoming darkness */
… …
111fast_sv_grow (SV *sv, STRLEN need) 104fast_sv_grow (SV *sv, STRLEN need)
112{ 105{
113 STRLEN len = SvLEN (sv); 106 STRLEN len = SvLEN (sv);
114 STRLEN want = SvCUR (sv) + need; 107 STRLEN want = SvCUR (sv) + need;
115 108
116 if (expect_false (len < want)) 109 if (ecb_expect_false (len < want))
117 { 110 {
118 do 111 do
119 len *= 2; 112 len *= 2;
120 while (len < want); 113 while (len < want);
121 114
… …
205struct cf_layout { 198struct cf_layout {
206 PangoLayout *pl; 199 PangoLayout *pl;
207 float r, g, b, a; // default color for rgba mode 200 float r, g, b, a; // default color for rgba mode
208 int base_height; 201 int base_height;
209 DC__Font font; 202 DC__Font font;
210 rc_t *rc; 203 rc_t rc;
211}; 204};
212 205
213typedef cf_layout *DC__Layout; 206typedef cf_layout *DC__Layout;
214 207
215static DC__Font default_font; 208static DC__Font default_font;
… …
255 if (!rect.height) rect.height = 1; 248 if (!rect.height) rect.height = 1;
256 249
257 *w = rect.width; 250 *w = rect.width;
258 *h = rect.height; 251 *h = rect.height;
259} 252}
253
254/////////////////////////////////////////////////////////////////////////////
260 255
261typedef uint16_t tileid; 256typedef uint16_t tileid;
262typedef uint16_t faceid; 257typedef uint16_t faceid;
263 258
264struct maptex 259struct maptex
… …
296 maprow *row; 291 maprow *row;
297}; 292};
298 293
299typedef mapgrid *DC__Map; 294typedef mapgrid *DC__Map;
300 295
301static char * 296template<typename T>
297static void
302prepend (char *ptr, int sze, int inc) 298prepend (T *&ptr, int sze, int inc)
303{ 299{
304 char *p; 300 T *p;
305 301
306 New (0, p, sze + inc, char); 302 Newx (p, inc + sze, T);
307 Zero (p, inc, char); 303 Zero (p, inc, T);
308 Move (ptr, p + inc, sze, char); 304 Move (ptr, p + inc, sze, T);
309 Safefree (ptr); 305 Safefree (ptr);
310 306
311 return p; 307 ptr = p;
312} 308}
313 309
314static char * 310template<typename T>
311static void
315append (char *ptr, int sze, int inc) 312append (T *&ptr, int sze, int inc)
316{ 313{
317 Renew (ptr, sze + inc, char); 314 Renew (ptr, sze + inc, T);
318 Zero (ptr + sze, inc, char); 315 Zero (ptr + sze, inc, T);
319
320 return ptr;
321} 316}
322
323#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((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))
325 317
326static void 318static void
327need_facenum (struct mapgrid *self, faceid face) 319need_facenum (struct mapgrid *self, faceid face)
328{ 320{
329 while (self->faces <= face) 321 while (self->faces <= face)
330 { 322 {
331 Append (tileid, self->face2tile, self->faces, self->faces); 323 append (self->face2tile, self->faces, self->faces);
332 self->faces *= 2; 324 self->faces *= 2;
333 } 325 }
334} 326}
335 327
336static void 328static void
337need_texid (struct mapgrid *self, int texid) 329need_texid (struct mapgrid *self, int texid)
338{ 330{
339 while (self->texs <= texid) 331 while (self->texs <= texid)
340 { 332 {
341 Append (maptex, self->tex, self->texs, self->texs); 333 append (self->tex, self->texs, self->texs);
342 self->texs *= 2; 334 self->texs *= 2;
343 } 335 }
344} 336}
345 337
346static maprow * 338static maprow *
347map_get_row (mapgrid *self, int y) 339map_get_row (mapgrid *self, int y)
348{ 340{
349 if (0 > y) 341 if (0 > y)
350 { 342 {
351 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
352 Prepend (maprow, self->row, self->rows, extend); 344 prepend (self->row, self->rows, extend);
353 345
354 self->rows += extend; 346 self->rows += extend;
355 self->y += extend; 347 self->y += extend;
356 y += extend; 348 y += extend;
357 } 349 }
358 else if (y >= self->rows) 350 else if (y >= self->rows)
359 { 351 {
360 int extend = y - self->rows + MAP_EXTEND_Y; 352 int extend = y - self->rows + MAP_EXTEND_Y;
361 Append (maprow, self->row, self->rows, extend); 353 append (self->row, self->rows, extend);
362 self->rows += extend; 354 self->rows += extend;
363 } 355 }
364 356
365 return self->row + y; 357 return self->row + y;
366} 358}
… …
376 } 368 }
377 369
378 if (row->c0 > x) 370 if (row->c0 > x)
379 { 371 {
380 int extend = row->c0 - x + MAP_EXTEND_X; 372 int extend = row->c0 - x + MAP_EXTEND_X;
381 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 373 prepend (row->col, row->c1 - row->c0, extend);
382 row->c0 -= extend; 374 row->c0 -= extend;
383 } 375 }
384 else if (x >= row->c1) 376 else if (x >= row->c1)
385 { 377 {
386 int extend = x - row->c1 + MAP_EXTEND_X; 378 int extend = x - row->c1 + MAP_EXTEND_X;
387 Append (mapcell, row->col, row->c1 - row->c0, extend); 379 append (row->col, row->c1 - row->c0, extend);
388 row->c1 += extend; 380 row->c1 += extend;
389 } 381 }
390 382
391 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
392} 384}
… …
534 n |= n >> 4; 526 n |= n >> 4;
535 n |= n >> 8; 527 n |= n >> 8;
536 n |= n >> 16; 528 n |= n >> 16;
537 529
538 return n + 1; 530 return n + 1;
539}
540
541static unsigned int
542popcount (unsigned int n)
543{
544 n -= (n >> 1) & 0x55555555U;
545 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
546 n = ((n >> 4) + n) & 0x0f0f0f0fU;
547 n *= 0x01010101U;
548
549 return n >> 24;
550} 531}
551 532
552/* SDL should provide this, really. */ 533/* SDL should provide this, really. */
553#define SDLK_MODIFIER_MIN 300 534#define SDLK_MODIFIER_MIN 300
554#define SDLK_MODIFIER_MAX 314 535#define SDLK_MODIFIER_MAX 314
… …
885 866
886NV ceil (NV x) 867NV ceil (NV x)
887 868
888IV minpot (UV n) 869IV minpot (UV n)
889 870
871UV ld32 (UV n)
872 CODE:
873 RETVAL = ecb_ld32 (n);
874 OUTPUT:
875 RETVAL
876
890IV popcount (UV n) 877IV popcount (UV n)
878 CODE:
879 RETVAL = ecb_popcount32 (n);
880 OUTPUT:
881 RETVAL
891 882
892NV distance (NV dx, NV dy) 883NV distance (NV dx, NV dy)
893 CODE: 884 CODE:
894 RETVAL = pow (dx * dx + dy * dy, 0.5); 885 RETVAL = pow (dx * dx + dy * dy, 0.5);
895 OUTPUT: 886 OUTPUT:
… …
1369 tc_restore (); 1360 tc_restore ();
1370 1361
1371DC::Layout 1362DC::Layout
1372new (SV *klass) 1363new (SV *klass)
1373 CODE: 1364 CODE:
1374 New (0, RETVAL, 1, struct cf_layout); 1365 RETVAL = new cf_layout;
1375 1366
1376 RETVAL->pl = pango_layout_new (opengl_context); 1367 RETVAL->pl = pango_layout_new (opengl_context);
1377 RETVAL->r = 1.; 1368 RETVAL->r = 1.;
1378 RETVAL->g = 1.; 1369 RETVAL->g = 1.;
1379 RETVAL->b = 1.; 1370 RETVAL->b = 1.;
1380 RETVAL->a = 1.; 1371 RETVAL->a = 1.;
1381 RETVAL->base_height = MIN_FONT_HEIGHT; 1372 RETVAL->base_height = MIN_FONT_HEIGHT;
1382 RETVAL->font = 0; 1373 RETVAL->font = 0;
1383 RETVAL->rc = rc_alloc ();
1384 1374
1385 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1375 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1386 layout_update_font (RETVAL); 1376 layout_update_font (RETVAL);
1387 OUTPUT: 1377 OUTPUT:
1388 RETVAL 1378 RETVAL
1389 1379
1390void 1380void
1391DESTROY (DC::Layout self) 1381DESTROY (DC::Layout self)
1392 CODE: 1382 CODE:
1393 g_object_unref (self->pl); 1383 g_object_unref (self->pl);
1394 rc_free (self->rc);
1395 Safefree (self); 1384 delete self;
1396 1385
1397void 1386void
1398set_text (DC::Layout self, SV *text_) 1387set_text (DC::Layout self, SV *text_)
1399 CODE: 1388 CODE:
1400{ 1389{
… …
1654} 1643}
1655 1644
1656void 1645void
1657render (DC::Layout self, float x, float y, int flags = 0) 1646render (DC::Layout self, float x, float y, int flags = 0)
1658 CODE: 1647 CODE:
1659 rc_clear (self->rc); 1648 self->rc.clear ();
1660 pango_opengl_render_layout_subpixel ( 1649 pango_opengl_render_layout_subpixel (
1661 self->pl, 1650 self->pl,
1662 self->rc, 1651 &self->rc,
1663 x * PANGO_SCALE, y * PANGO_SCALE, 1652 x * PANGO_SCALE, y * PANGO_SCALE,
1664 self->r, self->g, self->b, self->a, 1653 self->r, self->g, self->b, self->a,
1665 flags 1654 flags
1666 ); 1655 );
1667 // we assume that context_change actually clears/frees stuff 1656 // we assume that context_change actually clears/frees stuff
… …
1678 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1667 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1679 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1668 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1680 glEnable (GL_ALPHA_TEST); 1669 glEnable (GL_ALPHA_TEST);
1681 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1670 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1682 1671
1683 rc_draw (self->rc); 1672 self->rc.draw ();
1684 1673
1685 glDisable (GL_ALPHA_TEST); 1674 glDisable (GL_ALPHA_TEST);
1686 glDisable (GL_BLEND); 1675 glDisable (GL_BLEND);
1687 glDisable (GL_TEXTURE_2D); 1676 glDisable (GL_TEXTURE_2D);
1688} 1677}
… …
2058 self->ox += dx; self->x += dx; 2047 self->ox += dx; self->x += dx;
2059 self->oy += dy; self->y += dy; 2048 self->oy += dy; self->y += dy;
2060 2049
2061 while (self->y < 0) 2050 while (self->y < 0)
2062 { 2051 {
2063 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2052 prepend (self->row, self->rows, MAP_EXTEND_Y);
2064 2053
2065 self->rows += MAP_EXTEND_Y; 2054 self->rows += MAP_EXTEND_Y;
2066 self->y += MAP_EXTEND_Y; 2055 self->y += MAP_EXTEND_Y;
2067 } 2056 }
2068} 2057}
… …
2227 int x, y, z; 2216 int x, y, z;
2228 2217
2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static! 2218 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2230 int pl_x, pl_y; 2219 int pl_x, pl_y;
2231 maptex pl_tex; 2220 maptex pl_tex;
2232 rc_t *rc = rc_alloc (); 2221 rc_t rc;
2233 rc_t *rc_ov = rc_alloc (); 2222 rc_t rc_ov;
2234 rc_key_t key; 2223 rc_key_t key;
2235 rc_array_t *arr; 2224 rc_t::array_t *arr;
2236 2225
2237 pl_tex.name = 0; 2226 pl_tex.name = 0;
2238 2227
2239 // that's current max. sorry. 2228 // that's current max. sorry.
2240 if (sw > 255) sw = 255; 2229 if (sw > 255) sw = 255;
… …
2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2266 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2267 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2279 2268
2280 for (z = 0; z <= 2; z++) 2269 for (z = 0; z <= 2; z++)
2281 { 2270 {
2282 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2271 std::bitset<256> smooth_level; // one bit for every possible smooth level
2283 smooth_key skey; 2272 smooth_key skey;
2284 smooth_hash smooth; 2273 smooth_hash smooth;
2285 memset (smooth_level, 0, sizeof (smooth_level));
2286 key.texname = -1; 2274 key.texname = -1;
2287 2275
2288 for (y = 0; y < sh; y++) 2276 for (y = 0; y < sh; y++)
2289 if (0 <= y + my && y + my < self->rows) 2277 if (0 <= y + my && y + my < self->rows)
2290 { 2278 {
… …
2307 2295
2308 if (!tex.name) 2296 if (!tex.name)
2309 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2297 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2310 2298
2311 key.texname = tex.name; 2299 key.texname = tex.name;
2312 arr = rc_array (rc, &key); 2300 arr = &rc.array (key);
2313 } 2301 }
2314 2302
2315 px = (x + 1) * Th - tex.w; 2303 px = (x + 1) * Th - tex.w;
2316 py = (y + 1) * Tw - tex.h; 2304 py = (y + 1) * Tw - tex.h;
2317 2305
2318 if (expect_false (cell->player == player) && expect_false (z == 2)) 2306 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2319 { 2307 {
2320 pl_x = px; 2308 pl_x = px;
2321 pl_y = py; 2309 pl_y = py;
2322 pl_tex = tex; 2310 pl_tex = tex;
2323 continue; 2311 continue;
2324 } 2312 }
2325 2313
2326 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2314 arr->t2f_v3f (0 , 0 , px , py , 0);
2327 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2315 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2328 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2316 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2329 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2317 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2330 2318
2331 // update smooth hash 2319 // update smooth hash
2332 if (tex.smoothtile) 2320 if (tex.smoothtile)
2333 { 2321 {
2334 skey.tile = tex.smoothtile; 2322 skey.tile = tex.smoothtile;
2335 skey.level = tex.smoothlevel; 2323 skey.level = tex.smoothlevel;
2336 2324
2337 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2325 smooth_level[tex.smoothlevel] = 1;
2338 2326
2339 // add bits to current tile and all neighbours. skey.x|y is 2327 // add bits to current tile and all neighbours. skey.x|y is
2340 // shifted +1|+1 so we always stay positive. 2328 // shifted +1|+1 so we always stay positive.
2341 2329
2342 // bits is ___n cccc CCCC bbbb 2330 // bits is ___n cccc CCCC bbbb
… …
2366 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400); 2354 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2367 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800); 2355 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2368 } 2356 }
2369 } 2357 }
2370 2358
2371 if (expect_false (z == 2) && expect_false (cell->flags)) 2359 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2372 { 2360 {
2373 // overlays such as the speech bubble, probably more to come 2361 // overlays such as the speech bubble, probably more to come
2374 if (cell->flags & 1) 2362 if (cell->flags & 1)
2375 { 2363 {
2376 rc_key_t key_ov = key; 2364 rc_key_t key_ov = key;
2377 maptex tex = self->tex [TEXID_SPEECH]; 2365 maptex tex = self->tex[TEXID_SPEECH];
2378 rc_array_t *arr;
2379 int px = x * Tw + Tw * 2 / 32; 2366 int px = x * Tw + Tw * 2 / 32;
2380 int py = y * Th - Th * 6 / 32; 2367 int py = y * Th - Th * 6 / 32;
2381 2368
2382 key_ov.texname = tex.name; 2369 key_ov.texname = tex.name;
2383 arr = rc_array (rc_ov, &key_ov); 2370 rc_t::array_t &arr = rc_ov.array (key_ov);
2384 2371
2385 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2372 arr.t2f_v3f (0 , 0 , px , py , 0);
2386 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0); 2373 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2387 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0); 2374 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2388 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0); 2375 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2389 } 2376 }
2390 } 2377 }
2391 } 2378 }
2392 } 2379 }
2393 2380
2394 rc_draw (rc); 2381 rc.draw ();
2395 rc_clear (rc); 2382 rc.clear ();
2396 2383
2397 // go through all smoothlevels, lowest to highest, then draw. 2384 // go through all smoothlevels, lowest to highest, then draw.
2398 // this is basically counting sort 2385 // this is basically counting sort
2399 { 2386 {
2400 int w, b; 2387 int w, b;
2401 2388
2402 glEnable (GL_TEXTURE_2D); 2389 glEnable (GL_TEXTURE_2D);
2403 glBegin (GL_QUADS); 2390 glBegin (GL_QUADS);
2404 for (w = 0; w < 256 / 32; ++w) 2391 for (int level = 0; level < smooth_level.size (); ++level)
2392 if (smooth_level[level])
2393 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2405 { 2394 {
2406 uint32_t smask = smooth_level [w]; 2395 smooth_key &skey = it->first;
2407 if (smask) 2396 IV bits = it->second;
2408 for (b = 0; b < 32; ++b) 2397
2409 if (smask & (((uint32_t)1) << b)) 2398 if (!(bits & 0x1000)
2399 && skey.level == level
2400 && level > smooth_max [skey.x][skey.y])
2410 { 2401 {
2411 int level = (w << 5) | b; 2402 maptex tex = self->tex [skey.tile];
2403 int px = (((int)skey.x) - 1) * Tw;
2404 int py = (((int)skey.y) - 1) * Th;
2405 int border = bits & 15;
2406 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2407 float dx = tex.s * .0625f; // 16 images/row
2408 float dy = tex.t * .5f ; // 2 images/column
2409
2412 HE *he; 2410 if (tex.name)
2413
2414 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2415 { 2411 {
2416 smooth_key &skey = it->first; 2412 // this time avoiding texture state changes
2417 IV bits = it->second; 2413 // save gobs of state changes.
2418 2414 if (key.texname != tex.name)
2419 if (!(bits & 0x1000)
2420 && skey.level == level
2421 && level > smooth_max [skey.x][skey.y])
2422 { 2415 {
2423 maptex tex = self->tex [skey.tile];
2424 int px = (((int)skey.x) - 1) * Tw;
2425 int py = (((int)skey.y) - 1) * Th;
2426 int border = bits & 15;
2427 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2428 float dx = tex.s * .0625f; // 16 images/row
2429 float dy = tex.t * .5f ; // 2 images/column
2430
2431 if (tex.name)
2432 {
2433 // this time avoiding texture state changes
2434 // save gobs of state changes.
2435 if (key.texname != tex.name)
2436 {
2437 self->tex [skey.tile].unused = 0; 2416 self->tex [skey.tile].unused = 0;
2438 2417
2439 glEnd (); 2418 glEnd ();
2440 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2419 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2441 glBegin (GL_QUADS); 2420 glBegin (GL_QUADS);
2442 } 2421 }
2443 2422
2444 if (border) 2423 if (border)
2445 { 2424 {
2446 float ox = border * dx; 2425 float ox = border * dx;
2447 2426
2448 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2427 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2449 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2450 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th); 2429 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2451 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py ); 2430 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2452 } 2431 }
2453 2432
2454 if (corner) 2433 if (corner)
2455 { 2434 {
2456 float ox = corner * dx; 2435 float ox = corner * dx;
2457 2436
2458 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2459 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th); 2438 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2460 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th); 2439 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2461 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py ); 2440 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2462 }
2463 }
2464 } 2441 }
2465 } 2442 }
2466 } 2443 }
2467 } 2444 }
2468 2445
2469 glEnd (); 2446 glEnd ();
2470 glDisable (GL_TEXTURE_2D); 2447 glDisable (GL_TEXTURE_2D);
2471 key.texname = -1; 2448 key.texname = -1;
2472 } 2449 }
… …
2477 maptex tex = pl_tex; 2454 maptex tex = pl_tex;
2478 int px = pl_x + sdx; 2455 int px = pl_x + sdx;
2479 int py = pl_y + sdy; 2456 int py = pl_y + sdy;
2480 2457
2481 key.texname = tex.name; 2458 key.texname = tex.name;
2482 arr = rc_array (rc, &key); 2459 rc_t::array_t &arr = rc.array (key);
2483 2460
2484 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2461 arr.t2f_v3f (0 , 0 , px , py , 0);
2485 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2462 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2486 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2463 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2487 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2464 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2488 2465
2489 rc_draw (rc); 2466 rc.draw ();
2490 } 2467 }
2491 2468
2492 rc_draw (rc_ov); 2469 rc_ov.draw ();
2493 rc_clear (rc_ov); 2470 rc_ov.clear ();
2494 2471
2495 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
2496 rc_free (rc);
2497 rc_free (rc_ov);
2498 2473
2499 // top layer: overlays such as the health bar 2474 // top layer: overlays such as the health bar
2500 for (y = 0; y < sh; y++) 2475 for (y = 0; y < sh; y++)
2501 if (0 <= y + my && y + my < self->rows) 2476 if (0 <= y + my && y + my < self->rows)
2502 { 2477 {
… …
2508 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2509 2484
2510 int px = x * Tw; 2485 int px = x * Tw;
2511 int py = y * Th; 2486 int py = y * Th;
2512 2487
2513 if (expect_false (cell->player == player)) 2488 if (ecb_expect_false (cell->player == player))
2514 { 2489 {
2515 px += sdx; 2490 px += sdx;
2516 py += sdy; 2491 py += sdy;
2517 } 2492 }
2518 2493

Diff Legend

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