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.331 by root, Mon Nov 19 00:10:34 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))
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 82
85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
86 84
87/* 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 */
88/* then anything that is computed by incoming darkness */ 86/* then anything that is computed by incoming darkness */
… …
106fast_sv_grow (SV *sv, STRLEN need) 104fast_sv_grow (SV *sv, STRLEN need)
107{ 105{
108 STRLEN len = SvLEN (sv); 106 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need; 107 STRLEN want = SvCUR (sv) + need;
110 108
111 if (expect_false (len < want)) 109 if (ecb_expect_false (len < want))
112 { 110 {
113 do 111 do
114 len *= 2; 112 len *= 2;
115 while (len < want); 113 while (len < want);
116 114
… …
195 } 193 }
196 194
197 return 0; 195 return 0;
198} 196}
199 197
200typedef struct cf_layout { 198struct cf_layout {
201 PangoLayout *pl; 199 PangoLayout *pl;
202 float r, g, b, a; // default color for rgba mode 200 float r, g, b, a; // default color for rgba mode
203 int base_height; 201 int base_height;
204 DC__Font font; 202 DC__Font font;
205 rc_t *rc; 203 rc_t rc;
206} *DC__Layout; 204};
205
206typedef cf_layout *DC__Layout;
207 207
208static DC__Font default_font; 208static DC__Font default_font;
209static PangoContext *opengl_context; 209static PangoContext *opengl_context;
210static PangoFontMap *opengl_fontmap; 210static PangoFontMap *opengl_fontmap;
211 211
… …
249 249
250 *w = rect.width; 250 *w = rect.width;
251 *h = rect.height; 251 *h = rect.height;
252} 252}
253 253
254/////////////////////////////////////////////////////////////////////////////
255
254typedef uint16_t tileid; 256typedef uint16_t tileid;
255typedef uint16_t faceid; 257typedef uint16_t faceid;
256 258
257typedef struct { 259struct maptex
260{
258 GLuint name; 261 GLuint name;
259 int w, h; 262 int w, h;
260 float s, t; 263 float s, t;
261 uint8_t r, g, b, a; 264 uint8_t r, g, b, a;
262 tileid smoothtile; 265 tileid smoothtile;
263 uint8_t smoothlevel; 266 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */ 267 uint8_t unused; /* set to zero on use */
265} maptex; 268};
266 269
267typedef struct { 270struct mapcell
271{
268 uint32_t player; 272 uint32_t player;
269 tileid tile[3]; 273 tileid tile[3];
270 uint16_t darkness; 274 uint16_t darkness;
271 uint8_t stat_width, stat_hp, flags, smoothmax; 275 uint8_t stat_width, stat_hp, flags, smoothmax;
272} mapcell; 276};
273 277
274typedef struct { 278struct maprow
279{
275 int32_t c0, c1; 280 int32_t c0, c1;
276 mapcell *col; 281 mapcell *col;
277} maprow; 282};
278 283
279typedef struct map { 284struct mapgrid {
280 int x, y, w, h; 285 int x, y, w, h;
281 int ox, oy; /* offset to virtual global coordinate system */ 286 int ox, oy; /* offset to virtual global coordinate system */
282 int faces; tileid *face2tile; // [faceid] 287 int faces; tileid *face2tile; // [faceid]
283 int texs; maptex *tex; // [tileid] 288 int texs; maptex *tex; // [tileid]
284 289
285 int32_t rows; 290 int32_t rows;
286 maprow *row; 291 maprow *row;
287} *DC__Map; 292};
288 293
289static char * 294typedef mapgrid *DC__Map;
295
296template<typename T>
297static void
290prepend (char *ptr, int sze, int inc) 298prepend (T *&ptr, int sze, int inc)
291{ 299{
292 char *p; 300 T *p;
293 301
294 New (0, p, sze + inc, char); 302 Newx (p, inc + sze, T);
295 Zero (p, inc, char); 303 Zero (p, inc, T);
296 Move (ptr, p + inc, sze, char); 304 Move (ptr, p + inc, sze, T);
297 Safefree (ptr); 305 Safefree (ptr);
298 306
299 return p; 307 ptr = p;
300} 308}
301 309
302static char * 310template<typename T>
303append (char *ptr, int sze, int inc)
304{
305 Renew (ptr, sze + inc, char);
306 Zero (ptr + sze, inc, char);
307
308 return ptr;
309}
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
314static void 311static void
312append (T *&ptr, int sze, int inc)
313{
314 Renew (ptr, sze + inc, T);
315 Zero (ptr + sze, inc, T);
316}
317
318static void
315need_facenum (struct map *self, faceid face) 319need_facenum (struct mapgrid *self, faceid face)
316{ 320{
317 while (self->faces <= face) 321 while (self->faces <= face)
318 { 322 {
319 Append (tileid, self->face2tile, self->faces, self->faces); 323 append (self->face2tile, self->faces, self->faces);
320 self->faces *= 2; 324 self->faces *= 2;
321 } 325 }
322} 326}
323 327
324static void 328static void
325need_texid (struct map *self, int texid) 329need_texid (struct mapgrid *self, int texid)
326{ 330{
327 while (self->texs <= texid) 331 while (self->texs <= texid)
328 { 332 {
329 Append (maptex, self->tex, self->texs, self->texs); 333 append (self->tex, self->texs, self->texs);
330 self->texs *= 2; 334 self->texs *= 2;
331 } 335 }
332} 336}
333 337
334static maprow * 338static maprow *
335map_get_row (DC__Map self, int y) 339map_get_row (mapgrid *self, int y)
336{ 340{
337 if (0 > y) 341 if (0 > y)
338 { 342 {
339 int extend = - y + MAP_EXTEND_Y; 343 int extend = - y + MAP_EXTEND_Y;
340 Prepend (maprow, self->row, self->rows, extend); 344 prepend (self->row, self->rows, extend);
341 345
342 self->rows += extend; 346 self->rows += extend;
343 self->y += extend; 347 self->y += extend;
344 y += extend; 348 y += extend;
345 } 349 }
346 else if (y >= self->rows) 350 else if (y >= self->rows)
347 { 351 {
348 int extend = y - self->rows + MAP_EXTEND_Y; 352 int extend = y - self->rows + MAP_EXTEND_Y;
349 Append (maprow, self->row, self->rows, extend); 353 append (self->row, self->rows, extend);
350 self->rows += extend; 354 self->rows += extend;
351 } 355 }
352 356
353 return self->row + y; 357 return self->row + y;
354} 358}
… …
364 } 368 }
365 369
366 if (row->c0 > x) 370 if (row->c0 > x)
367 { 371 {
368 int extend = row->c0 - x + MAP_EXTEND_X; 372 int extend = row->c0 - x + MAP_EXTEND_X;
369 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 373 prepend (row->col, row->c1 - row->c0, extend);
370 row->c0 -= extend; 374 row->c0 -= extend;
371 } 375 }
372 else if (x >= row->c1) 376 else if (x >= row->c1)
373 { 377 {
374 int extend = x - row->c1 + MAP_EXTEND_X; 378 int extend = x - row->c1 + MAP_EXTEND_X;
375 Append (mapcell, row->col, row->c1 - row->c0, extend); 379 append (row->col, row->c1 - row->c0, extend);
376 row->c1 += extend; 380 row->c1 += extend;
377 } 381 }
378 382
379 return row->col + (x - row->c0); 383 return row->col + (x - row->c0);
380} 384}
381 385
382static mapcell * 386static mapcell *
383map_get_cell (DC__Map self, int x, int y) 387map_get_cell (mapgrid *self, int x, int y)
384{ 388{
385 return row_get_cell (map_get_row (self, y), x); 389 return row_get_cell (map_get_row (self, y), x);
386} 390}
387 391
388static void 392static void
389map_clear (DC__Map self) 393map_clear (mapgrid *self)
390{ 394{
391 int r; 395 int r;
392 396
393 for (r = 0; r < self->rows; r++) 397 for (r = 0; r < self->rows; r++)
394 Safefree (self->row[r].col); 398 Safefree (self->row[r].col);
… …
412 (cell)->flags = 0; \ 416 (cell)->flags = 0; \
413 (cell)->player = 0; \ 417 (cell)->player = 0; \
414 } while (0) 418 } while (0)
415 419
416static void 420static void
417map_blank (DC__Map self, int x0, int y0, int w, int h) 421map_blank (mapgrid *self, int x0, int y0, int w, int h)
418{ 422{
419 int x, y; 423 int x, y;
420 maprow *row; 424 maprow *row;
421 mapcell *cell; 425 mapcell *cell;
422 426
… …
439 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
440 } 444 }
441 } 445 }
442} 446}
443 447
444typedef struct { 448struct smooth_key
449{
445 tileid tile; 450 tileid tile;
446 uint8_t x, y, level; 451 uint8_t x, y, level;
447} smooth_key; 452
453 bool operator == (const smooth_key &o) const
454 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 }
457};
458
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
460
461namespace std {
462 template <>
463 struct hash<smooth_key>
464 {
465 size_t operator () (const smooth_key &v) const
466 {
467 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
468 }
469 };
470}
448 471
449static void 472static void
450smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
451{ 474{
452 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
453 476
454 if (SvIOK (*sv)) 477 if (it == h.end ())
455 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
456 else 479 else
457 sv_setiv (*sv, bits); 480 it->second |= bits;
458} 481}
459 482
460static void 483static void
461music_finished (void) 484music_finished (void)
462{ 485{
… …
503 n |= n >> 4; 526 n |= n >> 4;
504 n |= n >> 8; 527 n |= n >> 8;
505 n |= n >> 16; 528 n |= n >> 16;
506 529
507 return n + 1; 530 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} 531}
520 532
521/* SDL should provide this, really. */ 533/* SDL should provide this, really. */
522#define SDLK_MODIFIER_MIN 300 534#define SDLK_MODIFIER_MIN 300
523#define SDLK_MODIFIER_MAX 314 535#define SDLK_MODIFIER_MAX 314
… …
855NV ceil (NV x) 867NV ceil (NV x)
856 868
857IV minpot (UV n) 869IV minpot (UV n)
858 870
859IV popcount (UV n) 871IV popcount (UV n)
872 CODE:
873 RETVAL = ecb_popcount32 (n);
874 OUTPUT:
875 RETVAL
860 876
861NV distance (NV dx, NV dy) 877NV distance (NV dx, NV dy)
862 CODE: 878 CODE:
863 RETVAL = pow (dx * dx + dy * dy, 0.5); 879 RETVAL = pow (dx * dx + dy * dy, 0.5);
864 OUTPUT: 880 OUTPUT:
… …
1338 tc_restore (); 1354 tc_restore ();
1339 1355
1340DC::Layout 1356DC::Layout
1341new (SV *klass) 1357new (SV *klass)
1342 CODE: 1358 CODE:
1343 New (0, RETVAL, 1, struct cf_layout); 1359 RETVAL = new cf_layout;
1344 1360
1345 RETVAL->pl = pango_layout_new (opengl_context); 1361 RETVAL->pl = pango_layout_new (opengl_context);
1346 RETVAL->r = 1.; 1362 RETVAL->r = 1.;
1347 RETVAL->g = 1.; 1363 RETVAL->g = 1.;
1348 RETVAL->b = 1.; 1364 RETVAL->b = 1.;
1349 RETVAL->a = 1.; 1365 RETVAL->a = 1.;
1350 RETVAL->base_height = MIN_FONT_HEIGHT; 1366 RETVAL->base_height = MIN_FONT_HEIGHT;
1351 RETVAL->font = 0; 1367 RETVAL->font = 0;
1352 RETVAL->rc = rc_alloc ();
1353 1368
1354 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1369 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1355 layout_update_font (RETVAL); 1370 layout_update_font (RETVAL);
1356 OUTPUT: 1371 OUTPUT:
1357 RETVAL 1372 RETVAL
1358 1373
1359void 1374void
1360DESTROY (DC::Layout self) 1375DESTROY (DC::Layout self)
1361 CODE: 1376 CODE:
1362 g_object_unref (self->pl); 1377 g_object_unref (self->pl);
1363 rc_free (self->rc);
1364 Safefree (self); 1378 delete self;
1365 1379
1366void 1380void
1367set_text (DC::Layout self, SV *text_) 1381set_text (DC::Layout self, SV *text_)
1368 CODE: 1382 CODE:
1369{ 1383{
… …
1623} 1637}
1624 1638
1625void 1639void
1626render (DC::Layout self, float x, float y, int flags = 0) 1640render (DC::Layout self, float x, float y, int flags = 0)
1627 CODE: 1641 CODE:
1628 rc_clear (self->rc); 1642 self->rc.clear ();
1629 pango_opengl_render_layout_subpixel ( 1643 pango_opengl_render_layout_subpixel (
1630 self->pl, 1644 self->pl,
1631 self->rc, 1645 &self->rc,
1632 x * PANGO_SCALE, y * PANGO_SCALE, 1646 x * PANGO_SCALE, y * PANGO_SCALE,
1633 self->r, self->g, self->b, self->a, 1647 self->r, self->g, self->b, self->a,
1634 flags 1648 flags
1635 ); 1649 );
1636 // we assume that context_change actually clears/frees stuff 1650 // we assume that context_change actually clears/frees stuff
… …
1647 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1661 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1648 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1662 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1649 glEnable (GL_ALPHA_TEST); 1663 glEnable (GL_ALPHA_TEST);
1650 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1664 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1651 1665
1652 rc_draw (self->rc); 1666 self->rc.draw ();
1653 1667
1654 glDisable (GL_ALPHA_TEST); 1668 glDisable (GL_ALPHA_TEST);
1655 glDisable (GL_BLEND); 1669 glDisable (GL_BLEND);
1656 glDisable (GL_TEXTURE_2D); 1670 glDisable (GL_TEXTURE_2D);
1657} 1671}
… …
1871PROTOTYPES: DISABLE 1885PROTOTYPES: DISABLE
1872 1886
1873DC::Map 1887DC::Map
1874new (SV *klass) 1888new (SV *klass)
1875 CODE: 1889 CODE:
1876 New (0, RETVAL, 1, struct map); 1890 New (0, RETVAL, 1, mapgrid);
1877 RETVAL->x = 0; 1891 RETVAL->x = 0;
1878 RETVAL->y = 0; 1892 RETVAL->y = 0;
1879 RETVAL->w = 0; 1893 RETVAL->w = 0;
1880 RETVAL->h = 0; 1894 RETVAL->h = 0;
1881 RETVAL->ox = 0; 1895 RETVAL->ox = 0;
… …
2027 self->ox += dx; self->x += dx; 2041 self->ox += dx; self->x += dx;
2028 self->oy += dy; self->y += dy; 2042 self->oy += dy; self->y += dy;
2029 2043
2030 while (self->y < 0) 2044 while (self->y < 0)
2031 { 2045 {
2032 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2046 prepend (self->row, self->rows, MAP_EXTEND_Y);
2033 2047
2034 self->rows += MAP_EXTEND_Y; 2048 self->rows += MAP_EXTEND_Y;
2035 self->y += MAP_EXTEND_Y; 2049 self->y += MAP_EXTEND_Y;
2036 } 2050 }
2037} 2051}
… …
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) 2207draw (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: 2208 CODE:
2195{ 2209{
2196 int x, y, z; 2210 int x, y, z;
2197 2211
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) 2212 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; 2213 int pl_x, pl_y;
2203 maptex pl_tex; 2214 maptex pl_tex;
2204 rc_t *rc = rc_alloc (); 2215 rc_t rc;
2205 rc_t *rc_ov = rc_alloc (); 2216 rc_t rc_ov;
2206 rc_key_t key; 2217 rc_key_t key;
2207 rc_array_t *arr; 2218 rc_t::array_t *arr;
2208 2219
2209 pl_tex.name = 0; 2220 pl_tex.name = 0;
2210 2221
2211 // that's current max. sorry. 2222 // that's current max. sorry.
2212 if (sw > 255) sw = 255; 2223 if (sw > 255) sw = 255;
2213 if (sh > 255) sh = 255; 2224 if (sh > 255) sh = 255;
2214
2215 // clear key, in case of extra padding
2216 memset (&skey, 0, sizeof (skey));
2217 2225
2218 memset (&key, 0, sizeof (key)); 2226 memset (&key, 0, sizeof (key));
2219 key.r = 255; 2227 key.r = 255;
2220 key.g = 255; 2228 key.g = 255;
2221 key.b = 255; 2229 key.b = 255;
… …
2227 my += self->y; 2235 my += self->y;
2228 2236
2229 // first pass: determine smooth_max 2237 // first pass: determine smooth_max
2230 // rather ugly, if you ask me 2238 // rather ugly, if you ask me
2231 // could also be stored inside mapcell and updated on change 2239 // could also be stored inside mapcell and updated on change
2232 memset (smooth_max, 0, sizeof (smooth_max)); 2240 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2233 2241
2234 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
2235 if (0 <= y + my && y + my < self->rows) 2243 if (0 <= y + my && y + my < self->rows)
2236 { 2244 {
2237 maprow *row = self->row + (y + my); 2245 maprow *row = self->row + (y + my);
… …
2252 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2260 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2253 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2261 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2254 2262
2255 for (z = 0; z <= 2; z++) 2263 for (z = 0; z <= 2; z++)
2256 { 2264 {
2257 memset (smooth_level, 0, sizeof (smooth_level)); 2265 std::bitset<256> smooth_level; // one bit for every possible smooth level
2266 smooth_key skey;
2267 smooth_hash smooth;
2258 key.texname = -1; 2268 key.texname = -1;
2259 2269
2260 for (y = 0; y < sh; y++) 2270 for (y = 0; y < sh; y++)
2261 if (0 <= y + my && y + my < self->rows) 2271 if (0 <= y + my && y + my < self->rows)
2262 { 2272 {
… …
2279 2289
2280 if (!tex.name) 2290 if (!tex.name)
2281 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2291 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2282 2292
2283 key.texname = tex.name; 2293 key.texname = tex.name;
2284 arr = rc_array (rc, &key); 2294 arr = &rc.array (key);
2285 } 2295 }
2286 2296
2287 px = (x + 1) * Th - tex.w; 2297 px = (x + 1) * Th - tex.w;
2288 py = (y + 1) * Tw - tex.h; 2298 py = (y + 1) * Tw - tex.h;
2289 2299
2290 if (expect_false (cell->player == player) && expect_false (z == 2)) 2300 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2291 { 2301 {
2292 pl_x = px; 2302 pl_x = px;
2293 pl_y = py; 2303 pl_y = py;
2294 pl_tex = tex; 2304 pl_tex = tex;
2295 continue; 2305 continue;
2296 } 2306 }
2297 2307
2298 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2308 arr->t2f_v3f (0 , 0 , px , py , 0);
2299 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2309 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); 2310 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); 2311 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2302 2312
2303 // update smooth hash 2313 // update smooth hash
2304 if (tex.smoothtile) 2314 if (tex.smoothtile)
2305 { 2315 {
2306 skey.tile = tex.smoothtile; 2316 skey.tile = tex.smoothtile;
2307 skey.level = tex.smoothlevel; 2317 skey.level = tex.smoothlevel;
2308 2318
2309 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2319 smooth_level[tex.smoothlevel] = 1;
2310 2320
2311 // add bits to current tile and all neighbours. skey.x|y is 2321 // add bits to current tile and all neighbours. skey.x|y is
2312 // shifted +1|+1 so we always stay positive. 2322 // shifted +1|+1 so we always stay positive.
2313 2323
2314 // bits is ___n cccc CCCC bbbb 2324 // bits is ___n cccc CCCC bbbb
… …
2322 2332
2323 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2333 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2324 // ·· ·· ·┏ ┓· 2334 // ·· ·· ·┏ ┓·
2325 2335
2326 // full tile 2336 // full tile
2327 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2337 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2328 2338
2329 // borders 2339 // borders
2330 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2340 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); 2341 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); 2342 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); 2343 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2334 2344
2335 // corners 2345 // corners
2336 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2346 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); 2347 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); 2348 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); 2349 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2340 } 2350 }
2341 } 2351 }
2342 2352
2343 if (expect_false (z == 2) && expect_false (cell->flags)) 2353 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2344 { 2354 {
2345 // overlays such as the speech bubble, probably more to come 2355 // overlays such as the speech bubble, probably more to come
2346 if (cell->flags & 1) 2356 if (cell->flags & 1)
2347 { 2357 {
2348 rc_key_t key_ov = key; 2358 rc_key_t key_ov = key;
2349 maptex tex = self->tex [TEXID_SPEECH]; 2359 maptex tex = self->tex[TEXID_SPEECH];
2350 rc_array_t *arr;
2351 int px = x * Tw + Tw * 2 / 32; 2360 int px = x * Tw + Tw * 2 / 32;
2352 int py = y * Th - Th * 6 / 32; 2361 int py = y * Th - Th * 6 / 32;
2353 2362
2354 key_ov.texname = tex.name; 2363 key_ov.texname = tex.name;
2355 arr = rc_array (rc_ov, &key_ov); 2364 rc_t::array_t &arr = rc_ov.array (key_ov);
2356 2365
2357 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2366 arr.t2f_v3f (0 , 0 , px , py , 0);
2358 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0); 2367 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2359 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0); 2368 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2360 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0); 2369 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2361 } 2370 }
2362 } 2371 }
2363 } 2372 }
2364 } 2373 }
2365 2374
2366 rc_draw (rc); 2375 rc.draw ();
2367 rc_clear (rc); 2376 rc.clear ();
2368 2377
2369 // go through all smoothlevels, lowest to highest, then draw. 2378 // go through all smoothlevels, lowest to highest, then draw.
2370 // this is basically counting sort 2379 // this is basically counting sort
2371 { 2380 {
2372 int w, b; 2381 int w, b;
2373 2382
2374 glEnable (GL_TEXTURE_2D); 2383 glEnable (GL_TEXTURE_2D);
2375 glBegin (GL_QUADS); 2384 glBegin (GL_QUADS);
2376 for (w = 0; w < 256 / 32; ++w) 2385 for (int level = 0; level < smooth_level.size (); ++level)
2386 if (smooth_level[level])
2387 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2377 { 2388 {
2378 uint32_t smask = smooth_level [w]; 2389 smooth_key &skey = it->first;
2379 if (smask) 2390 IV bits = it->second;
2380 for (b = 0; b < 32; ++b) 2391
2381 if (smask & (((uint32_t)1) << b)) 2392 if (!(bits & 0x1000)
2393 && skey.level == level
2394 && level > smooth_max [skey.x][skey.y])
2382 { 2395 {
2383 int level = (w << 5) | b; 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
2384 HE *he; 2404 if (tex.name)
2385
2386 hv_iterinit (smooth);
2387 while ((he = hv_iternext (smooth)))
2388 { 2405 {
2389 smooth_key *skey = (smooth_key *)HeKEY (he); 2406 // this time avoiding texture state changes
2390 IV bits = SvIVX (HeVAL (he)); 2407 // save gobs of state changes.
2391 2408 if (key.texname != tex.name)
2392 if (!(bits & 0x1000)
2393 && skey->level == level
2394 && level > smooth_max [skey->x][skey->y])
2395 { 2409 {
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; 2410 self->tex [skey.tile].unused = 0;
2411 2411
2412 glEnd (); 2412 glEnd ();
2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2413 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2414 glBegin (GL_QUADS); 2414 glBegin (GL_QUADS);
2415 } 2415 }
2416 2416
2417 if (border) 2417 if (border)
2418 { 2418 {
2419 float ox = border * dx; 2419 float ox = border * dx;
2420 2420
2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2425 } 2425 }
2426 2426
2427 if (corner) 2427 if (corner)
2428 { 2428 {
2429 float ox = corner * dx; 2429 float ox = corner * dx;
2430 2430
2431 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2435 }
2436 }
2437 } 2435 }
2438 } 2436 }
2439 } 2437 }
2440 } 2438 }
2441 2439
2442 glEnd (); 2440 glEnd ();
2443 glDisable (GL_TEXTURE_2D); 2441 glDisable (GL_TEXTURE_2D);
2444 key.texname = -1; 2442 key.texname = -1;
2445 } 2443 }
2446
2447 hv_clear (smooth);
2448 } 2444 }
2449 2445
2450 if (pl_tex.name) 2446 if (pl_tex.name)
2451 { 2447 {
2452 maptex tex = pl_tex; 2448 maptex tex = pl_tex;
2453 int px = pl_x + sdx; 2449 int px = pl_x + sdx;
2454 int py = pl_y + sdy; 2450 int py = pl_y + sdy;
2455 2451
2456 key.texname = tex.name; 2452 key.texname = tex.name;
2457 arr = rc_array (rc, &key); 2453 rc_t::array_t &arr = rc.array (key);
2458 2454
2459 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2455 arr.t2f_v3f (0 , 0 , px , py , 0);
2460 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2456 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); 2457 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); 2458 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2463 2459
2464 rc_draw (rc); 2460 rc.draw ();
2465 } 2461 }
2466 2462
2467 rc_draw (rc_ov); 2463 rc_ov.draw ();
2468 rc_clear (rc_ov); 2464 rc_ov.clear ();
2469 2465
2470 glDisable (GL_BLEND); 2466 glDisable (GL_BLEND);
2471 rc_free (rc);
2472 rc_free (rc_ov);
2473 2467
2474 // top layer: overlays such as the health bar 2468 // top layer: overlays such as the health bar
2475 for (y = 0; y < sh; y++) 2469 for (y = 0; y < sh; y++)
2476 if (0 <= y + my && y + my < self->rows) 2470 if (0 <= y + my && y + my < self->rows)
2477 { 2471 {
… …
2483 mapcell *cell = row->col + (x + mx - row->c0); 2477 mapcell *cell = row->col + (x + mx - row->c0);
2484 2478
2485 int px = x * Tw; 2479 int px = x * Tw;
2486 int py = y * Th; 2480 int py = y * Th;
2487 2481
2488 if (expect_false (cell->player == player)) 2482 if (ecb_expect_false (cell->player == player))
2489 { 2483 {
2490 px += sdx; 2484 px += sdx;
2491 py += sdy; 2485 py += sdy;
2492 } 2486 }
2493 2487

Diff Legend

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