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.272 by root, Tue Aug 19 17:38:29 2008 UTC vs.
Revision 1.304 by root, Fri Apr 23 16:30:38 2010 UTC

19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
44/* work around os x broken headers */ 43/* work around os x broken headers */
45#ifdef __MACOSX__ 44#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 48#endif
48 49
49#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
51 52
81#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
83 84
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
87 91
88#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
90 94
91#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
92 96
93/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
99
100#define KMOD_LRAM 0x10000 // our extension
101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
95 104
96static AV *texture_av; 105static AV *texture_av;
97 106
98static struct 107static struct
99{ 108{
231 int w, h; 240 int w, h;
232 float s, t; 241 float s, t;
233 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
234 tileid smoothtile; 243 tileid smoothtile;
235 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
236} maptex; 246} maptex;
237 247
238typedef struct { 248typedef struct {
239 uint32_t player; 249 uint32_t player;
240 tileid tile[3]; 250 tileid tile[3];
527 return 0; 537 return 0;
528 538
529 return 1; 539 return 1;
530} 540}
531 541
542/******************************************************************************/
543
544/* process keyboard modifiers */
545static int
546mod_munge (int mod)
547{
548 mod &= MOD_MASK;
549
550 if (mod & (KMOD_META | KMOD_ALT))
551 mod |= KMOD_LRAM;
552
553 return mod;
554}
555
532static void 556static void
533deliantra_main () 557deliantra_main ()
534{ 558{
559 char *argv[] = { 0 };
535 call_argv ("::main", G_DISCARD | G_VOID, 0); 560 call_argv ("::main", G_DISCARD | G_VOID, argv);
536 dSP;
537} 561}
538 562
539#ifdef __MACOSX__ 563#ifdef __MACOSX__
540 /* to due surprising braindamage on the side of SDL design, we 564 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main() 565 * do some mind-boggling hack here: SDL requires a custom main()
602 const_iv (SDL_USEREVENT), 626 const_iv (SDL_USEREVENT),
603 627
604 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
605 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
606 const_iv (SDL_APPACTIVE), 630 const_iv (SDL_APPACTIVE),
631
632
633 const_iv (SDLK_UNKNOWN),
634 const_iv (SDLK_FIRST),
635 const_iv (SDLK_BACKSPACE),
636 const_iv (SDLK_TAB),
637 const_iv (SDLK_CLEAR),
638 const_iv (SDLK_RETURN),
639 const_iv (SDLK_PAUSE),
640 const_iv (SDLK_ESCAPE),
641 const_iv (SDLK_SPACE),
642 const_iv (SDLK_EXCLAIM),
643 const_iv (SDLK_QUOTEDBL),
644 const_iv (SDLK_HASH),
645 const_iv (SDLK_DOLLAR),
646 const_iv (SDLK_AMPERSAND),
647 const_iv (SDLK_QUOTE),
648 const_iv (SDLK_LEFTPAREN),
649 const_iv (SDLK_RIGHTPAREN),
650 const_iv (SDLK_ASTERISK),
651 const_iv (SDLK_PLUS),
652 const_iv (SDLK_COMMA),
653 const_iv (SDLK_MINUS),
654 const_iv (SDLK_PERIOD),
655 const_iv (SDLK_SLASH),
656 const_iv (SDLK_0),
657 const_iv (SDLK_1),
658 const_iv (SDLK_2),
659 const_iv (SDLK_3),
660 const_iv (SDLK_4),
661 const_iv (SDLK_5),
662 const_iv (SDLK_6),
663 const_iv (SDLK_7),
664 const_iv (SDLK_8),
665 const_iv (SDLK_9),
666 const_iv (SDLK_COLON),
667 const_iv (SDLK_SEMICOLON),
668 const_iv (SDLK_LESS),
669 const_iv (SDLK_EQUALS),
670 const_iv (SDLK_GREATER),
671 const_iv (SDLK_QUESTION),
672 const_iv (SDLK_AT),
673
674 const_iv (SDLK_LEFTBRACKET),
675 const_iv (SDLK_BACKSLASH),
676 const_iv (SDLK_RIGHTBRACKET),
677 const_iv (SDLK_CARET),
678 const_iv (SDLK_UNDERSCORE),
679 const_iv (SDLK_BACKQUOTE),
680 const_iv (SDLK_DELETE),
607 681
608 const_iv (SDLK_FIRST), 682 const_iv (SDLK_FIRST),
609 const_iv (SDLK_LAST), 683 const_iv (SDLK_LAST),
610 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
611 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
687 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
688 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
689 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
690 const_iv (KMOD_MODE), 764 const_iv (KMOD_MODE),
691 765
766 const_iv (KMOD_LRAM),
767
692 const_iv (MIX_DEFAULT_FORMAT), 768 const_iv (MIX_DEFAULT_FORMAT),
693 769
694 const_iv (SDL_INIT_TIMER), 770 const_iv (SDL_INIT_TIMER),
695 const_iv (SDL_INIT_AUDIO), 771 const_iv (SDL_INIT_AUDIO),
696 const_iv (SDL_INIT_VIDEO), 772 const_iv (SDL_INIT_VIDEO),
748 824
749IV minpot (UV n) 825IV minpot (UV n)
750 826
751IV popcount (UV n) 827IV popcount (UV n)
752 828
829NV distance (NV dx, NV dy)
830 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT:
833 RETVAL
834
753void 835void
754pango_init () 836pango_init ()
755 CODE: 837 CODE:
756{ 838{
757 opengl_fontmap = pango_opengl_font_map_new (); 839 opengl_fontmap = pango_opengl_font_map_new ();
848 930
849 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
850#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 932#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
851#include "glfunc.h" 933#include "glfunc.h"
852#undef GL_FUNC 934#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
853 } 938 }
854} 939}
855 OUTPUT: 940 OUTPUT:
856 RETVAL 941 RETVAL
857 942
883 { 968 {
884 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
885 case SDL_KEYUP: 970 case SDL_KEYUP:
886 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
887 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
888 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 973 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
889 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 974 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
890 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
891 break; 976 break;
892 977
893 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
894 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
912 x = ev.motion.x; 997 x = ev.motion.x;
913 y = ev.motion.y; 998 y = ev.motion.y;
914 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
915 } 1000 }
916 1001
917 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
918 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
919 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
920 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
921 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
922 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
941 } 1026 }
942 1027
943 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1028 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
944 } 1029 }
945} 1030}
1031
1032char *
1033SDL_AudioDriverName ()
1034 CODE:
1035{
1036 char buf [256];
1037 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1038 XSRETURN_UNDEF;
1039
1040 RETVAL = buf;
1041}
1042 OUTPUT:
1043 RETVAL
946 1044
947int 1045int
948Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1046Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
949 POSTCALL: 1047 POSTCALL:
950 Mix_HookMusicFinished (music_finished); 1048 Mix_HookMusicFinished (music_finished);
1138#if DEBUG 1236#if DEBUG
1139 VALGRIND_DO_LEAK_CHECK; 1237 VALGRIND_DO_LEAK_CHECK;
1140#endif 1238#endif
1141} 1239}
1142 1240
1241int
1242SvREFCNT (SV *sv)
1243 CODE:
1244 RETVAL = SvREFCNT (sv);
1245 OUTPUT:
1246 RETVAL
1247
1143MODULE = Deliantra::Client PACKAGE = DC::Font 1248MODULE = Deliantra::Client PACKAGE = DC::Font
1144 1249
1145PROTOTYPES: DISABLE 1250PROTOTYPES: DISABLE
1146 1251
1147DC::Font 1252DC::Font
1576 if (ix) 1681 if (ix)
1577 { 1682 {
1578 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1579 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1580 } 1685 }
1686}
1687
1688void
1689draw_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)
1690 PROTOTYPE: @
1691 CODE:
1692{
1693 glEnable (GL_BLEND);
1694 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1695 glEnable (GL_TEXTURE_2D);
1696 glBindTexture (GL_TEXTURE_2D, name1);
1697
1698 glColor3f (intensity, intensity, intensity);
1699 glPushMatrix ();
1700 glScalef (1./3, 1./3, 1.);
1701
1702 if (blend > 0.f)
1703 {
1704 float dx3 = dx * -3.f / w;
1705 float dy3 = dy * -3.f / h;
1706 GLfloat env_color[4] = { 0., 0., 0., blend };
1707
1708 /* interpolate the two shadow textures */
1709 /* stage 0 == rgb(glcolor) + alpha(t0) */
1710 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1711
1712 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1713 gl.ActiveTexture (GL_TEXTURE1);
1714 glEnable (GL_TEXTURE_2D);
1715 glBindTexture (GL_TEXTURE_2D, name2);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1717
1718 /* rgb == rgb(glcolor) */
1719 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1720 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1721 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1722
1723 /* alpha = interpolate t0, t1 by env_alpha */
1724 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1725
1726 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1727 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1728 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1729
1730 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1731 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1732
1733 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1734 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1735
1736 glBegin (GL_QUADS);
1737 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1738 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1739 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1740 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1741 glEnd ();
1742
1743 glDisable (GL_TEXTURE_2D);
1744 gl.ActiveTexture (GL_TEXTURE0);
1745 }
1746 else
1747 {
1748 /* simple blending of one texture, also opengl <1.3 path */
1749 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1750
1751 glBegin (GL_QUADS);
1752 glTexCoord2f (0, 0); glVertex2f (0, 0);
1753 glTexCoord2f (0, t); glVertex2f (0, h);
1754 glTexCoord2f (s, t); glVertex2f (w, h);
1755 glTexCoord2f (s, 0); glVertex2f (w, 0);
1756 glEnd ();
1757 }
1758
1759 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1760 {
1761 int x, y;
1762 int dx3 = dx * 3;
1763 int dy3 = dy * 3;
1764
1765 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1766 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1767 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1768 glTranslatef (-1., -1., 0);
1769 glBegin (GL_QUADS);
1770
1771 for (y = 1; y < h; y += 3)
1772 {
1773 int y1 = y - dy3;
1774 int y1valid = y1 >= 0 && y1 < h;
1775
1776 for (x = 1; x < w; x += 3)
1777 {
1778 int x1 = x - dx3;
1779 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1780 uint8_t h2;
1781
1782 if (y1valid && x1 >= 0 && x1 < w)
1783 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1784 else
1785 h2 = 1; /* out of range == invisible */
1786
1787 if (h1 || h2)
1788 {
1789 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1790 glColor4f (1., 1., 1., alpha);
1791
1792 glTexCoord2f (0, 0.); glVertex2i (x , y );
1793 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1794 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1795 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1796 }
1797 }
1798 }
1799 }
1800
1801 glEnd ();
1802
1803 glPopMatrix ();
1804
1805 glDisable (GL_TEXTURE_2D);
1806 glDisable (GL_BLEND);
1581} 1807}
1582 1808
1583IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1809IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1584 CODE: 1810 CODE:
1585{ 1811{
1691 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1917 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1692 // use uglier nearest interpolation because linear suffers 1918 // use uglier nearest interpolation because linear suffers
1693 // from transparent color bleeding and ugly wrapping effects. 1919 // from transparent color bleeding and ugly wrapping effects.
1694 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1920 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1695} 1921}
1922
1923void
1924expire_textures (DC::Map self, int texid, int count)
1925 PPCODE:
1926 for (; texid < self->texs && count; ++texid, --count)
1927 {
1928 maptex *tex = self->tex + texid;
1929
1930 if (tex->name)
1931 {
1932 if (tex->unused)
1933 {
1934 tex->name = 0;
1935 tex->unused = 0;
1936 XPUSHs (sv_2mortal (newSViv (texid)));
1937 }
1938 else
1939 tex->unused = 1;
1940 }
1941 }
1696 1942
1697int 1943int
1698ox (DC::Map self) 1944ox (DC::Map self)
1699 ALIAS: 1945 ALIAS:
1700 oy = 1 1946 oy = 1
1781 { 2027 {
1782 ext = *data++; 2028 ext = *data++;
1783 cmd = ext & 0x7f; 2029 cmd = ext & 0x7f;
1784 2030
1785 if (cmd < 4) 2031 if (cmd < 4)
1786 cell->darkness = 255 - ext * 64 + 1; 2032 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1787 else if (cmd == 5) // health 2033 else if (cmd == 5) // health
1788 { 2034 {
1789 cell->stat_width = 1; 2035 cell->stat_width = 1;
1790 cell->stat_hp = *data++; 2036 cell->stat_hp = *data++;
1791 } 2037 }
1821 cell->tile [z] = self->face2tile [face]; 2067 cell->tile [z] = self->face2tile [face];
1822 2068
1823 if (cell->tile [z]) 2069 if (cell->tile [z])
1824 { 2070 {
1825 maptex *tex = self->tex + cell->tile [z]; 2071 maptex *tex = self->tex + cell->tile [z];
2072 tex->unused = 0;
1826 if (!tex->name) 2073 if (!tex->name)
1827 av_push (missing, newSViv (cell->tile [z])); 2074 av_push (missing, newSViv (cell->tile [z]));
1828 2075
1829 if (tex->smoothtile) 2076 if (tex->smoothtile)
1830 { 2077 {
1831 maptex *smooth = self->tex + tex->smoothtile; 2078 maptex *smooth = self->tex + tex->smoothtile;
2079 smooth->unused = 0;
1832 if (!smooth->name) 2080 if (!smooth->name)
1833 av_push (missing, newSViv (tex->smoothtile)); 2081 av_push (missing, newSViv (tex->smoothtile));
1834 } 2082 }
1835 } 2083 }
1836 } 2084 }
1907 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2155 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1908 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2156 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1909 smooth_key skey; 2157 smooth_key skey;
1910 int pl_x, pl_y; 2158 int pl_x, pl_y;
1911 maptex pl_tex; 2159 maptex pl_tex;
1912 rc_t *rc = rc_alloc (); 2160 rc_t *rc = rc_alloc ();
2161 rc_t *rc_ov = rc_alloc ();
1913 rc_key_t key; 2162 rc_key_t key;
1914 rc_array_t *arr; 2163 rc_array_t *arr;
1915 2164
1916 pl_tex.name = 0; 2165 pl_tex.name = 0;
1917 2166
1918 // thats current max. sorry. 2167 // that's current max. sorry.
1919 if (sw > 255) sw = 255; 2168 if (sw > 255) sw = 255;
1920 if (sh > 255) sh = 255; 2169 if (sh > 255) sh = 255;
1921 2170
1922 // clear key, in case of extra padding 2171 // clear key, in case of extra padding
1923 memset (&skey, 0, sizeof (skey)); 2172 memset (&skey, 0, sizeof (skey));
1927 key.g = 255; 2176 key.g = 255;
1928 key.b = 255; 2177 key.b = 255;
1929 key.a = 255; 2178 key.a = 255;
1930 key.mode = GL_QUADS; 2179 key.mode = GL_QUADS;
1931 key.format = GL_T2F_V3F; 2180 key.format = GL_T2F_V3F;
1932 key.texname = -1;
1933 2181
1934 mx += self->x; 2182 mx += self->x;
1935 my += self->y; 2183 my += self->y;
1936 2184
1937 // first pass: determine smooth_max 2185 // first pass: determine smooth_max
1961 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2209 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1962 2210
1963 for (z = 0; z <= 2; z++) 2211 for (z = 0; z <= 2; z++)
1964 { 2212 {
1965 memset (smooth_level, 0, sizeof (smooth_level)); 2213 memset (smooth_level, 0, sizeof (smooth_level));
2214 key.texname = -1;
1966 2215
1967 for (y = 0; y < sh; y++) 2216 for (y = 0; y < sh; y++)
1968 if (0 <= y + my && y + my < self->rows) 2217 if (0 <= y + my && y + my < self->rows)
1969 { 2218 {
1970 maprow *row = self->row + (y + my); 2219 maprow *row = self->row + (y + my);
1976 tileid tile = cell->tile [z]; 2225 tileid tile = cell->tile [z];
1977 2226
1978 if (tile) 2227 if (tile)
1979 { 2228 {
1980 maptex tex = self->tex [tile]; 2229 maptex tex = self->tex [tile];
1981 int px = (x + 1) * T - tex.w; 2230 int px, py;
1982 int py = (y + 1) * T - tex.h;
1983 2231
1984 if (key.texname != tex.name) 2232 if (key.texname != tex.name)
1985 { 2233 {
2234 self->tex [tile].unused = 0;
2235
1986 if (!tex.name) 2236 if (!tex.name)
1987 tex = self->tex [2]; /* missing, replace by noface */ 2237 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1988 2238
1989 key.texname = tex.name; 2239 key.texname = tex.name;
1990 arr = rc_array (rc, &key); 2240 arr = rc_array (rc, &key);
1991 } 2241 }
2242
2243 px = (x + 1) * T - tex.w;
2244 py = (y + 1) * T - tex.h;
1992 2245
1993 if (expect_false (cell->player == player) && expect_false (z == 2)) 2246 if (expect_false (cell->player == player) && expect_false (z == 2))
1994 { 2247 {
1995 pl_x = px; 2248 pl_x = px;
1996 pl_y = py; 2249 pl_y = py;
2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2254 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2002 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2255 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2003 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2256 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2004 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2257 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2005 2258
2006 if (expect_false (cell->flags) && expect_false (z == 2))
2007 {
2008 // overlays such as the speech bubble, probably more to come
2009 if (cell->flags & 1)
2010 {
2011 maptex tex = self->tex [1];
2012 int px = x * T + T * 2 / 32;
2013 int py = y * T - T * 6 / 32;
2014
2015 if (tex.name)
2016 {
2017 if (key.texname != tex.name)
2018 {
2019 key.texname = tex.name;
2020 arr = rc_array (rc, &key);
2021 }
2022
2023 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2024 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2025 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2026 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2027 }
2028 }
2029 }
2030
2031 // update smooth hash 2259 // update smooth hash
2032 if (tex.smoothtile) 2260 if (tex.smoothtile)
2033 { 2261 {
2034 skey.tile = tex.smoothtile; 2262 skey.tile = tex.smoothtile;
2035 skey.level = tex.smoothlevel; 2263 skey.level = tex.smoothlevel;
2063 // corners 2291 // corners
2064 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2292 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2065 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2293 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2066 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2294 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2067 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2295 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2296 }
2297 }
2298
2299 if (expect_false (z == 2) && expect_false (cell->flags))
2300 {
2301 // overlays such as the speech bubble, probably more to come
2302 if (cell->flags & 1)
2303 {
2304 rc_key_t key_ov = key;
2305 maptex tex = self->tex [TEXID_SPEECH];
2306 rc_array_t *arr;
2307 int px = x * T + T * 2 / 32;
2308 int py = y * T - T * 6 / 32;
2309
2310 key_ov.texname = tex.name;
2311 arr = rc_array (rc_ov, &key_ov);
2312
2313 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2314 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2315 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2316 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2068 } 2317 }
2069 } 2318 }
2070 } 2319 }
2071 } 2320 }
2072 2321
2112 { 2361 {
2113 // this time avoiding texture state changes 2362 // this time avoiding texture state changes
2114 // save gobs of state changes. 2363 // save gobs of state changes.
2115 if (key.texname != tex.name) 2364 if (key.texname != tex.name)
2116 { 2365 {
2366 self->tex [skey->tile].unused = 0;
2367
2117 glEnd (); 2368 glEnd ();
2118 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2369 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2119 glBegin (GL_QUADS); 2370 glBegin (GL_QUADS);
2120 } 2371 }
2121 2372
2167 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2418 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2168 2419
2169 rc_draw (rc); 2420 rc_draw (rc);
2170 } 2421 }
2171 2422
2423 rc_draw (rc_ov);
2424 rc_clear (rc_ov);
2425
2172 glDisable (GL_BLEND); 2426 glDisable (GL_BLEND);
2173 rc_free (rc); 2427 rc_free (rc);
2428 rc_free (rc_ov);
2174 2429
2175 // top layer: overlays such as the health bar 2430 // top layer: overlays such as the health bar
2176 for (y = 0; y < sh; y++) 2431 for (y = 0; y < sh; y++)
2177 if (0 <= y + my && y + my < self->rows) 2432 if (0 <= y + my && y + my < self->rows)
2178 { 2433 {
2183 { 2438 {
2184 mapcell *cell = row->col + (x + mx - row->c0); 2439 mapcell *cell = row->col + (x + mx - row->c0);
2185 2440
2186 int px = x * T; 2441 int px = x * T;
2187 int py = y * T; 2442 int py = y * T;
2443
2444 if (expect_false (cell->player == player))
2445 {
2446 px += sdx;
2447 py += sdy;
2448 }
2188 2449
2189 if (cell->stat_hp) 2450 if (cell->stat_hp)
2190 { 2451 {
2191 int width = cell->stat_width * T; 2452 int width = cell->stat_width * T;
2192 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2453 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2203 } 2464 }
2204 } 2465 }
2205} 2466}
2206 2467
2207void 2468void
2208draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2469draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2209 CODE: 2470 CODE:
2210{ 2471{
2211 static float color[16][3] = { 2472 static float color[16][3] = {
2212 { 0.00F, 0.00F, 0.00F }, 2473 { 0.00f, 0.00f, 0.00f },
2213 { 1.00F, 1.00F, 1.00F }, 2474 { 1.00f, 1.00f, 1.00f },
2214 { 0.00F, 0.00F, 0.55F }, 2475 { 0.00f, 0.00f, 0.55f },
2215 { 1.00F, 0.00F, 0.00F }, 2476 { 1.00f, 0.00f, 0.00f },
2216 2477
2217 { 1.00F, 0.54F, 0.00F }, 2478 { 1.00f, 0.54f, 0.00f },
2218 { 0.11F, 0.56F, 1.00F }, 2479 { 0.11f, 0.56f, 1.00f },
2219 { 0.93F, 0.46F, 0.00F }, 2480 { 0.93f, 0.46f, 0.00f },
2220 { 0.18F, 0.54F, 0.34F }, 2481 { 0.18f, 0.54f, 0.34f },
2221 2482
2222 { 0.56F, 0.73F, 0.56F }, 2483 { 0.56f, 0.73f, 0.56f },
2223 { 0.80F, 0.80F, 0.80F }, 2484 { 0.80f, 0.80f, 0.80f },
2224 { 0.55F, 0.41F, 0.13F }, 2485 { 0.55f, 0.41f, 0.13f },
2225 { 0.99F, 0.77F, 0.26F }, 2486 { 0.99f, 0.77f, 0.26f },
2226 2487
2227 { 0.74F, 0.65F, 0.41F }, 2488 { 0.74f, 0.65f, 0.41f },
2228 2489
2229 { 0.00F, 1.00F, 1.00F }, 2490 { 0.00f, 1.00f, 1.00f },
2230 { 1.00F, 0.00F, 1.00F }, 2491 { 1.00f, 0.00f, 1.00f },
2231 { 1.00F, 1.00F, 0.00F }, 2492 { 1.00f, 1.00f, 0.00f },
2232 }; 2493 };
2233 2494
2234 int x, y; 2495 int x, y;
2235 2496
2236 glEnable (GL_TEXTURE_2D); 2497 glEnable (GL_TEXTURE_2D);
2498 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2499 * but the nvidia driver (185.18.14) mishandles alpha textures
2500 * and takes the colour from god knows where instead of using
2501 * Cp. MODULATE results in the same colour, but slightly different
2502 * alpha, but atcually gives us the correct colour with nvidia.
2503 */
2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2504 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2238 glEnable (GL_BLEND); 2505 glEnable (GL_BLEND);
2239 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2506 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2240 glBegin (GL_QUADS); 2507 glBegin (GL_QUADS);
2241 2508
2242 for (y = 0; y < h; y++) 2509 for (y = 0; y < h; y++)
2246 2513
2247 if (m) 2514 if (m)
2248 { 2515 {
2249 float *c = color [m & 15]; 2516 float *c = color [m & 15];
2250 2517
2251 float tx1 = m & 0x40 ? 0.5 : 0.; 2518 float tx1 = m & 0x40 ? 0.5f : 0.f;
2252 float tx2 = tx1 + 0.5; 2519 float tx2 = tx1 + 0.5f;
2253 2520
2254 glColor4f (c[0], c[1], c[2], 0.75); 2521 glColor4f (c[0], c[1], c[2], 1);
2255 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2522 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2256 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2523 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2257 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2524 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2258 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2525 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2259 } 2526 }
2267void 2534void
2268fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2535fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2269 PPCODE: 2536 PPCODE:
2270{ 2537{
2271 int x, y; 2538 int x, y;
2272 int sw1 = sw + 2; 2539 int sw1 = sw + 2;
2273 int sh1 = sh + 2; 2540 int sh1 = sh + 2;
2274 int sh3 = sh * 3; 2541 int sh3 = sh * 3;
2275 int sw34 = (sw * 3 + 3) & ~3; 2542 int sw3 = sw * 3;
2276 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2543 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2277 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2544 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2278 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2545 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2279 2546
2280 SvPOK_only (darkness3_sv); 2547 SvPOK_only (darkness3_sv);
2281 SvCUR_set (darkness3_sv, sw34 * sh3); 2548 SvCUR_set (darkness3_sv, sw3 * sh3);
2282 2549
2283 mx += self->x - 1; 2550 mx += self->x - 1;
2284 my += self->y - 1; 2551 my += self->y - 1;
2285
2286 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2287 2552
2288 for (y = 0; y < sh1; y++) 2553 for (y = 0; y < sh1; y++)
2289 if (0 <= y + my && y + my < self->rows) 2554 if (0 <= y + my && y + my < self->rows)
2290 { 2555 {
2291 maprow *row = self->row + (y + my); 2556 maprow *row = self->row + (y + my);
2294 if (row->c0 <= x + mx && x + mx < row->c1) 2559 if (row->c0 <= x + mx && x + mx < row->c1)
2295 { 2560 {
2296 mapcell *cell = row->col + (x + mx - row->c0); 2561 mapcell *cell = row->col + (x + mx - row->c0);
2297 2562
2298 darkness1 [y * sw1 + x] = cell->darkness 2563 darkness1 [y * sw1 + x] = cell->darkness
2299 ? 255 - (cell->darkness - 1) 2564 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2300 : 255 - FOW_DARKNESS; 2565 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2301 } 2566 }
2302 } 2567 }
2303 2568
2304 for (y = 0; y < sh; ++y) 2569 for (y = 0; y < sh; ++y)
2305 for (x = 0; x < sw; ++x) 2570 for (x = 0; x < sw; ++x)
2324 2589
2325 uint8_t r13 = (d13 + d23 + d12) / 3; 2590 uint8_t r13 = (d13 + d23 + d12) / 3;
2326 uint8_t r23 = d23; 2591 uint8_t r23 = d23;
2327 uint8_t r33 = (d23 + d33 + d32) / 3; 2592 uint8_t r33 = (d23 + d33 + d32) / 3;
2328 2593
2329 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2594 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2330 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2595 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2331 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2596 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2332 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2597 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2333 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2598 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2334 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2599 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2335 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2600 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2336 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2601 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2337 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2602 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2338 } 2603 }
2339 2604
2340 free (darkness1); 2605 free (darkness1);
2341 2606
2342 EXTEND (SP, 3); 2607 EXTEND (SP, 3);
2343 PUSHs (sv_2mortal (newSViv (sw34))); 2608 PUSHs (sv_2mortal (newSViv (sw3)));
2344 PUSHs (sv_2mortal (newSViv (sh3))); 2609 PUSHs (sv_2mortal (newSViv (sh3)));
2345 PUSHs (darkness3_sv); 2610 PUSHs (darkness3_sv);
2346} 2611}
2347 2612
2348SV * 2613SV *
2546 if (RETVAL < 0) 2811 if (RETVAL < 0)
2547 { 2812 {
2548 RETVAL = Mix_GroupOldest (-1); 2813 RETVAL = Mix_GroupOldest (-1);
2549 2814
2550 if (RETVAL < 0) 2815 if (RETVAL < 0)
2816 {
2817 // happens sometimes, maybe it just stopped playing(?)
2818 RETVAL = Mix_GroupAvailable (-1);
2819
2820 if (RETVAL < 0)
2551 XSRETURN_UNDEF; 2821 XSRETURN_UNDEF;
2552 2822 }
2823 else
2553 Mix_HaltChannel (RETVAL); 2824 Mix_HaltChannel (RETVAL);
2554 } 2825 }
2555 2826
2556 Mix_UnregisterAllEffects (RETVAL); 2827 Mix_UnregisterAllEffects (RETVAL);
2557 Mix_Volume (RETVAL, 128); 2828 Mix_Volume (RETVAL, 128);
2558} 2829}
2605void 2876void
2606set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2877set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2607 CODE: 2878 CODE:
2608{ 2879{
2609 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2880 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2610 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2881 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2611 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2882 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2612} 2883}
2613 2884
2614void 2885void
2615set_reverse_stereo (DC::Channel self, int flip) 2886set_reverse_stereo (DC::Channel self, int flip)
2617 Mix_SetReverseStereo (self, flip); 2888 Mix_SetReverseStereo (self, flip);
2618 2889
2619MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2890MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2620 2891
2621PROTOTYPES: DISABLE 2892PROTOTYPES: DISABLE
2893
2894void
2895decoders ()
2896 PPCODE:
2897#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2898 int i, num = Mix_GetNumChunkDecoders ();
2899 EXTEND (SP, num);
2900 for (i = 0; i < num; ++i)
2901 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2902#else
2903 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2904#endif
2622 2905
2623DC::MixChunk 2906DC::MixChunk
2624new (SV *class, DC::RW rwops) 2907new (SV *class, DC::RW rwops)
2625 CODE: 2908 CODE:
2626 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2909 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2659 OUTPUT: 2942 OUTPUT:
2660 RETVAL 2943 RETVAL
2661 2944
2662MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2945MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2663 2946
2947void
2948decoders ()
2949 PPCODE:
2950#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2951 int i, num = Mix_GetNumMusicDecoders ();
2952 EXTEND (SP, num);
2953 for (i = 0; i < num; ++i)
2954 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2955#else
2956 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2957#endif
2958
2664int 2959int
2665volume (int volume = -1) 2960volume (int volume = -1)
2666 PROTOTYPE: ;$ 2961 PROTOTYPE: ;$
2667 CODE: 2962 CODE:
2668 if (items > 0) 2963 if (items > 0)
2678 2973
2679void 2974void
2680halt () 2975halt ()
2681 CODE: 2976 CODE:
2682 Mix_HaltMusic (); 2977 Mix_HaltMusic ();
2978
2979int
2980playing ()
2981 CODE:
2982 RETVAL = Mix_PlayingMusic ();
2983 OUTPUT:
2984 RETVAL
2683 2985
2684DC::MixMusic 2986DC::MixMusic
2685new (SV *class, DC::RW rwops) 2987new (SV *class, DC::RW rwops)
2686 CODE: 2988 CODE:
2687 RETVAL = Mix_LoadMUS_RW (rwops); 2989 RETVAL = Mix_LoadMUS_RW (rwops);
2718 } *civ, const_iv[] = { 3020 } *civ, const_iv[] = {
2719# define const_iv(name) { # name, (IV)name } 3021# define const_iv(name) { # name, (IV)name }
2720 const_iv (GL_VENDOR), 3022 const_iv (GL_VENDOR),
2721 const_iv (GL_VERSION), 3023 const_iv (GL_VERSION),
2722 const_iv (GL_EXTENSIONS), 3024 const_iv (GL_EXTENSIONS),
3025 const_iv (GL_MAX_TEXTURE_UNITS),
2723 const_iv (GL_COLOR_MATERIAL), 3026 const_iv (GL_COLOR_MATERIAL),
2724 const_iv (GL_SMOOTH), 3027 const_iv (GL_SMOOTH),
2725 const_iv (GL_FLAT), 3028 const_iv (GL_FLAT),
2726 const_iv (GL_DITHER), 3029 const_iv (GL_DITHER),
2727 const_iv (GL_BLEND), 3030 const_iv (GL_BLEND),
2739 const_iv (GL_ZERO), 3042 const_iv (GL_ZERO),
2740 const_iv (GL_SRC_ALPHA), 3043 const_iv (GL_SRC_ALPHA),
2741 const_iv (GL_DST_ALPHA), 3044 const_iv (GL_DST_ALPHA),
2742 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3045 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2743 const_iv (GL_ONE_MINUS_DST_ALPHA), 3046 const_iv (GL_ONE_MINUS_DST_ALPHA),
3047 const_iv (GL_SRC_COLOR),
3048 const_iv (GL_DST_COLOR),
3049 const_iv (GL_ONE_MINUS_SRC_COLOR),
3050 const_iv (GL_ONE_MINUS_DST_COLOR),
2744 const_iv (GL_SRC_ALPHA_SATURATE), 3051 const_iv (GL_SRC_ALPHA_SATURATE),
2745 const_iv (GL_RGB), 3052 const_iv (GL_RGB),
2746 const_iv (GL_RGBA), 3053 const_iv (GL_RGBA),
2747 const_iv (GL_RGBA4), 3054 const_iv (GL_RGBA4),
2748 const_iv (GL_RGBA8), 3055 const_iv (GL_RGBA8),
2816 const_iv (GL_NICEST), 3123 const_iv (GL_NICEST),
2817 const_iv (GL_V2F), 3124 const_iv (GL_V2F),
2818 const_iv (GL_V3F), 3125 const_iv (GL_V3F),
2819 const_iv (GL_T2F_V3F), 3126 const_iv (GL_T2F_V3F),
2820 const_iv (GL_T2F_N3F_V3F), 3127 const_iv (GL_T2F_N3F_V3F),
3128 const_iv (GL_FUNC_ADD),
3129 const_iv (GL_FUNC_SUBTRACT),
3130 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2821# undef const_iv 3131# undef const_iv
2822 }; 3132 };
2823 3133
2824 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3134 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2825 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3135 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2832disable_GL_EXT_blend_func_separate () 3142disable_GL_EXT_blend_func_separate ()
2833 CODE: 3143 CODE:
2834 gl.BlendFuncSeparate = 0; 3144 gl.BlendFuncSeparate = 0;
2835 gl.BlendFuncSeparateEXT = 0; 3145 gl.BlendFuncSeparateEXT = 0;
2836 3146
3147void
3148apple_nvidia_bug (int enable)
3149
2837char * 3150char *
2838gl_vendor () 3151gl_vendor ()
2839 CODE: 3152 CODE:
2840 RETVAL = (char *)glGetString (GL_VENDOR); 3153 RETVAL = (char *)glGetString (GL_VENDOR);
2841 OUTPUT: 3154 OUTPUT:
2871 3184
2872int glGetError () 3185int glGetError ()
2873 3186
2874void glFinish () 3187void glFinish ()
2875 3188
3189void glFlush ()
3190
2876void glClear (int mask) 3191void glClear (int mask)
2877 3192
2878void glClearColor (float r, float g, float b, float a = 1.0) 3193void glClearColor (float r, float g, float b, float a = 1.0)
2879 PROTOTYPE: @ 3194 PROTOTYPE: @
2880 3195
2889void glBlendFunc (int sfactor, int dfactor) 3204void glBlendFunc (int sfactor, int dfactor)
2890 3205
2891void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3206void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2892 CODE: 3207 CODE:
2893 gl_BlendFuncSeparate (sa, da, saa, daa); 3208 gl_BlendFuncSeparate (sa, da, saa, daa);
3209
3210# void glBlendEquation (int se)
2894 3211
2895void glDepthMask (int flag) 3212void glDepthMask (int flag)
2896 3213
2897void glLogicOp (int opcode) 3214void glLogicOp (int opcode)
2898 3215
2933void glRotate (float angle, float x, float y, float z) 3250void glRotate (float angle, float x, float y, float z)
2934 CODE: 3251 CODE:
2935 glRotatef (angle, x, y, z); 3252 glRotatef (angle, x, y, z);
2936 3253
2937void glColor (float r, float g, float b, float a = 1.0) 3254void glColor (float r, float g, float b, float a = 1.0)
3255 PROTOTYPE: @
2938 ALIAS: 3256 ALIAS:
2939 glColor_premultiply = 1 3257 glColor_premultiply = 1
2940 CODE: 3258 CODE:
2941 if (ix) 3259 if (ix)
2942 { 3260 {
3047void glNewList (int list, int mode = GL_COMPILE) 3365void glNewList (int list, int mode = GL_COMPILE)
3048 3366
3049void glEndList () 3367void glEndList ()
3050 3368
3051void glCallList (int list) 3369void glCallList (int list)
3370
3371void c_init ()
3372 CODE:
3373 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3374 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3052 3375
3053MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3376MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3054 3377
3055PROTOTYPES: DISABLE 3378PROTOTYPES: DISABLE
3056 3379

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines