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