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.270 by root, Sun Jul 20 15:05:13 2008 UTC vs.
Revision 1.301 by root, Thu Feb 4 20:01:08 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>
… …
38#include <SDL_thread.h> 37#include <SDL_thread.h>
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
42
43/* work around os x broken headers */
44#ifdef __MACOSX__
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);
48#endif
43 49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib/gmacros.h>
… …
76#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
78 84
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 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 */
81#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
82 91
83#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
85 94
86#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
87 96
88/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
89#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
90 104
91static AV *texture_av; 105static AV *texture_av;
92 106
93static struct 107static struct
94{ 108{
… …
226 int w, h; 240 int w, h;
227 float s, t; 241 float s, t;
228 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
229 tileid smoothtile; 243 tileid smoothtile;
230 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
231} maptex; 246} maptex;
232 247
233typedef struct { 248typedef struct {
234 uint32_t player; 249 uint32_t player;
235 tileid tile[3]; 250 tileid tile[3];
… …
521 if (!svp || !SvTRUE (*svp)) 536 if (!svp || !SvTRUE (*svp))
522 return 0; 537 return 0;
523 538
524 return 1; 539 return 1;
525} 540}
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
556static void
557deliantra_main ()
558{
559 char *argv[] = { 0 };
560 call_argv ("::main", G_DISCARD | G_VOID, argv);
561}
562
563#ifdef __MACOSX__
564 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back.
569 */
570 extern C_LINKAGE int
571 main (int argc, char *argv[])
572 {
573 deliantra_main ();
574 }
575
576 #undef main
577
578 extern C_LINKAGE int main (int argc, char *argv[]);
579
580 static void
581 SDL_braino (void)
582 {
583 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv);
585 }
586#else
587 static void
588 SDL_braino (void)
589 {
590 deliantra_main ();
591 }
592#endif
526 593
527MODULE = Deliantra::Client PACKAGE = DC 594MODULE = Deliantra::Client PACKAGE = DC
528 595
529PROTOTYPES: ENABLE 596PROTOTYPES: ENABLE
530 597
… …
559 const_iv (SDL_USEREVENT), 626 const_iv (SDL_USEREVENT),
560 627
561 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
562 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
563 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),
564 681
565 const_iv (SDLK_FIRST), 682 const_iv (SDLK_FIRST),
566 const_iv (SDLK_LAST), 683 const_iv (SDLK_LAST),
567 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
568 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
… …
644 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
645 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
646 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
647 const_iv (KMOD_MODE), 764 const_iv (KMOD_MODE),
648 765
766 const_iv (KMOD_LRAM),
767
649 const_iv (MIX_DEFAULT_FORMAT), 768 const_iv (MIX_DEFAULT_FORMAT),
650 769
651 const_iv (SDL_INIT_TIMER), 770 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO), 771 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO), 772 const_iv (SDL_INIT_VIDEO),
… …
701 820
702NV floor (NV x) 821NV floor (NV x)
703 822
704NV ceil (NV x) 823NV ceil (NV x)
705 824
706NV ceilabs (NV x) 825IV minpot (UV n)
826
827IV popcount (UV n)
828
829NV distance (NV dx, NV dy)
707 CODE: 830 CODE:
708 RETVAL = x < 0. ? - ceil (-x) : ceil (x); 831 RETVAL = pow (dx * dx + dy * dy, 0.5);
709 OUTPUT: 832 OUTPUT:
710 RETVAL 833 RETVAL
711
712IV minpot (UV n)
713
714IV popcount (UV n)
715 834
716void 835void
717pango_init () 836pango_init ()
718 CODE: 837 CODE:
719{ 838{
… …
726 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 845 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
727#endif 846#endif
728} 847}
729 848
730char *SDL_GetError () 849char *SDL_GetError ()
850
851void SDL_braino ()
731 852
732int SDL_Init (U32 flags) 853int SDL_Init (U32 flags)
733 854
734int SDL_InitSubSystem (U32 flags) 855int SDL_InitSubSystem (U32 flags)
735 856
… …
809 930
810 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
811#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);
812#include "glfunc.h" 933#include "glfunc.h"
813#undef GL_FUNC 934#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
814 } 938 }
815} 939}
816 OUTPUT: 940 OUTPUT:
817 RETVAL 941 RETVAL
818 942
… …
844 { 968 {
845 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
846 case SDL_KEYUP: 970 case SDL_KEYUP:
847 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
848 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
849 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);
850 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 */
851 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
852 break; 976 break;
853 977
854 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
855 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
873 x = ev.motion.x; 997 x = ev.motion.x;
874 y = ev.motion.y; 998 y = ev.motion.y;
875 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
876 } 1000 }
877 1001
878 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
879 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
880 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
881 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
882 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
883 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1099#if DEBUG 1223#if DEBUG
1100 VALGRIND_DO_LEAK_CHECK; 1224 VALGRIND_DO_LEAK_CHECK;
1101#endif 1225#endif
1102} 1226}
1103 1227
1228int
1229SvREFCNT (SV *sv)
1230 CODE:
1231 RETVAL = SvREFCNT (sv);
1232 OUTPUT:
1233 RETVAL
1234
1104MODULE = Deliantra::Client PACKAGE = DC::Font 1235MODULE = Deliantra::Client PACKAGE = DC::Font
1105 1236
1106PROTOTYPES: DISABLE 1237PROTOTYPES: DISABLE
1107 1238
1108DC::Font 1239DC::Font
… …
1537 if (ix) 1668 if (ix)
1538 { 1669 {
1539 glDisable (GL_ALPHA_TEST); 1670 glDisable (GL_ALPHA_TEST);
1540 glDisable (GL_BLEND); 1671 glDisable (GL_BLEND);
1541 } 1672 }
1673}
1674
1675void
1676draw_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)
1677 PROTOTYPE: @
1678 CODE:
1679{
1680 glEnable (GL_BLEND);
1681 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1682 glEnable (GL_TEXTURE_2D);
1683 glBindTexture (GL_TEXTURE_2D, name1);
1684
1685 glColor3f (intensity, intensity, intensity);
1686 glPushMatrix ();
1687 glScalef (1./3, 1./3, 1.);
1688
1689 if (blend > 0.f)
1690 {
1691 float dx3 = dx * -3.f / w;
1692 float dy3 = dy * -3.f / h;
1693 GLfloat env_color[4] = { 0., 0., 0., blend };
1694
1695 /* interpolate the two shadow textures */
1696 /* stage 0 == rgb(glcolor) + alpha(t0) */
1697 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1698
1699 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1700 gl.ActiveTexture (GL_TEXTURE1);
1701 glEnable (GL_TEXTURE_2D);
1702 glBindTexture (GL_TEXTURE_2D, name2);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1704
1705 /* rgb == rgb(glcolor) */
1706 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1707 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1708 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1709
1710 /* alpha = interpolate t0, t1 by env_alpha */
1711 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1712
1713 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1714 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1715 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1716
1717 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1718 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1719
1720 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1721 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1722
1723 glBegin (GL_QUADS);
1724 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1725 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1726 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1727 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1728 glEnd ();
1729
1730 glDisable (GL_TEXTURE_2D);
1731 gl.ActiveTexture (GL_TEXTURE0);
1732 }
1733 else
1734 {
1735 /* simple blending of one texture, also opengl <1.3 path */
1736 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1737
1738 glBegin (GL_QUADS);
1739 glTexCoord2f (0, 0); glVertex2f (0, 0);
1740 glTexCoord2f (0, t); glVertex2f (0, h);
1741 glTexCoord2f (s, t); glVertex2f (w, h);
1742 glTexCoord2f (s, 0); glVertex2f (w, 0);
1743 glEnd ();
1744 }
1745
1746 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1747 {
1748 int x, y;
1749 int dx3 = dx * 3;
1750 int dy3 = dy * 3;
1751
1752 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1753 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1754 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1755 glTranslatef (-1., -1., 0);
1756 glBegin (GL_QUADS);
1757
1758 for (y = 1; y < h; y += 3)
1759 {
1760 int y1 = y - dy3;
1761 int y1valid = y1 >= 0 && y1 < h;
1762
1763 for (x = 1; x < w; x += 3)
1764 {
1765 int x1 = x - dx3;
1766 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1767 uint8_t h2;
1768
1769 if (y1valid && x1 >= 0 && x1 < w)
1770 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1771 else
1772 h2 = 1; /* out of range == invisible */
1773
1774 if (h1 || h2)
1775 {
1776 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1777 glColor4f (1., 1., 1., alpha);
1778
1779 glTexCoord2f (0, 0.); glVertex2i (x , y );
1780 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1781 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1782 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1783 }
1784 }
1785 }
1786 }
1787
1788 glEnd ();
1789
1790 glPopMatrix ();
1791
1792 glDisable (GL_TEXTURE_2D);
1793 glDisable (GL_BLEND);
1542} 1794}
1543 1795
1544IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1796IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1545 CODE: 1797 CODE:
1546{ 1798{
… …
1652 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1904 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1653 // use uglier nearest interpolation because linear suffers 1905 // use uglier nearest interpolation because linear suffers
1654 // from transparent color bleeding and ugly wrapping effects. 1906 // from transparent color bleeding and ugly wrapping effects.
1655 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1907 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1656} 1908}
1909
1910void
1911expire_textures (DC::Map self, int texid, int count)
1912 PPCODE:
1913 for (; texid < self->texs && count; ++texid, --count)
1914 {
1915 maptex *tex = self->tex + texid;
1916
1917 if (tex->name)
1918 {
1919 if (tex->unused)
1920 {
1921 tex->name = 0;
1922 tex->unused = 0;
1923 XPUSHs (sv_2mortal (newSViv (texid)));
1924 }
1925 else
1926 tex->unused = 1;
1927 }
1928 }
1657 1929
1658int 1930int
1659ox (DC::Map self) 1931ox (DC::Map self)
1660 ALIAS: 1932 ALIAS:
1661 oy = 1 1933 oy = 1
… …
1742 { 2014 {
1743 ext = *data++; 2015 ext = *data++;
1744 cmd = ext & 0x7f; 2016 cmd = ext & 0x7f;
1745 2017
1746 if (cmd < 4) 2018 if (cmd < 4)
1747 cell->darkness = 255 - ext * 64 + 1; 2019 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1748 else if (cmd == 5) // health 2020 else if (cmd == 5) // health
1749 { 2021 {
1750 cell->stat_width = 1; 2022 cell->stat_width = 1;
1751 cell->stat_hp = *data++; 2023 cell->stat_hp = *data++;
1752 } 2024 }
… …
1782 cell->tile [z] = self->face2tile [face]; 2054 cell->tile [z] = self->face2tile [face];
1783 2055
1784 if (cell->tile [z]) 2056 if (cell->tile [z])
1785 { 2057 {
1786 maptex *tex = self->tex + cell->tile [z]; 2058 maptex *tex = self->tex + cell->tile [z];
2059 tex->unused = 0;
1787 if (!tex->name) 2060 if (!tex->name)
1788 av_push (missing, newSViv (cell->tile [z])); 2061 av_push (missing, newSViv (cell->tile [z]));
1789 2062
1790 if (tex->smoothtile) 2063 if (tex->smoothtile)
1791 { 2064 {
1792 maptex *smooth = self->tex + tex->smoothtile; 2065 maptex *smooth = self->tex + tex->smoothtile;
2066 smooth->unused = 0;
1793 if (!smooth->name) 2067 if (!smooth->name)
1794 av_push (missing, newSViv (tex->smoothtile)); 2068 av_push (missing, newSViv (tex->smoothtile));
1795 } 2069 }
1796 } 2070 }
1797 } 2071 }
… …
1868 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2142 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1869 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2143 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1870 smooth_key skey; 2144 smooth_key skey;
1871 int pl_x, pl_y; 2145 int pl_x, pl_y;
1872 maptex pl_tex; 2146 maptex pl_tex;
1873 rc_t *rc = rc_alloc (); 2147 rc_t *rc = rc_alloc ();
2148 rc_t *rc_ov = rc_alloc ();
1874 rc_key_t key; 2149 rc_key_t key;
1875 rc_array_t *arr; 2150 rc_array_t *arr;
1876 2151
1877 pl_tex.name = 0; 2152 pl_tex.name = 0;
1878 2153
1879 // thats current max. sorry. 2154 // that's current max. sorry.
1880 if (sw > 255) sw = 255; 2155 if (sw > 255) sw = 255;
1881 if (sh > 255) sh = 255; 2156 if (sh > 255) sh = 255;
1882 2157
1883 // clear key, in case of extra padding 2158 // clear key, in case of extra padding
1884 memset (&skey, 0, sizeof (skey)); 2159 memset (&skey, 0, sizeof (skey));
… …
1888 key.g = 255; 2163 key.g = 255;
1889 key.b = 255; 2164 key.b = 255;
1890 key.a = 255; 2165 key.a = 255;
1891 key.mode = GL_QUADS; 2166 key.mode = GL_QUADS;
1892 key.format = GL_T2F_V3F; 2167 key.format = GL_T2F_V3F;
1893 key.texname = -1;
1894 2168
1895 mx += self->x; 2169 mx += self->x;
1896 my += self->y; 2170 my += self->y;
1897 2171
1898 // first pass: determine smooth_max 2172 // first pass: determine smooth_max
… …
1922 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2196 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1923 2197
1924 for (z = 0; z <= 2; z++) 2198 for (z = 0; z <= 2; z++)
1925 { 2199 {
1926 memset (smooth_level, 0, sizeof (smooth_level)); 2200 memset (smooth_level, 0, sizeof (smooth_level));
2201 key.texname = -1;
1927 2202
1928 for (y = 0; y < sh; y++) 2203 for (y = 0; y < sh; y++)
1929 if (0 <= y + my && y + my < self->rows) 2204 if (0 <= y + my && y + my < self->rows)
1930 { 2205 {
1931 maprow *row = self->row + (y + my); 2206 maprow *row = self->row + (y + my);
… …
1937 tileid tile = cell->tile [z]; 2212 tileid tile = cell->tile [z];
1938 2213
1939 if (tile) 2214 if (tile)
1940 { 2215 {
1941 maptex tex = self->tex [tile]; 2216 maptex tex = self->tex [tile];
1942 int px = (x + 1) * T - tex.w; 2217 int px, py;
1943 int py = (y + 1) * T - tex.h;
1944 2218
1945 if (key.texname != tex.name) 2219 if (key.texname != tex.name)
1946 { 2220 {
2221 self->tex [tile].unused = 0;
2222
1947 if (!tex.name) 2223 if (!tex.name)
1948 tex = self->tex [2]; /* missing, replace by noface */ 2224 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1949 2225
1950 key.texname = tex.name; 2226 key.texname = tex.name;
1951 arr = rc_array (rc, &key); 2227 arr = rc_array (rc, &key);
1952 } 2228 }
2229
2230 px = (x + 1) * T - tex.w;
2231 py = (y + 1) * T - tex.h;
1953 2232
1954 if (expect_false (cell->player == player) && expect_false (z == 2)) 2233 if (expect_false (cell->player == player) && expect_false (z == 2))
1955 { 2234 {
1956 pl_x = px; 2235 pl_x = px;
1957 pl_y = py; 2236 pl_y = py;
… …
1962 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2241 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1963 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2242 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1964 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2243 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1965 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2244 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1966 2245
1967 if (expect_false (cell->flags) && expect_false (z == 2))
1968 {
1969 // overlays such as the speech bubble, probably more to come
1970 if (cell->flags & 1)
1971 {
1972 maptex tex = self->tex [1];
1973 int px = x * T + T * 2 / 32;
1974 int py = y * T - T * 6 / 32;
1975
1976 if (tex.name)
1977 {
1978 if (key.texname != tex.name)
1979 {
1980 key.texname = tex.name;
1981 arr = rc_array (rc, &key);
1982 }
1983
1984 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1985 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1986 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1987 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1988 }
1989 }
1990 }
1991
1992 // update smooth hash 2246 // update smooth hash
1993 if (tex.smoothtile) 2247 if (tex.smoothtile)
1994 { 2248 {
1995 skey.tile = tex.smoothtile; 2249 skey.tile = tex.smoothtile;
1996 skey.level = tex.smoothlevel; 2250 skey.level = tex.smoothlevel;
… …
2024 // corners 2278 // corners
2025 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2279 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2026 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2280 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2027 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2281 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2028 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2282 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2283 }
2284 }
2285
2286 if (expect_false (z == 2) && expect_false (cell->flags))
2287 {
2288 // overlays such as the speech bubble, probably more to come
2289 if (cell->flags & 1)
2290 {
2291 rc_key_t key_ov = key;
2292 maptex tex = self->tex [TEXID_SPEECH];
2293 rc_array_t *arr;
2294 int px = x * T + T * 2 / 32;
2295 int py = y * T - T * 6 / 32;
2296
2297 key_ov.texname = tex.name;
2298 arr = rc_array (rc_ov, &key_ov);
2299
2300 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2301 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2302 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2303 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2029 } 2304 }
2030 } 2305 }
2031 } 2306 }
2032 } 2307 }
2033 2308
… …
2073 { 2348 {
2074 // this time avoiding texture state changes 2349 // this time avoiding texture state changes
2075 // save gobs of state changes. 2350 // save gobs of state changes.
2076 if (key.texname != tex.name) 2351 if (key.texname != tex.name)
2077 { 2352 {
2353 self->tex [skey->tile].unused = 0;
2354
2078 glEnd (); 2355 glEnd ();
2079 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2356 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2080 glBegin (GL_QUADS); 2357 glBegin (GL_QUADS);
2081 } 2358 }
2082 2359
… …
2128 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2405 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2129 2406
2130 rc_draw (rc); 2407 rc_draw (rc);
2131 } 2408 }
2132 2409
2410 rc_draw (rc_ov);
2411 rc_clear (rc_ov);
2412
2133 glDisable (GL_BLEND); 2413 glDisable (GL_BLEND);
2134 rc_free (rc); 2414 rc_free (rc);
2415 rc_free (rc_ov);
2135 2416
2136 // top layer: overlays such as the health bar 2417 // top layer: overlays such as the health bar
2137 for (y = 0; y < sh; y++) 2418 for (y = 0; y < sh; y++)
2138 if (0 <= y + my && y + my < self->rows) 2419 if (0 <= y + my && y + my < self->rows)
2139 { 2420 {
… …
2144 { 2425 {
2145 mapcell *cell = row->col + (x + mx - row->c0); 2426 mapcell *cell = row->col + (x + mx - row->c0);
2146 2427
2147 int px = x * T; 2428 int px = x * T;
2148 int py = y * T; 2429 int py = y * T;
2430
2431 if (expect_false (cell->player == player))
2432 {
2433 px += sdx;
2434 py += sdy;
2435 }
2149 2436
2150 if (cell->stat_hp) 2437 if (cell->stat_hp)
2151 { 2438 {
2152 int width = cell->stat_width * T; 2439 int width = cell->stat_width * T;
2153 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2440 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2164 } 2451 }
2165 } 2452 }
2166} 2453}
2167 2454
2168void 2455void
2169draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2456draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2170 CODE: 2457 CODE:
2171{ 2458{
2172 static float color[16][3] = { 2459 static float color[16][3] = {
2173 { 0.00F, 0.00F, 0.00F }, 2460 { 0.00f, 0.00f, 0.00f },
2174 { 1.00F, 1.00F, 1.00F }, 2461 { 1.00f, 1.00f, 1.00f },
2175 { 0.00F, 0.00F, 0.55F }, 2462 { 0.00f, 0.00f, 0.55f },
2176 { 1.00F, 0.00F, 0.00F }, 2463 { 1.00f, 0.00f, 0.00f },
2177 2464
2178 { 1.00F, 0.54F, 0.00F }, 2465 { 1.00f, 0.54f, 0.00f },
2179 { 0.11F, 0.56F, 1.00F }, 2466 { 0.11f, 0.56f, 1.00f },
2180 { 0.93F, 0.46F, 0.00F }, 2467 { 0.93f, 0.46f, 0.00f },
2181 { 0.18F, 0.54F, 0.34F }, 2468 { 0.18f, 0.54f, 0.34f },
2182 2469
2183 { 0.56F, 0.73F, 0.56F }, 2470 { 0.56f, 0.73f, 0.56f },
2184 { 0.80F, 0.80F, 0.80F }, 2471 { 0.80f, 0.80f, 0.80f },
2185 { 0.55F, 0.41F, 0.13F }, 2472 { 0.55f, 0.41f, 0.13f },
2186 { 0.99F, 0.77F, 0.26F }, 2473 { 0.99f, 0.77f, 0.26f },
2187 2474
2188 { 0.74F, 0.65F, 0.41F }, 2475 { 0.74f, 0.65f, 0.41f },
2189 2476
2190 { 0.00F, 1.00F, 1.00F }, 2477 { 0.00f, 1.00f, 1.00f },
2191 { 1.00F, 0.00F, 1.00F }, 2478 { 1.00f, 0.00f, 1.00f },
2192 { 1.00F, 1.00F, 0.00F }, 2479 { 1.00f, 1.00f, 0.00f },
2193 }; 2480 };
2194 2481
2195 int x, y; 2482 int x, y;
2196 2483
2197 glEnable (GL_TEXTURE_2D); 2484 glEnable (GL_TEXTURE_2D);
2485 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2486 * but the nvidia driver (185.18.14) mishandles alpha textures
2487 * and takes the colour from god knows where instead of using
2488 * Cp. MODULATE results in the same colour, but slightly different
2489 * alpha, but atcually gives us the correct colour with nvidia.
2490 */
2198 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2491 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2199 glEnable (GL_BLEND); 2492 glEnable (GL_BLEND);
2200 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2493 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2201 glBegin (GL_QUADS); 2494 glBegin (GL_QUADS);
2202 2495
2203 for (y = 0; y < h; y++) 2496 for (y = 0; y < h; y++)
… …
2207 2500
2208 if (m) 2501 if (m)
2209 { 2502 {
2210 float *c = color [m & 15]; 2503 float *c = color [m & 15];
2211 2504
2212 float tx1 = m & 0x40 ? 0.5 : 0.; 2505 float tx1 = m & 0x40 ? 0.5f : 0.f;
2213 float tx2 = tx1 + 0.5; 2506 float tx2 = tx1 + 0.5f;
2214 2507
2215 glColor4f (c[0], c[1], c[2], 0.75); 2508 glColor4f (c[0], c[1], c[2], 1);
2216 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2509 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2217 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2510 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2218 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2511 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2219 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2512 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2220 } 2513 }
… …
2228void 2521void
2229fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2522fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2230 PPCODE: 2523 PPCODE:
2231{ 2524{
2232 int x, y; 2525 int x, y;
2233 int sw1 = sw + 2; 2526 int sw1 = sw + 2;
2234 int sh1 = sh + 2; 2527 int sh1 = sh + 2;
2235 int sh3 = sh * 3; 2528 int sh3 = sh * 3;
2236 int sw34 = (sw * 3 + 3) & ~3; 2529 int sw3 = sw * 3;
2237 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2530 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2238 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2531 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2239 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2532 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2240 2533
2241 SvPOK_only (darkness3_sv); 2534 SvPOK_only (darkness3_sv);
2242 SvCUR_set (darkness3_sv, sw34 * sh3); 2535 SvCUR_set (darkness3_sv, sw3 * sh3);
2243 2536
2244 mx += self->x - 1; 2537 mx += self->x - 1;
2245 my += self->y - 1; 2538 my += self->y - 1;
2246
2247 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2248 2539
2249 for (y = 0; y < sh1; y++) 2540 for (y = 0; y < sh1; y++)
2250 if (0 <= y + my && y + my < self->rows) 2541 if (0 <= y + my && y + my < self->rows)
2251 { 2542 {
2252 maprow *row = self->row + (y + my); 2543 maprow *row = self->row + (y + my);
… …
2255 if (row->c0 <= x + mx && x + mx < row->c1) 2546 if (row->c0 <= x + mx && x + mx < row->c1)
2256 { 2547 {
2257 mapcell *cell = row->col + (x + mx - row->c0); 2548 mapcell *cell = row->col + (x + mx - row->c0);
2258 2549
2259 darkness1 [y * sw1 + x] = cell->darkness 2550 darkness1 [y * sw1 + x] = cell->darkness
2260 ? 255 - (cell->darkness - 1) 2551 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2261 : 255 - FOW_DARKNESS; 2552 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2262 } 2553 }
2263 } 2554 }
2264 2555
2265 for (y = 0; y < sh; ++y) 2556 for (y = 0; y < sh; ++y)
2266 for (x = 0; x < sw; ++x) 2557 for (x = 0; x < sw; ++x)
… …
2285 2576
2286 uint8_t r13 = (d13 + d23 + d12) / 3; 2577 uint8_t r13 = (d13 + d23 + d12) / 3;
2287 uint8_t r23 = d23; 2578 uint8_t r23 = d23;
2288 uint8_t r33 = (d23 + d33 + d32) / 3; 2579 uint8_t r33 = (d23 + d33 + d32) / 3;
2289 2580
2290 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2581 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2291 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2582 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2292 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2583 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2293 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2584 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2294 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2585 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2295 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2586 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2296 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2587 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2297 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2588 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2298 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2589 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2299 } 2590 }
2300 2591
2301 free (darkness1); 2592 free (darkness1);
2302 2593
2303 EXTEND (SP, 3); 2594 EXTEND (SP, 3);
2304 PUSHs (sv_2mortal (newSViv (sw34))); 2595 PUSHs (sv_2mortal (newSViv (sw3)));
2305 PUSHs (sv_2mortal (newSViv (sh3))); 2596 PUSHs (sv_2mortal (newSViv (sh3)));
2306 PUSHs (darkness3_sv); 2597 PUSHs (darkness3_sv);
2307} 2598}
2308 2599
2309SV * 2600SV *
… …
2566void 2857void
2567set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2858set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2568 CODE: 2859 CODE:
2569{ 2860{
2570 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2861 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2571 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2862 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2572 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2863 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2573} 2864}
2574 2865
2575void 2866void
2576set_reverse_stereo (DC::Channel self, int flip) 2867set_reverse_stereo (DC::Channel self, int flip)
… …
2578 Mix_SetReverseStereo (self, flip); 2869 Mix_SetReverseStereo (self, flip);
2579 2870
2580MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2871MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2581 2872
2582PROTOTYPES: DISABLE 2873PROTOTYPES: DISABLE
2874
2875void
2876decoders ()
2877 PPCODE:
2878#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2879 int i, num = Mix_GetNumChunkDecoders ();
2880 EXTEND (SP, num);
2881 for (i = 0; i < num; ++i)
2882 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2883#else
2884 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2885#endif
2583 2886
2584DC::MixChunk 2887DC::MixChunk
2585new (SV *class, DC::RW rwops) 2888new (SV *class, DC::RW rwops)
2586 CODE: 2889 CODE:
2587 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2890 RETVAL = Mix_LoadWAV_RW (rwops, 1);
… …
2620 OUTPUT: 2923 OUTPUT:
2621 RETVAL 2924 RETVAL
2622 2925
2623MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2926MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2624 2927
2928void
2929decoders ()
2930 PPCODE:
2931#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2932 int i, num = Mix_GetNumMusicDecoders ();
2933 EXTEND (SP, num);
2934 for (i = 0; i < num; ++i)
2935 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2936#else
2937 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2938#endif
2939
2625int 2940int
2626volume (int volume = -1) 2941volume (int volume = -1)
2627 PROTOTYPE: ;$ 2942 PROTOTYPE: ;$
2628 CODE: 2943 CODE:
2629 if (items > 0) 2944 if (items > 0)
… …
2639 2954
2640void 2955void
2641halt () 2956halt ()
2642 CODE: 2957 CODE:
2643 Mix_HaltMusic (); 2958 Mix_HaltMusic ();
2959
2960int
2961playing ()
2962 CODE:
2963 RETVAL = Mix_PlayingMusic ();
2964 OUTPUT:
2965 RETVAL
2644 2966
2645DC::MixMusic 2967DC::MixMusic
2646new (SV *class, DC::RW rwops) 2968new (SV *class, DC::RW rwops)
2647 CODE: 2969 CODE:
2648 RETVAL = Mix_LoadMUS_RW (rwops); 2970 RETVAL = Mix_LoadMUS_RW (rwops);
… …
2679 } *civ, const_iv[] = { 3001 } *civ, const_iv[] = {
2680# define const_iv(name) { # name, (IV)name } 3002# define const_iv(name) { # name, (IV)name }
2681 const_iv (GL_VENDOR), 3003 const_iv (GL_VENDOR),
2682 const_iv (GL_VERSION), 3004 const_iv (GL_VERSION),
2683 const_iv (GL_EXTENSIONS), 3005 const_iv (GL_EXTENSIONS),
3006 const_iv (GL_MAX_TEXTURE_UNITS),
2684 const_iv (GL_COLOR_MATERIAL), 3007 const_iv (GL_COLOR_MATERIAL),
2685 const_iv (GL_SMOOTH), 3008 const_iv (GL_SMOOTH),
2686 const_iv (GL_FLAT), 3009 const_iv (GL_FLAT),
2687 const_iv (GL_DITHER), 3010 const_iv (GL_DITHER),
2688 const_iv (GL_BLEND), 3011 const_iv (GL_BLEND),
… …
2700 const_iv (GL_ZERO), 3023 const_iv (GL_ZERO),
2701 const_iv (GL_SRC_ALPHA), 3024 const_iv (GL_SRC_ALPHA),
2702 const_iv (GL_DST_ALPHA), 3025 const_iv (GL_DST_ALPHA),
2703 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3026 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2704 const_iv (GL_ONE_MINUS_DST_ALPHA), 3027 const_iv (GL_ONE_MINUS_DST_ALPHA),
3028 const_iv (GL_SRC_COLOR),
3029 const_iv (GL_DST_COLOR),
3030 const_iv (GL_ONE_MINUS_SRC_COLOR),
3031 const_iv (GL_ONE_MINUS_DST_COLOR),
2705 const_iv (GL_SRC_ALPHA_SATURATE), 3032 const_iv (GL_SRC_ALPHA_SATURATE),
2706 const_iv (GL_RGB), 3033 const_iv (GL_RGB),
2707 const_iv (GL_RGBA), 3034 const_iv (GL_RGBA),
2708 const_iv (GL_RGBA4), 3035 const_iv (GL_RGBA4),
2709 const_iv (GL_RGBA8), 3036 const_iv (GL_RGBA8),
… …
2777 const_iv (GL_NICEST), 3104 const_iv (GL_NICEST),
2778 const_iv (GL_V2F), 3105 const_iv (GL_V2F),
2779 const_iv (GL_V3F), 3106 const_iv (GL_V3F),
2780 const_iv (GL_T2F_V3F), 3107 const_iv (GL_T2F_V3F),
2781 const_iv (GL_T2F_N3F_V3F), 3108 const_iv (GL_T2F_N3F_V3F),
3109 const_iv (GL_FUNC_ADD),
3110 const_iv (GL_FUNC_SUBTRACT),
3111 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2782# undef const_iv 3112# undef const_iv
2783 }; 3113 };
2784 3114
2785 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3115 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2786 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3116 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2793disable_GL_EXT_blend_func_separate () 3123disable_GL_EXT_blend_func_separate ()
2794 CODE: 3124 CODE:
2795 gl.BlendFuncSeparate = 0; 3125 gl.BlendFuncSeparate = 0;
2796 gl.BlendFuncSeparateEXT = 0; 3126 gl.BlendFuncSeparateEXT = 0;
2797 3127
3128void
3129apple_nvidia_bug (int enable)
3130
2798char * 3131char *
2799gl_vendor () 3132gl_vendor ()
2800 CODE: 3133 CODE:
2801 RETVAL = (char *)glGetString (GL_VENDOR); 3134 RETVAL = (char *)glGetString (GL_VENDOR);
2802 OUTPUT: 3135 OUTPUT:
… …
2851 3184
2852void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3185void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2853 CODE: 3186 CODE:
2854 gl_BlendFuncSeparate (sa, da, saa, daa); 3187 gl_BlendFuncSeparate (sa, da, saa, daa);
2855 3188
3189# void glBlendEquation (int se)
3190
2856void glDepthMask (int flag) 3191void glDepthMask (int flag)
2857 3192
2858void glLogicOp (int opcode) 3193void glLogicOp (int opcode)
2859 3194
2860void glColorMask (int red, int green, int blue, int alpha) 3195void glColorMask (int red, int green, int blue, int alpha)
… …
2894void glRotate (float angle, float x, float y, float z) 3229void glRotate (float angle, float x, float y, float z)
2895 CODE: 3230 CODE:
2896 glRotatef (angle, x, y, z); 3231 glRotatef (angle, x, y, z);
2897 3232
2898void glColor (float r, float g, float b, float a = 1.0) 3233void glColor (float r, float g, float b, float a = 1.0)
3234 PROTOTYPE: @
2899 ALIAS: 3235 ALIAS:
2900 glColor_premultiply = 1 3236 glColor_premultiply = 1
2901 CODE: 3237 CODE:
2902 if (ix) 3238 if (ix)
2903 { 3239 {
… …
3008void glNewList (int list, int mode = GL_COMPILE) 3344void glNewList (int list, int mode = GL_COMPILE)
3009 3345
3010void glEndList () 3346void glEndList ()
3011 3347
3012void glCallList (int list) 3348void glCallList (int list)
3349
3350void c_init ()
3351 CODE:
3352 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3353 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3013 3354
3014MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3355MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3015 3356
3016PROTOTYPES: DISABLE 3357PROTOTYPES: DISABLE
3017 3358

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines