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.315 by root, Wed Jan 18 23:34:44 2012 UTC vs.
Revision 1.325 by root, Sun Nov 18 02:04:48 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>
48#endif 53#endif
49 54
50#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
51#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
52 57
53#include <glib/gmacros.h> 58#include <glib.h>
54 59
55#include <pango/pango.h> 60#include <pango/pango.h>
56 61
57#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
184{ 189{
185 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
186 191
187 while (attrs) 192 while (attrs)
188 { 193 {
189 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
190 195
191 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
192 return 1; 197 return 1;
193 198
194 attrs = attrs->next; 199 attrs = attrs->next;
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
212static void 219static void
213substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
214{ 221{
215 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
216#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
217 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
218#endif 225#endif
219 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
220} 227}
221 228
222static void 229static void
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}
889void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
890 922
891void SDL_Quit () 923void SDL_Quit ()
892 924
893int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
894 927
895int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
896 CODE: 929 CODE:
897 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
898 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
899 OUTPUT: 932 OUTPUT:
900 RETVAL 933 RETVAL
901 934
902void 935void
975void 1008void
976SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
977 1010
978char * 1011char *
979SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
980 1014
981int 1015int
982SDL_GetAppState () 1016SDL_GetAppState ()
983 1017
984int 1018int
1081 OUTPUT: 1115 OUTPUT:
1082 RETVAL 1116 RETVAL
1083 1117
1084int 1118int
1085Mix_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)
1086 POSTCALL: 1120 POSTCALL:
1087 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
1088 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
1089 1123
1090void 1124void
1091Mix_QuerySpec () 1125Mix_QuerySpec ()
1212 1246
1213 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1214 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1215 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1216 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1217 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1218 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1252 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1219 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1220 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1221 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1222 1256
1294MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1295 1329
1296PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1297 1331
1298DC::Font 1332DC::Font
1299new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1300 CODE: 1334 CODE:
1301{ 1335{
1302 int count; 1336 int count;
1303 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1304 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1333 PROTOTYPE: 1367 PROTOTYPE:
1334 CODE: 1368 CODE:
1335 tc_restore (); 1369 tc_restore ();
1336 1370
1337DC::Layout 1371DC::Layout
1338new (SV *class) 1372new (SV *klass)
1339 CODE: 1373 CODE:
1340 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
1341 1375
1342 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1343 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1492 1526
1493void 1527void
1494set_height (DC::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1495 CODE: 1529 CODE:
1496 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1497 { 1531 {
1498 self->base_height = base_height; 1532 self->base_height = base_height;
1499 layout_update_font (self); 1533 layout_update_font (self);
1500 } 1534 }
1501 1535
1502void 1536void
1866MODULE = Deliantra::Client PACKAGE = DC::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1867 1901
1868PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1869 1903
1870DC::Map 1904DC::Map
1871new (SV *class) 1905new (SV *klass)
1872 CODE: 1906 CODE:
1873 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1874 RETVAL->x = 0; 1908 RETVAL->x = 0;
1875 RETVAL->y = 0; 1909 RETVAL->y = 0;
1876 RETVAL->w = 0; 1910 RETVAL->w = 0;
1877 RETVAL->h = 0; 1911 RETVAL->h = 0;
1878 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1915 1949
1916void 1950void
1917set_smooth (DC::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1918 CODE: 1952 CODE:
1919{ 1953{
1920 tileid texid; 1954 tileid texid;
1921 maptex *tex; 1955 maptex *tex;
1922 1956
1923 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1924 return; 1958 return;
1925 1959
1926 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1927 return; 1961 return;
1928 1962
1929 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1930 1964
1931 if (!texid) 1965 if (!texid)
1932 return; 1966 return;
1933 1967
1934 tex = self->tex + texid; 1968 tex = self->tex + texid;
1967} 2001}
1968 2002
1969void 2003void
1970expire_textures (DC::Map self, int texid, int count) 2004expire_textures (DC::Map self, int texid, int count)
1971 PPCODE: 2005 PPCODE:
1972 for (; texid < self->texs && count; ++texid, --count) 2006 for (; texid < self->texs && count; ++texid, --count)
1973 { 2007 {
1974 maptex *tex = self->tex + texid; 2008 maptex *tex = self->tex + texid;
1975 2009
1976 if (tex->name) 2010 if (tex->name)
1977 { 2011 {
2032 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
2033 } 2067 }
2034} 2068}
2035 2069
2036SV * 2070SV *
2037map1a_update (DC::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
2038 CODE: 2072 CODE:
2039{ 2073{
2040 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
2041 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
2042 mapcell *cell; 2076 mapcell *cell;
2063 2097
2064 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
2065 2099
2066 if (flags & 8) 2100 if (flags & 8)
2067 { 2101 {
2102 uint8_t ext, cmd;
2103
2068 if (extmap) 2104 do
2069 { 2105 {
2070 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
2071 2108
2072 do 2109 if (cmd < 4)
2110 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2111 else if (cmd == 5) // health
2073 { 2112 {
2074 ext = *data++;
2075 cmd = ext & 0x7f;
2076
2077 if (cmd < 4)
2078 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2079 else if (cmd == 5) // health
2080 {
2081 cell->stat_width = 1; 2113 cell->stat_width = 1;
2082 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
2083 }
2084 else if (cmd == 6) // monster width
2085 cell->stat_width = *data++ + 1;
2086 else if (cmd == 0x47)
2087 {
2088 if (*data == 1) cell->player = data [1];
2089 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2090 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2091 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2092
2093 data += *data + 1;
2094 }
2095 else if (cmd == 8) // cell flags
2096 cell->flags = *data++;
2097 else if (ext & 0x40) // unknown, multibyte => skip
2098 data += *data + 1;
2099 else
2100 data++;
2101 } 2115 }
2102 while (ext & 0x80); 2116 else if (cmd == 6) // monster width
2117 cell->stat_width = *data++ + 1;
2118 else if (cmd == 0x47)
2119 {
2120 if (*data == 1) cell->player = data [1];
2121 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2122 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2123 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2124
2125 data += *data + 1;
2126 }
2127 else if (cmd == 8) // cell flags
2128 cell->flags = *data++;
2129 else if (ext & 0x40) // unknown, multibyte => skip
2130 data += *data + 1;
2131 else
2132 data++;
2103 } 2133 }
2104 else 2134 while (ext & 0x80);
2105 cell->darkness = *data++ + 1;
2106 } 2135 }
2107 2136
2108 for (z = 0; z <= 2; ++z) 2137 for (z = 0; z <= 2; ++z)
2109 if (flags & (4 >> z)) 2138 if (flags & (4 >> z))
2110 { 2139 {
2184 | (b << 16) 2213 | (b << 16)
2185 | (a << 24); 2214 | (a << 24);
2186 } 2215 }
2187 } 2216 }
2188 2217
2189 RETVAL = map_sv; 2218 RETVAL = map_sv;
2190} 2219}
2191 OUTPUT: 2220 OUTPUT:
2192 RETVAL 2221 RETVAL
2193 2222
2194void 2223void
2195draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2224draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2196 CODE: 2225 CODE:
2197{ 2226{
2198 int x, y, z; 2227 int x, y, z;
2199 2228
2200 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2201 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2202 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2203 smooth_key skey;
2204 int pl_x, pl_y; 2230 int pl_x, pl_y;
2205 maptex pl_tex; 2231 maptex pl_tex;
2206 rc_t *rc = rc_alloc (); 2232 rc_t *rc = rc_alloc ();
2207 rc_t *rc_ov = rc_alloc (); 2233 rc_t *rc_ov = rc_alloc ();
2208 rc_key_t key; 2234 rc_key_t key;
2211 pl_tex.name = 0; 2237 pl_tex.name = 0;
2212 2238
2213 // that's current max. sorry. 2239 // that's current max. sorry.
2214 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
2215 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
2216
2217 // clear key, in case of extra padding
2218 memset (&skey, 0, sizeof (skey));
2219 2242
2220 memset (&key, 0, sizeof (key)); 2243 memset (&key, 0, sizeof (key));
2221 key.r = 255; 2244 key.r = 255;
2222 key.g = 255; 2245 key.g = 255;
2223 key.b = 255; 2246 key.b = 255;
2229 my += self->y; 2252 my += self->y;
2230 2253
2231 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
2232 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
2233 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
2234 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2235 2258
2236 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
2237 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
2238 { 2261 {
2239 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
2254 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2255 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2256 2279
2257 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
2258 { 2281 {
2259 memset (smooth_level, 0, sizeof (smooth_level)); 2282 std::bitset<256> smooth_level; // one bit for every possible smooth level
2283 smooth_key skey;
2284 smooth_hash smooth;
2260 key.texname = -1; 2285 key.texname = -1;
2261 2286
2262 for (y = 0; y < sh; y++) 2287 for (y = 0; y < sh; y++)
2263 if (0 <= y + my && y + my < self->rows) 2288 if (0 <= y + my && y + my < self->rows)
2264 { 2289 {
2306 if (tex.smoothtile) 2331 if (tex.smoothtile)
2307 { 2332 {
2308 skey.tile = tex.smoothtile; 2333 skey.tile = tex.smoothtile;
2309 skey.level = tex.smoothlevel; 2334 skey.level = tex.smoothlevel;
2310 2335
2311 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2336 smooth_level[tex.smoothlevel] = 1;
2312 2337
2313 // add bits to current tile and all neighbours. skey.x|y is 2338 // add bits to current tile and all neighbours. skey.x|y is
2314 // shifted +1|+1 so we always stay positive. 2339 // shifted +1|+1 so we always stay positive.
2315 2340
2316 // bits is ___n cccc CCCC bbbb 2341 // bits is ___n cccc CCCC bbbb
2324 2349
2325 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2350 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2326 // ·· ·· ·┏ ┓· 2351 // ·· ·· ·┏ ┓·
2327 2352
2328 // full tile 2353 // full tile
2329 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2354 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2330 2355
2331 // borders 2356 // borders
2332 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2357 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2333 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2358 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2334 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2359 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2335 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2360 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2336 2361
2337 // corners 2362 // corners
2338 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2363 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2339 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2364 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2340 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2365 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2341 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2366 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2342 } 2367 }
2343 } 2368 }
2344 2369
2345 if (expect_false (z == 2) && expect_false (cell->flags)) 2370 if (expect_false (z == 2) && expect_false (cell->flags))
2346 { 2371 {
2373 { 2398 {
2374 int w, b; 2399 int w, b;
2375 2400
2376 glEnable (GL_TEXTURE_2D); 2401 glEnable (GL_TEXTURE_2D);
2377 glBegin (GL_QUADS); 2402 glBegin (GL_QUADS);
2378 for (w = 0; w < 256 / 32; ++w) 2403 for (int level = 0; level < smooth_level.size (); ++level)
2404 if (smooth_level[level])
2405 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2379 { 2406 {
2380 uint32_t smask = smooth_level [w]; 2407 smooth_key &skey = it->first;
2381 if (smask) 2408 IV bits = it->second;
2382 for (b = 0; b < 32; ++b) 2409
2383 if (smask & (((uint32_t)1) << b)) 2410 if (!(bits & 0x1000)
2411 && skey.level == level
2412 && level > smooth_max [skey.x][skey.y])
2384 { 2413 {
2385 int level = (w << 5) | b; 2414 maptex tex = self->tex [skey.tile];
2415 int px = (((int)skey.x) - 1) * Tw;
2416 int py = (((int)skey.y) - 1) * Th;
2417 int border = bits & 15;
2418 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2419 float dx = tex.s * .0625f; // 16 images/row
2420 float dy = tex.t * .5f ; // 2 images/column
2421
2386 HE *he; 2422 if (tex.name)
2387
2388 hv_iterinit (smooth);
2389 while ((he = hv_iternext (smooth)))
2390 { 2423 {
2391 smooth_key *skey = (smooth_key *)HeKEY (he); 2424 // this time avoiding texture state changes
2392 IV bits = SvIVX (HeVAL (he)); 2425 // save gobs of state changes.
2393 2426 if (key.texname != tex.name)
2394 if (!(bits & 0x1000)
2395 && skey->level == level
2396 && level > smooth_max [skey->x][skey->y])
2397 { 2427 {
2398 maptex tex = self->tex [skey->tile];
2399 int px = (((int)skey->x) - 1) * Tw;
2400 int py = (((int)skey->y) - 1) * Th;
2401 int border = bits & 15;
2402 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2403 float dx = tex.s * .0625f; // 16 images/row
2404 float dy = tex.t * .5f ; // 2 images/column
2405
2406 if (tex.name)
2407 {
2408 // this time avoiding texture state changes
2409 // save gobs of state changes.
2410 if (key.texname != tex.name)
2411 {
2412 self->tex [skey->tile].unused = 0; 2428 self->tex [skey.tile].unused = 0;
2413 2429
2414 glEnd (); 2430 glEnd ();
2415 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2431 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2416 glBegin (GL_QUADS); 2432 glBegin (GL_QUADS);
2417 } 2433 }
2418 2434
2419 if (border) 2435 if (border)
2420 { 2436 {
2421 float ox = border * dx; 2437 float ox = border * dx;
2422 2438
2423 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2439 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2424 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2425 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2426 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py ); 2442 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2427 } 2443 }
2428 2444
2429 if (corner) 2445 if (corner)
2430 { 2446 {
2431 float ox = corner * dx; 2447 float ox = corner * dx;
2432 2448
2433 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2434 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th); 2450 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2435 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th); 2451 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2436 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py ); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2437 }
2438 }
2439 } 2453 }
2440 } 2454 }
2441 } 2455 }
2442 } 2456 }
2443 2457
2444 glEnd (); 2458 glEnd ();
2445 glDisable (GL_TEXTURE_2D); 2459 glDisable (GL_TEXTURE_2D);
2446 key.texname = -1; 2460 key.texname = -1;
2447 } 2461 }
2448
2449 hv_clear (smooth);
2450 } 2462 }
2451 2463
2452 if (pl_tex.name) 2464 if (pl_tex.name)
2453 { 2465 {
2454 maptex tex = pl_tex; 2466 maptex tex = pl_tex;
2723 else 2735 else
2724 *data++ = 0; 2736 *data++ = 0;
2725 } 2737 }
2726 } 2738 }
2727 2739
2728 /* if size is w*h + 5 then no data has been found */ 2740 /* if size is w*h + 5 then no data has been found */
2729 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2741 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2730 { 2742 {
2731 SvPOK_only (data_sv); 2743 SvPOK_only (data_sv);
2732 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2744 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2733 } 2745 }
2734 2746
2735 RETVAL = data_sv; 2747 RETVAL = data_sv;
2736} 2748}
2737 OUTPUT: 2749 OUTPUT:
2738 RETVAL 2750 RETVAL
2739 2751
2740void 2752void
2747 STRLEN len; 2759 STRLEN len;
2748 uint8_t *data, *end; 2760 uint8_t *data, *end;
2749 2761
2750 len = SvLEN (data_sv); 2762 len = SvLEN (data_sv);
2751 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2763 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2752 data = SvPVbyte_nolen (data_sv); 2764 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2753 end = data + len + 8; 2765 end = data + len + 8;
2754 2766
2755 if (len < 5) 2767 if (len < 5)
2756 XSRETURN_EMPTY; 2768 XSRETURN_EMPTY;
2757 2769
2818} 2830}
2819 2831
2820MODULE = Deliantra::Client PACKAGE = DC::RW 2832MODULE = Deliantra::Client PACKAGE = DC::RW
2821 2833
2822DC::RW 2834DC::RW
2823new (SV *class, SV *data_sv) 2835new (SV *klass, SV *data_sv)
2824 CODE: 2836 CODE:
2825{ 2837{
2826 STRLEN datalen; 2838 STRLEN datalen;
2827 char *data = SvPVbyte (data_sv, datalen); 2839 char *data = SvPVbyte (data_sv, datalen);
2828 2840
2830} 2842}
2831 OUTPUT: 2843 OUTPUT:
2832 RETVAL 2844 RETVAL
2833 2845
2834DC::RW 2846DC::RW
2835new_from_file (SV *class, const char *path, const char *mode = "rb") 2847new_from_file (SV *klass, const char *path, const char *mode = "rb")
2836 CODE: 2848 CODE:
2837 RETVAL = SDL_RWFromFile (path, mode); 2849 RETVAL = SDL_RWFromFile (path, mode);
2838 OUTPUT: 2850 OUTPUT:
2839 RETVAL 2851 RETVAL
2840 2852
2949#else 2961#else
2950 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0))); 2962 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2951#endif 2963#endif
2952 2964
2953DC::MixChunk 2965DC::MixChunk
2954new (SV *class, DC::RW rwops) 2966new (SV *klass, DC::RW rwops)
2955 CODE: 2967 CODE:
2956 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2968 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2957 OUTPUT: 2969 OUTPUT:
2958 RETVAL 2970 RETVAL
2959 2971
3029 RETVAL = Mix_PlayingMusic (); 3041 RETVAL = Mix_PlayingMusic ();
3030 OUTPUT: 3042 OUTPUT:
3031 RETVAL 3043 RETVAL
3032 3044
3033DC::MixMusic 3045DC::MixMusic
3034new (SV *class, DC::RW rwops) 3046new (SV *klass, DC::RW rwops)
3035 CODE: 3047 CODE:
3036 RETVAL = Mix_LoadMUS_RW (rwops); 3048 RETVAL = Mix_LoadMUS_RW (rwops);
3037 OUTPUT: 3049 OUTPUT:
3038 RETVAL 3050 RETVAL
3039 3051
3192 gl.BlendFuncSeparateEXT = 0; 3204 gl.BlendFuncSeparateEXT = 0;
3193 3205
3194void 3206void
3195apple_nvidia_bug (int enable) 3207apple_nvidia_bug (int enable)
3196 3208
3197char * 3209const char *
3198gl_vendor () 3210gl_vendor ()
3199 CODE: 3211 CODE:
3200 RETVAL = (char *)glGetString (GL_VENDOR); 3212 RETVAL = (const char *)glGetString (GL_VENDOR);
3201 OUTPUT: 3213 OUTPUT:
3202 RETVAL 3214 RETVAL
3203 3215
3204char * 3216const char *
3205gl_version () 3217gl_version ()
3206 CODE: 3218 CODE:
3207 RETVAL = (char *)glGetString (GL_VERSION); 3219 RETVAL = (const char *)glGetString (GL_VERSION);
3208 OUTPUT: 3220 OUTPUT:
3209 RETVAL 3221 RETVAL
3210 3222
3211char * 3223const char *
3212gl_extensions () 3224gl_extensions ()
3213 CODE: 3225 CODE:
3214 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3226 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3215 OUTPUT: 3227 OUTPUT:
3216 RETVAL 3228 RETVAL
3217 3229
3218const char *glGetString (GLenum pname) 3230const char *glGetString (GLenum pname)
3231 CODE:
3232 RETVAL = (const char *)glGetString (pname);
3233 OUTPUT:
3234 RETVAL
3219 3235
3220GLint glGetInteger (GLenum pname) 3236GLint glGetInteger (GLenum pname)
3221 CODE: 3237 CODE:
3222 glGetIntegerv (pname, &RETVAL); 3238 glGetIntegerv (pname, &RETVAL);
3223 OUTPUT: 3239 OUTPUT:
3426 3442
3427void 3443void
3428find_widget (SV *self, NV x, NV y) 3444find_widget (SV *self, NV x, NV y)
3429 PPCODE: 3445 PPCODE:
3430{ 3446{
3431 if (within_widget (self, x, y)) 3447 if (within_widget (self, x, y))
3432 XPUSHs (self); 3448 XPUSHs (self);
3433} 3449}
3434 3450
3435BOOT: 3451BOOT:
3436{ 3452{
3444 3460
3445void 3461void
3446draw (SV *self) 3462draw (SV *self)
3447 CODE: 3463 CODE:
3448{ 3464{
3449 HV *hv; 3465 HV *hv;
3450 SV **svp; 3466 SV **svp;
3451 NV x, y, w, h; 3467 NV x, y, w, h;
3452 SV *draw_x_sv = GvSV (draw_x_gv); 3468 SV *draw_x_sv = GvSV (draw_x_gv);
3453 SV *draw_y_sv = GvSV (draw_y_gv); 3469 SV *draw_y_sv = GvSV (draw_y_gv);
3454 SV *draw_w_sv = GvSV (draw_w_gv); 3470 SV *draw_w_sv = GvSV (draw_w_gv);
3455 SV *draw_h_sv = GvSV (draw_h_gv); 3471 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines