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.298 by root, Tue Dec 22 00:46:05 2009 UTC vs.
Revision 1.322 by root, Sun Nov 18 01:43:12 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>
33 37
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35 39
36#include <SDL.h> 40#include <SDL.h>
37#include <SDL_thread.h> 41#include <SDL_thread.h>
48#endif 52#endif
49 53
50#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
51#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
52 56
53#include <glib/gmacros.h> 57#include <glib.h>
54 58
55#include <pango/pango.h> 59#include <pango/pango.h>
56 60
57#ifndef PANGO_VERSION_CHECK 61#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0 62# define PANGO_VERSION_CHECK(a,b,c) 0
100#define KMOD_LRAM 0x10000 // our extension 104#define KMOD_LRAM 0x10000 // our extension
101 105
102#define TEXID_SPEECH 1 106#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2 107#define TEXID_NOFACE 2
104 108
109static char *
110fast_sv_grow (SV *sv, STRLEN need)
111{
112 STRLEN len = SvLEN (sv);
113 STRLEN want = SvCUR (sv) + need;
114
115 if (expect_false (len < want))
116 {
117 do
118 len *= 2;
119 while (len < want);
120
121 sv_grow (sv, len);
122 }
123
124 SvCUR_set (sv, want);
125 return SvEND (sv) - need;
126}
127
105static AV *texture_av; 128static AV *texture_av;
106 129
107static struct 130static struct
108{ 131{
109#define GL_FUNC(ptr,name) ptr name; 132#define GL_FUNC(ptr,name) ptr name;
165{ 188{
166 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
167 190
168 while (attrs) 191 while (attrs)
169 { 192 {
170 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
171 194
172 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
173 return 1; 196 return 1;
174 197
175 attrs = attrs->next; 198 attrs = attrs->next;
193static void 216static void
194substitute_func (FcPattern *pattern, gpointer data) 217substitute_func (FcPattern *pattern, gpointer data)
195{ 218{
196 FcPatternAddBool (pattern, FC_HINTING, 1); 219 FcPatternAddBool (pattern, FC_HINTING, 1);
197#ifdef FC_HINT_STYLE 220#ifdef FC_HINT_STYLE
198 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 221 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
199#endif 222#endif
200 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 223 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
201} 224}
202 225
203static void 226static void
420 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
421 } 444 }
422 } 445 }
423} 446}
424 447
425typedef struct { 448struct smooth_key
449{
426 tileid tile; 450 tileid tile;
427 uint8_t x, y, level; 451 uint8_t x, y, level;
428} smooth_key; 452
453 bool operator == (const smooth_key &o) const
454 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 }
457};
458
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
460
461namespace std {
462 template <>
463 struct hash<smooth_key>
464 {
465 size_t operator () (const smooth_key &v) const
466 {
467 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
468 }
469 };
470}
429 471
430static void 472static void
431smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
432{ 474{
433 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
434 476
435 if (SvIOK (*sv)) 477 if (it == h.end ())
436 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
437 else 479 else
438 sv_setiv (*sv, bits); 480 it->second |= bits;
439} 481}
440 482
441static void 483static void
442music_finished (void) 484music_finished (void)
443{ 485{
460 ev.code = 1; 502 ev.code = 1;
461 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
462 ev.data2 = 0; 504 ev.data2 = 0;
463 505
464 SDL_PushEvent ((SDL_Event *)&ev); 506 SDL_PushEvent ((SDL_Event *)&ev);
507}
508
509// approximately divide by 255
510static unsigned int
511div255 (unsigned int n)
512{
513 return (n + (n >> 8)) >> 8;
465} 514}
466 515
467static unsigned int 516static unsigned int
468minpot (unsigned int n) 517minpot (unsigned int n)
469{ 518{
552 601
553 return mod; 602 return mod;
554} 603}
555 604
556static void 605static void
557deliantra_main () 606deliantra_main (SV *real_main)
558{ 607{
559 char *argv[] = { 0 }; 608 dSP;
560 call_argv ("::main", G_DISCARD | G_VOID, argv); 609
610 PUSHMARK (SP);
611 call_sv (real_main, G_DISCARD | G_VOID);
561} 612}
562 613
563#ifdef __MACOSX__ 614#ifdef __MACOSX__
615 static SV *real_main;
616
564 /* to due surprising braindamage on the side of SDL design, we 617 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main() 618 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which, 619 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 620 * due to shared library magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back. 621 * and which calls our main (== SDL_main) back.
569 */ 622 */
570 extern C_LINKAGE int 623 extern C_LINKAGE int
571 main (int argc, char *argv[]) 624 main (int argc, char *argv[])
572 { 625 {
573 deliantra_main (); 626 deliantra_main (real_main);
574 } 627 }
575 628
576 #undef main 629 #undef main
577 630
578 extern C_LINKAGE int main (int argc, char *argv[]); 631 extern C_LINKAGE int main (int argc, char *argv[]);
579 632
580 static void 633 static void
581 SDL_braino (void) 634 SDL_main_hack (SV *real_main_)
582 { 635 {
636 real_main = real_main_;
637
583 char *argv[] = { "deliantra client", 0 }; 638 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv); 639 (main) (1, argv);
585 } 640 }
586#else 641#else
587 static void 642 static void
588 SDL_braino (void) 643 SDL_main_hack (SV *real_main)
589 { 644 {
590 deliantra_main (); 645 deliantra_main (real_main);
591 } 646 }
592#endif 647#endif
593 648
594MODULE = Deliantra::Client PACKAGE = DC 649MODULE = Deliantra::Client PACKAGE = DC
595 650
796 851
797 const_iv (FOW_DARKNESS) 852 const_iv (FOW_DARKNESS)
798# undef const_iv 853# undef const_iv
799 }; 854 };
800 855
801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 856 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
803 858
804 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
805 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
806} 861}
807 862
846#endif 901#endif
847} 902}
848 903
849char *SDL_GetError () 904char *SDL_GetError ()
850 905
851void SDL_braino () 906void SDL_main_hack (SV *real_main)
907 PROTOTYPE: &
852 908
853int SDL_Init (U32 flags) 909int SDL_Init (U32 flags)
854 910
855int SDL_InitSubSystem (U32 flags) 911int SDL_InitSubSystem (U32 flags)
856 912
857void SDL_QuitSubSystem (U32 flags) 913void SDL_QuitSubSystem (U32 flags)
858 914
859void SDL_Quit () 915void SDL_Quit ()
860 916
861int SDL_GL_SetAttribute (int attr, int value) 917int SDL_GL_SetAttribute (int attr, int value)
918 C_ARGS: (SDL_GLattr)attr, value
862 919
863int SDL_GL_GetAttribute (int attr) 920int SDL_GL_GetAttribute (int attr)
864 CODE: 921 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL)) 922 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
866 XSRETURN_UNDEF; 923 XSRETURN_UNDEF;
867 OUTPUT: 924 OUTPUT:
868 RETVAL 925 RETVAL
869 926
870void 927void
925 ); 982 );
926 983
927 if (RETVAL) 984 if (RETVAL)
928 { 985 {
929 av_clear (texture_av); 986 av_clear (texture_av);
930
931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
932#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 987#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
933#include "glfunc.h" 988#include "glfunc.h"
934#undef GL_FUNC 989#undef GL_FUNC
990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
935 } 992 }
936} 993}
937 OUTPUT: 994 OUTPUT:
938 RETVAL 995 RETVAL
996
997void
998SDL_WM_SetCaption (const char *title, const char *icon)
939 999
940void 1000void
941SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
942 1002
943char * 1003char *
944SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
945 1006
946int 1007int
947SDL_GetAppState () 1008SDL_GetAppState ()
948 1009
949int 1010int
950SDL_GetModState () 1011SDL_GetModState ()
951 1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
952void 1017void
1018SDL_PumpEvents ()
1019
1020void
953poll_events () 1021peep_events ()
954 PPCODE: 1022 PPCODE:
955{ 1023{
956 SDL_Event ev; 1024 SDL_Event ev;
957 1025
958 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
1024 1092
1025 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1093 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1026 } 1094 }
1027} 1095}
1028 1096
1097char *
1098SDL_AudioDriverName ()
1099 CODE:
1100{
1101 char buf [256];
1102 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1103 XSRETURN_UNDEF;
1104
1105 RETVAL = buf;
1106}
1107 OUTPUT:
1108 RETVAL
1109
1029int 1110int
1030Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1111Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1031 POSTCALL: 1112 POSTCALL:
1032 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
1033 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
1034 1115
1035void 1116void
1036Mix_QuerySpec () 1117Mix_QuerySpec ()
1095add_font (char *file) 1176add_font (char *file)
1096 CODE: 1177 CODE:
1097 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1178 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1098 OUTPUT: 1179 OUTPUT:
1099 RETVAL 1180 RETVAL
1181
1182void
1183IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1184
1185# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1186void
1187Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1100 1188
1101void 1189void
1102load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
1103 ALIAS: 1191 ALIAS:
1104 load_image_file = 1 1192 load_image_file = 1
1150 1238
1151 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
1152 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
1153 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
1154 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
1155 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1156 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1244 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1157 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1158 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1159 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
1160 1248
1232MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1233 1321
1234PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1235 1323
1236DC::Font 1324DC::Font
1237new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1238 CODE: 1326 CODE:
1239{ 1327{
1240 int count; 1328 int count;
1241 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1242 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1271 PROTOTYPE: 1359 PROTOTYPE:
1272 CODE: 1360 CODE:
1273 tc_restore (); 1361 tc_restore ();
1274 1362
1275DC::Layout 1363DC::Layout
1276new (SV *class) 1364new (SV *klass)
1277 CODE: 1365 CODE:
1278 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1279 1367
1280 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1281 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1430 1518
1431void 1519void
1432set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1433 CODE: 1521 CODE:
1434 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1435 { 1523 {
1436 self->base_height = base_height; 1524 self->base_height = base_height;
1437 layout_update_font (self); 1525 layout_update_font (self);
1438 } 1526 }
1439 1527
1440void 1528void
1672void 1760void
1673draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1) 1761draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1674 PROTOTYPE: @ 1762 PROTOTYPE: @
1675 CODE: 1763 CODE:
1676{ 1764{
1765 glEnable (GL_BLEND);
1766 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677 glEnable (GL_TEXTURE_2D); 1767 glEnable (GL_TEXTURE_2D);
1678 glEnable (GL_BLEND);
1679 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1680 glBindTexture (GL_TEXTURE_2D, name1); 1768 glBindTexture (GL_TEXTURE_2D, name1);
1681 1769
1682 glColor3f (intensity, intensity, intensity); 1770 glColor3f (intensity, intensity, intensity);
1683 glPushMatrix (); 1771 glPushMatrix ();
1684 glScalef (1./3, 1./3, 1.); 1772 glScalef (1./3, 1./3, 1.);
1699 glBindTexture (GL_TEXTURE_2D, name2); 1787 glBindTexture (GL_TEXTURE_2D, name2);
1700 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1701 1789
1702 /* rgb == rgb(glcolor) */ 1790 /* rgb == rgb(glcolor) */
1703 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1791 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1792 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1705 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1793 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1706 1794
1707 /* alpha = interpolate t0, t1 by env_alpha */ 1795 /* alpha = interpolate t0, t1 by env_alpha */
1708 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1796 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1709 1797
1804MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1805 1893
1806PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1807 1895
1808DC::Map 1896DC::Map
1809new (SV *class) 1897new (SV *klass)
1810 CODE: 1898 CODE:
1811 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1812 RETVAL->x = 0; 1900 RETVAL->x = 0;
1813 RETVAL->y = 0; 1901 RETVAL->y = 0;
1814 RETVAL->w = 0; 1902 RETVAL->w = 0;
1853 1941
1854void 1942void
1855set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1856 CODE: 1944 CODE:
1857{ 1945{
1858 tileid texid; 1946 tileid texid;
1859 maptex *tex; 1947 maptex *tex;
1860 1948
1861 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1862 return; 1950 return;
1863 1951
1864 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1865 return; 1953 return;
1866 1954
1867 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1868 1956
1869 if (!texid) 1957 if (!texid)
1870 return; 1958 return;
1871 1959
1872 tex = self->tex + texid; 1960 tex = self->tex + texid;
1905} 1993}
1906 1994
1907void 1995void
1908expire_textures (DC::Map self, int texid, int count) 1996expire_textures (DC::Map self, int texid, int count)
1909 PPCODE: 1997 PPCODE:
1910 for (; texid < self->texs && count; ++texid, --count) 1998 for (; texid < self->texs && count; ++texid, --count)
1911 { 1999 {
1912 maptex *tex = self->tex + texid; 2000 maptex *tex = self->tex + texid;
1913 2001
1914 if (tex->name) 2002 if (tex->name)
1915 { 2003 {
1970 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1971 } 2059 }
1972} 2060}
1973 2061
1974SV * 2062SV *
1975map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1976 CODE: 2064 CODE:
1977{ 2065{
1978 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1979 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1980 mapcell *cell; 2068 mapcell *cell;
2001 2089
2002 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
2003 2091
2004 if (flags & 8) 2092 if (flags & 8)
2005 { 2093 {
2094 uint8_t ext, cmd;
2095
2006 if (extmap) 2096 do
2007 { 2097 {
2008 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
2009 2100
2010 do 2101 if (cmd < 4)
2102 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2103 else if (cmd == 5) // health
2011 { 2104 {
2012 ext = *data++;
2013 cmd = ext & 0x7f;
2014
2015 if (cmd < 4)
2016 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2017 else if (cmd == 5) // health
2018 {
2019 cell->stat_width = 1; 2105 cell->stat_width = 1;
2020 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
2021 }
2022 else if (cmd == 6) // monster width
2023 cell->stat_width = *data++ + 1;
2024 else if (cmd == 0x47)
2025 {
2026 if (*data == 1) cell->player = data [1];
2027 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2028 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2029 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2030
2031 data += *data + 1;
2032 }
2033 else if (cmd == 8) // cell flags
2034 cell->flags = *data++;
2035 else if (ext & 0x40) // unknown, multibyte => skip
2036 data += *data + 1;
2037 else
2038 data++;
2039 } 2107 }
2040 while (ext & 0x80); 2108 else if (cmd == 6) // monster width
2109 cell->stat_width = *data++ + 1;
2110 else if (cmd == 0x47)
2111 {
2112 if (*data == 1) cell->player = data [1];
2113 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2114 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2115 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2116
2117 data += *data + 1;
2118 }
2119 else if (cmd == 8) // cell flags
2120 cell->flags = *data++;
2121 else if (ext & 0x40) // unknown, multibyte => skip
2122 data += *data + 1;
2123 else
2124 data++;
2041 } 2125 }
2042 else 2126 while (ext & 0x80);
2043 cell->darkness = *data++ + 1;
2044 } 2127 }
2045 2128
2046 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
2047 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
2048 { 2131 {
2096 ? self->row + y 2179 ? self->row + y
2097 : 0; 2180 : 0;
2098 2181
2099 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
2100 { 2183 {
2101 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
2102 2185
2103 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
2104 { 2187 {
2105 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
2106 2189
2108 { 2191 {
2109 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
2110 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
2111 int a1 = tex.a; 2194 int a1 = tex.a;
2112 2195
2113 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
2114 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
2115 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
2116 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
2117 } 2200 }
2118 } 2201 }
2119 2202
2120 *map++ = (r ) 2203 *map++ = (r )
2121 | (g << 8) 2204 | (g << 8)
2122 | (b << 16) 2205 | (b << 16)
2123 | (a << 24); 2206 | (a << 24);
2124 } 2207 }
2125 } 2208 }
2126 2209
2127 RETVAL = map_sv; 2210 RETVAL = map_sv;
2128} 2211}
2129 OUTPUT: 2212 OUTPUT:
2130 RETVAL 2213 RETVAL
2131 2214
2132void 2215void
2133draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2216draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2134 CODE: 2217 CODE:
2135{ 2218{
2136 int x, y, z; 2219 int x, y, z;
2137 2220
2138 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2139 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2221 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2140 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2222 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
2141 smooth_key skey; 2223 smooth_key skey;
2142 int pl_x, pl_y; 2224 int pl_x, pl_y;
2143 maptex pl_tex; 2225 maptex pl_tex;
2192 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2193 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2194 2276
2195 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
2196 { 2278 {
2279 smooth_hash smooth;
2197 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2198 key.texname = -1; 2281 key.texname = -1;
2199 2282
2200 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
2201 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
2222 2305
2223 key.texname = tex.name; 2306 key.texname = tex.name;
2224 arr = rc_array (rc, &key); 2307 arr = rc_array (rc, &key);
2225 } 2308 }
2226 2309
2227 px = (x + 1) * T - tex.w; 2310 px = (x + 1) * Th - tex.w;
2228 py = (y + 1) * T - tex.h; 2311 py = (y + 1) * Tw - tex.h;
2229 2312
2230 if (expect_false (cell->player == player) && expect_false (z == 2)) 2313 if (expect_false (cell->player == player) && expect_false (z == 2))
2231 { 2314 {
2232 pl_x = px; 2315 pl_x = px;
2233 pl_y = py; 2316 pl_y = py;
2262 2345
2263 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2264 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
2265 2348
2266 // full tile 2349 // full tile
2267 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2350 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2268 2351
2269 // borders 2352 // borders
2270 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2353 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2271 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2354 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2272 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2355 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2273 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2356 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2274 2357
2275 // corners 2358 // corners
2276 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2359 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2277 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2360 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2278 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2361 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2279 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2362 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2280 } 2363 }
2281 } 2364 }
2282 2365
2283 if (expect_false (z == 2) && expect_false (cell->flags)) 2366 if (expect_false (z == 2) && expect_false (cell->flags))
2284 { 2367 {
2286 if (cell->flags & 1) 2369 if (cell->flags & 1)
2287 { 2370 {
2288 rc_key_t key_ov = key; 2371 rc_key_t key_ov = key;
2289 maptex tex = self->tex [TEXID_SPEECH]; 2372 maptex tex = self->tex [TEXID_SPEECH];
2290 rc_array_t *arr; 2373 rc_array_t *arr;
2291 int px = x * T + T * 2 / 32; 2374 int px = x * Tw + Tw * 2 / 32;
2292 int py = y * T - T * 6 / 32; 2375 int py = y * Th - Th * 6 / 32;
2293 2376
2294 key_ov.texname = tex.name; 2377 key_ov.texname = tex.name;
2295 arr = rc_array (rc_ov, &key_ov); 2378 arr = rc_array (rc_ov, &key_ov);
2296 2379
2297 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2380 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2298 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2381 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2299 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2382 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2300 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2383 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2301 } 2384 }
2302 } 2385 }
2303 } 2386 }
2304 } 2387 }
2305 2388
2321 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
2322 { 2405 {
2323 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
2324 HE *he; 2407 HE *he;
2325 2408
2326 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2327 while ((he = hv_iternext (smooth)))
2328 { 2410 {
2329 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
2330 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
2331 2413
2332 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
2333 && skey->level == level 2415 && skey.level == level
2334 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
2335 { 2417 {
2336 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
2337 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
2338 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
2339 int border = bits & 15; 2421 int border = bits & 15;
2340 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2341 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
2342 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
2343 2425
2345 { 2427 {
2346 // this time avoiding texture state changes 2428 // this time avoiding texture state changes
2347 // save gobs of state changes. 2429 // save gobs of state changes.
2348 if (key.texname != tex.name) 2430 if (key.texname != tex.name)
2349 { 2431 {
2350 self->tex [skey->tile].unused = 0; 2432 self->tex [skey.tile].unused = 0;
2351 2433
2352 glEnd (); 2434 glEnd ();
2353 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2354 glBegin (GL_QUADS); 2436 glBegin (GL_QUADS);
2355 } 2437 }
2356 2438
2357 if (border) 2439 if (border)
2358 { 2440 {
2359 float ox = border * dx; 2441 float ox = border * dx;
2360 2442
2361 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2362 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2363 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2364 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2365 } 2447 }
2366 2448
2367 if (corner) 2449 if (corner)
2368 { 2450 {
2369 float ox = corner * dx; 2451 float ox = corner * dx;
2370 2452
2371 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2372 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2373 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2374 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2375 } 2457 }
2376 } 2458 }
2377 } 2459 }
2378 } 2460 }
2379 } 2461 }
2381 2463
2382 glEnd (); 2464 glEnd ();
2383 glDisable (GL_TEXTURE_2D); 2465 glDisable (GL_TEXTURE_2D);
2384 key.texname = -1; 2466 key.texname = -1;
2385 } 2467 }
2386
2387 hv_clear (smooth);
2388 } 2468 }
2389 2469
2390 if (pl_tex.name) 2470 if (pl_tex.name)
2391 { 2471 {
2392 maptex tex = pl_tex; 2472 maptex tex = pl_tex;
2420 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
2421 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
2422 { 2502 {
2423 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
2424 2504
2425 int px = x * T; 2505 int px = x * Tw;
2426 int py = y * T; 2506 int py = y * Th;
2427 2507
2428 if (expect_false (cell->player == player)) 2508 if (expect_false (cell->player == player))
2429 { 2509 {
2430 px += sdx; 2510 px += sdx;
2431 py += sdy; 2511 py += sdy;
2432 } 2512 }
2433 2513
2434 if (cell->stat_hp) 2514 if (cell->stat_hp)
2435 { 2515 {
2436 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
2437 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2438 2518
2439 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
2440 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
2441 px + width - 1, py); 2521 px + width - 1, py);
2442 2522
2522 int x, y; 2602 int x, y;
2523 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2524 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2525 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2526 int sw3 = sw * 3; 2606 int sw3 = sw * 3;
2527 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2528 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2607 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2529 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2608 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2610 memset (darkness1, 0, sw1*sh1);
2530 2611
2531 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2532 SvCUR_set (darkness3_sv, sw3 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2533 2614
2534 mx += self->x - 1; 2615 mx += self->x - 1;
2660 else 2741 else
2661 *data++ = 0; 2742 *data++ = 0;
2662 } 2743 }
2663 } 2744 }
2664 2745
2665 /* if size is w*h + 5 then no data has been found */ 2746 /* if size is w*h + 5 then no data has been found */
2666 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2747 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2667 { 2748 {
2668 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2669 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2670 } 2751 }
2671 2752
2672 RETVAL = data_sv; 2753 RETVAL = data_sv;
2673} 2754}
2674 OUTPUT: 2755 OUTPUT:
2675 RETVAL 2756 RETVAL
2676 2757
2677void 2758void
2684 STRLEN len; 2765 STRLEN len;
2685 uint8_t *data, *end; 2766 uint8_t *data, *end;
2686 2767
2687 len = SvLEN (data_sv); 2768 len = SvLEN (data_sv);
2688 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2769 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2689 data = SvPVbyte_nolen (data_sv); 2770 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2690 end = data + len + 8; 2771 end = data + len + 8;
2691 2772
2692 if (len < 5) 2773 if (len < 5)
2693 XSRETURN_EMPTY; 2774 XSRETURN_EMPTY;
2694 2775
2755} 2836}
2756 2837
2757MODULE = Deliantra::Client PACKAGE = DC::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2758 2839
2759DC::RW 2840DC::RW
2760new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2761 CODE: 2842 CODE:
2762{ 2843{
2763 STRLEN datalen; 2844 STRLEN datalen;
2764 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2765 2846
2767} 2848}
2768 OUTPUT: 2849 OUTPUT:
2769 RETVAL 2850 RETVAL
2770 2851
2771DC::RW 2852DC::RW
2772new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2773 CODE: 2854 CODE:
2774 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2775 OUTPUT: 2856 OUTPUT:
2776 RETVAL 2857 RETVAL
2777 2858
2795 if (RETVAL < 0) 2876 if (RETVAL < 0)
2796 { 2877 {
2797 RETVAL = Mix_GroupOldest (-1); 2878 RETVAL = Mix_GroupOldest (-1);
2798 2879
2799 if (RETVAL < 0) 2880 if (RETVAL < 0)
2881 {
2882 // happens sometimes, maybe it just stopped playing(?)
2883 RETVAL = Mix_GroupAvailable (-1);
2884
2885 if (RETVAL < 0)
2800 XSRETURN_UNDEF; 2886 XSRETURN_UNDEF;
2801 2887 }
2888 else
2802 Mix_HaltChannel (RETVAL); 2889 Mix_HaltChannel (RETVAL);
2803 } 2890 }
2804 2891
2805 Mix_UnregisterAllEffects (RETVAL); 2892 Mix_UnregisterAllEffects (RETVAL);
2806 Mix_Volume (RETVAL, 128); 2893 Mix_Volume (RETVAL, 128);
2807} 2894}
2867 2954
2868MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2955MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2869 2956
2870PROTOTYPES: DISABLE 2957PROTOTYPES: DISABLE
2871 2958
2959void
2960decoders ()
2961 PPCODE:
2962#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2963 int i, num = Mix_GetNumChunkDecoders ();
2964 EXTEND (SP, num);
2965 for (i = 0; i < num; ++i)
2966 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2967#else
2968 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2969#endif
2970
2872DC::MixChunk 2971DC::MixChunk
2873new (SV *class, DC::RW rwops) 2972new (SV *klass, DC::RW rwops)
2874 CODE: 2973 CODE:
2875 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2876 OUTPUT: 2975 OUTPUT:
2877 RETVAL 2976 RETVAL
2878 2977
2908 OUTPUT: 3007 OUTPUT:
2909 RETVAL 3008 RETVAL
2910 3009
2911MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3010MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2912 3011
3012void
3013decoders ()
3014 PPCODE:
3015#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3016 int i, num = Mix_GetNumMusicDecoders ();
3017 EXTEND (SP, num);
3018 for (i = 0; i < num; ++i)
3019 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3020#else
3021 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3022#endif
3023
2913int 3024int
2914volume (int volume = -1) 3025volume (int volume = -1)
2915 PROTOTYPE: ;$ 3026 PROTOTYPE: ;$
2916 CODE: 3027 CODE:
2917 if (items > 0) 3028 if (items > 0)
2928void 3039void
2929halt () 3040halt ()
2930 CODE: 3041 CODE:
2931 Mix_HaltMusic (); 3042 Mix_HaltMusic ();
2932 3043
3044int
3045playing ()
3046 CODE:
3047 RETVAL = Mix_PlayingMusic ();
3048 OUTPUT:
3049 RETVAL
3050
2933DC::MixMusic 3051DC::MixMusic
2934new (SV *class, DC::RW rwops) 3052new (SV *klass, DC::RW rwops)
2935 CODE: 3053 CODE:
2936 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2937 OUTPUT: 3055 OUTPUT:
2938 RETVAL 3056 RETVAL
2939 3057
3076 const_iv (GL_FUNC_SUBTRACT), 3194 const_iv (GL_FUNC_SUBTRACT),
3077 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3195 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3078# undef const_iv 3196# undef const_iv
3079 }; 3197 };
3080 3198
3081 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3199 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3082 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3083 3201
3084 texture_av = newAV (); 3202 texture_av = newAV ();
3085 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
3086} 3204}
3087 3205
3092 gl.BlendFuncSeparateEXT = 0; 3210 gl.BlendFuncSeparateEXT = 0;
3093 3211
3094void 3212void
3095apple_nvidia_bug (int enable) 3213apple_nvidia_bug (int enable)
3096 3214
3097char * 3215const char *
3098gl_vendor () 3216gl_vendor ()
3099 CODE: 3217 CODE:
3100 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
3101 OUTPUT: 3219 OUTPUT:
3102 RETVAL 3220 RETVAL
3103 3221
3104char * 3222const char *
3105gl_version () 3223gl_version ()
3106 CODE: 3224 CODE:
3107 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
3108 OUTPUT: 3226 OUTPUT:
3109 RETVAL 3227 RETVAL
3110 3228
3111char * 3229const char *
3112gl_extensions () 3230gl_extensions ()
3113 CODE: 3231 CODE:
3114 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3115 OUTPUT: 3233 OUTPUT:
3116 RETVAL 3234 RETVAL
3117 3235
3118const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
3119 3241
3120GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
3121 CODE: 3243 CODE:
3122 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
3123 OUTPUT: 3245 OUTPUT:
3130 RETVAL 3252 RETVAL
3131 3253
3132int glGetError () 3254int glGetError ()
3133 3255
3134void glFinish () 3256void glFinish ()
3257
3258void glFlush ()
3135 3259
3136void glClear (int mask) 3260void glClear (int mask)
3137 3261
3138void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
3139 PROTOTYPE: @ 3263 PROTOTYPE: @
3324 3448
3325void 3449void
3326find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
3327 PPCODE: 3451 PPCODE:
3328{ 3452{
3329 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
3330 XPUSHs (self); 3454 XPUSHs (self);
3331} 3455}
3332 3456
3333BOOT: 3457BOOT:
3334{ 3458{
3342 3466
3343void 3467void
3344draw (SV *self) 3468draw (SV *self)
3345 CODE: 3469 CODE:
3346{ 3470{
3347 HV *hv; 3471 HV *hv;
3348 SV **svp; 3472 SV **svp;
3349 NV x, y, w, h; 3473 NV x, y, w, h;
3350 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
3351 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
3352 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
3353 SV *draw_h_sv = GvSV (draw_h_gv); 3477 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines