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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.322 by root, Sun Nov 18 01:43:12 2018 UTC vs.
Revision 1.335 by root, Mon Nov 19 01:56:11 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>
… …
75# include <netinet/in.h> 76# include <netinet/in.h>
76# include <netinet/tcp.h> 77# include <netinet/tcp.h>
77# include <inttypes.h> 78# include <inttypes.h>
78#endif 79#endif
79 80
80#if __GNUC__ >= 4 81#include "ecb.h"
81# define expect(expr,value) __builtin_expect ((expr),(value)) 82#include "salloc.h"
82#else
83# define expect(expr,value) (expr)
84#endif
85
86#define expect_false(expr) expect ((expr) != 0, 0)
87#define expect_true(expr) expect ((expr) != 0, 1)
88 83
89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
90 85
91/* 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 */
92/* then anything that is computed by incoming darkness */ 87/* then anything that is computed by incoming darkness */
… …
104#define KMOD_LRAM 0x10000 // our extension 99#define KMOD_LRAM 0x10000 // our extension
105 100
106#define TEXID_SPEECH 1 101#define TEXID_SPEECH 1
107#define TEXID_NOFACE 2 102#define TEXID_NOFACE 2
108 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
109static char * 128static char *
110fast_sv_grow (SV *sv, STRLEN need) 129fast_sv_grow (SV *sv, STRLEN need)
111{ 130{
112 STRLEN len = SvLEN (sv); 131 STRLEN len = SvLEN (sv);
113 STRLEN want = SvCUR (sv) + need; 132 STRLEN want = SvCUR (sv) + need;
114 133
115 if (expect_false (len < want)) 134 if (ecb_expect_false (len < want))
116 { 135 {
117 do 136 do
118 len *= 2; 137 len *= 2;
119 while (len < want); 138 while (len < want);
120 139
… …
199 } 218 }
200 219
201 return 0; 220 return 0;
202} 221}
203 222
204typedef struct cf_layout { 223struct cf_layout {
205 PangoLayout *pl; 224 PangoLayout *pl;
206 float r, g, b, a; // default color for rgba mode 225 float r, g, b, a; // default color for rgba mode
207 int base_height; 226 int base_height;
208 DC__Font font; 227 DC__Font font;
209 rc_t *rc; 228 rc_t rc;
210} *DC__Layout; 229};
230
231typedef cf_layout *DC__Layout;
211 232
212static DC__Font default_font; 233static DC__Font default_font;
213static PangoContext *opengl_context; 234static PangoContext *opengl_context;
214static PangoFontMap *opengl_fontmap; 235static PangoFontMap *opengl_fontmap;
215 236
… …
253 274
254 *w = rect.width; 275 *w = rect.width;
255 *h = rect.height; 276 *h = rect.height;
256} 277}
257 278
279/////////////////////////////////////////////////////////////////////////////
280
258typedef uint16_t tileid; 281typedef uint16_t tileid;
259typedef uint16_t faceid; 282typedef uint16_t faceid;
260 283
261typedef struct { 284struct maptex
285{
262 GLuint name; 286 GLuint name;
263 int w, h; 287 int w, h;
264 float s, t; 288 float s, t;
265 uint8_t r, g, b, a; 289 uint8_t r, g, b, a;
266 tileid smoothtile; 290 tileid smoothtile;
267 uint8_t smoothlevel; 291 uint8_t smoothlevel;
268 uint8_t unused; /* set to zero on use */ 292 uint8_t unused; /* set to zero on use */
269} maptex; 293};
270 294
271typedef struct { 295struct mapcell
296{
272 uint32_t player; 297 uint32_t player;
273 tileid tile[3]; 298 tileid tile[3];
274 uint16_t darkness; 299 uint16_t darkness;
275 uint8_t stat_width, stat_hp, flags, smoothmax; 300 uint8_t stat_width, stat_hp, flags, smoothmax;
276} mapcell; 301};
277 302
278typedef struct { 303struct maprow
304{
279 int32_t c0, c1; 305 int32_t c0, c1;
280 mapcell *col; 306 mapcell *col;
281} maprow; 307};
282 308
283typedef struct map { 309struct mapgrid {
284 int x, y, w, h; 310 int x, y, w, h;
285 int ox, oy; /* offset to virtual global coordinate system */ 311 int ox, oy; /* offset to virtual global coordinate system */
286 int faces; tileid *face2tile; // [faceid] 312 int faces; tileid *face2tile; // [faceid]
287 int texs; maptex *tex; // [tileid] 313 int texs; maptex *tex; // [tileid]
288 314
289 int32_t rows; 315 int32_t rows;
290 maprow *row; 316 maprow *row;
291} *DC__Map; 317};
292 318
293static char * 319typedef mapgrid *DC__Map;
320
321template<typename T>
322ecb_cold static void
294prepend (char *ptr, int sze, int inc) 323prepend (T *&ptr, int sze, int inc)
295{ 324{
296 char *p; 325 T *p;
297 326
298 New (0, p, sze + inc, char); 327 Newx (p, inc + sze, T);
299 Zero (p, inc, char); 328 Zero (p, inc, T);
300 Move (ptr, p + inc, sze, char); 329 Move (ptr, p + inc, sze, T);
301 Safefree (ptr); 330 Safefree (ptr);
302 331
303 return p; 332 ptr = p;
304} 333}
305 334
306static char * 335template<typename T>
336ecb_cold static void
307append (char *ptr, int sze, int inc) 337append (T *&ptr, int sze, int inc)
308{ 338{
309 Renew (ptr, sze + inc, char); 339 Renew (ptr, sze + inc, T);
310 Zero (ptr + sze, inc, char); 340 Zero (ptr + sze, inc, T);
311
312 return ptr;
313} 341}
314
315#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
316#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
317 342
318static void 343static void
319need_facenum (struct map *self, faceid face) 344need_facenum (struct mapgrid *self, faceid face)
320{ 345{
321 while (self->faces <= face) 346 if (ecb_expect_true (self->faces > face))
322 { 347 return;
348
349 size_t newsize = minpot (face + 1);
323 Append (tileid, self->face2tile, self->faces, self->faces); 350 append (self->face2tile, self->faces, newsize - self->faces);
324 self->faces *= 2; 351 self->faces = newsize;
325 }
326} 352}
327 353
328static void 354static void
329need_texid (struct map *self, int texid) 355need_texid (struct mapgrid *self, int texid)
330{ 356{
331 while (self->texs <= texid) 357 if (ecb_expect_true (self->texs > texid))
332 { 358 return;
359
360 size_t newsize = minpot (texid + 1);
333 Append (maptex, self->tex, self->texs, self->texs); 361 append (self->tex, self->texs, newsize - self->texs);
334 self->texs *= 2; 362 self->texs = newsize;
335 }
336} 363}
337 364
338static maprow * 365static maprow *
339map_get_row (DC__Map self, int y) 366map_get_row (mapgrid *self, int y)
340{ 367{
341 if (0 > y) 368 if (0 > y)
342 { 369 {
343 int extend = - y + MAP_EXTEND_Y; 370 int extend = - y + MAP_EXTEND_Y;
344 Prepend (maprow, self->row, self->rows, extend); 371 prepend (self->row, self->rows, extend);
345 372
346 self->rows += extend; 373 self->rows += extend;
347 self->y += extend; 374 self->y += extend;
348 y += extend; 375 y += extend;
349 } 376 }
350 else if (y >= self->rows) 377 else if (y >= self->rows)
351 { 378 {
352 int extend = y - self->rows + MAP_EXTEND_Y; 379 int extend = y - self->rows + MAP_EXTEND_Y;
353 Append (maprow, self->row, self->rows, extend); 380 append (self->row, self->rows, extend);
354 self->rows += extend; 381 self->rows += extend;
355 } 382 }
356 383
357 return self->row + y; 384 return self->row + y;
358} 385}
… …
368 } 395 }
369 396
370 if (row->c0 > x) 397 if (row->c0 > x)
371 { 398 {
372 int extend = row->c0 - x + MAP_EXTEND_X; 399 int extend = row->c0 - x + MAP_EXTEND_X;
373 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 400 prepend (row->col, row->c1 - row->c0, extend);
374 row->c0 -= extend; 401 row->c0 -= extend;
375 } 402 }
376 else if (x >= row->c1) 403 else if (x >= row->c1)
377 { 404 {
378 int extend = x - row->c1 + MAP_EXTEND_X; 405 int extend = x - row->c1 + MAP_EXTEND_X;
379 Append (mapcell, row->col, row->c1 - row->c0, extend); 406 append (row->col, row->c1 - row->c0, extend);
380 row->c1 += extend; 407 row->c1 += extend;
381 } 408 }
382 409
383 return row->col + (x - row->c0); 410 return row->col + (x - row->c0);
384} 411}
385 412
386static mapcell * 413static mapcell *
387map_get_cell (DC__Map self, int x, int y) 414map_get_cell (mapgrid *self, int x, int y)
388{ 415{
389 return row_get_cell (map_get_row (self, y), x); 416 return row_get_cell (map_get_row (self, y), x);
390} 417}
391 418
392static void 419static void
393map_clear (DC__Map self) 420map_clear (mapgrid *self)
394{ 421{
395 int r; 422 int r;
396 423
397 for (r = 0; r < self->rows; r++) 424 for (r = 0; r < self->rows; r++)
398 Safefree (self->row[r].col); 425 Safefree (self->row[r].col);
… …
416 (cell)->flags = 0; \ 443 (cell)->flags = 0; \
417 (cell)->player = 0; \ 444 (cell)->player = 0; \
418 } while (0) 445 } while (0)
419 446
420static void 447static void
421map_blank (DC__Map self, int x0, int y0, int w, int h) 448map_blank (mapgrid *self, int x0, int y0, int w, int h)
422{ 449{
423 int x, y; 450 int x, y;
424 maprow *row; 451 maprow *row;
425 mapcell *cell; 452 mapcell *cell;
426 453
… …
454 { 481 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level; 482 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 } 483 }
457}; 484};
458 485
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash; 486typedef ska::flat_hash_map<smooth_key, IV, std::hash<smooth_key>, std::equal_to<smooth_key>, slice_allocator<smooth_key>> smooth_hash;
460 487
461namespace std { 488namespace std {
462 template <> 489 template <>
463 struct hash<smooth_key> 490 struct hash<smooth_key>
464 { 491 {
… …
502 ev.code = 1; 529 ev.code = 1;
503 ev.data1 = (void *)(long)channel; 530 ev.data1 = (void *)(long)channel;
504 ev.data2 = 0; 531 ev.data2 = 0;
505 532
506 SDL_PushEvent ((SDL_Event *)&ev); 533 SDL_PushEvent ((SDL_Event *)&ev);
507}
508
509// approximately divide by 255
510static unsigned int
511div255 (unsigned int n)
512{
513 return (n + (n >> 8)) >> 8;
514}
515
516static unsigned int
517minpot (unsigned int n)
518{
519 if (!n)
520 return 0;
521
522 --n;
523
524 n |= n >> 1;
525 n |= n >> 2;
526 n |= n >> 4;
527 n |= n >> 8;
528 n |= n >> 16;
529
530 return n + 1;
531}
532
533static unsigned int
534popcount (unsigned int n)
535{
536 n -= (n >> 1) & 0x55555555U;
537 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
538 n = ((n >> 4) + n) & 0x0f0f0f0fU;
539 n *= 0x01010101U;
540
541 return n >> 24;
542} 534}
543 535
544/* SDL should provide this, really. */ 536/* SDL should provide this, really. */
545#define SDLK_MODIFIER_MIN 300 537#define SDLK_MODIFIER_MIN 300
546#define SDLK_MODIFIER_MAX 314 538#define SDLK_MODIFIER_MAX 314
… …
877 869
878NV ceil (NV x) 870NV ceil (NV x)
879 871
880IV minpot (UV n) 872IV minpot (UV n)
881 873
874UV ld32 (UV n)
875 CODE:
876 RETVAL = ecb_ld32 (n);
877 OUTPUT:
878 RETVAL
879
882IV popcount (UV n) 880IV popcount (UV n)
881 CODE:
882 RETVAL = ecb_popcount32 (n);
883 OUTPUT:
884 RETVAL
883 885
884NV distance (NV dx, NV dy) 886NV distance (NV dx, NV dy)
885 CODE: 887 CODE:
886 RETVAL = pow (dx * dx + dy * dy, 0.5); 888 RETVAL = pow (dx * dx + dy * dy, 0.5);
887 OUTPUT: 889 OUTPUT:
… …
1361 tc_restore (); 1363 tc_restore ();
1362 1364
1363DC::Layout 1365DC::Layout
1364new (SV *klass) 1366new (SV *klass)
1365 CODE: 1367 CODE:
1366 New (0, RETVAL, 1, struct cf_layout); 1368 RETVAL = new cf_layout;
1367 1369
1368 RETVAL->pl = pango_layout_new (opengl_context); 1370 RETVAL->pl = pango_layout_new (opengl_context);
1369 RETVAL->r = 1.; 1371 RETVAL->r = 1.;
1370 RETVAL->g = 1.; 1372 RETVAL->g = 1.;
1371 RETVAL->b = 1.; 1373 RETVAL->b = 1.;
1372 RETVAL->a = 1.; 1374 RETVAL->a = 1.;
1373 RETVAL->base_height = MIN_FONT_HEIGHT; 1375 RETVAL->base_height = MIN_FONT_HEIGHT;
1374 RETVAL->font = 0; 1376 RETVAL->font = 0;
1375 RETVAL->rc = rc_alloc ();
1376 1377
1377 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1378 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1378 layout_update_font (RETVAL); 1379 layout_update_font (RETVAL);
1379 OUTPUT: 1380 OUTPUT:
1380 RETVAL 1381 RETVAL
1381 1382
1382void 1383void
1383DESTROY (DC::Layout self) 1384DESTROY (DC::Layout self)
1384 CODE: 1385 CODE:
1385 g_object_unref (self->pl); 1386 g_object_unref (self->pl);
1386 rc_free (self->rc);
1387 Safefree (self); 1387 delete self;
1388 1388
1389void 1389void
1390set_text (DC::Layout self, SV *text_) 1390set_text (DC::Layout self, SV *text_)
1391 CODE: 1391 CODE:
1392{ 1392{
… …
1646} 1646}
1647 1647
1648void 1648void
1649render (DC::Layout self, float x, float y, int flags = 0) 1649render (DC::Layout self, float x, float y, int flags = 0)
1650 CODE: 1650 CODE:
1651 rc_clear (self->rc); 1651 self->rc.clear ();
1652 pango_opengl_render_layout_subpixel ( 1652 pango_opengl_render_layout_subpixel (
1653 self->pl, 1653 self->pl,
1654 self->rc, 1654 &self->rc,
1655 x * PANGO_SCALE, y * PANGO_SCALE, 1655 x * PANGO_SCALE, y * PANGO_SCALE,
1656 self->r, self->g, self->b, self->a, 1656 self->r, self->g, self->b, self->a,
1657 flags 1657 flags
1658 ); 1658 );
1659 // we assume that context_change actually clears/frees stuff 1659 // we assume that context_change actually clears/frees stuff
… …
1670 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1670 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1671 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1671 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1672 glEnable (GL_ALPHA_TEST); 1672 glEnable (GL_ALPHA_TEST);
1673 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1673 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1674 1674
1675 rc_draw (self->rc); 1675 self->rc.draw ();
1676 1676
1677 glDisable (GL_ALPHA_TEST); 1677 glDisable (GL_ALPHA_TEST);
1678 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1679 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1680} 1680}
… …
1894PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1895 1895
1896DC::Map 1896DC::Map
1897new (SV *klass) 1897new (SV *klass)
1898 CODE: 1898 CODE:
1899 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, mapgrid);
1900 RETVAL->x = 0; 1900 RETVAL->x = 0;
1901 RETVAL->y = 0; 1901 RETVAL->y = 0;
1902 RETVAL->w = 0; 1902 RETVAL->w = 0;
1903 RETVAL->h = 0; 1903 RETVAL->h = 0;
1904 RETVAL->ox = 0; 1904 RETVAL->ox = 0;
… …
2050 self->ox += dx; self->x += dx; 2050 self->ox += dx; self->x += dx;
2051 self->oy += dy; self->y += dy; 2051 self->oy += dy; self->y += dy;
2052 2052
2053 while (self->y < 0) 2053 while (self->y < 0)
2054 { 2054 {
2055 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2055 prepend (self->row, self->rows, MAP_EXTEND_Y);
2056 2056
2057 self->rows += MAP_EXTEND_Y; 2057 self->rows += MAP_EXTEND_Y;
2058 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
2059 } 2059 }
2060} 2060}
… …
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) 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)
2217 CODE: 2217 CODE:
2218{ 2218{
2219 int x, y, z; 2219 int x, y, z;
2220 2220
2221 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2222 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2221 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2223 smooth_key skey;
2224 int pl_x, pl_y; 2222 int pl_x, pl_y;
2225 maptex pl_tex; 2223 maptex pl_tex;
2226 rc_t *rc = rc_alloc (); 2224 rc_t rc;
2227 rc_t *rc_ov = rc_alloc (); 2225 rc_t rc_ov;
2228 rc_key_t key; 2226 rc_key_t key;
2229 rc_array_t *arr; 2227 rc_t::array_t *arr;
2230 2228
2231 pl_tex.name = 0; 2229 pl_tex.name = 0;
2232 2230
2233 // that's current max. sorry. 2231 // that's current max. sorry.
2234 if (sw > 255) sw = 255; 2232 if (sw > 255) sw = 255;
2235 if (sh > 255) sh = 255; 2233 if (sh > 255) sh = 255;
2236
2237 // clear key, in case of extra padding
2238 memset (&skey, 0, sizeof (skey));
2239 2234
2240 memset (&key, 0, sizeof (key)); 2235 memset (&key, 0, sizeof (key));
2241 key.r = 255; 2236 key.r = 255;
2242 key.g = 255; 2237 key.g = 255;
2243 key.b = 255; 2238 key.b = 255;
… …
2249 my += self->y; 2244 my += self->y;
2250 2245
2251 // first pass: determine smooth_max 2246 // first pass: determine smooth_max
2252 // rather ugly, if you ask me 2247 // rather ugly, if you ask me
2253 // could also be stored inside mapcell and updated on change 2248 // could also be stored inside mapcell and updated on change
2254 memset (smooth_max, 0, sizeof (smooth_max)); 2249 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2255 2250
2256 for (y = 0; y < sh; y++) 2251 for (y = 0; y < sh; y++)
2257 if (0 <= y + my && y + my < self->rows) 2252 if (0 <= y + my && y + my < self->rows)
2258 { 2253 {
2259 maprow *row = self->row + (y + my); 2254 maprow *row = self->row + (y + my);
… …
2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2269 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2270 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2276 2271
2277 for (z = 0; z <= 2; z++) 2272 for (z = 0; z <= 2; z++)
2278 { 2273 {
2274 std::bitset<256> smooth_level; // one bit for every possible smooth level
2275 smooth_key skey;
2279 smooth_hash smooth; 2276 smooth_hash smooth;
2280 memset (smooth_level, 0, sizeof (smooth_level));
2281 key.texname = -1; 2277 key.texname = -1;
2282 2278
2283 for (y = 0; y < sh; y++) 2279 for (y = 0; y < sh; y++)
2284 if (0 <= y + my && y + my < self->rows) 2280 if (0 <= y + my && y + my < self->rows)
2285 { 2281 {
… …
2302 2298
2303 if (!tex.name) 2299 if (!tex.name)
2304 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2300 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2305 2301
2306 key.texname = tex.name; 2302 key.texname = tex.name;
2307 arr = rc_array (rc, &key); 2303 arr = &rc.array (key);
2308 } 2304 }
2309 2305
2310 px = (x + 1) * Th - tex.w; 2306 px = (x + 1) * Th - tex.w;
2311 py = (y + 1) * Tw - tex.h; 2307 py = (y + 1) * Tw - tex.h;
2312 2308
2313 if (expect_false (cell->player == player) && expect_false (z == 2)) 2309 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2314 { 2310 {
2315 pl_x = px; 2311 pl_x = px;
2316 pl_y = py; 2312 pl_y = py;
2317 pl_tex = tex; 2313 pl_tex = tex;
2318 continue; 2314 continue;
2319 } 2315 }
2320 2316
2321 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2317 arr->t2f_v3f (0 , 0 , px , py , 0);
2322 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2318 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2323 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2319 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2324 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2320 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2325 2321
2326 // update smooth hash 2322 // update smooth hash
2327 if (tex.smoothtile) 2323 if (tex.smoothtile)
2328 { 2324 {
2329 skey.tile = tex.smoothtile; 2325 skey.tile = tex.smoothtile;
2330 skey.level = tex.smoothlevel; 2326 skey.level = tex.smoothlevel;
2331 2327
2332 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2328 smooth_level[tex.smoothlevel] = 1;
2333 2329
2334 // 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
2335 // shifted +1|+1 so we always stay positive. 2331 // shifted +1|+1 so we always stay positive.
2336 2332
2337 // bits is ___n cccc CCCC bbbb 2333 // bits is ___n cccc CCCC bbbb
… …
2361 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);
2362 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);
2363 } 2359 }
2364 } 2360 }
2365 2361
2366 if (expect_false (z == 2) && expect_false (cell->flags)) 2362 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2367 { 2363 {
2368 // overlays such as the speech bubble, probably more to come 2364 // overlays such as the speech bubble, probably more to come
2369 if (cell->flags & 1) 2365 if (cell->flags & 1)
2370 { 2366 {
2371 rc_key_t key_ov = key; 2367 rc_key_t key_ov = key;
2372 maptex tex = self->tex [TEXID_SPEECH]; 2368 maptex tex = self->tex[TEXID_SPEECH];
2373 rc_array_t *arr;
2374 int px = x * Tw + Tw * 2 / 32; 2369 int px = x * Tw + Tw * 2 / 32;
2375 int py = y * Th - Th * 6 / 32; 2370 int py = y * Th - Th * 6 / 32;
2376 2371
2377 key_ov.texname = tex.name; 2372 key_ov.texname = tex.name;
2378 arr = rc_array (rc_ov, &key_ov); 2373 rc_t::array_t &arr = rc_ov.array (key_ov);
2379 2374
2380 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2375 arr.t2f_v3f (0 , 0 , px , py , 0);
2381 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0); 2376 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2382 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);
2383 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0); 2378 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2384 } 2379 }
2385 } 2380 }
2386 } 2381 }
2387 } 2382 }
2388 2383
2389 rc_draw (rc); 2384 rc.draw ();
2390 rc_clear (rc); 2385 rc.clear ();
2391 2386
2392 // go through all smoothlevels, lowest to highest, then draw. 2387 // go through all smoothlevels, lowest to highest, then draw.
2393 // this is basically counting sort 2388 // this is basically counting sort
2394 { 2389 {
2395 int w, b; 2390 int w, b;
2396 2391
2397 glEnable (GL_TEXTURE_2D); 2392 glEnable (GL_TEXTURE_2D);
2398 glBegin (GL_QUADS); 2393 glBegin (GL_QUADS);
2399 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)
2400 { 2397 {
2401 uint32_t smask = smooth_level [w]; 2398 smooth_key &skey = it->first;
2402 if (smask) 2399 IV bits = it->second;
2403 for (b = 0; b < 32; ++b) 2400
2404 if (smask & (((uint32_t)1) << b)) 2401 if (!(bits & 0x1000)
2402 && skey.level == level
2403 && level > smooth_max [skey.x][skey.y])
2405 { 2404 {
2406 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
2407 HE *he; 2413 if (tex.name)
2408
2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2410 { 2414 {
2411 smooth_key &skey = it->first; 2415 // this time avoiding texture state changes
2412 IV bits = it->second; 2416 // save gobs of state changes.
2413 2417 if (key.texname != tex.name)
2414 if (!(bits & 0x1000)
2415 && skey.level == level
2416 && level > smooth_max [skey.x][skey.y])
2417 { 2418 {
2418 maptex tex = self->tex [skey.tile];
2419 int px = (((int)skey.x) - 1) * Tw;
2420 int py = (((int)skey.y) - 1) * Th;
2421 int border = bits & 15;
2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2423 float dx = tex.s * .0625f; // 16 images/row
2424 float dy = tex.t * .5f ; // 2 images/column
2425
2426 if (tex.name)
2427 {
2428 // this time avoiding texture state changes
2429 // save gobs of state changes.
2430 if (key.texname != tex.name)
2431 {
2432 self->tex [skey.tile].unused = 0; 2419 self->tex [skey.tile].unused = 0;
2433 2420
2434 glEnd (); 2421 glEnd ();
2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2422 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2436 glBegin (GL_QUADS); 2423 glBegin (GL_QUADS);
2437 } 2424 }
2438 2425
2439 if (border) 2426 if (border)
2440 { 2427 {
2441 float ox = border * dx; 2428 float ox = border * dx;
2442 2429
2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th); 2432 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py ); 2433 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2447 } 2434 }
2448 2435
2449 if (corner) 2436 if (corner)
2450 { 2437 {
2451 float ox = corner * dx; 2438 float ox = corner * dx;
2452 2439
2453 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th); 2441 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th); 2442 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py ); 2443 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2457 }
2458 }
2459 } 2444 }
2460 } 2445 }
2461 } 2446 }
2462 } 2447 }
2463 2448
2464 glEnd (); 2449 glEnd ();
2465 glDisable (GL_TEXTURE_2D); 2450 glDisable (GL_TEXTURE_2D);
2466 key.texname = -1; 2451 key.texname = -1;
2467 } 2452 }
… …
2472 maptex tex = pl_tex; 2457 maptex tex = pl_tex;
2473 int px = pl_x + sdx; 2458 int px = pl_x + sdx;
2474 int py = pl_y + sdy; 2459 int py = pl_y + sdy;
2475 2460
2476 key.texname = tex.name; 2461 key.texname = tex.name;
2477 arr = rc_array (rc, &key); 2462 rc_t::array_t &arr = rc.array (key);
2478 2463
2479 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2464 arr.t2f_v3f (0 , 0 , px , py , 0);
2480 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2465 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2481 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2466 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2482 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2467 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2483 2468
2484 rc_draw (rc); 2469 rc.draw ();
2485 } 2470 }
2486 2471
2487 rc_draw (rc_ov); 2472 rc_ov.draw ();
2488 rc_clear (rc_ov); 2473 rc_ov.clear ();
2489 2474
2490 glDisable (GL_BLEND); 2475 glDisable (GL_BLEND);
2491 rc_free (rc);
2492 rc_free (rc_ov);
2493 2476
2494 // top layer: overlays such as the health bar 2477 // top layer: overlays such as the health bar
2495 for (y = 0; y < sh; y++) 2478 for (y = 0; y < sh; y++)
2496 if (0 <= y + my && y + my < self->rows) 2479 if (0 <= y + my && y + my < self->rows)
2497 { 2480 {
… …
2503 mapcell *cell = row->col + (x + mx - row->c0); 2486 mapcell *cell = row->col + (x + mx - row->c0);
2504 2487
2505 int px = x * Tw; 2488 int px = x * Tw;
2506 int py = y * Th; 2489 int py = y * Th;
2507 2490
2508 if (expect_false (cell->player == player)) 2491 if (ecb_expect_false (cell->player == player))
2509 { 2492 {
2510 px += sdx; 2493 px += sdx;
2511 py += sdy; 2494 py += sdy;
2512 } 2495 }
2513 2496

Diff Legend

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