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.321 by root, Sun Nov 18 01:15:04 2018 UTC vs.
Revision 1.335 by root, Mon Nov 19 01:56:11 2018 UTC

… …
15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f 27# define M_PI 3.14159265f
26#endif 28#endif
27 29
28#include <assert.h> 30#include <cassert>
29#include <math.h> 31#include <cmath>
30#include <string.h> 32#include <cstring>
31#include <stdio.h> 33#include <cstdio>
32#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
33 38
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35 40
36#include <SDL.h> 41#include <SDL.h>
37#include <SDL_thread.h> 42#include <SDL_thread.h>
… …
71# include <netinet/in.h> 76# include <netinet/in.h>
72# include <netinet/tcp.h> 77# include <netinet/tcp.h>
73# include <inttypes.h> 78# include <inttypes.h>
74#endif 79#endif
75 80
76#if __GNUC__ >= 4 81#include "ecb.h"
77# define expect(expr,value) __builtin_expect ((expr),(value)) 82#include "salloc.h"
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84 83
85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
86 85
87/* this is used as fow flag as well, so has to have a different value */ 86/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */ 87/* then anything that is computed by incoming darkness */
… …
100#define KMOD_LRAM 0x10000 // our extension 99#define KMOD_LRAM 0x10000 // our extension
101 100
102#define TEXID_SPEECH 1 101#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2 102#define TEXID_NOFACE 2
104 103
104// approximately divide by 255
105static unsigned int
106div255 (unsigned int n)
107{
108 return (n + (n >> 8)) >> 8;
109}
110
111static unsigned int
112minpot (unsigned int n)
113{
114 if (!n)
115 return 0;
116
117 --n;
118
119 n |= n >> 1;
120 n |= n >> 2;
121 n |= n >> 4;
122 n |= n >> 8;
123 n |= n >> 16;
124
125 return n + 1;
126}
127
105static char * 128static char *
106fast_sv_grow (SV *sv, STRLEN need) 129fast_sv_grow (SV *sv, STRLEN need)
107{ 130{
108 STRLEN len = SvLEN (sv); 131 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need; 132 STRLEN want = SvCUR (sv) + need;
110 133
111 if (expect_false (len < want)) 134 if (ecb_expect_false (len < want))
112 { 135 {
113 do 136 do
114 len *= 2; 137 len *= 2;
115 while (len < want); 138 while (len < want);
116 139
… …
195 } 218 }
196 219
197 return 0; 220 return 0;
198} 221}
199 222
200typedef struct cf_layout { 223struct cf_layout {
201 PangoLayout *pl; 224 PangoLayout *pl;
202 float r, g, b, a; // default color for rgba mode 225 float r, g, b, a; // default color for rgba mode
203 int base_height; 226 int base_height;
204 DC__Font font; 227 DC__Font font;
205 rc_t *rc; 228 rc_t rc;
206} *DC__Layout; 229};
230
231typedef cf_layout *DC__Layout;
207 232
208static DC__Font default_font; 233static DC__Font default_font;
209static PangoContext *opengl_context; 234static PangoContext *opengl_context;
210static PangoFontMap *opengl_fontmap; 235static PangoFontMap *opengl_fontmap;
211 236
… …
249 274
250 *w = rect.width; 275 *w = rect.width;
251 *h = rect.height; 276 *h = rect.height;
252} 277}
253 278
279/////////////////////////////////////////////////////////////////////////////
280
254typedef uint16_t tileid; 281typedef uint16_t tileid;
255typedef uint16_t faceid; 282typedef uint16_t faceid;
256 283
257typedef struct { 284struct maptex
285{
258 GLuint name; 286 GLuint name;
259 int w, h; 287 int w, h;
260 float s, t; 288 float s, t;
261 uint8_t r, g, b, a; 289 uint8_t r, g, b, a;
262 tileid smoothtile; 290 tileid smoothtile;
263 uint8_t smoothlevel; 291 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */ 292 uint8_t unused; /* set to zero on use */
265} maptex; 293};
266 294
267typedef struct { 295struct mapcell
296{
268 uint32_t player; 297 uint32_t player;
269 tileid tile[3]; 298 tileid tile[3];
270 uint16_t darkness; 299 uint16_t darkness;
271 uint8_t stat_width, stat_hp, flags, smoothmax; 300 uint8_t stat_width, stat_hp, flags, smoothmax;
272} mapcell; 301};
273 302
274typedef struct { 303struct maprow
304{
275 int32_t c0, c1; 305 int32_t c0, c1;
276 mapcell *col; 306 mapcell *col;
277} maprow; 307};
278 308
279typedef struct map { 309struct mapgrid {
280 int x, y, w, h; 310 int x, y, w, h;
281 int ox, oy; /* offset to virtual global coordinate system */ 311 int ox, oy; /* offset to virtual global coordinate system */
282 int faces; tileid *face2tile; // [faceid] 312 int faces; tileid *face2tile; // [faceid]
283 int texs; maptex *tex; // [tileid] 313 int texs; maptex *tex; // [tileid]
284 314
285 int32_t rows; 315 int32_t rows;
286 maprow *row; 316 maprow *row;
287} *DC__Map; 317};
288 318
289static char * 319typedef mapgrid *DC__Map;
320
321template<typename T>
322ecb_cold static void
290prepend (char *ptr, int sze, int inc) 323prepend (T *&ptr, int sze, int inc)
291{ 324{
292 char *p; 325 T *p;
293 326
294 New (0, p, sze + inc, char); 327 Newx (p, inc + sze, T);
295 Zero (p, inc, char); 328 Zero (p, inc, T);
296 Move (ptr, p + inc, sze, char); 329 Move (ptr, p + inc, sze, T);
297 Safefree (ptr); 330 Safefree (ptr);
298 331
299 return p; 332 ptr = p;
300} 333}
301 334
302static char * 335template<typename T>
336ecb_cold static void
303append (char *ptr, int sze, int inc) 337append (T *&ptr, int sze, int inc)
304{ 338{
305 Renew (ptr, sze + inc, char); 339 Renew (ptr, sze + inc, T);
306 Zero (ptr + sze, inc, char); 340 Zero (ptr + sze, inc, T);
307
308 return ptr;
309} 341}
310
311#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
312#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
313 342
314static void 343static void
315need_facenum (struct map *self, faceid face) 344need_facenum (struct mapgrid *self, faceid face)
316{ 345{
317 while (self->faces <= face) 346 if (ecb_expect_true (self->faces > face))
318 { 347 return;
348
349 size_t newsize = minpot (face + 1);
319 Append (tileid, self->face2tile, self->faces, self->faces); 350 append (self->face2tile, self->faces, newsize - self->faces);
320 self->faces *= 2; 351 self->faces = newsize;
321 }
322} 352}
323 353
324static void 354static void
325need_texid (struct map *self, int texid) 355need_texid (struct mapgrid *self, int texid)
326{ 356{
327 while (self->texs <= texid) 357 if (ecb_expect_true (self->texs > texid))
328 { 358 return;
359
360 size_t newsize = minpot (texid + 1);
329 Append (maptex, self->tex, self->texs, self->texs); 361 append (self->tex, self->texs, newsize - self->texs);
330 self->texs *= 2; 362 self->texs = newsize;
331 }
332} 363}
333 364
334static maprow * 365static maprow *
335map_get_row (DC__Map self, int y) 366map_get_row (mapgrid *self, int y)
336{ 367{
337 if (0 > y) 368 if (0 > y)
338 { 369 {
339 int extend = - y + MAP_EXTEND_Y; 370 int extend = - y + MAP_EXTEND_Y;
340 Prepend (maprow, self->row, self->rows, extend); 371 prepend (self->row, self->rows, extend);
341 372
342 self->rows += extend; 373 self->rows += extend;
343 self->y += extend; 374 self->y += extend;
344 y += extend; 375 y += extend;
345 } 376 }
346 else if (y >= self->rows) 377 else if (y >= self->rows)
347 { 378 {
348 int extend = y - self->rows + MAP_EXTEND_Y; 379 int extend = y - self->rows + MAP_EXTEND_Y;
349 Append (maprow, self->row, self->rows, extend); 380 append (self->row, self->rows, extend);
350 self->rows += extend; 381 self->rows += extend;
351 } 382 }
352 383
353 return self->row + y; 384 return self->row + y;
354} 385}
… …
364 } 395 }
365 396
366 if (row->c0 > x) 397 if (row->c0 > x)
367 { 398 {
368 int extend = row->c0 - x + MAP_EXTEND_X; 399 int extend = row->c0 - x + MAP_EXTEND_X;
369 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 400 prepend (row->col, row->c1 - row->c0, extend);
370 row->c0 -= extend; 401 row->c0 -= extend;
371 } 402 }
372 else if (x >= row->c1) 403 else if (x >= row->c1)
373 { 404 {
374 int extend = x - row->c1 + MAP_EXTEND_X; 405 int extend = x - row->c1 + MAP_EXTEND_X;
375 Append (mapcell, row->col, row->c1 - row->c0, extend); 406 append (row->col, row->c1 - row->c0, extend);
376 row->c1 += extend; 407 row->c1 += extend;
377 } 408 }
378 409
379 return row->col + (x - row->c0); 410 return row->col + (x - row->c0);
380} 411}
381 412
382static mapcell * 413static mapcell *
383map_get_cell (DC__Map self, int x, int y) 414map_get_cell (mapgrid *self, int x, int y)
384{ 415{
385 return row_get_cell (map_get_row (self, y), x); 416 return row_get_cell (map_get_row (self, y), x);
386} 417}
387 418
388static void 419static void
389map_clear (DC__Map self) 420map_clear (mapgrid *self)
390{ 421{
391 int r; 422 int r;
392 423
393 for (r = 0; r < self->rows; r++) 424 for (r = 0; r < self->rows; r++)
394 Safefree (self->row[r].col); 425 Safefree (self->row[r].col);
… …
412 (cell)->flags = 0; \ 443 (cell)->flags = 0; \
413 (cell)->player = 0; \ 444 (cell)->player = 0; \
414 } while (0) 445 } while (0)
415 446
416static void 447static void
417map_blank (DC__Map self, int x0, int y0, int w, int h) 448map_blank (mapgrid *self, int x0, int y0, int w, int h)
418{ 449{
419 int x, y; 450 int x, y;
420 maprow *row; 451 maprow *row;
421 mapcell *cell; 452 mapcell *cell;
422 453
… …
439 CELL_CLEAR (cell); 470 CELL_CLEAR (cell);
440 } 471 }
441 } 472 }
442} 473}
443 474
444typedef struct { 475struct smooth_key
476{
445 tileid tile; 477 tileid tile;
446 uint8_t x, y, level; 478 uint8_t x, y, level;
447} smooth_key; 479
480 bool operator == (const smooth_key &o) const
481 {
482 return tile == o.tile && x == o.x && y == o.y && level == o.level;
483 }
484};
485
486typedef ska::flat_hash_map<smooth_key, IV, std::hash<smooth_key>, std::equal_to<smooth_key>, slice_allocator<smooth_key>> smooth_hash;
487
488namespace std {
489 template <>
490 struct hash<smooth_key>
491 {
492 size_t operator () (const smooth_key &v) const
493 {
494 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
495 }
496 };
497}
448 498
449static void 499static void
450smooth_or_bits (HV *hv, smooth_key *key, IV bits) 500smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
451{ 501{
452 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 502 auto &&it = h.find (key);
453 503
454 if (SvIOK (*sv)) 504 if (it == h.end ())
455 SvIV_set (*sv, SvIVX (*sv) | bits); 505 h.insert (std::make_pair (key, bits));
456 else 506 else
457 sv_setiv (*sv, bits); 507 it->second |= bits;
458} 508}
459 509
460static void 510static void
461music_finished (void) 511music_finished (void)
462{ 512{
… …
479 ev.code = 1; 529 ev.code = 1;
480 ev.data1 = (void *)(long)channel; 530 ev.data1 = (void *)(long)channel;
481 ev.data2 = 0; 531 ev.data2 = 0;
482 532
483 SDL_PushEvent ((SDL_Event *)&ev); 533 SDL_PushEvent ((SDL_Event *)&ev);
484}
485
486// approximately divide by 255
487static unsigned int
488div255 (unsigned int n)
489{
490 return (n + (n >> 8)) >> 8;
491}
492
493static unsigned int
494minpot (unsigned int n)
495{
496 if (!n)
497 return 0;
498
499 --n;
500
501 n |= n >> 1;
502 n |= n >> 2;
503 n |= n >> 4;
504 n |= n >> 8;
505 n |= n >> 16;
506
507 return n + 1;
508}
509
510static unsigned int
511popcount (unsigned int n)
512{
513 n -= (n >> 1) & 0x55555555U;
514 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
515 n = ((n >> 4) + n) & 0x0f0f0f0fU;
516 n *= 0x01010101U;
517
518 return n >> 24;
519} 534}
520 535
521/* SDL should provide this, really. */ 536/* SDL should provide this, really. */
522#define SDLK_MODIFIER_MIN 300 537#define SDLK_MODIFIER_MIN 300
523#define SDLK_MODIFIER_MAX 314 538#define SDLK_MODIFIER_MAX 314
… …
854 869
855NV ceil (NV x) 870NV ceil (NV x)
856 871
857IV minpot (UV n) 872IV minpot (UV n)
858 873
874UV ld32 (UV n)
875 CODE:
876 RETVAL = ecb_ld32 (n);
877 OUTPUT:
878 RETVAL
879
859IV popcount (UV n) 880IV popcount (UV n)
881 CODE:
882 RETVAL = ecb_popcount32 (n);
883 OUTPUT:
884 RETVAL
860 885
861NV distance (NV dx, NV dy) 886NV distance (NV dx, NV dy)
862 CODE: 887 CODE:
863 RETVAL = pow (dx * dx + dy * dy, 0.5); 888 RETVAL = pow (dx * dx + dy * dy, 0.5);
864 OUTPUT: 889 OUTPUT:
… …
1338 tc_restore (); 1363 tc_restore ();
1339 1364
1340DC::Layout 1365DC::Layout
1341new (SV *klass) 1366new (SV *klass)
1342 CODE: 1367 CODE:
1343 New (0, RETVAL, 1, struct cf_layout); 1368 RETVAL = new cf_layout;
1344 1369
1345 RETVAL->pl = pango_layout_new (opengl_context); 1370 RETVAL->pl = pango_layout_new (opengl_context);
1346 RETVAL->r = 1.; 1371 RETVAL->r = 1.;
1347 RETVAL->g = 1.; 1372 RETVAL->g = 1.;
1348 RETVAL->b = 1.; 1373 RETVAL->b = 1.;
1349 RETVAL->a = 1.; 1374 RETVAL->a = 1.;
1350 RETVAL->base_height = MIN_FONT_HEIGHT; 1375 RETVAL->base_height = MIN_FONT_HEIGHT;
1351 RETVAL->font = 0; 1376 RETVAL->font = 0;
1352 RETVAL->rc = rc_alloc ();
1353 1377
1354 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1378 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1355 layout_update_font (RETVAL); 1379 layout_update_font (RETVAL);
1356 OUTPUT: 1380 OUTPUT:
1357 RETVAL 1381 RETVAL
1358 1382
1359void 1383void
1360DESTROY (DC::Layout self) 1384DESTROY (DC::Layout self)
1361 CODE: 1385 CODE:
1362 g_object_unref (self->pl); 1386 g_object_unref (self->pl);
1363 rc_free (self->rc);
1364 Safefree (self); 1387 delete self;
1365 1388
1366void 1389void
1367set_text (DC::Layout self, SV *text_) 1390set_text (DC::Layout self, SV *text_)
1368 CODE: 1391 CODE:
1369{ 1392{
… …
1623} 1646}
1624 1647
1625void 1648void
1626render (DC::Layout self, float x, float y, int flags = 0) 1649render (DC::Layout self, float x, float y, int flags = 0)
1627 CODE: 1650 CODE:
1628 rc_clear (self->rc); 1651 self->rc.clear ();
1629 pango_opengl_render_layout_subpixel ( 1652 pango_opengl_render_layout_subpixel (
1630 self->pl, 1653 self->pl,
1631 self->rc, 1654 &self->rc,
1632 x * PANGO_SCALE, y * PANGO_SCALE, 1655 x * PANGO_SCALE, y * PANGO_SCALE,
1633 self->r, self->g, self->b, self->a, 1656 self->r, self->g, self->b, self->a,
1634 flags 1657 flags
1635 ); 1658 );
1636 // we assume that context_change actually clears/frees stuff 1659 // we assume that context_change actually clears/frees stuff
… …
1647 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1670 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1648 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1671 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1649 glEnable (GL_ALPHA_TEST); 1672 glEnable (GL_ALPHA_TEST);
1650 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1673 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1651 1674
1652 rc_draw (self->rc); 1675 self->rc.draw ();
1653 1676
1654 glDisable (GL_ALPHA_TEST); 1677 glDisable (GL_ALPHA_TEST);
1655 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1656 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1657} 1680}
… …
1871PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1872 1895
1873DC::Map 1896DC::Map
1874new (SV *klass) 1897new (SV *klass)
1875 CODE: 1898 CODE:
1876 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, mapgrid);
1877 RETVAL->x = 0; 1900 RETVAL->x = 0;
1878 RETVAL->y = 0; 1901 RETVAL->y = 0;
1879 RETVAL->w = 0; 1902 RETVAL->w = 0;
1880 RETVAL->h = 0; 1903 RETVAL->h = 0;
1881 RETVAL->ox = 0; 1904 RETVAL->ox = 0;
… …
2027 self->ox += dx; self->x += dx; 2050 self->ox += dx; self->x += dx;
2028 self->oy += dy; self->y += dy; 2051 self->oy += dy; self->y += dy;
2029 2052
2030 while (self->y < 0) 2053 while (self->y < 0)
2031 { 2054 {
2032 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2055 prepend (self->row, self->rows, MAP_EXTEND_Y);
2033 2056
2034 self->rows += MAP_EXTEND_Y; 2057 self->rows += MAP_EXTEND_Y;
2035 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
2036 } 2059 }
2037} 2060}
… …
2193draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 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)
2194 CODE: 2217 CODE:
2195{ 2218{
2196 int x, y, z; 2219 int x, y, z;
2197 2220
2198 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2199 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2200 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2221 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2201 smooth_key skey;
2202 int pl_x, pl_y; 2222 int pl_x, pl_y;
2203 maptex pl_tex; 2223 maptex pl_tex;
2204 rc_t *rc = rc_alloc (); 2224 rc_t rc;
2205 rc_t *rc_ov = rc_alloc (); 2225 rc_t rc_ov;
2206 rc_key_t key; 2226 rc_key_t key;
2207 rc_array_t *arr; 2227 rc_t::array_t *arr;
2208 2228
2209 pl_tex.name = 0; 2229 pl_tex.name = 0;
2210 2230
2211 // that's current max. sorry. 2231 // that's current max. sorry.
2212 if (sw > 255) sw = 255; 2232 if (sw > 255) sw = 255;
2213 if (sh > 255) sh = 255; 2233 if (sh > 255) sh = 255;
2214
2215 // clear key, in case of extra padding
2216 memset (&skey, 0, sizeof (skey));
2217 2234
2218 memset (&key, 0, sizeof (key)); 2235 memset (&key, 0, sizeof (key));
2219 key.r = 255; 2236 key.r = 255;
2220 key.g = 255; 2237 key.g = 255;
2221 key.b = 255; 2238 key.b = 255;
… …
2227 my += self->y; 2244 my += self->y;
2228 2245
2229 // first pass: determine smooth_max 2246 // first pass: determine smooth_max
2230 // rather ugly, if you ask me 2247 // rather ugly, if you ask me
2231 // could also be stored inside mapcell and updated on change 2248 // could also be stored inside mapcell and updated on change
2232 memset (smooth_max, 0, sizeof (smooth_max)); 2249 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2233 2250
2234 for (y = 0; y < sh; y++) 2251 for (y = 0; y < sh; y++)
2235 if (0 <= y + my && y + my < self->rows) 2252 if (0 <= y + my && y + my < self->rows)
2236 { 2253 {
2237 maprow *row = self->row + (y + my); 2254 maprow *row = self->row + (y + my);
… …
2252 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2269 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2253 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2270 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2254 2271
2255 for (z = 0; z <= 2; z++) 2272 for (z = 0; z <= 2; z++)
2256 { 2273 {
2257 memset (smooth_level, 0, sizeof (smooth_level)); 2274 std::bitset<256> smooth_level; // one bit for every possible smooth level
2275 smooth_key skey;
2276 smooth_hash smooth;
2258 key.texname = -1; 2277 key.texname = -1;
2259 2278
2260 for (y = 0; y < sh; y++) 2279 for (y = 0; y < sh; y++)
2261 if (0 <= y + my && y + my < self->rows) 2280 if (0 <= y + my && y + my < self->rows)
2262 { 2281 {
… …
2279 2298
2280 if (!tex.name) 2299 if (!tex.name)
2281 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2300 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2282 2301
2283 key.texname = tex.name; 2302 key.texname = tex.name;
2284 arr = rc_array (rc, &key); 2303 arr = &rc.array (key);
2285 } 2304 }
2286 2305
2287 px = (x + 1) * Th - tex.w; 2306 px = (x + 1) * Th - tex.w;
2288 py = (y + 1) * Tw - tex.h; 2307 py = (y + 1) * Tw - tex.h;
2289 2308
2290 if (expect_false (cell->player == player) && expect_false (z == 2)) 2309 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2291 { 2310 {
2292 pl_x = px; 2311 pl_x = px;
2293 pl_y = py; 2312 pl_y = py;
2294 pl_tex = tex; 2313 pl_tex = tex;
2295 continue; 2314 continue;
2296 } 2315 }
2297 2316
2298 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2317 arr->t2f_v3f (0 , 0 , px , py , 0);
2299 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2318 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2300 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2319 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2301 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2320 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2302 2321
2303 // update smooth hash 2322 // update smooth hash
2304 if (tex.smoothtile) 2323 if (tex.smoothtile)
2305 { 2324 {
2306 skey.tile = tex.smoothtile; 2325 skey.tile = tex.smoothtile;
2307 skey.level = tex.smoothlevel; 2326 skey.level = tex.smoothlevel;
2308 2327
2309 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2328 smooth_level[tex.smoothlevel] = 1;
2310 2329
2311 // add bits to current tile and all neighbours. skey.x|y is 2330 // add bits to current tile and all neighbours. skey.x|y is
2312 // shifted +1|+1 so we always stay positive. 2331 // shifted +1|+1 so we always stay positive.
2313 2332
2314 // bits is ___n cccc CCCC bbbb 2333 // bits is ___n cccc CCCC bbbb
… …
2322 2341
2323 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2342 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2324 // ·· ·· ·┏ ┓· 2343 // ·· ·· ·┏ ┓·
2325 2344
2326 // full tile 2345 // full tile
2327 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2346 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2328 2347
2329 // borders 2348 // borders
2330 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2349 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2331 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2350 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2332 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2351 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2333 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2352 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2334 2353
2335 // corners 2354 // corners
2336 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2355 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2337 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2356 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2338 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2357 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2339 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2358 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2340 } 2359 }
2341 } 2360 }
2342 2361
2343 if (expect_false (z == 2) && expect_false (cell->flags)) 2362 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2344 { 2363 {
2345 // overlays such as the speech bubble, probably more to come 2364 // overlays such as the speech bubble, probably more to come
2346 if (cell->flags & 1) 2365 if (cell->flags & 1)
2347 { 2366 {
2348 rc_key_t key_ov = key; 2367 rc_key_t key_ov = key;
2349 maptex tex = self->tex [TEXID_SPEECH]; 2368 maptex tex = self->tex[TEXID_SPEECH];
2350 rc_array_t *arr;
2351 int px = x * Tw + Tw * 2 / 32; 2369 int px = x * Tw + Tw * 2 / 32;
2352 int py = y * Th - Th * 6 / 32; 2370 int py = y * Th - Th * 6 / 32;
2353 2371
2354 key_ov.texname = tex.name; 2372 key_ov.texname = tex.name;
2355 arr = rc_array (rc_ov, &key_ov); 2373 rc_t::array_t &arr = rc_ov.array (key_ov);
2356 2374
2357 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2375 arr.t2f_v3f (0 , 0 , px , py , 0);
2358 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0); 2376 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2359 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0); 2377 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2360 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0); 2378 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2361 } 2379 }
2362 } 2380 }
2363 } 2381 }
2364 } 2382 }
2365 2383
2366 rc_draw (rc); 2384 rc.draw ();
2367 rc_clear (rc); 2385 rc.clear ();
2368 2386
2369 // go through all smoothlevels, lowest to highest, then draw. 2387 // go through all smoothlevels, lowest to highest, then draw.
2370 // this is basically counting sort 2388 // this is basically counting sort
2371 { 2389 {
2372 int w, b; 2390 int w, b;
2373 2391
2374 glEnable (GL_TEXTURE_2D); 2392 glEnable (GL_TEXTURE_2D);
2375 glBegin (GL_QUADS); 2393 glBegin (GL_QUADS);
2376 for (w = 0; w < 256 / 32; ++w) 2394 for (int level = 0; level < smooth_level.size (); ++level)
2395 if (smooth_level[level])
2396 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2377 { 2397 {
2378 uint32_t smask = smooth_level [w]; 2398 smooth_key &skey = it->first;
2379 if (smask) 2399 IV bits = it->second;
2380 for (b = 0; b < 32; ++b) 2400
2381 if (smask & (((uint32_t)1) << b)) 2401 if (!(bits & 0x1000)
2402 && skey.level == level
2403 && level > smooth_max [skey.x][skey.y])
2382 { 2404 {
2383 int level = (w << 5) | b; 2405 maptex tex = self->tex [skey.tile];
2406 int px = (((int)skey.x) - 1) * Tw;
2407 int py = (((int)skey.y) - 1) * Th;
2408 int border = bits & 15;
2409 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2410 float dx = tex.s * .0625f; // 16 images/row
2411 float dy = tex.t * .5f ; // 2 images/column
2412
2384 HE *he; 2413 if (tex.name)
2385
2386 hv_iterinit (smooth);
2387 while ((he = hv_iternext (smooth)))
2388 { 2414 {
2389 smooth_key *skey = (smooth_key *)HeKEY (he); 2415 // this time avoiding texture state changes
2390 IV bits = SvIVX (HeVAL (he)); 2416 // save gobs of state changes.
2391 2417 if (key.texname != tex.name)
2392 if (!(bits & 0x1000)
2393 && skey->level == level
2394 && level > smooth_max [skey->x][skey->y])
2395 { 2418 {
2396 maptex tex = self->tex [skey->tile];
2397 int px = (((int)skey->x) - 1) * Tw;
2398 int py = (((int)skey->y) - 1) * Th;
2399 int border = bits & 15;
2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2401 float dx = tex.s * .0625f; // 16 images/row
2402 float dy = tex.t * .5f ; // 2 images/column
2403
2404 if (tex.name)
2405 {
2406 // this time avoiding texture state changes
2407 // save gobs of state changes.
2408 if (key.texname != tex.name)
2409 {
2410 self->tex [skey->tile].unused = 0; 2419 self->tex [skey.tile].unused = 0;
2411 2420
2412 glEnd (); 2421 glEnd ();
2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2422 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2414 glBegin (GL_QUADS); 2423 glBegin (GL_QUADS);
2415 } 2424 }
2416 2425
2417 if (border) 2426 if (border)
2418 { 2427 {
2419 float ox = border * dx; 2428 float ox = border * dx;
2420 2429
2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th); 2432 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py ); 2433 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2425 } 2434 }
2426 2435
2427 if (corner) 2436 if (corner)
2428 { 2437 {
2429 float ox = corner * dx; 2438 float ox = corner * dx;
2430 2439
2431 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th); 2441 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th); 2442 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py ); 2443 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2435 }
2436 }
2437 } 2444 }
2438 } 2445 }
2439 } 2446 }
2440 } 2447 }
2441 2448
2442 glEnd (); 2449 glEnd ();
2443 glDisable (GL_TEXTURE_2D); 2450 glDisable (GL_TEXTURE_2D);
2444 key.texname = -1; 2451 key.texname = -1;
2445 } 2452 }
2446
2447 hv_clear (smooth);
2448 } 2453 }
2449 2454
2450 if (pl_tex.name) 2455 if (pl_tex.name)
2451 { 2456 {
2452 maptex tex = pl_tex; 2457 maptex tex = pl_tex;
2453 int px = pl_x + sdx; 2458 int px = pl_x + sdx;
2454 int py = pl_y + sdy; 2459 int py = pl_y + sdy;
2455 2460
2456 key.texname = tex.name; 2461 key.texname = tex.name;
2457 arr = rc_array (rc, &key); 2462 rc_t::array_t &arr = rc.array (key);
2458 2463
2459 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2464 arr.t2f_v3f (0 , 0 , px , py , 0);
2460 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2465 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2461 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2466 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2462 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2467 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2463 2468
2464 rc_draw (rc); 2469 rc.draw ();
2465 } 2470 }
2466 2471
2467 rc_draw (rc_ov); 2472 rc_ov.draw ();
2468 rc_clear (rc_ov); 2473 rc_ov.clear ();
2469 2474
2470 glDisable (GL_BLEND); 2475 glDisable (GL_BLEND);
2471 rc_free (rc);
2472 rc_free (rc_ov);
2473 2476
2474 // top layer: overlays such as the health bar 2477 // top layer: overlays such as the health bar
2475 for (y = 0; y < sh; y++) 2478 for (y = 0; y < sh; y++)
2476 if (0 <= y + my && y + my < self->rows) 2479 if (0 <= y + my && y + my < self->rows)
2477 { 2480 {
… …
2483 mapcell *cell = row->col + (x + mx - row->c0); 2486 mapcell *cell = row->col + (x + mx - row->c0);
2484 2487
2485 int px = x * Tw; 2488 int px = x * Tw;
2486 int py = y * Th; 2489 int py = y * Th;
2487 2490
2488 if (expect_false (cell->player == player)) 2491 if (ecb_expect_false (cell->player == player))
2489 { 2492 {
2490 px += sdx; 2493 px += sdx;
2491 py += sdy; 2494 py += sdy;
2492 } 2495 }
2493 2496

Diff Legend

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