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.334 by root, Mon Nov 19 01:37:28 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 */
… …
110fast_sv_grow (SV *sv, STRLEN need) 105fast_sv_grow (SV *sv, STRLEN need)
111{ 106{
112 STRLEN len = SvLEN (sv); 107 STRLEN len = SvLEN (sv);
113 STRLEN want = SvCUR (sv) + need; 108 STRLEN want = SvCUR (sv) + need;
114 109
115 if (expect_false (len < want)) 110 if (ecb_expect_false (len < want))
116 { 111 {
117 do 112 do
118 len *= 2; 113 len *= 2;
119 while (len < want); 114 while (len < want);
120 115
… …
199 } 194 }
200 195
201 return 0; 196 return 0;
202} 197}
203 198
204typedef struct cf_layout { 199struct cf_layout {
205 PangoLayout *pl; 200 PangoLayout *pl;
206 float r, g, b, a; // default color for rgba mode 201 float r, g, b, a; // default color for rgba mode
207 int base_height; 202 int base_height;
208 DC__Font font; 203 DC__Font font;
209 rc_t *rc; 204 rc_t rc;
210} *DC__Layout; 205};
206
207typedef cf_layout *DC__Layout;
211 208
212static DC__Font default_font; 209static DC__Font default_font;
213static PangoContext *opengl_context; 210static PangoContext *opengl_context;
214static PangoFontMap *opengl_fontmap; 211static PangoFontMap *opengl_fontmap;
215 212
… …
253 250
254 *w = rect.width; 251 *w = rect.width;
255 *h = rect.height; 252 *h = rect.height;
256} 253}
257 254
255/////////////////////////////////////////////////////////////////////////////
256
258typedef uint16_t tileid; 257typedef uint16_t tileid;
259typedef uint16_t faceid; 258typedef uint16_t faceid;
260 259
261typedef struct { 260struct maptex
261{
262 GLuint name; 262 GLuint name;
263 int w, h; 263 int w, h;
264 float s, t; 264 float s, t;
265 uint8_t r, g, b, a; 265 uint8_t r, g, b, a;
266 tileid smoothtile; 266 tileid smoothtile;
267 uint8_t smoothlevel; 267 uint8_t smoothlevel;
268 uint8_t unused; /* set to zero on use */ 268 uint8_t unused; /* set to zero on use */
269} maptex; 269};
270 270
271typedef struct { 271struct mapcell
272{
272 uint32_t player; 273 uint32_t player;
273 tileid tile[3]; 274 tileid tile[3];
274 uint16_t darkness; 275 uint16_t darkness;
275 uint8_t stat_width, stat_hp, flags, smoothmax; 276 uint8_t stat_width, stat_hp, flags, smoothmax;
276} mapcell; 277};
277 278
278typedef struct { 279struct maprow
280{
279 int32_t c0, c1; 281 int32_t c0, c1;
280 mapcell *col; 282 mapcell *col;
281} maprow; 283};
282 284
283typedef struct map { 285struct mapgrid {
284 int x, y, w, h; 286 int x, y, w, h;
285 int ox, oy; /* offset to virtual global coordinate system */ 287 int ox, oy; /* offset to virtual global coordinate system */
286 int faces; tileid *face2tile; // [faceid] 288 int faces; tileid *face2tile; // [faceid]
287 int texs; maptex *tex; // [tileid] 289 int texs; maptex *tex; // [tileid]
288 290
289 int32_t rows; 291 int32_t rows;
290 maprow *row; 292 maprow *row;
291} *DC__Map; 293};
292 294
293static char * 295typedef mapgrid *DC__Map;
296
297template<typename T>
298static void
294prepend (char *ptr, int sze, int inc) 299prepend (T *&ptr, int sze, int inc)
295{ 300{
296 char *p; 301 T *p;
297 302
298 New (0, p, sze + inc, char); 303 Newx (p, inc + sze, T);
299 Zero (p, inc, char); 304 Zero (p, inc, T);
300 Move (ptr, p + inc, sze, char); 305 Move (ptr, p + inc, sze, T);
301 Safefree (ptr); 306 Safefree (ptr);
302 307
303 return p; 308 ptr = p;
304} 309}
305 310
306static char * 311template<typename T>
307append (char *ptr, int sze, int inc)
308{
309 Renew (ptr, sze + inc, char);
310 Zero (ptr + sze, inc, char);
311
312 return ptr;
313}
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
318static void 312static void
313append (T *&ptr, int sze, int inc)
314{
315 Renew (ptr, sze + inc, T);
316 Zero (ptr + sze, inc, T);
317}
318
319static void
319need_facenum (struct map *self, faceid face) 320need_facenum (struct mapgrid *self, faceid face)
320{ 321{
321 while (self->faces <= face) 322 while (self->faces <= face)
322 { 323 {
323 Append (tileid, self->face2tile, self->faces, self->faces); 324 append (self->face2tile, self->faces, self->faces);
324 self->faces *= 2; 325 self->faces *= 2;
325 } 326 }
326} 327}
327 328
328static void 329static void
329need_texid (struct map *self, int texid) 330need_texid (struct mapgrid *self, int texid)
330{ 331{
331 while (self->texs <= texid) 332 while (self->texs <= texid)
332 { 333 {
333 Append (maptex, self->tex, self->texs, self->texs); 334 append (self->tex, self->texs, self->texs);
334 self->texs *= 2; 335 self->texs *= 2;
335 } 336 }
336} 337}
337 338
338static maprow * 339static maprow *
339map_get_row (DC__Map self, int y) 340map_get_row (mapgrid *self, int y)
340{ 341{
341 if (0 > y) 342 if (0 > y)
342 { 343 {
343 int extend = - y + MAP_EXTEND_Y; 344 int extend = - y + MAP_EXTEND_Y;
344 Prepend (maprow, self->row, self->rows, extend); 345 prepend (self->row, self->rows, extend);
345 346
346 self->rows += extend; 347 self->rows += extend;
347 self->y += extend; 348 self->y += extend;
348 y += extend; 349 y += extend;
349 } 350 }
350 else if (y >= self->rows) 351 else if (y >= self->rows)
351 { 352 {
352 int extend = y - self->rows + MAP_EXTEND_Y; 353 int extend = y - self->rows + MAP_EXTEND_Y;
353 Append (maprow, self->row, self->rows, extend); 354 append (self->row, self->rows, extend);
354 self->rows += extend; 355 self->rows += extend;
355 } 356 }
356 357
357 return self->row + y; 358 return self->row + y;
358} 359}
… …
368 } 369 }
369 370
370 if (row->c0 > x) 371 if (row->c0 > x)
371 { 372 {
372 int extend = row->c0 - x + MAP_EXTEND_X; 373 int extend = row->c0 - x + MAP_EXTEND_X;
373 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 374 prepend (row->col, row->c1 - row->c0, extend);
374 row->c0 -= extend; 375 row->c0 -= extend;
375 } 376 }
376 else if (x >= row->c1) 377 else if (x >= row->c1)
377 { 378 {
378 int extend = x - row->c1 + MAP_EXTEND_X; 379 int extend = x - row->c1 + MAP_EXTEND_X;
379 Append (mapcell, row->col, row->c1 - row->c0, extend); 380 append (row->col, row->c1 - row->c0, extend);
380 row->c1 += extend; 381 row->c1 += extend;
381 } 382 }
382 383
383 return row->col + (x - row->c0); 384 return row->col + (x - row->c0);
384} 385}
385 386
386static mapcell * 387static mapcell *
387map_get_cell (DC__Map self, int x, int y) 388map_get_cell (mapgrid *self, int x, int y)
388{ 389{
389 return row_get_cell (map_get_row (self, y), x); 390 return row_get_cell (map_get_row (self, y), x);
390} 391}
391 392
392static void 393static void
393map_clear (DC__Map self) 394map_clear (mapgrid *self)
394{ 395{
395 int r; 396 int r;
396 397
397 for (r = 0; r < self->rows; r++) 398 for (r = 0; r < self->rows; r++)
398 Safefree (self->row[r].col); 399 Safefree (self->row[r].col);
… …
416 (cell)->flags = 0; \ 417 (cell)->flags = 0; \
417 (cell)->player = 0; \ 418 (cell)->player = 0; \
418 } while (0) 419 } while (0)
419 420
420static void 421static void
421map_blank (DC__Map self, int x0, int y0, int w, int h) 422map_blank (mapgrid *self, int x0, int y0, int w, int h)
422{ 423{
423 int x, y; 424 int x, y;
424 maprow *row; 425 maprow *row;
425 mapcell *cell; 426 mapcell *cell;
426 427
… …
454 { 455 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level; 456 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 } 457 }
457}; 458};
458 459
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash; 460typedef ska::flat_hash_map<smooth_key, IV, std::hash<smooth_key>, std::equal_to<smooth_key>, slice_allocator<smooth_key>> smooth_hash;
460 461
461namespace std { 462namespace std {
462 template <> 463 template <>
463 struct hash<smooth_key> 464 struct hash<smooth_key>
464 { 465 {
… …
526 n |= n >> 4; 527 n |= n >> 4;
527 n |= n >> 8; 528 n |= n >> 8;
528 n |= n >> 16; 529 n |= n >> 16;
529 530
530 return n + 1; 531 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} 532}
543 533
544/* SDL should provide this, really. */ 534/* SDL should provide this, really. */
545#define SDLK_MODIFIER_MIN 300 535#define SDLK_MODIFIER_MIN 300
546#define SDLK_MODIFIER_MAX 314 536#define SDLK_MODIFIER_MAX 314
… …
877 867
878NV ceil (NV x) 868NV ceil (NV x)
879 869
880IV minpot (UV n) 870IV minpot (UV n)
881 871
872UV ld32 (UV n)
873 CODE:
874 RETVAL = ecb_ld32 (n);
875 OUTPUT:
876 RETVAL
877
882IV popcount (UV n) 878IV popcount (UV n)
879 CODE:
880 RETVAL = ecb_popcount32 (n);
881 OUTPUT:
882 RETVAL
883 883
884NV distance (NV dx, NV dy) 884NV distance (NV dx, NV dy)
885 CODE: 885 CODE:
886 RETVAL = pow (dx * dx + dy * dy, 0.5); 886 RETVAL = pow (dx * dx + dy * dy, 0.5);
887 OUTPUT: 887 OUTPUT:
… …
1361 tc_restore (); 1361 tc_restore ();
1362 1362
1363DC::Layout 1363DC::Layout
1364new (SV *klass) 1364new (SV *klass)
1365 CODE: 1365 CODE:
1366 New (0, RETVAL, 1, struct cf_layout); 1366 RETVAL = new cf_layout;
1367 1367
1368 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1369 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1370 RETVAL->g = 1.; 1370 RETVAL->g = 1.;
1371 RETVAL->b = 1.; 1371 RETVAL->b = 1.;
1372 RETVAL->a = 1.; 1372 RETVAL->a = 1.;
1373 RETVAL->base_height = MIN_FONT_HEIGHT; 1373 RETVAL->base_height = MIN_FONT_HEIGHT;
1374 RETVAL->font = 0; 1374 RETVAL->font = 0;
1375 RETVAL->rc = rc_alloc ();
1376 1375
1377 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1376 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1378 layout_update_font (RETVAL); 1377 layout_update_font (RETVAL);
1379 OUTPUT: 1378 OUTPUT:
1380 RETVAL 1379 RETVAL
1381 1380
1382void 1381void
1383DESTROY (DC::Layout self) 1382DESTROY (DC::Layout self)
1384 CODE: 1383 CODE:
1385 g_object_unref (self->pl); 1384 g_object_unref (self->pl);
1386 rc_free (self->rc);
1387 Safefree (self); 1385 delete self;
1388 1386
1389void 1387void
1390set_text (DC::Layout self, SV *text_) 1388set_text (DC::Layout self, SV *text_)
1391 CODE: 1389 CODE:
1392{ 1390{
… …
1646} 1644}
1647 1645
1648void 1646void
1649render (DC::Layout self, float x, float y, int flags = 0) 1647render (DC::Layout self, float x, float y, int flags = 0)
1650 CODE: 1648 CODE:
1651 rc_clear (self->rc); 1649 self->rc.clear ();
1652 pango_opengl_render_layout_subpixel ( 1650 pango_opengl_render_layout_subpixel (
1653 self->pl, 1651 self->pl,
1654 self->rc, 1652 &self->rc,
1655 x * PANGO_SCALE, y * PANGO_SCALE, 1653 x * PANGO_SCALE, y * PANGO_SCALE,
1656 self->r, self->g, self->b, self->a, 1654 self->r, self->g, self->b, self->a,
1657 flags 1655 flags
1658 ); 1656 );
1659 // we assume that context_change actually clears/frees stuff 1657 // we assume that context_change actually clears/frees stuff
… …
1670 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1668 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1671 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1669 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1672 glEnable (GL_ALPHA_TEST); 1670 glEnable (GL_ALPHA_TEST);
1673 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1671 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1674 1672
1675 rc_draw (self->rc); 1673 self->rc.draw ();
1676 1674
1677 glDisable (GL_ALPHA_TEST); 1675 glDisable (GL_ALPHA_TEST);
1678 glDisable (GL_BLEND); 1676 glDisable (GL_BLEND);
1679 glDisable (GL_TEXTURE_2D); 1677 glDisable (GL_TEXTURE_2D);
1680} 1678}
… …
1894PROTOTYPES: DISABLE 1892PROTOTYPES: DISABLE
1895 1893
1896DC::Map 1894DC::Map
1897new (SV *klass) 1895new (SV *klass)
1898 CODE: 1896 CODE:
1899 New (0, RETVAL, 1, struct map); 1897 New (0, RETVAL, 1, mapgrid);
1900 RETVAL->x = 0; 1898 RETVAL->x = 0;
1901 RETVAL->y = 0; 1899 RETVAL->y = 0;
1902 RETVAL->w = 0; 1900 RETVAL->w = 0;
1903 RETVAL->h = 0; 1901 RETVAL->h = 0;
1904 RETVAL->ox = 0; 1902 RETVAL->ox = 0;
… …
2050 self->ox += dx; self->x += dx; 2048 self->ox += dx; self->x += dx;
2051 self->oy += dy; self->y += dy; 2049 self->oy += dy; self->y += dy;
2052 2050
2053 while (self->y < 0) 2051 while (self->y < 0)
2054 { 2052 {
2055 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2053 prepend (self->row, self->rows, MAP_EXTEND_Y);
2056 2054
2057 self->rows += MAP_EXTEND_Y; 2055 self->rows += MAP_EXTEND_Y;
2058 self->y += MAP_EXTEND_Y; 2056 self->y += MAP_EXTEND_Y;
2059 } 2057 }
2060} 2058}
… …
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) 2214draw (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: 2215 CODE:
2218{ 2216{
2219 int x, y, z; 2217 int x, y, z;
2220 2218
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) 2219 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; 2220 int pl_x, pl_y;
2225 maptex pl_tex; 2221 maptex pl_tex;
2226 rc_t *rc = rc_alloc (); 2222 rc_t rc;
2227 rc_t *rc_ov = rc_alloc (); 2223 rc_t rc_ov;
2228 rc_key_t key; 2224 rc_key_t key;
2229 rc_array_t *arr; 2225 rc_t::array_t *arr;
2230 2226
2231 pl_tex.name = 0; 2227 pl_tex.name = 0;
2232 2228
2233 // that's current max. sorry. 2229 // that's current max. sorry.
2234 if (sw > 255) sw = 255; 2230 if (sw > 255) sw = 255;
2235 if (sh > 255) sh = 255; 2231 if (sh > 255) sh = 255;
2236
2237 // clear key, in case of extra padding
2238 memset (&skey, 0, sizeof (skey));
2239 2232
2240 memset (&key, 0, sizeof (key)); 2233 memset (&key, 0, sizeof (key));
2241 key.r = 255; 2234 key.r = 255;
2242 key.g = 255; 2235 key.g = 255;
2243 key.b = 255; 2236 key.b = 255;
… …
2249 my += self->y; 2242 my += self->y;
2250 2243
2251 // first pass: determine smooth_max 2244 // first pass: determine smooth_max
2252 // rather ugly, if you ask me 2245 // rather ugly, if you ask me
2253 // could also be stored inside mapcell and updated on change 2246 // could also be stored inside mapcell and updated on change
2254 memset (smooth_max, 0, sizeof (smooth_max)); 2247 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2255 2248
2256 for (y = 0; y < sh; y++) 2249 for (y = 0; y < sh; y++)
2257 if (0 <= y + my && y + my < self->rows) 2250 if (0 <= y + my && y + my < self->rows)
2258 { 2251 {
2259 maprow *row = self->row + (y + my); 2252 maprow *row = self->row + (y + my);
… …
2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2267 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2268 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2276 2269
2277 for (z = 0; z <= 2; z++) 2270 for (z = 0; z <= 2; z++)
2278 { 2271 {
2272 std::bitset<256> smooth_level; // one bit for every possible smooth level
2273 smooth_key skey;
2279 smooth_hash smooth; 2274 smooth_hash smooth;
2280 memset (smooth_level, 0, sizeof (smooth_level));
2281 key.texname = -1; 2275 key.texname = -1;
2282 2276
2283 for (y = 0; y < sh; y++) 2277 for (y = 0; y < sh; y++)
2284 if (0 <= y + my && y + my < self->rows) 2278 if (0 <= y + my && y + my < self->rows)
2285 { 2279 {
… …
2302 2296
2303 if (!tex.name) 2297 if (!tex.name)
2304 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2298 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2305 2299
2306 key.texname = tex.name; 2300 key.texname = tex.name;
2307 arr = rc_array (rc, &key); 2301 arr = &rc.array (key);
2308 } 2302 }
2309 2303
2310 px = (x + 1) * Th - tex.w; 2304 px = (x + 1) * Th - tex.w;
2311 py = (y + 1) * Tw - tex.h; 2305 py = (y + 1) * Tw - tex.h;
2312 2306
2313 if (expect_false (cell->player == player) && expect_false (z == 2)) 2307 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2314 { 2308 {
2315 pl_x = px; 2309 pl_x = px;
2316 pl_y = py; 2310 pl_y = py;
2317 pl_tex = tex; 2311 pl_tex = tex;
2318 continue; 2312 continue;
2319 } 2313 }
2320 2314
2321 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2315 arr->t2f_v3f (0 , 0 , px , py , 0);
2322 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2316 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); 2317 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); 2318 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2325 2319
2326 // update smooth hash 2320 // update smooth hash
2327 if (tex.smoothtile) 2321 if (tex.smoothtile)
2328 { 2322 {
2329 skey.tile = tex.smoothtile; 2323 skey.tile = tex.smoothtile;
2330 skey.level = tex.smoothlevel; 2324 skey.level = tex.smoothlevel;
2331 2325
2332 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2326 smooth_level[tex.smoothlevel] = 1;
2333 2327
2334 // add bits to current tile and all neighbours. skey.x|y is 2328 // add bits to current tile and all neighbours. skey.x|y is
2335 // shifted +1|+1 so we always stay positive. 2329 // shifted +1|+1 so we always stay positive.
2336 2330
2337 // bits is ___n cccc CCCC bbbb 2331 // bits is ___n cccc CCCC bbbb
… …
2361 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400); 2355 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); 2356 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2363 } 2357 }
2364 } 2358 }
2365 2359
2366 if (expect_false (z == 2) && expect_false (cell->flags)) 2360 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2367 { 2361 {
2368 // overlays such as the speech bubble, probably more to come 2362 // overlays such as the speech bubble, probably more to come
2369 if (cell->flags & 1) 2363 if (cell->flags & 1)
2370 { 2364 {
2371 rc_key_t key_ov = key; 2365 rc_key_t key_ov = key;
2372 maptex tex = self->tex [TEXID_SPEECH]; 2366 maptex tex = self->tex[TEXID_SPEECH];
2373 rc_array_t *arr;
2374 int px = x * Tw + Tw * 2 / 32; 2367 int px = x * Tw + Tw * 2 / 32;
2375 int py = y * Th - Th * 6 / 32; 2368 int py = y * Th - Th * 6 / 32;
2376 2369
2377 key_ov.texname = tex.name; 2370 key_ov.texname = tex.name;
2378 arr = rc_array (rc_ov, &key_ov); 2371 rc_t::array_t &arr = rc_ov.array (key_ov);
2379 2372
2380 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2373 arr.t2f_v3f (0 , 0 , px , py , 0);
2381 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0); 2374 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2382 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0); 2375 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2383 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0); 2376 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2384 } 2377 }
2385 } 2378 }
2386 } 2379 }
2387 } 2380 }
2388 2381
2389 rc_draw (rc); 2382 rc.draw ();
2390 rc_clear (rc); 2383 rc.clear ();
2391 2384
2392 // go through all smoothlevels, lowest to highest, then draw. 2385 // go through all smoothlevels, lowest to highest, then draw.
2393 // this is basically counting sort 2386 // this is basically counting sort
2394 { 2387 {
2395 int w, b; 2388 int w, b;
2396 2389
2397 glEnable (GL_TEXTURE_2D); 2390 glEnable (GL_TEXTURE_2D);
2398 glBegin (GL_QUADS); 2391 glBegin (GL_QUADS);
2399 for (w = 0; w < 256 / 32; ++w) 2392 for (int level = 0; level < smooth_level.size (); ++level)
2393 if (smooth_level[level])
2394 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2400 { 2395 {
2401 uint32_t smask = smooth_level [w]; 2396 smooth_key &skey = it->first;
2402 if (smask) 2397 IV bits = it->second;
2403 for (b = 0; b < 32; ++b) 2398
2404 if (smask & (((uint32_t)1) << b)) 2399 if (!(bits & 0x1000)
2400 && skey.level == level
2401 && level > smooth_max [skey.x][skey.y])
2405 { 2402 {
2406 int level = (w << 5) | b; 2403 maptex tex = self->tex [skey.tile];
2404 int px = (((int)skey.x) - 1) * Tw;
2405 int py = (((int)skey.y) - 1) * Th;
2406 int border = bits & 15;
2407 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2408 float dx = tex.s * .0625f; // 16 images/row
2409 float dy = tex.t * .5f ; // 2 images/column
2410
2407 HE *he; 2411 if (tex.name)
2408
2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2410 { 2412 {
2411 smooth_key &skey = it->first; 2413 // this time avoiding texture state changes
2412 IV bits = it->second; 2414 // save gobs of state changes.
2413 2415 if (key.texname != tex.name)
2414 if (!(bits & 0x1000)
2415 && skey.level == level
2416 && level > smooth_max [skey.x][skey.y])
2417 { 2416 {
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; 2417 self->tex [skey.tile].unused = 0;
2433 2418
2434 glEnd (); 2419 glEnd ();
2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2420 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2436 glBegin (GL_QUADS); 2421 glBegin (GL_QUADS);
2437 } 2422 }
2438 2423
2439 if (border) 2424 if (border)
2440 { 2425 {
2441 float ox = border * dx; 2426 float ox = border * dx;
2442 2427
2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2428 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th); 2429 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th); 2430 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py ); 2431 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2447 } 2432 }
2448 2433
2449 if (corner) 2434 if (corner)
2450 { 2435 {
2451 float ox = corner * dx; 2436 float ox = corner * dx;
2452 2437
2453 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2438 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th); 2439 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th); 2440 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py ); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2457 }
2458 }
2459 } 2442 }
2460 } 2443 }
2461 } 2444 }
2462 } 2445 }
2463 2446
2464 glEnd (); 2447 glEnd ();
2465 glDisable (GL_TEXTURE_2D); 2448 glDisable (GL_TEXTURE_2D);
2466 key.texname = -1; 2449 key.texname = -1;
2467 } 2450 }
… …
2472 maptex tex = pl_tex; 2455 maptex tex = pl_tex;
2473 int px = pl_x + sdx; 2456 int px = pl_x + sdx;
2474 int py = pl_y + sdy; 2457 int py = pl_y + sdy;
2475 2458
2476 key.texname = tex.name; 2459 key.texname = tex.name;
2477 arr = rc_array (rc, &key); 2460 rc_t::array_t &arr = rc.array (key);
2478 2461
2479 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2462 arr.t2f_v3f (0 , 0 , px , py , 0);
2480 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2463 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); 2464 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); 2465 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2483 2466
2484 rc_draw (rc); 2467 rc.draw ();
2485 } 2468 }
2486 2469
2487 rc_draw (rc_ov); 2470 rc_ov.draw ();
2488 rc_clear (rc_ov); 2471 rc_ov.clear ();
2489 2472
2490 glDisable (GL_BLEND); 2473 glDisable (GL_BLEND);
2491 rc_free (rc);
2492 rc_free (rc_ov);
2493 2474
2494 // top layer: overlays such as the health bar 2475 // top layer: overlays such as the health bar
2495 for (y = 0; y < sh; y++) 2476 for (y = 0; y < sh; y++)
2496 if (0 <= y + my && y + my < self->rows) 2477 if (0 <= y + my && y + my < self->rows)
2497 { 2478 {
… …
2503 mapcell *cell = row->col + (x + mx - row->c0); 2484 mapcell *cell = row->col + (x + mx - row->c0);
2504 2485
2505 int px = x * Tw; 2486 int px = x * Tw;
2506 int py = y * Th; 2487 int py = y * Th;
2507 2488
2508 if (expect_false (cell->player == player)) 2489 if (ecb_expect_false (cell->player == player))
2509 { 2490 {
2510 px += sdx; 2491 px += sdx;
2511 py += sdy; 2492 py += sdy;
2512 } 2493 }
2513 2494

Diff Legend

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