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