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.317 by root, Fri Nov 23 12:39:05 2012 UTC vs.
Revision 1.327 by root, Sun Nov 18 12:01:50 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 std::vector<tileid> tile;
283 int texs; maptex *tex; // [tileid] 293 std::vector<maptex> tex;
284 294
285 int32_t rows; 295 int32_t rows;
286 maprow *row; 296 maprow *row;
287} *DC__Map; 297
298 ~mapgrid ()
299 {
300 clear_cells ();
301 }
302
303 void clear_cells ();
304};
305
306typedef mapgrid *DC__Map;
288 307
289static char * 308static char *
290prepend (char *ptr, int sze, int inc) 309prepend (char *ptr, int sze, int inc)
291{ 310{
292 char *p; 311 char *p;
309} 328}
310 329
311#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 330#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)) 331#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
313 332
314static void
315need_facenum (struct map *self, faceid face)
316{
317 while (self->faces <= face)
318 {
319 Append (tileid, self->face2tile, self->faces, self->faces);
320 self->faces *= 2;
321 }
322}
323
324static void
325need_texid (struct map *self, int texid)
326{
327 while (self->texs <= texid)
328 {
329 Append (maptex, self->tex, self->texs, self->texs);
330 self->texs *= 2;
331 }
332}
333
334static maprow * 333static maprow *
335map_get_row (DC__Map self, int y) 334map_get_row (mapgrid *self, int y)
336{ 335{
337 if (0 > y) 336 if (0 > y)
338 { 337 {
339 int extend = - y + MAP_EXTEND_Y; 338 int extend = - y + MAP_EXTEND_Y;
340 Prepend (maprow, self->row, self->rows, extend); 339 Prepend (maprow, self->row, self->rows, extend);
378 377
379 return row->col + (x - row->c0); 378 return row->col + (x - row->c0);
380} 379}
381 380
382static mapcell * 381static mapcell *
383map_get_cell (DC__Map self, int x, int y) 382map_get_cell (mapgrid *self, int x, int y)
384{ 383{
385 return row_get_cell (map_get_row (self, y), x); 384 return row_get_cell (map_get_row (self, y), x);
386} 385}
387 386
388static void 387void mapgrid::clear_cells ()
389map_clear (DC__Map self)
390{ 388{
391 int r; 389 int r;
392 390
393 for (r = 0; r < self->rows; r++) 391 for (r = 0; r < rows; r++)
394 Safefree (self->row[r].col); 392 Safefree (row[r].col);
395 393
396 Safefree (self->row); 394 Safefree (row);
397 395
398 self->x = 0; 396 x = 0;
399 self->y = 0; 397 y = 0;
400 self->ox = 0; 398 ox = 0;
401 self->oy = 0; 399 oy = 0;
402 self->row = 0; 400 row = 0;
403 self->rows = 0; 401 rows = 0;
404} 402}
405 403
406#define CELL_CLEAR(cell) \ 404#define CELL_CLEAR(cell) \
407 do { \ 405 do { \
408 if ((cell)->player) \ 406 if ((cell)->player) \
412 (cell)->flags = 0; \ 410 (cell)->flags = 0; \
413 (cell)->player = 0; \ 411 (cell)->player = 0; \
414 } while (0) 412 } while (0)
415 413
416static void 414static void
417map_blank (DC__Map self, int x0, int y0, int w, int h) 415map_blank (mapgrid *self, int x0, int y0, int w, int h)
418{ 416{
419 int x, y; 417 int x, y;
420 maprow *row; 418 maprow *row;
421 mapcell *cell; 419 mapcell *cell;
422 420
439 CELL_CLEAR (cell); 437 CELL_CLEAR (cell);
440 } 438 }
441 } 439 }
442} 440}
443 441
444typedef struct { 442struct smooth_key
443{
445 tileid tile; 444 tileid tile;
446 uint8_t x, y, level; 445 uint8_t x, y, level;
447} smooth_key; 446
447 bool operator == (const smooth_key &o) const
448 {
449 return tile == o.tile && x == o.x && y == o.y && level == o.level;
450 }
451};
452
453typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
454
455namespace std {
456 template <>
457 struct hash<smooth_key>
458 {
459 size_t operator () (const smooth_key &v) const
460 {
461 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
462 }
463 };
464}
448 465
449static void 466static void
450smooth_or_bits (HV *hv, smooth_key *key, IV bits) 467smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
451{ 468{
452 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 469 auto &&it = h.find (key);
453 470
454 if (SvIOK (*sv)) 471 if (it == h.end ())
455 SvIV_set (*sv, SvIVX (*sv) | bits); 472 h.insert (std::make_pair (key, bits));
456 else 473 else
457 sv_setiv (*sv, bits); 474 it->second |= bits;
458} 475}
459 476
460static void 477static void
461music_finished (void) 478music_finished (void)
462{ 479{
481 ev.data2 = 0; 498 ev.data2 = 0;
482 499
483 SDL_PushEvent ((SDL_Event *)&ev); 500 SDL_PushEvent ((SDL_Event *)&ev);
484} 501}
485 502
503// approximately divide by 255
486static unsigned int 504static unsigned int
487div255 (unsigned int n) 505div255 (unsigned int n)
488{ 506{
489 return (n + (n >> 8)) >> 8; 507 return (n + (n >> 8)) >> 8;
490} 508}
889void SDL_QuitSubSystem (U32 flags) 907void SDL_QuitSubSystem (U32 flags)
890 908
891void SDL_Quit () 909void SDL_Quit ()
892 910
893int SDL_GL_SetAttribute (int attr, int value) 911int SDL_GL_SetAttribute (int attr, int value)
912 C_ARGS: (SDL_GLattr)attr, value
894 913
895int SDL_GL_GetAttribute (int attr) 914int SDL_GL_GetAttribute (int attr)
896 CODE: 915 CODE:
897 if (SDL_GL_GetAttribute (attr, &RETVAL)) 916 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
898 XSRETURN_UNDEF; 917 XSRETURN_UNDEF;
899 OUTPUT: 918 OUTPUT:
900 RETVAL 919 RETVAL
901 920
902void 921void
975void 994void
976SDL_GL_SwapBuffers () 995SDL_GL_SwapBuffers ()
977 996
978char * 997char *
979SDL_GetKeyName (int sym) 998SDL_GetKeyName (int sym)
999 C_ARGS: (SDLKey)sym
980 1000
981int 1001int
982SDL_GetAppState () 1002SDL_GetAppState ()
983 1003
984int 1004int
1081 OUTPUT: 1101 OUTPUT:
1082 RETVAL 1102 RETVAL
1083 1103
1084int 1104int
1085Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1105Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1086 POSTCALL: 1106 POSTCALL:
1087 Mix_HookMusicFinished (music_finished); 1107 Mix_HookMusicFinished (music_finished);
1088 Mix_ChannelFinished (channel_finished); 1108 Mix_ChannelFinished (channel_finished);
1089 1109
1090void 1110void
1091Mix_QuerySpec () 1111Mix_QuerySpec ()
1212 1232
1213 SDL_LockSurface (surface2); 1233 SDL_LockSurface (surface2);
1214 EXTEND (SP, 6); 1234 EXTEND (SP, 6);
1215 PUSHs (sv_2mortal (newSViv (surface2->w))); 1235 PUSHs (sv_2mortal (newSViv (surface2->w)));
1216 PUSHs (sv_2mortal (newSViv (surface2->h))); 1236 PUSHs (sv_2mortal (newSViv (surface2->h)));
1217 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1237 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))); 1238 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1219 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1239 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1220 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1240 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1221 SDL_UnlockSurface (surface2); 1241 SDL_UnlockSurface (surface2);
1222 1242
1294MODULE = Deliantra::Client PACKAGE = DC::Font 1314MODULE = Deliantra::Client PACKAGE = DC::Font
1295 1315
1296PROTOTYPES: DISABLE 1316PROTOTYPES: DISABLE
1297 1317
1298DC::Font 1318DC::Font
1299new_from_file (SV *class, char *path, int id = 0) 1319new_from_file (SV *klass, char *path, int id = 0)
1300 CODE: 1320 CODE:
1301{ 1321{
1302 int count; 1322 int count;
1303 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1323 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1304 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1324 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1333 PROTOTYPE: 1353 PROTOTYPE:
1334 CODE: 1354 CODE:
1335 tc_restore (); 1355 tc_restore ();
1336 1356
1337DC::Layout 1357DC::Layout
1338new (SV *class) 1358new (SV *klass)
1339 CODE: 1359 CODE:
1340 New (0, RETVAL, 1, struct cf_layout); 1360 RETVAL = new cf_layout;
1341 1361
1342 RETVAL->pl = pango_layout_new (opengl_context); 1362 RETVAL->pl = pango_layout_new (opengl_context);
1343 RETVAL->r = 1.; 1363 RETVAL->r = 1.;
1344 RETVAL->g = 1.; 1364 RETVAL->g = 1.;
1345 RETVAL->b = 1.; 1365 RETVAL->b = 1.;
1346 RETVAL->a = 1.; 1366 RETVAL->a = 1.;
1347 RETVAL->base_height = MIN_FONT_HEIGHT; 1367 RETVAL->base_height = MIN_FONT_HEIGHT;
1348 RETVAL->font = 0; 1368 RETVAL->font = 0;
1349 RETVAL->rc = rc_alloc ();
1350 1369
1351 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1370 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1352 layout_update_font (RETVAL); 1371 layout_update_font (RETVAL);
1353 OUTPUT: 1372 OUTPUT:
1354 RETVAL 1373 RETVAL
1355 1374
1356void 1375void
1357DESTROY (DC::Layout self) 1376DESTROY (DC::Layout self)
1358 CODE: 1377 CODE:
1359 g_object_unref (self->pl); 1378 g_object_unref (self->pl);
1360 rc_free (self->rc);
1361 Safefree (self); 1379 delete self;
1362 1380
1363void 1381void
1364set_text (DC::Layout self, SV *text_) 1382set_text (DC::Layout self, SV *text_)
1365 CODE: 1383 CODE:
1366{ 1384{
1620} 1638}
1621 1639
1622void 1640void
1623render (DC::Layout self, float x, float y, int flags = 0) 1641render (DC::Layout self, float x, float y, int flags = 0)
1624 CODE: 1642 CODE:
1625 rc_clear (self->rc); 1643 self->rc.clear ();
1626 pango_opengl_render_layout_subpixel ( 1644 pango_opengl_render_layout_subpixel (
1627 self->pl, 1645 self->pl,
1628 self->rc, 1646 &self->rc,
1629 x * PANGO_SCALE, y * PANGO_SCALE, 1647 x * PANGO_SCALE, y * PANGO_SCALE,
1630 self->r, self->g, self->b, self->a, 1648 self->r, self->g, self->b, self->a,
1631 flags 1649 flags
1632 ); 1650 );
1633 // we assume that context_change actually clears/frees stuff 1651 // we assume that context_change actually clears/frees stuff
1644 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1662 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1645 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1663 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1646 glEnable (GL_ALPHA_TEST); 1664 glEnable (GL_ALPHA_TEST);
1647 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1665 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1648 1666
1649 rc_draw (self->rc); 1667 self->rc.draw ();
1650 1668
1651 glDisable (GL_ALPHA_TEST); 1669 glDisable (GL_ALPHA_TEST);
1652 glDisable (GL_BLEND); 1670 glDisable (GL_BLEND);
1653 glDisable (GL_TEXTURE_2D); 1671 glDisable (GL_TEXTURE_2D);
1654} 1672}
1866MODULE = Deliantra::Client PACKAGE = DC::Map 1884MODULE = Deliantra::Client PACKAGE = DC::Map
1867 1885
1868PROTOTYPES: DISABLE 1886PROTOTYPES: DISABLE
1869 1887
1870DC::Map 1888DC::Map
1871new (SV *class) 1889new (SV *klass)
1872 CODE: 1890 CODE:
1873 New (0, RETVAL, 1, struct map); 1891 RETVAL = new mapgrid;
1874 RETVAL->x = 0; 1892 RETVAL->x = 0;
1875 RETVAL->y = 0; 1893 RETVAL->y = 0;
1876 RETVAL->w = 0; 1894 RETVAL->w = 0;
1877 RETVAL->h = 0; 1895 RETVAL->h = 0;
1878 RETVAL->ox = 0; 1896 RETVAL->ox = 0;
1879 RETVAL->oy = 0; 1897 RETVAL->oy = 0;
1880 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1881 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1882 RETVAL->rows = 0; 1898 RETVAL->rows = 0;
1883 RETVAL->row = 0; 1899 RETVAL->row = 0;
1884 OUTPUT: 1900 OUTPUT:
1885 RETVAL 1901 RETVAL
1886 1902
1887void 1903void
1888DESTROY (DC::Map self) 1904DESTROY (DC::Map self)
1889 CODE: 1905 CODE:
1890{ 1906{
1891 map_clear (self);
1892 Safefree (self->face2tile);
1893 Safefree (self->tex);
1894 Safefree (self); 1907 delete self;
1895} 1908}
1896 1909
1897void 1910void
1898resize (DC::Map self, int map_width, int map_height) 1911resize (DC::Map self, int map_width, int map_height)
1899 CODE: 1912 CODE:
1901 self->h = map_height; 1914 self->h = map_height;
1902 1915
1903void 1916void
1904clear (DC::Map self) 1917clear (DC::Map self)
1905 CODE: 1918 CODE:
1906 map_clear (self); 1919 self->clear_cells ();
1907 1920
1908void 1921void
1909set_tileid (DC::Map self, int face, int tile) 1922set_tileid (DC::Map self, int face, int tile)
1910 CODE: 1923 CODE:
1911{ 1924{
1912 need_facenum (self, face); self->face2tile [face] = tile; 1925 if (self->tile.size () <= face) self->tile.resize (face + 1);
1913 need_texid (self, tile); 1926 self->tile[face] = tile;
1927 if (self->tex.size () <= tile) self->tex .resize (tile + 1);
1914} 1928}
1915 1929
1916void 1930void
1917set_smooth (DC::Map self, int face, int smooth, int level) 1931set_smooth (DC::Map self, int face, int smooth, int level)
1918 CODE: 1932 CODE:
1919{ 1933{
1920 tileid texid;
1921 maptex *tex;
1922
1923 if (face < 0 || face >= self->faces) 1934 if (face < 0 || face >= self->tile.size ())
1924 return; 1935 return;
1925 1936
1926 if (smooth < 0 || smooth >= self->faces) 1937 if (smooth < 0 || smooth >= self->tile.size ())
1927 return; 1938 return;
1928 1939
1929 texid = self->face2tile [face]; 1940 tileid texid = self->tile[face];
1930 1941
1931 if (!texid) 1942 if (!texid)
1932 return; 1943 return;
1933 1944
1934 tex = self->tex + texid; 1945 maptex &tex = self->tex[texid];
1935 tex->smoothtile = self->face2tile [smooth]; 1946 tex.smoothtile = self->tile[smooth];
1936 tex->smoothlevel = level; 1947 tex.smoothlevel = level;
1937} 1948}
1938 1949
1939void 1950void
1940set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1951set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1941 CODE: 1952 CODE:
1942{ 1953{
1943 need_texid (self, texid); 1954 if (self->tex.size () < texid) self->tex.resize (texid + 1);
1944 1955
1945 { 1956 {
1946 maptex *tex = self->tex + texid; 1957 maptex &tex = self->tex[texid];
1947 1958
1948 tex->name = name; 1959 tex.name = name;
1949 tex->w = w; 1960 tex.w = w;
1950 tex->h = h; 1961 tex.h = h;
1951 tex->s = s; 1962 tex.s = s;
1952 tex->t = t; 1963 tex.t = t;
1953 tex->r = r; 1964 tex.r = r;
1954 tex->g = g; 1965 tex.g = g;
1955 tex->b = b; 1966 tex.b = b;
1956 tex->a = a; 1967 tex.a = a;
1957 } 1968 }
1958 1969
1959 // somewhat hackish, but for textures that require it, it really 1970 // somewhat hackish, but for textures that require it, it really
1960 // improves the look, and most others don't suffer. 1971 // improves the look, and most others don't suffer.
1961 glBindTexture (GL_TEXTURE_2D, name); 1972 glBindTexture (GL_TEXTURE_2D, name);
1967} 1978}
1968 1979
1969void 1980void
1970expire_textures (DC::Map self, int texid, int count) 1981expire_textures (DC::Map self, int texid, int count)
1971 PPCODE: 1982 PPCODE:
1972 for (; texid < self->texs && count; ++texid, --count) 1983 for (; texid < self->tex.size () && count; ++texid, --count)
1973 { 1984 {
1974 maptex *tex = self->tex + texid; 1985 maptex &tex = self->tex[texid];
1975 1986
1976 if (tex->name) 1987 if (tex.name)
1977 { 1988 {
1978 if (tex->unused) 1989 if (tex.unused)
1979 { 1990 {
1980 tex->name = 0; 1991 tex.name = 0;
1981 tex->unused = 0; 1992 tex.unused = 0;
1982 XPUSHs (sv_2mortal (newSViv (texid))); 1993 XPUSHs (sv_2mortal (newSViv (texid)));
1983 } 1994 }
1984 else 1995 else
1985 tex->unused = 1; 1996 tex.unused = 1;
1986 } 1997 }
1987 } 1998 }
1988 1999
1989int 2000int
1990ox (DC::Map self) 2001ox (DC::Map self)
2101 } 2112 }
2102 2113
2103 for (z = 0; z <= 2; ++z) 2114 for (z = 0; z <= 2; ++z)
2104 if (flags & (4 >> z)) 2115 if (flags & (4 >> z))
2105 { 2116 {
2106 faceid face = (data [0] << 8) + data [1]; data += 2; 2117 faceid face = (data[0] << 8) + data[1]; data += 2;
2107 need_facenum (self, face); 2118 if (self->tile.size () <= face) self->tile.resize (face + 1);
2108 cell->tile [z] = self->face2tile [face]; 2119 cell->tile[z] = self->tile[face];
2109 2120
2110 if (cell->tile [z]) 2121 if (cell->tile[z])
2111 { 2122 {
2112 maptex *tex = self->tex + cell->tile [z]; 2123 maptex &tex = self->tex[cell->tile[z]];
2113 tex->unused = 0; 2124 tex.unused = 0;
2114 if (!tex->name) 2125 if (!tex.name)
2115 av_push (missing, newSViv (cell->tile [z])); 2126 av_push (missing, newSViv (cell->tile [z]));
2116 2127
2117 if (tex->smoothtile) 2128 if (tex.smoothtile)
2118 { 2129 {
2119 maptex *smooth = self->tex + tex->smoothtile; 2130 maptex &smooth = self->tex[tex.smoothtile];
2120 smooth->unused = 0; 2131 smooth.unused = 0;
2121 if (!smooth->name) 2132 if (!smooth.name)
2122 av_push (missing, newSViv (tex->smoothtile)); 2133 av_push (missing, newSViv (tex.smoothtile));
2123 } 2134 }
2124 } 2135 }
2125 } 2136 }
2126 } 2137 }
2127 else 2138 else
2179 | (b << 16) 2190 | (b << 16)
2180 | (a << 24); 2191 | (a << 24);
2181 } 2192 }
2182 } 2193 }
2183 2194
2184 RETVAL = map_sv; 2195 RETVAL = map_sv;
2185} 2196}
2186 OUTPUT: 2197 OUTPUT:
2187 RETVAL 2198 RETVAL
2188 2199
2189void 2200void
2190draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2201draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2191 CODE: 2202 CODE:
2192{ 2203{
2193 int x, y, z; 2204 int x, y, z;
2194 2205
2195 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2196 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2197 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2206 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2198 smooth_key skey;
2199 int pl_x, pl_y; 2207 int pl_x, pl_y;
2200 maptex pl_tex; 2208 maptex pl_tex;
2201 rc_t *rc = rc_alloc (); 2209 rc_t rc;
2202 rc_t *rc_ov = rc_alloc (); 2210 rc_t rc_ov;
2203 rc_key_t key; 2211 rc_key_t key;
2204 rc_array_t *arr; 2212 rc_t::array_t *arr;
2205 2213
2206 pl_tex.name = 0; 2214 pl_tex.name = 0;
2207 2215
2208 // that's current max. sorry. 2216 // that's current max. sorry.
2209 if (sw > 255) sw = 255; 2217 if (sw > 255) sw = 255;
2210 if (sh > 255) sh = 255; 2218 if (sh > 255) sh = 255;
2211
2212 // clear key, in case of extra padding
2213 memset (&skey, 0, sizeof (skey));
2214 2219
2215 memset (&key, 0, sizeof (key)); 2220 memset (&key, 0, sizeof (key));
2216 key.r = 255; 2221 key.r = 255;
2217 key.g = 255; 2222 key.g = 255;
2218 key.b = 255; 2223 key.b = 255;
2224 my += self->y; 2229 my += self->y;
2225 2230
2226 // first pass: determine smooth_max 2231 // first pass: determine smooth_max
2227 // rather ugly, if you ask me 2232 // rather ugly, if you ask me
2228 // could also be stored inside mapcell and updated on change 2233 // could also be stored inside mapcell and updated on change
2229 memset (smooth_max, 0, sizeof (smooth_max)); 2234 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2230 2235
2231 for (y = 0; y < sh; y++) 2236 for (y = 0; y < sh; y++)
2232 if (0 <= y + my && y + my < self->rows) 2237 if (0 <= y + my && y + my < self->rows)
2233 { 2238 {
2234 maprow *row = self->row + (y + my); 2239 maprow *row = self->row + (y + my);
2249 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2254 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2250 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2255 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2251 2256
2252 for (z = 0; z <= 2; z++) 2257 for (z = 0; z <= 2; z++)
2253 { 2258 {
2254 memset (smooth_level, 0, sizeof (smooth_level)); 2259 std::bitset<256> smooth_level; // one bit for every possible smooth level
2260 smooth_key skey;
2261 smooth_hash smooth;
2255 key.texname = -1; 2262 key.texname = -1;
2256 2263
2257 for (y = 0; y < sh; y++) 2264 for (y = 0; y < sh; y++)
2258 if (0 <= y + my && y + my < self->rows) 2265 if (0 <= y + my && y + my < self->rows)
2259 { 2266 {
2276 2283
2277 if (!tex.name) 2284 if (!tex.name)
2278 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2285 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2279 2286
2280 key.texname = tex.name; 2287 key.texname = tex.name;
2281 arr = rc_array (rc, &key); 2288 arr = &rc.array (key);
2282 } 2289 }
2283 2290
2284 px = (x + 1) * Th - tex.w; 2291 px = (x + 1) * Th - tex.w;
2285 py = (y + 1) * Tw - tex.h; 2292 py = (y + 1) * Tw - tex.h;
2286 2293
2290 pl_y = py; 2297 pl_y = py;
2291 pl_tex = tex; 2298 pl_tex = tex;
2292 continue; 2299 continue;
2293 } 2300 }
2294 2301
2295 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2302 arr->t2f_v3f (0 , 0 , px , py , 0);
2296 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2303 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2297 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2304 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2298 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2305 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2299 2306
2300 // update smooth hash 2307 // update smooth hash
2301 if (tex.smoothtile) 2308 if (tex.smoothtile)
2302 { 2309 {
2303 skey.tile = tex.smoothtile; 2310 skey.tile = tex.smoothtile;
2304 skey.level = tex.smoothlevel; 2311 skey.level = tex.smoothlevel;
2305 2312
2306 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2313 smooth_level[tex.smoothlevel] = 1;
2307 2314
2308 // add bits to current tile and all neighbours. skey.x|y is 2315 // add bits to current tile and all neighbours. skey.x|y is
2309 // shifted +1|+1 so we always stay positive. 2316 // shifted +1|+1 so we always stay positive.
2310 2317
2311 // bits is ___n cccc CCCC bbbb 2318 // bits is ___n cccc CCCC bbbb
2319 2326
2320 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2327 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2321 // ·· ·· ·┏ ┓· 2328 // ·· ·· ·┏ ┓·
2322 2329
2323 // full tile 2330 // full tile
2324 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2331 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2325 2332
2326 // borders 2333 // borders
2327 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2334 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2328 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2335 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2329 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2336 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2330 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2337 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2331 2338
2332 // corners 2339 // corners
2333 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2340 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2334 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2341 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2335 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2342 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2336 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2343 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2337 } 2344 }
2338 } 2345 }
2339 2346
2340 if (expect_false (z == 2) && expect_false (cell->flags)) 2347 if (expect_false (z == 2) && expect_false (cell->flags))
2341 { 2348 {
2342 // overlays such as the speech bubble, probably more to come 2349 // overlays such as the speech bubble, probably more to come
2343 if (cell->flags & 1) 2350 if (cell->flags & 1)
2344 { 2351 {
2345 rc_key_t key_ov = key; 2352 rc_key_t key_ov = key;
2346 maptex tex = self->tex [TEXID_SPEECH]; 2353 maptex tex = self->tex[TEXID_SPEECH];
2347 rc_array_t *arr;
2348 int px = x * Tw + Tw * 2 / 32; 2354 int px = x * Tw + Tw * 2 / 32;
2349 int py = y * Th - Th * 6 / 32; 2355 int py = y * Th - Th * 6 / 32;
2350 2356
2351 key_ov.texname = tex.name; 2357 key_ov.texname = tex.name;
2352 arr = rc_array (rc_ov, &key_ov); 2358 rc_t::array_t &arr = rc_ov.array (key_ov);
2353 2359
2354 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2360 arr.t2f_v3f (0 , 0 , px , py , 0);
2355 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0); 2361 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2356 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0); 2362 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2357 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0); 2363 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2358 } 2364 }
2359 } 2365 }
2360 } 2366 }
2361 } 2367 }
2362 2368
2363 rc_draw (rc); 2369 rc.draw ();
2364 rc_clear (rc); 2370 rc.clear ();
2365 2371
2366 // go through all smoothlevels, lowest to highest, then draw. 2372 // go through all smoothlevels, lowest to highest, then draw.
2367 // this is basically counting sort 2373 // this is basically counting sort
2368 { 2374 {
2369 int w, b; 2375 int w, b;
2370 2376
2371 glEnable (GL_TEXTURE_2D); 2377 glEnable (GL_TEXTURE_2D);
2372 glBegin (GL_QUADS); 2378 glBegin (GL_QUADS);
2373 for (w = 0; w < 256 / 32; ++w) 2379 for (int level = 0; level < smooth_level.size (); ++level)
2380 if (smooth_level[level])
2381 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2374 { 2382 {
2375 uint32_t smask = smooth_level [w]; 2383 smooth_key &skey = it->first;
2376 if (smask) 2384 IV bits = it->second;
2377 for (b = 0; b < 32; ++b) 2385
2378 if (smask & (((uint32_t)1) << b)) 2386 if (!(bits & 0x1000)
2387 && skey.level == level
2388 && level > smooth_max [skey.x][skey.y])
2379 { 2389 {
2380 int level = (w << 5) | b; 2390 maptex tex = self->tex [skey.tile];
2391 int px = (((int)skey.x) - 1) * Tw;
2392 int py = (((int)skey.y) - 1) * Th;
2393 int border = bits & 15;
2394 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2395 float dx = tex.s * .0625f; // 16 images/row
2396 float dy = tex.t * .5f ; // 2 images/column
2397
2381 HE *he; 2398 if (tex.name)
2382
2383 hv_iterinit (smooth);
2384 while ((he = hv_iternext (smooth)))
2385 { 2399 {
2386 smooth_key *skey = (smooth_key *)HeKEY (he); 2400 // this time avoiding texture state changes
2387 IV bits = SvIVX (HeVAL (he)); 2401 // save gobs of state changes.
2388 2402 if (key.texname != tex.name)
2389 if (!(bits & 0x1000)
2390 && skey->level == level
2391 && level > smooth_max [skey->x][skey->y])
2392 { 2403 {
2393 maptex tex = self->tex [skey->tile];
2394 int px = (((int)skey->x) - 1) * Tw;
2395 int py = (((int)skey->y) - 1) * Th;
2396 int border = bits & 15;
2397 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2398 float dx = tex.s * .0625f; // 16 images/row
2399 float dy = tex.t * .5f ; // 2 images/column
2400
2401 if (tex.name)
2402 {
2403 // this time avoiding texture state changes
2404 // save gobs of state changes.
2405 if (key.texname != tex.name)
2406 {
2407 self->tex [skey->tile].unused = 0; 2404 self->tex [skey.tile].unused = 0;
2408 2405
2409 glEnd (); 2406 glEnd ();
2410 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2407 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2411 glBegin (GL_QUADS); 2408 glBegin (GL_QUADS);
2412 } 2409 }
2413 2410
2414 if (border) 2411 if (border)
2415 { 2412 {
2416 float ox = border * dx; 2413 float ox = border * dx;
2417 2414
2418 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2419 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th); 2416 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2420 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th); 2417 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2421 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py ); 2418 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2422 } 2419 }
2423 2420
2424 if (corner) 2421 if (corner)
2425 { 2422 {
2426 float ox = corner * dx; 2423 float ox = corner * dx;
2427 2424
2428 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2425 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2429 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th); 2426 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2430 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th); 2427 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2431 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py ); 2428 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2432 }
2433 }
2434 } 2429 }
2435 } 2430 }
2436 } 2431 }
2437 } 2432 }
2438 2433
2439 glEnd (); 2434 glEnd ();
2440 glDisable (GL_TEXTURE_2D); 2435 glDisable (GL_TEXTURE_2D);
2441 key.texname = -1; 2436 key.texname = -1;
2442 } 2437 }
2443
2444 hv_clear (smooth);
2445 } 2438 }
2446 2439
2447 if (pl_tex.name) 2440 if (pl_tex.name)
2448 { 2441 {
2449 maptex tex = pl_tex; 2442 maptex tex = pl_tex;
2450 int px = pl_x + sdx; 2443 int px = pl_x + sdx;
2451 int py = pl_y + sdy; 2444 int py = pl_y + sdy;
2452 2445
2453 key.texname = tex.name; 2446 key.texname = tex.name;
2454 arr = rc_array (rc, &key); 2447 rc_t::array_t &arr = rc.array (key);
2455 2448
2456 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2449 arr.t2f_v3f (0 , 0 , px , py , 0);
2457 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2450 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2458 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2451 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2459 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2452 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2460 2453
2461 rc_draw (rc); 2454 rc.draw ();
2462 } 2455 }
2463 2456
2464 rc_draw (rc_ov); 2457 rc_ov.draw ();
2465 rc_clear (rc_ov); 2458 rc_ov.clear ();
2466 2459
2467 glDisable (GL_BLEND); 2460 glDisable (GL_BLEND);
2468 rc_free (rc);
2469 rc_free (rc_ov);
2470 2461
2471 // top layer: overlays such as the health bar 2462 // top layer: overlays such as the health bar
2472 for (y = 0; y < sh; y++) 2463 for (y = 0; y < sh; y++)
2473 if (0 <= y + my && y + my < self->rows) 2464 if (0 <= y + my && y + my < self->rows)
2474 { 2465 {
2718 else 2709 else
2719 *data++ = 0; 2710 *data++ = 0;
2720 } 2711 }
2721 } 2712 }
2722 2713
2723 /* if size is w*h + 5 then no data has been found */ 2714 /* if size is w*h + 5 then no data has been found */
2724 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2715 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2725 { 2716 {
2726 SvPOK_only (data_sv); 2717 SvPOK_only (data_sv);
2727 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2718 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2728 } 2719 }
2729 2720
2730 RETVAL = data_sv; 2721 RETVAL = data_sv;
2731} 2722}
2732 OUTPUT: 2723 OUTPUT:
2733 RETVAL 2724 RETVAL
2734 2725
2735void 2726void
2742 STRLEN len; 2733 STRLEN len;
2743 uint8_t *data, *end; 2734 uint8_t *data, *end;
2744 2735
2745 len = SvLEN (data_sv); 2736 len = SvLEN (data_sv);
2746 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2737 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2747 data = SvPVbyte_nolen (data_sv); 2738 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2748 end = data + len + 8; 2739 end = data + len + 8;
2749 2740
2750 if (len < 5) 2741 if (len < 5)
2751 XSRETURN_EMPTY; 2742 XSRETURN_EMPTY;
2752 2743
2796 2787
2797 for (z = 0; z <= 2; z++) 2788 for (z = 0; z <= 2; z++)
2798 { 2789 {
2799 tileid t = tile [z]; 2790 tileid t = tile [z];
2800 2791
2801 if (t >= self->texs || (t && !self->tex [t].name)) 2792 if (t >= self->tex.size () || (t && !self->tex[t].name))
2802 { 2793 {
2803 PUSHs (sv_2mortal (newSViv (t))); 2794 PUSHs (sv_2mortal (newSViv (t)));
2804 need_texid (self, t); 2795 if (self->tex.size () <= t) self->tex.resize (t + 1);
2805 } 2796 }
2806 2797
2807 cell->tile [z] = t; 2798 cell->tile[z] = t;
2808 } 2799 }
2809 } 2800 }
2810 } 2801 }
2811 } 2802 }
2812 } 2803 }
2813} 2804}
2814 2805
2815MODULE = Deliantra::Client PACKAGE = DC::RW 2806MODULE = Deliantra::Client PACKAGE = DC::RW
2816 2807
2817DC::RW 2808DC::RW
2818new (SV *class, SV *data_sv) 2809new (SV *klass, SV *data_sv)
2819 CODE: 2810 CODE:
2820{ 2811{
2821 STRLEN datalen; 2812 STRLEN datalen;
2822 char *data = SvPVbyte (data_sv, datalen); 2813 char *data = SvPVbyte (data_sv, datalen);
2823 2814
2825} 2816}
2826 OUTPUT: 2817 OUTPUT:
2827 RETVAL 2818 RETVAL
2828 2819
2829DC::RW 2820DC::RW
2830new_from_file (SV *class, const char *path, const char *mode = "rb") 2821new_from_file (SV *klass, const char *path, const char *mode = "rb")
2831 CODE: 2822 CODE:
2832 RETVAL = SDL_RWFromFile (path, mode); 2823 RETVAL = SDL_RWFromFile (path, mode);
2833 OUTPUT: 2824 OUTPUT:
2834 RETVAL 2825 RETVAL
2835 2826
2944#else 2935#else
2945 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0))); 2936 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2946#endif 2937#endif
2947 2938
2948DC::MixChunk 2939DC::MixChunk
2949new (SV *class, DC::RW rwops) 2940new (SV *klass, DC::RW rwops)
2950 CODE: 2941 CODE:
2951 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2942 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2952 OUTPUT: 2943 OUTPUT:
2953 RETVAL 2944 RETVAL
2954 2945
3024 RETVAL = Mix_PlayingMusic (); 3015 RETVAL = Mix_PlayingMusic ();
3025 OUTPUT: 3016 OUTPUT:
3026 RETVAL 3017 RETVAL
3027 3018
3028DC::MixMusic 3019DC::MixMusic
3029new (SV *class, DC::RW rwops) 3020new (SV *klass, DC::RW rwops)
3030 CODE: 3021 CODE:
3031 RETVAL = Mix_LoadMUS_RW (rwops); 3022 RETVAL = Mix_LoadMUS_RW (rwops);
3032 OUTPUT: 3023 OUTPUT:
3033 RETVAL 3024 RETVAL
3034 3025
3187 gl.BlendFuncSeparateEXT = 0; 3178 gl.BlendFuncSeparateEXT = 0;
3188 3179
3189void 3180void
3190apple_nvidia_bug (int enable) 3181apple_nvidia_bug (int enable)
3191 3182
3192char * 3183const char *
3193gl_vendor () 3184gl_vendor ()
3194 CODE: 3185 CODE:
3195 RETVAL = (char *)glGetString (GL_VENDOR); 3186 RETVAL = (const char *)glGetString (GL_VENDOR);
3196 OUTPUT: 3187 OUTPUT:
3197 RETVAL 3188 RETVAL
3198 3189
3199char * 3190const char *
3200gl_version () 3191gl_version ()
3201 CODE: 3192 CODE:
3202 RETVAL = (char *)glGetString (GL_VERSION); 3193 RETVAL = (const char *)glGetString (GL_VERSION);
3203 OUTPUT: 3194 OUTPUT:
3204 RETVAL 3195 RETVAL
3205 3196
3206char * 3197const char *
3207gl_extensions () 3198gl_extensions ()
3208 CODE: 3199 CODE:
3209 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3200 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3210 OUTPUT: 3201 OUTPUT:
3211 RETVAL 3202 RETVAL
3212 3203
3213const char *glGetString (GLenum pname) 3204const char *glGetString (GLenum pname)
3205 CODE:
3206 RETVAL = (const char *)glGetString (pname);
3207 OUTPUT:
3208 RETVAL
3214 3209
3215GLint glGetInteger (GLenum pname) 3210GLint glGetInteger (GLenum pname)
3216 CODE: 3211 CODE:
3217 glGetIntegerv (pname, &RETVAL); 3212 glGetIntegerv (pname, &RETVAL);
3218 OUTPUT: 3213 OUTPUT:
3421 3416
3422void 3417void
3423find_widget (SV *self, NV x, NV y) 3418find_widget (SV *self, NV x, NV y)
3424 PPCODE: 3419 PPCODE:
3425{ 3420{
3426 if (within_widget (self, x, y)) 3421 if (within_widget (self, x, y))
3427 XPUSHs (self); 3422 XPUSHs (self);
3428} 3423}
3429 3424
3430BOOT: 3425BOOT:
3431{ 3426{
3439 3434
3440void 3435void
3441draw (SV *self) 3436draw (SV *self)
3442 CODE: 3437 CODE:
3443{ 3438{
3444 HV *hv; 3439 HV *hv;
3445 SV **svp; 3440 SV **svp;
3446 NV x, y, w, h; 3441 NV x, y, w, h;
3447 SV *draw_x_sv = GvSV (draw_x_gv); 3442 SV *draw_x_sv = GvSV (draw_x_gv);
3448 SV *draw_y_sv = GvSV (draw_y_gv); 3443 SV *draw_y_sv = GvSV (draw_y_gv);
3449 SV *draw_w_sv = GvSV (draw_w_gv); 3444 SV *draw_w_sv = GvSV (draw_w_gv);
3450 SV *draw_h_sv = GvSV (draw_h_gv); 3445 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines