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.320 by root, Sun Nov 18 01:00:10 2018 UTC vs.
Revision 1.328 by root, Sun Nov 18 12:47:55 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>
… …
195 } 200 }
196 201
197 return 0; 202 return 0;
198} 203}
199 204
200typedef struct cf_layout { 205struct cf_layout {
201 PangoLayout *pl; 206 PangoLayout *pl;
202 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
203 int base_height; 208 int base_height;
204 DC__Font font; 209 DC__Font font;
205 rc_t *rc; 210 rc_t rc;
206} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
207 214
208static DC__Font default_font; 215static DC__Font default_font;
209static PangoContext *opengl_context; 216static PangoContext *opengl_context;
210static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
211 218
… …
252} 259}
253 260
254typedef uint16_t tileid; 261typedef uint16_t tileid;
255typedef uint16_t faceid; 262typedef uint16_t faceid;
256 263
257typedef struct { 264struct maptex
265{
258 GLuint name; 266 GLuint name;
259 int w, h; 267 int w, h;
260 float s, t; 268 float s, t;
261 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
262 tileid smoothtile; 270 tileid smoothtile;
263 uint8_t smoothlevel; 271 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */ 272 uint8_t unused; /* set to zero on use */
265} maptex; 273};
266 274
267typedef struct { 275struct mapcell
276{
268 uint32_t player; 277 uint32_t player;
269 tileid tile[3]; 278 tileid tile[3];
270 uint16_t darkness; 279 uint16_t darkness;
271 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
272} mapcell; 281};
273 282
274typedef struct { 283struct maprow
284{
275 int32_t c0, c1; 285 int32_t c0, c1;
276 mapcell *col; 286 mapcell *col;
277} maprow; 287};
278 288
279typedef struct map { 289struct mapgrid {
280 int x, y, w, h; 290 int x, y, w, h;
281 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
282 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
283 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
284 294
285 int32_t rows; 295 int32_t rows;
286 maprow *row; 296 maprow *row;
287} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
288 300
289static char * 301static char *
290prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
291{ 303{
292 char *p; 304 char *p;
… …
310 322
311#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#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)) 324#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
313 325
314static void 326static void
315need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
316{ 328{
317 while (self->faces <= face) 329 while (self->faces <= face)
318 { 330 {
319 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
320 self->faces *= 2; 332 self->faces *= 2;
321 } 333 }
322} 334}
323 335
324static void 336static void
325need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
326{ 338{
327 while (self->texs <= texid) 339 while (self->texs <= texid)
328 { 340 {
329 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
330 self->texs *= 2; 342 self->texs *= 2;
331 } 343 }
332} 344}
333 345
334static maprow * 346static maprow *
335map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
336{ 348{
337 if (0 > y) 349 if (0 > y)
338 { 350 {
339 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
340 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
… …
378 390
379 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
380} 392}
381 393
382static mapcell * 394static mapcell *
383map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
384{ 396{
385 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
386} 398}
387 399
388static void 400static void
389map_clear (DC__Map self) 401map_clear (mapgrid *self)
390{ 402{
391 int r; 403 int r;
392 404
393 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
394 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
… …
412 (cell)->flags = 0; \ 424 (cell)->flags = 0; \
413 (cell)->player = 0; \ 425 (cell)->player = 0; \
414 } while (0) 426 } while (0)
415 427
416static void 428static void
417map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
418{ 430{
419 int x, y; 431 int x, y;
420 maprow *row; 432 maprow *row;
421 mapcell *cell; 433 mapcell *cell;
422 434
… …
439 CELL_CLEAR (cell); 451 CELL_CLEAR (cell);
440 } 452 }
441 } 453 }
442} 454}
443 455
444typedef struct { 456struct smooth_key
457{
445 tileid tile; 458 tileid tile;
446 uint8_t x, y, level; 459 uint8_t x, y, level;
447} smooth_key; 460
461 bool operator == (const smooth_key &o) const
462 {
463 return tile == o.tile && x == o.x && y == o.y && level == o.level;
464 }
465};
466
467typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
468
469namespace std {
470 template <>
471 struct hash<smooth_key>
472 {
473 size_t operator () (const smooth_key &v) const
474 {
475 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
476 }
477 };
478}
448 479
449static void 480static void
450smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
451{ 482{
452 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
453 484
454 if (SvIOK (*sv)) 485 if (it == h.end ())
455 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
456 else 487 else
457 sv_setiv (*sv, bits); 488 it->second |= bits;
458} 489}
459 490
460static void 491static void
461music_finished (void) 492music_finished (void)
462{ 493{
… …
481 ev.data2 = 0; 512 ev.data2 = 0;
482 513
483 SDL_PushEvent ((SDL_Event *)&ev); 514 SDL_PushEvent ((SDL_Event *)&ev);
484} 515}
485 516
517// approximately divide by 255
486static unsigned int 518static unsigned int
487div255 (unsigned int n) 519div255 (unsigned int n)
488{ 520{
489 return (n + (n >> 8)) >> 8; 521 return (n + (n >> 8)) >> 8;
490} 522}
… …
1083 OUTPUT: 1115 OUTPUT:
1084 RETVAL 1116 RETVAL
1085 1117
1086int 1118int
1087Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1119Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1088 POSTCALL: 1120 POSTCALL:
1089 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
1090 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
1091 1123
1092void 1124void
1093Mix_QuerySpec () 1125Mix_QuerySpec ()
… …
1337 tc_restore (); 1369 tc_restore ();
1338 1370
1339DC::Layout 1371DC::Layout
1340new (SV *klass) 1372new (SV *klass)
1341 CODE: 1373 CODE:
1342 New (0, RETVAL, 1, struct cf_layout); 1374 RETVAL = new cf_layout;
1343 1375
1344 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1345 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1346 RETVAL->g = 1.; 1378 RETVAL->g = 1.;
1347 RETVAL->b = 1.; 1379 RETVAL->b = 1.;
1348 RETVAL->a = 1.; 1380 RETVAL->a = 1.;
1349 RETVAL->base_height = MIN_FONT_HEIGHT; 1381 RETVAL->base_height = MIN_FONT_HEIGHT;
1350 RETVAL->font = 0; 1382 RETVAL->font = 0;
1351 RETVAL->rc = rc_alloc ();
1352 1383
1353 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1354 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
1355 OUTPUT: 1386 OUTPUT:
1356 RETVAL 1387 RETVAL
1357 1388
1358void 1389void
1359DESTROY (DC::Layout self) 1390DESTROY (DC::Layout self)
1360 CODE: 1391 CODE:
1361 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1362 rc_free (self->rc);
1363 Safefree (self); 1393 delete self;
1364 1394
1365void 1395void
1366set_text (DC::Layout self, SV *text_) 1396set_text (DC::Layout self, SV *text_)
1367 CODE: 1397 CODE:
1368{ 1398{
… …
1622} 1652}
1623 1653
1624void 1654void
1625render (DC::Layout self, float x, float y, int flags = 0) 1655render (DC::Layout self, float x, float y, int flags = 0)
1626 CODE: 1656 CODE:
1627 rc_clear (self->rc); 1657 self->rc.clear ();
1628 pango_opengl_render_layout_subpixel ( 1658 pango_opengl_render_layout_subpixel (
1629 self->pl, 1659 self->pl,
1630 self->rc, 1660 &self->rc,
1631 x * PANGO_SCALE, y * PANGO_SCALE, 1661 x * PANGO_SCALE, y * PANGO_SCALE,
1632 self->r, self->g, self->b, self->a, 1662 self->r, self->g, self->b, self->a,
1633 flags 1663 flags
1634 ); 1664 );
1635 // we assume that context_change actually clears/frees stuff 1665 // we assume that context_change actually clears/frees stuff
… …
1646 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1676 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1647 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1677 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1648 glEnable (GL_ALPHA_TEST); 1678 glEnable (GL_ALPHA_TEST);
1649 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1679 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1650 1680
1651 rc_draw (self->rc); 1681 self->rc.draw ();
1652 1682
1653 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1654 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1655 glDisable (GL_TEXTURE_2D); 1685 glDisable (GL_TEXTURE_2D);
1656} 1686}
… …
1870PROTOTYPES: DISABLE 1900PROTOTYPES: DISABLE
1871 1901
1872DC::Map 1902DC::Map
1873new (SV *klass) 1903new (SV *klass)
1874 CODE: 1904 CODE:
1875 New (0, RETVAL, 1, struct map); 1905 New (0, RETVAL, 1, mapgrid);
1876 RETVAL->x = 0; 1906 RETVAL->x = 0;
1877 RETVAL->y = 0; 1907 RETVAL->y = 0;
1878 RETVAL->w = 0; 1908 RETVAL->w = 0;
1879 RETVAL->h = 0; 1909 RETVAL->h = 0;
1880 RETVAL->ox = 0; 1910 RETVAL->ox = 0;
… …
1917 1947
1918void 1948void
1919set_smooth (DC::Map self, int face, int smooth, int level) 1949set_smooth (DC::Map self, int face, int smooth, int level)
1920 CODE: 1950 CODE:
1921{ 1951{
1922 tileid texid; 1952 tileid texid;
1923 maptex *tex; 1953 maptex *tex;
1924 1954
1925 if (face < 0 || face >= self->faces) 1955 if (face < 0 || face >= self->faces)
1926 return; 1956 return;
1927 1957
1928 if (smooth < 0 || smooth >= self->faces) 1958 if (smooth < 0 || smooth >= self->faces)
1929 return; 1959 return;
1930 1960
1931 texid = self->face2tile [face]; 1961 texid = self->face2tile [face];
1932 1962
1933 if (!texid) 1963 if (!texid)
1934 return; 1964 return;
1935 1965
1936 tex = self->tex + texid; 1966 tex = self->tex + texid;
… …
1969} 1999}
1970 2000
1971void 2001void
1972expire_textures (DC::Map self, int texid, int count) 2002expire_textures (DC::Map self, int texid, int count)
1973 PPCODE: 2003 PPCODE:
1974 for (; texid < self->texs && count; ++texid, --count) 2004 for (; texid < self->texs && count; ++texid, --count)
1975 { 2005 {
1976 maptex *tex = self->tex + texid; 2006 maptex *tex = self->tex + texid;
1977 2007
1978 if (tex->name) 2008 if (tex->name)
1979 { 2009 {
… …
2181 | (b << 16) 2211 | (b << 16)
2182 | (a << 24); 2212 | (a << 24);
2183 } 2213 }
2184 } 2214 }
2185 2215
2186 RETVAL = map_sv; 2216 RETVAL = map_sv;
2187} 2217}
2188 OUTPUT: 2218 OUTPUT:
2189 RETVAL 2219 RETVAL
2190 2220
2191void 2221void
2192draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2222draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2193 CODE: 2223 CODE:
2194{ 2224{
2195 int x, y, z; 2225 int x, y, z;
2196 2226
2197 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2198 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2199 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2227 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2200 smooth_key skey;
2201 int pl_x, pl_y; 2228 int pl_x, pl_y;
2202 maptex pl_tex; 2229 maptex pl_tex;
2203 rc_t *rc = rc_alloc (); 2230 rc_t rc;
2204 rc_t *rc_ov = rc_alloc (); 2231 rc_t rc_ov;
2205 rc_key_t key; 2232 rc_key_t key;
2206 rc_array_t *arr; 2233 rc_t::array_t *arr;
2207 2234
2208 pl_tex.name = 0; 2235 pl_tex.name = 0;
2209 2236
2210 // that's current max. sorry. 2237 // that's current max. sorry.
2211 if (sw > 255) sw = 255; 2238 if (sw > 255) sw = 255;
2212 if (sh > 255) sh = 255; 2239 if (sh > 255) sh = 255;
2213
2214 // clear key, in case of extra padding
2215 memset (&skey, 0, sizeof (skey));
2216 2240
2217 memset (&key, 0, sizeof (key)); 2241 memset (&key, 0, sizeof (key));
2218 key.r = 255; 2242 key.r = 255;
2219 key.g = 255; 2243 key.g = 255;
2220 key.b = 255; 2244 key.b = 255;
… …
2226 my += self->y; 2250 my += self->y;
2227 2251
2228 // first pass: determine smooth_max 2252 // first pass: determine smooth_max
2229 // rather ugly, if you ask me 2253 // rather ugly, if you ask me
2230 // could also be stored inside mapcell and updated on change 2254 // could also be stored inside mapcell and updated on change
2231 memset (smooth_max, 0, sizeof (smooth_max)); 2255 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2232 2256
2233 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
2234 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
2235 { 2259 {
2236 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
… …
2251 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2275 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2252 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2276 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2253 2277
2254 for (z = 0; z <= 2; z++) 2278 for (z = 0; z <= 2; z++)
2255 { 2279 {
2256 memset (smooth_level, 0, sizeof (smooth_level)); 2280 std::bitset<256> smooth_level; // one bit for every possible smooth level
2281 smooth_key skey;
2282 smooth_hash smooth;
2257 key.texname = -1; 2283 key.texname = -1;
2258 2284
2259 for (y = 0; y < sh; y++) 2285 for (y = 0; y < sh; y++)
2260 if (0 <= y + my && y + my < self->rows) 2286 if (0 <= y + my && y + my < self->rows)
2261 { 2287 {
… …
2278 2304
2279 if (!tex.name) 2305 if (!tex.name)
2280 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2306 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2281 2307
2282 key.texname = tex.name; 2308 key.texname = tex.name;
2283 arr = rc_array (rc, &key); 2309 arr = &rc.array (key);
2284 } 2310 }
2285 2311
2286 px = (x + 1) * Th - tex.w; 2312 px = (x + 1) * Th - tex.w;
2287 py = (y + 1) * Tw - tex.h; 2313 py = (y + 1) * Tw - tex.h;
2288 2314
… …
2292 pl_y = py; 2318 pl_y = py;
2293 pl_tex = tex; 2319 pl_tex = tex;
2294 continue; 2320 continue;
2295 } 2321 }
2296 2322
2297 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2323 arr->t2f_v3f (0 , 0 , px , py , 0);
2298 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2324 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2299 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2325 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2300 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2326 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2301 2327
2302 // update smooth hash 2328 // update smooth hash
2303 if (tex.smoothtile) 2329 if (tex.smoothtile)
2304 { 2330 {
2305 skey.tile = tex.smoothtile; 2331 skey.tile = tex.smoothtile;
2306 skey.level = tex.smoothlevel; 2332 skey.level = tex.smoothlevel;
2307 2333
2308 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2334 smooth_level[tex.smoothlevel] = 1;
2309 2335
2310 // add bits to current tile and all neighbours. skey.x|y is 2336 // add bits to current tile and all neighbours. skey.x|y is
2311 // shifted +1|+1 so we always stay positive. 2337 // shifted +1|+1 so we always stay positive.
2312 2338
2313 // bits is ___n cccc CCCC bbbb 2339 // bits is ___n cccc CCCC bbbb
… …
2321 2347
2322 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2348 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2323 // ·· ·· ·┏ ┓· 2349 // ·· ·· ·┏ ┓·
2324 2350
2325 // full tile 2351 // full tile
2326 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2352 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2327 2353
2328 // borders 2354 // borders
2329 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2355 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2330 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2356 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2331 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2357 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2332 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2358 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2333 2359
2334 // corners 2360 // corners
2335 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2361 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2336 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2362 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2337 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2363 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2338 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2364 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2339 } 2365 }
2340 } 2366 }
2341 2367
2342 if (expect_false (z == 2) && expect_false (cell->flags)) 2368 if (expect_false (z == 2) && expect_false (cell->flags))
2343 { 2369 {
2344 // overlays such as the speech bubble, probably more to come 2370 // overlays such as the speech bubble, probably more to come
2345 if (cell->flags & 1) 2371 if (cell->flags & 1)
2346 { 2372 {
2347 rc_key_t key_ov = key; 2373 rc_key_t key_ov = key;
2348 maptex tex = self->tex [TEXID_SPEECH]; 2374 maptex tex = self->tex[TEXID_SPEECH];
2349 rc_array_t *arr;
2350 int px = x * Tw + Tw * 2 / 32; 2375 int px = x * Tw + Tw * 2 / 32;
2351 int py = y * Th - Th * 6 / 32; 2376 int py = y * Th - Th * 6 / 32;
2352 2377
2353 key_ov.texname = tex.name; 2378 key_ov.texname = tex.name;
2354 arr = rc_array (rc_ov, &key_ov); 2379 rc_t::array_t &arr = rc_ov.array (key_ov);
2355 2380
2356 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2381 arr.t2f_v3f (0 , 0 , px , py , 0);
2357 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0); 2382 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2358 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0); 2383 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2359 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0); 2384 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2360 } 2385 }
2361 } 2386 }
2362 } 2387 }
2363 } 2388 }
2364 2389
2365 rc_draw (rc); 2390 rc.draw ();
2366 rc_clear (rc); 2391 rc.clear ();
2367 2392
2368 // go through all smoothlevels, lowest to highest, then draw. 2393 // go through all smoothlevels, lowest to highest, then draw.
2369 // this is basically counting sort 2394 // this is basically counting sort
2370 { 2395 {
2371 int w, b; 2396 int w, b;
2372 2397
2373 glEnable (GL_TEXTURE_2D); 2398 glEnable (GL_TEXTURE_2D);
2374 glBegin (GL_QUADS); 2399 glBegin (GL_QUADS);
2375 for (w = 0; w < 256 / 32; ++w) 2400 for (int level = 0; level < smooth_level.size (); ++level)
2401 if (smooth_level[level])
2402 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2376 { 2403 {
2377 uint32_t smask = smooth_level [w]; 2404 smooth_key &skey = it->first;
2378 if (smask) 2405 IV bits = it->second;
2379 for (b = 0; b < 32; ++b) 2406
2380 if (smask & (((uint32_t)1) << b)) 2407 if (!(bits & 0x1000)
2408 && skey.level == level
2409 && level > smooth_max [skey.x][skey.y])
2381 { 2410 {
2382 int level = (w << 5) | b; 2411 maptex tex = self->tex [skey.tile];
2412 int px = (((int)skey.x) - 1) * Tw;
2413 int py = (((int)skey.y) - 1) * Th;
2414 int border = bits & 15;
2415 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2416 float dx = tex.s * .0625f; // 16 images/row
2417 float dy = tex.t * .5f ; // 2 images/column
2418
2383 HE *he; 2419 if (tex.name)
2384
2385 hv_iterinit (smooth);
2386 while ((he = hv_iternext (smooth)))
2387 { 2420 {
2388 smooth_key *skey = (smooth_key *)HeKEY (he); 2421 // this time avoiding texture state changes
2389 IV bits = SvIVX (HeVAL (he)); 2422 // save gobs of state changes.
2390 2423 if (key.texname != tex.name)
2391 if (!(bits & 0x1000)
2392 && skey->level == level
2393 && level > smooth_max [skey->x][skey->y])
2394 { 2424 {
2395 maptex tex = self->tex [skey->tile];
2396 int px = (((int)skey->x) - 1) * Tw;
2397 int py = (((int)skey->y) - 1) * Th;
2398 int border = bits & 15;
2399 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2400 float dx = tex.s * .0625f; // 16 images/row
2401 float dy = tex.t * .5f ; // 2 images/column
2402
2403 if (tex.name)
2404 {
2405 // this time avoiding texture state changes
2406 // save gobs of state changes.
2407 if (key.texname != tex.name)
2408 {
2409 self->tex [skey->tile].unused = 0; 2425 self->tex [skey.tile].unused = 0;
2410 2426
2411 glEnd (); 2427 glEnd ();
2412 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2428 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2413 glBegin (GL_QUADS); 2429 glBegin (GL_QUADS);
2414 } 2430 }
2415 2431
2416 if (border) 2432 if (border)
2417 { 2433 {
2418 float ox = border * dx; 2434 float ox = border * dx;
2419 2435
2420 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2436 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2421 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2422 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th); 2438 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2423 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py ); 2439 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2424 } 2440 }
2425 2441
2426 if (corner) 2442 if (corner)
2427 { 2443 {
2428 float ox = corner * dx; 2444 float ox = corner * dx;
2429 2445
2430 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2446 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2431 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th); 2447 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2432 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th); 2448 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2433 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py ); 2449 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2434 }
2435 }
2436 } 2450 }
2437 } 2451 }
2438 } 2452 }
2439 } 2453 }
2440 2454
2441 glEnd (); 2455 glEnd ();
2442 glDisable (GL_TEXTURE_2D); 2456 glDisable (GL_TEXTURE_2D);
2443 key.texname = -1; 2457 key.texname = -1;
2444 } 2458 }
2445
2446 hv_clear (smooth);
2447 } 2459 }
2448 2460
2449 if (pl_tex.name) 2461 if (pl_tex.name)
2450 { 2462 {
2451 maptex tex = pl_tex; 2463 maptex tex = pl_tex;
2452 int px = pl_x + sdx; 2464 int px = pl_x + sdx;
2453 int py = pl_y + sdy; 2465 int py = pl_y + sdy;
2454 2466
2455 key.texname = tex.name; 2467 key.texname = tex.name;
2456 arr = rc_array (rc, &key); 2468 rc_t::array_t &arr = rc.array (key);
2457 2469
2458 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2470 arr.t2f_v3f (0 , 0 , px , py , 0);
2459 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2471 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2460 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2472 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2461 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2473 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2462 2474
2463 rc_draw (rc); 2475 rc.draw ();
2464 } 2476 }
2465 2477
2466 rc_draw (rc_ov); 2478 rc_ov.draw ();
2467 rc_clear (rc_ov); 2479 rc_ov.clear ();
2468 2480
2469 glDisable (GL_BLEND); 2481 glDisable (GL_BLEND);
2470 rc_free (rc);
2471 rc_free (rc_ov);
2472 2482
2473 // top layer: overlays such as the health bar 2483 // top layer: overlays such as the health bar
2474 for (y = 0; y < sh; y++) 2484 for (y = 0; y < sh; y++)
2475 if (0 <= y + my && y + my < self->rows) 2485 if (0 <= y + my && y + my < self->rows)
2476 { 2486 {
… …
2720 else 2730 else
2721 *data++ = 0; 2731 *data++ = 0;
2722 } 2732 }
2723 } 2733 }
2724 2734
2725 /* if size is w*h + 5 then no data has been found */ 2735 /* if size is w*h + 5 then no data has been found */
2726 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2736 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2727 { 2737 {
2728 SvPOK_only (data_sv); 2738 SvPOK_only (data_sv);
2729 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2739 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2730 } 2740 }
2731 2741
2732 RETVAL = data_sv; 2742 RETVAL = data_sv;
2733} 2743}
2734 OUTPUT: 2744 OUTPUT:
2735 RETVAL 2745 RETVAL
2736 2746
2737void 2747void
… …
3427 3437
3428void 3438void
3429find_widget (SV *self, NV x, NV y) 3439find_widget (SV *self, NV x, NV y)
3430 PPCODE: 3440 PPCODE:
3431{ 3441{
3432 if (within_widget (self, x, y)) 3442 if (within_widget (self, x, y))
3433 XPUSHs (self); 3443 XPUSHs (self);
3434} 3444}
3435 3445
3436BOOT: 3446BOOT:
3437{ 3447{
… …
3445 3455
3446void 3456void
3447draw (SV *self) 3457draw (SV *self)
3448 CODE: 3458 CODE:
3449{ 3459{
3450 HV *hv; 3460 HV *hv;
3451 SV **svp; 3461 SV **svp;
3452 NV x, y, w, h; 3462 NV x, y, w, h;
3453 SV *draw_x_sv = GvSV (draw_x_gv); 3463 SV *draw_x_sv = GvSV (draw_x_gv);
3454 SV *draw_y_sv = GvSV (draw_y_gv); 3464 SV *draw_y_sv = GvSV (draw_y_gv);
3455 SV *draw_w_sv = GvSV (draw_w_gv); 3465 SV *draw_w_sv = GvSV (draw_w_gv);
3456 SV *draw_h_sv = GvSV (draw_h_gv); 3466 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

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