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.265 by root, Fri Jul 18 22:56:11 2008 UTC vs.
Revision 1.303 by root, Thu Apr 22 11:18:04 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];
… …
367 self->oy = 0; 382 self->oy = 0;
368 self->row = 0; 383 self->row = 0;
369 self->rows = 0; 384 self->rows = 0;
370} 385}
371 386
387#define CELL_CLEAR(cell) \
388 do { \
389 if ((cell)->player) \
390 (cell)->tile [2] = 0; \
391 (cell)->darkness = 0; \
392 (cell)->stat_hp = 0; \
393 (cell)->flags = 0; \
394 (cell)->player = 0; \
395 } while (0)
396
372static void 397static void
373map_blank (DC__Map self, int x0, int y0, int w, int h) 398map_blank (DC__Map self, int x0, int y0, int w, int h)
374{ 399{
375 int x, y; 400 int x, y;
376 maprow *row; 401 maprow *row;
… …
390 if (x >= row->c1) 415 if (x >= row->c1)
391 break; 416 break;
392 417
393 cell = row->col + x - row->c0; 418 cell = row->col + x - row->c0;
394 419
395 cell->darkness = 0; 420 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 421 }
400 } 422 }
401} 423}
402 424
403typedef struct { 425typedef struct {
… …
514 if (!svp || !SvTRUE (*svp)) 536 if (!svp || !SvTRUE (*svp))
515 return 0; 537 return 0;
516 538
517 return 1; 539 return 1;
518} 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
519 593
520MODULE = Deliantra::Client PACKAGE = DC 594MODULE = Deliantra::Client PACKAGE = DC
521 595
522PROTOTYPES: ENABLE 596PROTOTYPES: ENABLE
523 597
… …
552 const_iv (SDL_USEREVENT), 626 const_iv (SDL_USEREVENT),
553 627
554 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
555 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
556 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),
557 681
558 const_iv (SDLK_FIRST), 682 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST), 683 const_iv (SDLK_LAST),
560 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
561 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
… …
637 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
638 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
639 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
640 const_iv (KMOD_MODE), 764 const_iv (KMOD_MODE),
641 765
766 const_iv (KMOD_LRAM),
767
642 const_iv (MIX_DEFAULT_FORMAT), 768 const_iv (MIX_DEFAULT_FORMAT),
643 769
644 const_iv (SDL_INIT_TIMER), 770 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO), 771 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO), 772 const_iv (SDL_INIT_VIDEO),
… …
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 790 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO), 791 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 792 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES), 793 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL), 794 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL) 795 const_iv (SDL_GL_SWAP_CONTROL),
796
797 const_iv (FOW_DARKNESS)
670# undef const_iv 798# undef const_iv
671 }; 799 };
672 800
673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
695NV ceil (NV x) 823NV ceil (NV x)
696 824
697IV minpot (UV n) 825IV minpot (UV n)
698 826
699IV popcount (UV n) 827IV popcount (UV n)
828
829NV distance (NV dx, NV dy)
830 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT:
833 RETVAL
700 834
701void 835void
702pango_init () 836pango_init ()
703 CODE: 837 CODE:
704{ 838{
… …
711 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 845 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
712#endif 846#endif
713} 847}
714 848
715char *SDL_GetError () 849char *SDL_GetError ()
850
851void SDL_braino ()
716 852
717int SDL_Init (U32 flags) 853int SDL_Init (U32 flags)
718 854
719int SDL_InitSubSystem (U32 flags) 855int SDL_InitSubSystem (U32 flags)
720 856
… …
794 930
795 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
796#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);
797#include "glfunc.h" 933#include "glfunc.h"
798#undef GL_FUNC 934#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
799 } 938 }
800} 939}
801 OUTPUT: 940 OUTPUT:
802 RETVAL 941 RETVAL
803 942
… …
829 { 968 {
830 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
831 case SDL_KEYUP: 970 case SDL_KEYUP:
832 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
833 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
834 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);
835 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 */
836 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
837 break; 976 break;
838 977
839 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
840 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
858 x = ev.motion.x; 997 x = ev.motion.x;
859 y = ev.motion.y; 998 y = ev.motion.y;
860 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
861 } 1000 }
862 1001
863 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
864 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
865 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
866 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
867 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
868 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
887 } 1026 }
888 1027
889 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))));
890 } 1029 }
891} 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
892 1044
893int 1045int
894Mix_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)
895 POSTCALL: 1047 POSTCALL:
896 Mix_HookMusicFinished (music_finished); 1048 Mix_HookMusicFinished (music_finished);
… …
1084#if DEBUG 1236#if DEBUG
1085 VALGRIND_DO_LEAK_CHECK; 1237 VALGRIND_DO_LEAK_CHECK;
1086#endif 1238#endif
1087} 1239}
1088 1240
1241int
1242SvREFCNT (SV *sv)
1243 CODE:
1244 RETVAL = SvREFCNT (sv);
1245 OUTPUT:
1246 RETVAL
1247
1089MODULE = Deliantra::Client PACKAGE = DC::Font 1248MODULE = Deliantra::Client PACKAGE = DC::Font
1090 1249
1091PROTOTYPES: DISABLE 1250PROTOTYPES: DISABLE
1092 1251
1093DC::Font 1252DC::Font
… …
1522 if (ix) 1681 if (ix)
1523 { 1682 {
1524 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1525 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1526 } 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);
1527} 1807}
1528 1808
1529IV 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)
1530 CODE: 1810 CODE:
1531{ 1811{
… …
1637 //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);
1638 // use uglier nearest interpolation because linear suffers 1918 // use uglier nearest interpolation because linear suffers
1639 // from transparent color bleeding and ugly wrapping effects. 1919 // from transparent color bleeding and ugly wrapping effects.
1640 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1920 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1641} 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 }
1642 1942
1643int 1943int
1644ox (DC::Map self) 1944ox (DC::Map self)
1645 ALIAS: 1945 ALIAS:
1646 oy = 1 1946 oy = 1
… …
1727 { 2027 {
1728 ext = *data++; 2028 ext = *data++;
1729 cmd = ext & 0x7f; 2029 cmd = ext & 0x7f;
1730 2030
1731 if (cmd < 4) 2031 if (cmd < 4)
1732 cell->darkness = 255 - ext * 64 + 1; 2032 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1733 else if (cmd == 5) // health 2033 else if (cmd == 5) // health
1734 { 2034 {
1735 cell->stat_width = 1; 2035 cell->stat_width = 1;
1736 cell->stat_hp = *data++; 2036 cell->stat_hp = *data++;
1737 } 2037 }
… …
1767 cell->tile [z] = self->face2tile [face]; 2067 cell->tile [z] = self->face2tile [face];
1768 2068
1769 if (cell->tile [z]) 2069 if (cell->tile [z])
1770 { 2070 {
1771 maptex *tex = self->tex + cell->tile [z]; 2071 maptex *tex = self->tex + cell->tile [z];
2072 tex->unused = 0;
1772 if (!tex->name) 2073 if (!tex->name)
1773 av_push (missing, newSViv (cell->tile [z])); 2074 av_push (missing, newSViv (cell->tile [z]));
1774 2075
1775 if (tex->smoothtile) 2076 if (tex->smoothtile)
1776 { 2077 {
1777 maptex *smooth = self->tex + tex->smoothtile; 2078 maptex *smooth = self->tex + tex->smoothtile;
2079 smooth->unused = 0;
1778 if (!smooth->name) 2080 if (!smooth->name)
1779 av_push (missing, newSViv (tex->smoothtile)); 2081 av_push (missing, newSViv (tex->smoothtile));
1780 } 2082 }
1781 } 2083 }
1782 } 2084 }
1783 } 2085 }
1784 else 2086 else
1785 cell->darkness = 0; 2087 CELL_CLEAR (cell);
1786 } 2088 }
1787} 2089}
1788 OUTPUT: 2090 OUTPUT:
1789 RETVAL 2091 RETVAL
1790 2092
… …
1842} 2144}
1843 OUTPUT: 2145 OUTPUT:
1844 RETVAL 2146 RETVAL
1845 2147
1846void 2148void
1847draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2149draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1848 CODE: 2150 CODE:
1849{ 2151{
1850 int x, y, z; 2152 int x, y, z;
1851 2153
1852 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2154 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1853 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
1854 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)
1855 smooth_key skey; 2157 smooth_key skey;
1856 int pl_x, pl_y; 2158 int pl_x, pl_y;
1857 maptex pl_tex; 2159 maptex pl_tex;
1858 rc_t *rc = rc_alloc (); 2160 rc_t *rc = rc_alloc ();
2161 rc_t *rc_ov = rc_alloc ();
1859 rc_key_t key; 2162 rc_key_t key;
1860 rc_array_t *arr; 2163 rc_array_t *arr;
1861 2164
1862 pl_tex.name = 0; 2165 pl_tex.name = 0;
1863 2166
1864 // thats current max. sorry. 2167 // that's current max. sorry.
1865 if (sw > 255) sw = 255; 2168 if (sw > 255) sw = 255;
1866 if (sh > 255) sh = 255; 2169 if (sh > 255) sh = 255;
1867 2170
1868 // clear key, in case of extra padding 2171 // clear key, in case of extra padding
1869 memset (&skey, 0, sizeof (skey)); 2172 memset (&skey, 0, sizeof (skey));
… …
1873 key.g = 255; 2176 key.g = 255;
1874 key.b = 255; 2177 key.b = 255;
1875 key.a = 255; 2178 key.a = 255;
1876 key.mode = GL_QUADS; 2179 key.mode = GL_QUADS;
1877 key.format = GL_T2F_V3F; 2180 key.format = GL_T2F_V3F;
1878 key.texname = -1;
1879 2181
1880 mx += self->x; 2182 mx += self->x;
1881 my += self->y; 2183 my += self->y;
1882 2184
1883 // first pass: determine smooth_max 2185 // first pass: determine smooth_max
… …
1907 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2209 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1908 2210
1909 for (z = 0; z <= 2; z++) 2211 for (z = 0; z <= 2; z++)
1910 { 2212 {
1911 memset (smooth_level, 0, sizeof (smooth_level)); 2213 memset (smooth_level, 0, sizeof (smooth_level));
2214 key.texname = -1;
1912 2215
1913 for (y = 0; y < sh; y++) 2216 for (y = 0; y < sh; y++)
1914 if (0 <= y + my && y + my < self->rows) 2217 if (0 <= y + my && y + my < self->rows)
1915 { 2218 {
1916 maprow *row = self->row + (y + my); 2219 maprow *row = self->row + (y + my);
… …
1922 tileid tile = cell->tile [z]; 2225 tileid tile = cell->tile [z];
1923 2226
1924 if (tile) 2227 if (tile)
1925 { 2228 {
1926 maptex tex = self->tex [tile]; 2229 maptex tex = self->tex [tile];
1927 int px = (x + 1) * T - tex.w; 2230 int px, py;
1928 int py = (y + 1) * T - tex.h;
1929 2231
1930 if (key.texname != tex.name) 2232 if (key.texname != tex.name)
1931 { 2233 {
2234 self->tex [tile].unused = 0;
2235
1932 if (!tex.name) 2236 if (!tex.name)
1933 tex = self->tex [2]; /* missing, replace by noface */ 2237 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1934 2238
1935 key.texname = tex.name; 2239 key.texname = tex.name;
1936 arr = rc_array (rc, &key); 2240 arr = rc_array (rc, &key);
1937 } 2241 }
2242
2243 px = (x + 1) * T - tex.w;
2244 py = (y + 1) * T - tex.h;
1938 2245
1939 if (expect_false (cell->player == player) && expect_false (z == 2)) 2246 if (expect_false (cell->player == player) && expect_false (z == 2))
1940 { 2247 {
1941 pl_x = px; 2248 pl_x = px;
1942 pl_y = py; 2249 pl_y = py;
… …
1947 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2254 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1948 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);
1949 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);
1950 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);
1951 2258
1952 if (expect_false (cell->flags) && expect_false (z == 2))
1953 {
1954 // overlays such as the speech bubble, probably more to come
1955 if (cell->flags & 1)
1956 {
1957 maptex tex = self->tex [1];
1958 int px = x * T + T * 2 / 32;
1959 int py = y * T - T * 6 / 32;
1960
1961 if (tex.name)
1962 {
1963 if (key.texname != tex.name)
1964 {
1965 key.texname = tex.name;
1966 arr = rc_array (rc, &key);
1967 }
1968
1969 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1970 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1971 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1972 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1973 }
1974 }
1975 }
1976
1977 // update smooth hash 2259 // update smooth hash
1978 if (tex.smoothtile) 2260 if (tex.smoothtile)
1979 { 2261 {
1980 skey.tile = tex.smoothtile; 2262 skey.tile = tex.smoothtile;
1981 skey.level = tex.smoothlevel; 2263 skey.level = tex.smoothlevel;
… …
2009 // corners 2291 // corners
2010 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);
2011 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);
2012 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);
2013 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);
2014 } 2317 }
2015 } 2318 }
2016 } 2319 }
2017 } 2320 }
2018 2321
… …
2058 { 2361 {
2059 // this time avoiding texture state changes 2362 // this time avoiding texture state changes
2060 // save gobs of state changes. 2363 // save gobs of state changes.
2061 if (key.texname != tex.name) 2364 if (key.texname != tex.name)
2062 { 2365 {
2366 self->tex [skey->tile].unused = 0;
2367
2063 glEnd (); 2368 glEnd ();
2064 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2369 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2065 glBegin (GL_QUADS); 2370 glBegin (GL_QUADS);
2066 } 2371 }
2067 2372
… …
2099 } 2404 }
2100 2405
2101 if (pl_tex.name) 2406 if (pl_tex.name)
2102 { 2407 {
2103 maptex tex = pl_tex; 2408 maptex tex = pl_tex;
2104 int px = pl_x + pdx; 2409 int px = pl_x + sdx;
2105 int py = pl_y + pdy; 2410 int py = pl_y + sdy;
2106 2411
2107 key.texname = tex.name; 2412 key.texname = tex.name;
2108 arr = rc_array (rc, &key); 2413 arr = rc_array (rc, &key);
2109 2414
2110 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2415 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
… …
2113 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);
2114 2419
2115 rc_draw (rc); 2420 rc_draw (rc);
2116 } 2421 }
2117 2422
2423 rc_draw (rc_ov);
2424 rc_clear (rc_ov);
2425
2118 glDisable (GL_BLEND); 2426 glDisable (GL_BLEND);
2119 rc_free (rc); 2427 rc_free (rc);
2428 rc_free (rc_ov);
2120 2429
2121 // top layer: overlays such as the health bar 2430 // top layer: overlays such as the health bar
2122 for (y = 0; y < sh; y++) 2431 for (y = 0; y < sh; y++)
2123 if (0 <= y + my && y + my < self->rows) 2432 if (0 <= y + my && y + my < self->rows)
2124 { 2433 {
… …
2129 { 2438 {
2130 mapcell *cell = row->col + (x + mx - row->c0); 2439 mapcell *cell = row->col + (x + mx - row->c0);
2131 2440
2132 int px = x * T; 2441 int px = x * T;
2133 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 }
2134 2449
2135 if (cell->stat_hp) 2450 if (cell->stat_hp)
2136 { 2451 {
2137 int width = cell->stat_width * T; 2452 int width = cell->stat_width * T;
2138 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2453 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2149 } 2464 }
2150 } 2465 }
2151} 2466}
2152 2467
2153void 2468void
2154draw_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)
2155 CODE: 2470 CODE:
2156{ 2471{
2157 static float color[16][3] = { 2472 static float color[16][3] = {
2158 { 0.00F, 0.00F, 0.00F }, 2473 { 0.00f, 0.00f, 0.00f },
2159 { 1.00F, 1.00F, 1.00F }, 2474 { 1.00f, 1.00f, 1.00f },
2160 { 0.00F, 0.00F, 0.55F }, 2475 { 0.00f, 0.00f, 0.55f },
2161 { 1.00F, 0.00F, 0.00F }, 2476 { 1.00f, 0.00f, 0.00f },
2162 2477
2163 { 1.00F, 0.54F, 0.00F }, 2478 { 1.00f, 0.54f, 0.00f },
2164 { 0.11F, 0.56F, 1.00F }, 2479 { 0.11f, 0.56f, 1.00f },
2165 { 0.93F, 0.46F, 0.00F }, 2480 { 0.93f, 0.46f, 0.00f },
2166 { 0.18F, 0.54F, 0.34F }, 2481 { 0.18f, 0.54f, 0.34f },
2167 2482
2168 { 0.56F, 0.73F, 0.56F }, 2483 { 0.56f, 0.73f, 0.56f },
2169 { 0.80F, 0.80F, 0.80F }, 2484 { 0.80f, 0.80f, 0.80f },
2170 { 0.55F, 0.41F, 0.13F }, 2485 { 0.55f, 0.41f, 0.13f },
2171 { 0.99F, 0.77F, 0.26F }, 2486 { 0.99f, 0.77f, 0.26f },
2172 2487
2173 { 0.74F, 0.65F, 0.41F }, 2488 { 0.74f, 0.65f, 0.41f },
2174 2489
2175 { 0.00F, 1.00F, 1.00F }, 2490 { 0.00f, 1.00f, 1.00f },
2176 { 1.00F, 0.00F, 1.00F }, 2491 { 1.00f, 0.00f, 1.00f },
2177 { 1.00F, 1.00F, 0.00F }, 2492 { 1.00f, 1.00f, 0.00f },
2178 }; 2493 };
2179 2494
2180 int x, y; 2495 int x, y;
2181 2496
2182 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 */
2183 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2504 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2184 glEnable (GL_BLEND); 2505 glEnable (GL_BLEND);
2185 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2506 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2186 glBegin (GL_QUADS); 2507 glBegin (GL_QUADS);
2187 2508
2188 for (y = 0; y < h; y++) 2509 for (y = 0; y < h; y++)
… …
2192 2513
2193 if (m) 2514 if (m)
2194 { 2515 {
2195 float *c = color [m & 15]; 2516 float *c = color [m & 15];
2196 2517
2197 float tx1 = m & 0x40 ? 0.5 : 0.; 2518 float tx1 = m & 0x40 ? 0.5f : 0.f;
2198 float tx2 = tx1 + 0.5; 2519 float tx2 = tx1 + 0.5f;
2199 2520
2200 glColor4f (c[0], c[1], c[2], 0.75); 2521 glColor4f (c[0], c[1], c[2], 1);
2201 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2522 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2202 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2523 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2203 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2524 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2204 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2525 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2205 } 2526 }
… …
2213void 2534void
2214fow_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)
2215 PPCODE: 2536 PPCODE:
2216{ 2537{
2217 int x, y; 2538 int x, y;
2218 int sw1 = sw + 2; 2539 int sw1 = sw + 2;
2219 int sh1 = sh + 2; 2540 int sh1 = sh + 2;
2220 int sh3 = sh * 3; 2541 int sh3 = sh * 3;
2221 int sw34 = (sw * 3 + 3) & ~3; 2542 int sw3 = sw * 3;
2222 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2543 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2223 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2544 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2224 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2545 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2225 2546
2226 SvPOK_only (darkness3_sv); 2547 SvPOK_only (darkness3_sv);
2227 SvCUR_set (darkness3_sv, sw34 * sh3); 2548 SvCUR_set (darkness3_sv, sw3 * sh3);
2228 2549
2229 mx += self->x - 1; 2550 mx += self->x - 1;
2230 my += self->y - 1; 2551 my += self->y - 1;
2231
2232 memset (darkness1, 255, sw1 * sh1);
2233 2552
2234 for (y = 0; y < sh1; y++) 2553 for (y = 0; y < sh1; y++)
2235 if (0 <= y + my && y + my < self->rows) 2554 if (0 <= y + my && y + my < self->rows)
2236 { 2555 {
2237 maprow *row = self->row + (y + my); 2556 maprow *row = self->row + (y + my);
… …
2240 if (row->c0 <= x + mx && x + mx < row->c1) 2559 if (row->c0 <= x + mx && x + mx < row->c1)
2241 { 2560 {
2242 mapcell *cell = row->col + (x + mx - row->c0); 2561 mapcell *cell = row->col + (x + mx - row->c0);
2243 2562
2244 darkness1 [y * sw1 + x] = cell->darkness 2563 darkness1 [y * sw1 + x] = cell->darkness
2245 ? 255 - (cell->darkness - 1) 2564 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2246 : 255 - FOW_DARKNESS; 2565 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2247 } 2566 }
2248 } 2567 }
2249 2568
2250 for (y = 0; y < sh; ++y) 2569 for (y = 0; y < sh; ++y)
2251 for (x = 0; x < sw; ++x) 2570 for (x = 0; x < sw; ++x)
… …
2270 2589
2271 uint8_t r13 = (d13 + d23 + d12) / 3; 2590 uint8_t r13 = (d13 + d23 + d12) / 3;
2272 uint8_t r23 = d23; 2591 uint8_t r23 = d23;
2273 uint8_t r33 = (d23 + d33 + d32) / 3; 2592 uint8_t r33 = (d23 + d33 + d32) / 3;
2274 2593
2275 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2594 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2276 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2595 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2277 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2596 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2278 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2597 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2279 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 */
2280 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2599 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2281 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2600 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2282 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2601 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2283 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2602 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2284 } 2603 }
2285 2604
2286 free (darkness1); 2605 free (darkness1);
2287 2606
2288 EXTEND (SP, 3); 2607 EXTEND (SP, 3);
2289 PUSHs (sv_2mortal (newSViv (sw34))); 2608 PUSHs (sv_2mortal (newSViv (sw3)));
2290 PUSHs (sv_2mortal (newSViv (sh3))); 2609 PUSHs (sv_2mortal (newSViv (sh3)));
2291 PUSHs (darkness3_sv); 2610 PUSHs (darkness3_sv);
2292} 2611}
2293 2612
2294SV * 2613SV *
… …
2492 if (RETVAL < 0) 2811 if (RETVAL < 0)
2493 { 2812 {
2494 RETVAL = Mix_GroupOldest (-1); 2813 RETVAL = Mix_GroupOldest (-1);
2495 2814
2496 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)
2497 XSRETURN_UNDEF; 2821 XSRETURN_UNDEF;
2498 2822 }
2823 else
2499 Mix_HaltChannel (RETVAL); 2824 Mix_HaltChannel (RETVAL);
2500 } 2825 }
2501 2826
2502 Mix_UnregisterAllEffects (RETVAL); 2827 Mix_UnregisterAllEffects (RETVAL);
2503 Mix_Volume (RETVAL, 128); 2828 Mix_Volume (RETVAL, 128);
2504} 2829}
… …
2551void 2876void
2552set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2877set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2553 CODE: 2878 CODE:
2554{ 2879{
2555 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));
2556 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;
2557 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2882 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2558} 2883}
2559 2884
2560void 2885void
2561set_reverse_stereo (DC::Channel self, int flip) 2886set_reverse_stereo (DC::Channel self, int flip)
… …
2563 Mix_SetReverseStereo (self, flip); 2888 Mix_SetReverseStereo (self, flip);
2564 2889
2565MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2890MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2566 2891
2567PROTOTYPES: 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
2568 2905
2569DC::MixChunk 2906DC::MixChunk
2570new (SV *class, DC::RW rwops) 2907new (SV *class, DC::RW rwops)
2571 CODE: 2908 CODE:
2572 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2909 RETVAL = Mix_LoadWAV_RW (rwops, 1);
… …
2605 OUTPUT: 2942 OUTPUT:
2606 RETVAL 2943 RETVAL
2607 2944
2608MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2945MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2609 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
2610int 2959int
2611volume (int volume = -1) 2960volume (int volume = -1)
2612 PROTOTYPE: ;$ 2961 PROTOTYPE: ;$
2613 CODE: 2962 CODE:
2614 if (items > 0) 2963 if (items > 0)
… …
2624 2973
2625void 2974void
2626halt () 2975halt ()
2627 CODE: 2976 CODE:
2628 Mix_HaltMusic (); 2977 Mix_HaltMusic ();
2978
2979int
2980playing ()
2981 CODE:
2982 RETVAL = Mix_PlayingMusic ();
2983 OUTPUT:
2984 RETVAL
2629 2985
2630DC::MixMusic 2986DC::MixMusic
2631new (SV *class, DC::RW rwops) 2987new (SV *class, DC::RW rwops)
2632 CODE: 2988 CODE:
2633 RETVAL = Mix_LoadMUS_RW (rwops); 2989 RETVAL = Mix_LoadMUS_RW (rwops);
… …
2664 } *civ, const_iv[] = { 3020 } *civ, const_iv[] = {
2665# define const_iv(name) { # name, (IV)name } 3021# define const_iv(name) { # name, (IV)name }
2666 const_iv (GL_VENDOR), 3022 const_iv (GL_VENDOR),
2667 const_iv (GL_VERSION), 3023 const_iv (GL_VERSION),
2668 const_iv (GL_EXTENSIONS), 3024 const_iv (GL_EXTENSIONS),
3025 const_iv (GL_MAX_TEXTURE_UNITS),
2669 const_iv (GL_COLOR_MATERIAL), 3026 const_iv (GL_COLOR_MATERIAL),
2670 const_iv (GL_SMOOTH), 3027 const_iv (GL_SMOOTH),
2671 const_iv (GL_FLAT), 3028 const_iv (GL_FLAT),
2672 const_iv (GL_DITHER), 3029 const_iv (GL_DITHER),
2673 const_iv (GL_BLEND), 3030 const_iv (GL_BLEND),
… …
2685 const_iv (GL_ZERO), 3042 const_iv (GL_ZERO),
2686 const_iv (GL_SRC_ALPHA), 3043 const_iv (GL_SRC_ALPHA),
2687 const_iv (GL_DST_ALPHA), 3044 const_iv (GL_DST_ALPHA),
2688 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3045 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2689 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),
2690 const_iv (GL_SRC_ALPHA_SATURATE), 3051 const_iv (GL_SRC_ALPHA_SATURATE),
2691 const_iv (GL_RGB), 3052 const_iv (GL_RGB),
2692 const_iv (GL_RGBA), 3053 const_iv (GL_RGBA),
2693 const_iv (GL_RGBA4), 3054 const_iv (GL_RGBA4),
2694 const_iv (GL_RGBA8), 3055 const_iv (GL_RGBA8),
… …
2762 const_iv (GL_NICEST), 3123 const_iv (GL_NICEST),
2763 const_iv (GL_V2F), 3124 const_iv (GL_V2F),
2764 const_iv (GL_V3F), 3125 const_iv (GL_V3F),
2765 const_iv (GL_T2F_V3F), 3126 const_iv (GL_T2F_V3F),
2766 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),
2767# undef const_iv 3131# undef const_iv
2768 }; 3132 };
2769 3133
2770 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; )
2771 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3135 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2778disable_GL_EXT_blend_func_separate () 3142disable_GL_EXT_blend_func_separate ()
2779 CODE: 3143 CODE:
2780 gl.BlendFuncSeparate = 0; 3144 gl.BlendFuncSeparate = 0;
2781 gl.BlendFuncSeparateEXT = 0; 3145 gl.BlendFuncSeparateEXT = 0;
2782 3146
3147void
3148apple_nvidia_bug (int enable)
3149
2783char * 3150char *
2784gl_vendor () 3151gl_vendor ()
2785 CODE: 3152 CODE:
2786 RETVAL = (char *)glGetString (GL_VENDOR); 3153 RETVAL = (char *)glGetString (GL_VENDOR);
2787 OUTPUT: 3154 OUTPUT:
… …
2835void glBlendFunc (int sfactor, int dfactor) 3202void glBlendFunc (int sfactor, int dfactor)
2836 3203
2837void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3204void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2838 CODE: 3205 CODE:
2839 gl_BlendFuncSeparate (sa, da, saa, daa); 3206 gl_BlendFuncSeparate (sa, da, saa, daa);
3207
3208# void glBlendEquation (int se)
2840 3209
2841void glDepthMask (int flag) 3210void glDepthMask (int flag)
2842 3211
2843void glLogicOp (int opcode) 3212void glLogicOp (int opcode)
2844 3213
… …
2879void glRotate (float angle, float x, float y, float z) 3248void glRotate (float angle, float x, float y, float z)
2880 CODE: 3249 CODE:
2881 glRotatef (angle, x, y, z); 3250 glRotatef (angle, x, y, z);
2882 3251
2883void glColor (float r, float g, float b, float a = 1.0) 3252void glColor (float r, float g, float b, float a = 1.0)
3253 PROTOTYPE: @
2884 ALIAS: 3254 ALIAS:
2885 glColor_premultiply = 1 3255 glColor_premultiply = 1
2886 CODE: 3256 CODE:
2887 if (ix) 3257 if (ix)
2888 { 3258 {
… …
2993void glNewList (int list, int mode = GL_COMPILE) 3363void glNewList (int list, int mode = GL_COMPILE)
2994 3364
2995void glEndList () 3365void glEndList ()
2996 3366
2997void glCallList (int list) 3367void glCallList (int list)
3368
3369void c_init ()
3370 CODE:
3371 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3372 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2998 3373
2999MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3374MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3000 3375
3001PROTOTYPES: DISABLE 3376PROTOTYPES: DISABLE
3002 3377

Diff Legend

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