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.302 by root, Tue Apr 20 10:53:11 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);
… …
1084#if DEBUG 1223#if DEBUG
1085 VALGRIND_DO_LEAK_CHECK; 1224 VALGRIND_DO_LEAK_CHECK;
1086#endif 1225#endif
1087} 1226}
1088 1227
1228int
1229SvREFCNT (SV *sv)
1230 CODE:
1231 RETVAL = SvREFCNT (sv);
1232 OUTPUT:
1233 RETVAL
1234
1089MODULE = Deliantra::Client PACKAGE = DC::Font 1235MODULE = Deliantra::Client PACKAGE = DC::Font
1090 1236
1091PROTOTYPES: DISABLE 1237PROTOTYPES: DISABLE
1092 1238
1093DC::Font 1239DC::Font
… …
1522 if (ix) 1668 if (ix)
1523 { 1669 {
1524 glDisable (GL_ALPHA_TEST); 1670 glDisable (GL_ALPHA_TEST);
1525 glDisable (GL_BLEND); 1671 glDisable (GL_BLEND);
1526 } 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);
1527} 1794}
1528 1795
1529IV 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)
1530 CODE: 1797 CODE:
1531{ 1798{
… …
1637 //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);
1638 // use uglier nearest interpolation because linear suffers 1905 // use uglier nearest interpolation because linear suffers
1639 // from transparent color bleeding and ugly wrapping effects. 1906 // from transparent color bleeding and ugly wrapping effects.
1640 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1907 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1641} 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 }
1642 1929
1643int 1930int
1644ox (DC::Map self) 1931ox (DC::Map self)
1645 ALIAS: 1932 ALIAS:
1646 oy = 1 1933 oy = 1
… …
1727 { 2014 {
1728 ext = *data++; 2015 ext = *data++;
1729 cmd = ext & 0x7f; 2016 cmd = ext & 0x7f;
1730 2017
1731 if (cmd < 4) 2018 if (cmd < 4)
1732 cell->darkness = 255 - ext * 64 + 1; 2019 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1733 else if (cmd == 5) // health 2020 else if (cmd == 5) // health
1734 { 2021 {
1735 cell->stat_width = 1; 2022 cell->stat_width = 1;
1736 cell->stat_hp = *data++; 2023 cell->stat_hp = *data++;
1737 } 2024 }
… …
1767 cell->tile [z] = self->face2tile [face]; 2054 cell->tile [z] = self->face2tile [face];
1768 2055
1769 if (cell->tile [z]) 2056 if (cell->tile [z])
1770 { 2057 {
1771 maptex *tex = self->tex + cell->tile [z]; 2058 maptex *tex = self->tex + cell->tile [z];
2059 tex->unused = 0;
1772 if (!tex->name) 2060 if (!tex->name)
1773 av_push (missing, newSViv (cell->tile [z])); 2061 av_push (missing, newSViv (cell->tile [z]));
1774 2062
1775 if (tex->smoothtile) 2063 if (tex->smoothtile)
1776 { 2064 {
1777 maptex *smooth = self->tex + tex->smoothtile; 2065 maptex *smooth = self->tex + tex->smoothtile;
2066 smooth->unused = 0;
1778 if (!smooth->name) 2067 if (!smooth->name)
1779 av_push (missing, newSViv (tex->smoothtile)); 2068 av_push (missing, newSViv (tex->smoothtile));
1780 } 2069 }
1781 } 2070 }
1782 } 2071 }
1783 } 2072 }
1784 else 2073 else
1785 cell->darkness = 0; 2074 CELL_CLEAR (cell);
1786 } 2075 }
1787} 2076}
1788 OUTPUT: 2077 OUTPUT:
1789 RETVAL 2078 RETVAL
1790 2079
… …
1842} 2131}
1843 OUTPUT: 2132 OUTPUT:
1844 RETVAL 2133 RETVAL
1845 2134
1846void 2135void
1847draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2136draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1848 CODE: 2137 CODE:
1849{ 2138{
1850 int x, y, z; 2139 int x, y, z;
1851 2140
1852 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2141 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1853 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
1854 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)
1855 smooth_key skey; 2144 smooth_key skey;
1856 int pl_x, pl_y; 2145 int pl_x, pl_y;
1857 maptex pl_tex; 2146 maptex pl_tex;
1858 rc_t *rc = rc_alloc (); 2147 rc_t *rc = rc_alloc ();
2148 rc_t *rc_ov = rc_alloc ();
1859 rc_key_t key; 2149 rc_key_t key;
1860 rc_array_t *arr; 2150 rc_array_t *arr;
1861 2151
1862 pl_tex.name = 0; 2152 pl_tex.name = 0;
1863 2153
1864 // thats current max. sorry. 2154 // that's current max. sorry.
1865 if (sw > 255) sw = 255; 2155 if (sw > 255) sw = 255;
1866 if (sh > 255) sh = 255; 2156 if (sh > 255) sh = 255;
1867 2157
1868 // clear key, in case of extra padding 2158 // clear key, in case of extra padding
1869 memset (&skey, 0, sizeof (skey)); 2159 memset (&skey, 0, sizeof (skey));
… …
1873 key.g = 255; 2163 key.g = 255;
1874 key.b = 255; 2164 key.b = 255;
1875 key.a = 255; 2165 key.a = 255;
1876 key.mode = GL_QUADS; 2166 key.mode = GL_QUADS;
1877 key.format = GL_T2F_V3F; 2167 key.format = GL_T2F_V3F;
1878 key.texname = -1;
1879 2168
1880 mx += self->x; 2169 mx += self->x;
1881 my += self->y; 2170 my += self->y;
1882 2171
1883 // first pass: determine smooth_max 2172 // first pass: determine smooth_max
… …
1907 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2196 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1908 2197
1909 for (z = 0; z <= 2; z++) 2198 for (z = 0; z <= 2; z++)
1910 { 2199 {
1911 memset (smooth_level, 0, sizeof (smooth_level)); 2200 memset (smooth_level, 0, sizeof (smooth_level));
2201 key.texname = -1;
1912 2202
1913 for (y = 0; y < sh; y++) 2203 for (y = 0; y < sh; y++)
1914 if (0 <= y + my && y + my < self->rows) 2204 if (0 <= y + my && y + my < self->rows)
1915 { 2205 {
1916 maprow *row = self->row + (y + my); 2206 maprow *row = self->row + (y + my);
… …
1922 tileid tile = cell->tile [z]; 2212 tileid tile = cell->tile [z];
1923 2213
1924 if (tile) 2214 if (tile)
1925 { 2215 {
1926 maptex tex = self->tex [tile]; 2216 maptex tex = self->tex [tile];
1927 int px = (x + 1) * T - tex.w; 2217 int px, py;
1928 int py = (y + 1) * T - tex.h;
1929 2218
1930 if (key.texname != tex.name) 2219 if (key.texname != tex.name)
1931 { 2220 {
2221 self->tex [tile].unused = 0;
2222
1932 if (!tex.name) 2223 if (!tex.name)
1933 tex = self->tex [2]; /* missing, replace by noface */ 2224 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1934 2225
1935 key.texname = tex.name; 2226 key.texname = tex.name;
1936 arr = rc_array (rc, &key); 2227 arr = rc_array (rc, &key);
1937 } 2228 }
2229
2230 px = (x + 1) * T - tex.w;
2231 py = (y + 1) * T - tex.h;
1938 2232
1939 if (expect_false (cell->player == player) && expect_false (z == 2)) 2233 if (expect_false (cell->player == player) && expect_false (z == 2))
1940 { 2234 {
1941 pl_x = px; 2235 pl_x = px;
1942 pl_y = py; 2236 pl_y = py;
… …
1947 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2241 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1948 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);
1949 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);
1950 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);
1951 2245
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 2246 // update smooth hash
1978 if (tex.smoothtile) 2247 if (tex.smoothtile)
1979 { 2248 {
1980 skey.tile = tex.smoothtile; 2249 skey.tile = tex.smoothtile;
1981 skey.level = tex.smoothlevel; 2250 skey.level = tex.smoothlevel;
… …
2009 // corners 2278 // corners
2010 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);
2011 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);
2012 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);
2013 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);
2014 } 2304 }
2015 } 2305 }
2016 } 2306 }
2017 } 2307 }
2018 2308
… …
2058 { 2348 {
2059 // this time avoiding texture state changes 2349 // this time avoiding texture state changes
2060 // save gobs of state changes. 2350 // save gobs of state changes.
2061 if (key.texname != tex.name) 2351 if (key.texname != tex.name)
2062 { 2352 {
2353 self->tex [skey->tile].unused = 0;
2354
2063 glEnd (); 2355 glEnd ();
2064 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2356 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2065 glBegin (GL_QUADS); 2357 glBegin (GL_QUADS);
2066 } 2358 }
2067 2359
… …
2099 } 2391 }
2100 2392
2101 if (pl_tex.name) 2393 if (pl_tex.name)
2102 { 2394 {
2103 maptex tex = pl_tex; 2395 maptex tex = pl_tex;
2104 int px = pl_x + pdx; 2396 int px = pl_x + sdx;
2105 int py = pl_y + pdy; 2397 int py = pl_y + sdy;
2106 2398
2107 key.texname = tex.name; 2399 key.texname = tex.name;
2108 arr = rc_array (rc, &key); 2400 arr = rc_array (rc, &key);
2109 2401
2110 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2402 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
… …
2113 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);
2114 2406
2115 rc_draw (rc); 2407 rc_draw (rc);
2116 } 2408 }
2117 2409
2410 rc_draw (rc_ov);
2411 rc_clear (rc_ov);
2412
2118 glDisable (GL_BLEND); 2413 glDisable (GL_BLEND);
2119 rc_free (rc); 2414 rc_free (rc);
2415 rc_free (rc_ov);
2120 2416
2121 // top layer: overlays such as the health bar 2417 // top layer: overlays such as the health bar
2122 for (y = 0; y < sh; y++) 2418 for (y = 0; y < sh; y++)
2123 if (0 <= y + my && y + my < self->rows) 2419 if (0 <= y + my && y + my < self->rows)
2124 { 2420 {
… …
2129 { 2425 {
2130 mapcell *cell = row->col + (x + mx - row->c0); 2426 mapcell *cell = row->col + (x + mx - row->c0);
2131 2427
2132 int px = x * T; 2428 int px = x * T;
2133 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 }
2134 2436
2135 if (cell->stat_hp) 2437 if (cell->stat_hp)
2136 { 2438 {
2137 int width = cell->stat_width * T; 2439 int width = cell->stat_width * T;
2138 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2440 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2149 } 2451 }
2150 } 2452 }
2151} 2453}
2152 2454
2153void 2455void
2154draw_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)
2155 CODE: 2457 CODE:
2156{ 2458{
2157 static float color[16][3] = { 2459 static float color[16][3] = {
2158 { 0.00F, 0.00F, 0.00F }, 2460 { 0.00f, 0.00f, 0.00f },
2159 { 1.00F, 1.00F, 1.00F }, 2461 { 1.00f, 1.00f, 1.00f },
2160 { 0.00F, 0.00F, 0.55F }, 2462 { 0.00f, 0.00f, 0.55f },
2161 { 1.00F, 0.00F, 0.00F }, 2463 { 1.00f, 0.00f, 0.00f },
2162 2464
2163 { 1.00F, 0.54F, 0.00F }, 2465 { 1.00f, 0.54f, 0.00f },
2164 { 0.11F, 0.56F, 1.00F }, 2466 { 0.11f, 0.56f, 1.00f },
2165 { 0.93F, 0.46F, 0.00F }, 2467 { 0.93f, 0.46f, 0.00f },
2166 { 0.18F, 0.54F, 0.34F }, 2468 { 0.18f, 0.54f, 0.34f },
2167 2469
2168 { 0.56F, 0.73F, 0.56F }, 2470 { 0.56f, 0.73f, 0.56f },
2169 { 0.80F, 0.80F, 0.80F }, 2471 { 0.80f, 0.80f, 0.80f },
2170 { 0.55F, 0.41F, 0.13F }, 2472 { 0.55f, 0.41f, 0.13f },
2171 { 0.99F, 0.77F, 0.26F }, 2473 { 0.99f, 0.77f, 0.26f },
2172 2474
2173 { 0.74F, 0.65F, 0.41F }, 2475 { 0.74f, 0.65f, 0.41f },
2174 2476
2175 { 0.00F, 1.00F, 1.00F }, 2477 { 0.00f, 1.00f, 1.00f },
2176 { 1.00F, 0.00F, 1.00F }, 2478 { 1.00f, 0.00f, 1.00f },
2177 { 1.00F, 1.00F, 0.00F }, 2479 { 1.00f, 1.00f, 0.00f },
2178 }; 2480 };
2179 2481
2180 int x, y; 2482 int x, y;
2181 2483
2182 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 */
2183 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2491 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2184 glEnable (GL_BLEND); 2492 glEnable (GL_BLEND);
2185 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2493 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2186 glBegin (GL_QUADS); 2494 glBegin (GL_QUADS);
2187 2495
2188 for (y = 0; y < h; y++) 2496 for (y = 0; y < h; y++)
… …
2192 2500
2193 if (m) 2501 if (m)
2194 { 2502 {
2195 float *c = color [m & 15]; 2503 float *c = color [m & 15];
2196 2504
2197 float tx1 = m & 0x40 ? 0.5 : 0.; 2505 float tx1 = m & 0x40 ? 0.5f : 0.f;
2198 float tx2 = tx1 + 0.5; 2506 float tx2 = tx1 + 0.5f;
2199 2507
2200 glColor4f (c[0], c[1], c[2], 0.75); 2508 glColor4f (c[0], c[1], c[2], 1);
2201 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2509 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2202 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2510 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2203 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2511 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2204 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2512 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2205 } 2513 }
… …
2213void 2521void
2214fow_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)
2215 PPCODE: 2523 PPCODE:
2216{ 2524{
2217 int x, y; 2525 int x, y;
2218 int sw1 = sw + 2; 2526 int sw1 = sw + 2;
2219 int sh1 = sh + 2; 2527 int sh1 = sh + 2;
2220 int sh3 = sh * 3; 2528 int sh3 = sh * 3;
2221 int sw34 = (sw * 3 + 3) & ~3; 2529 int sw3 = sw * 3;
2222 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2530 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2223 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2531 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2224 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2532 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2225 2533
2226 SvPOK_only (darkness3_sv); 2534 SvPOK_only (darkness3_sv);
2227 SvCUR_set (darkness3_sv, sw34 * sh3); 2535 SvCUR_set (darkness3_sv, sw3 * sh3);
2228 2536
2229 mx += self->x - 1; 2537 mx += self->x - 1;
2230 my += self->y - 1; 2538 my += self->y - 1;
2231
2232 memset (darkness1, 255, sw1 * sh1);
2233 2539
2234 for (y = 0; y < sh1; y++) 2540 for (y = 0; y < sh1; y++)
2235 if (0 <= y + my && y + my < self->rows) 2541 if (0 <= y + my && y + my < self->rows)
2236 { 2542 {
2237 maprow *row = self->row + (y + my); 2543 maprow *row = self->row + (y + my);
… …
2240 if (row->c0 <= x + mx && x + mx < row->c1) 2546 if (row->c0 <= x + mx && x + mx < row->c1)
2241 { 2547 {
2242 mapcell *cell = row->col + (x + mx - row->c0); 2548 mapcell *cell = row->col + (x + mx - row->c0);
2243 2549
2244 darkness1 [y * sw1 + x] = cell->darkness 2550 darkness1 [y * sw1 + x] = cell->darkness
2245 ? 255 - (cell->darkness - 1) 2551 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2246 : 255 - FOW_DARKNESS; 2552 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2247 } 2553 }
2248 } 2554 }
2249 2555
2250 for (y = 0; y < sh; ++y) 2556 for (y = 0; y < sh; ++y)
2251 for (x = 0; x < sw; ++x) 2557 for (x = 0; x < sw; ++x)
… …
2270 2576
2271 uint8_t r13 = (d13 + d23 + d12) / 3; 2577 uint8_t r13 = (d13 + d23 + d12) / 3;
2272 uint8_t r23 = d23; 2578 uint8_t r23 = d23;
2273 uint8_t r33 = (d23 + d33 + d32) / 3; 2579 uint8_t r33 = (d23 + d33 + d32) / 3;
2274 2580
2275 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2581 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2276 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2582 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2277 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2583 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2278 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2584 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2279 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 */
2280 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2586 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2281 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2587 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2282 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2588 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2283 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2589 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2284 } 2590 }
2285 2591
2286 free (darkness1); 2592 free (darkness1);
2287 2593
2288 EXTEND (SP, 3); 2594 EXTEND (SP, 3);
2289 PUSHs (sv_2mortal (newSViv (sw34))); 2595 PUSHs (sv_2mortal (newSViv (sw3)));
2290 PUSHs (sv_2mortal (newSViv (sh3))); 2596 PUSHs (sv_2mortal (newSViv (sh3)));
2291 PUSHs (darkness3_sv); 2597 PUSHs (darkness3_sv);
2292} 2598}
2293 2599
2294SV * 2600SV *
… …
2492 if (RETVAL < 0) 2798 if (RETVAL < 0)
2493 { 2799 {
2494 RETVAL = Mix_GroupOldest (-1); 2800 RETVAL = Mix_GroupOldest (-1);
2495 2801
2496 if (RETVAL < 0) 2802 if (RETVAL < 0)
2803 {
2804 // happens sometimes, maybe it just stopped playing(?)
2805 RETVAL = Mix_GroupAvailable (-1);
2806
2807 if (RETVAL < 0)
2497 XSRETURN_UNDEF; 2808 XSRETURN_UNDEF;
2498 2809 }
2810 else
2499 Mix_HaltChannel (RETVAL); 2811 Mix_HaltChannel (RETVAL);
2500 } 2812 }
2501 2813
2502 Mix_UnregisterAllEffects (RETVAL); 2814 Mix_UnregisterAllEffects (RETVAL);
2503 Mix_Volume (RETVAL, 128); 2815 Mix_Volume (RETVAL, 128);
2504} 2816}
… …
2551void 2863void
2552set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2864set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2553 CODE: 2865 CODE:
2554{ 2866{
2555 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2867 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); 2868 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2557 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2869 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2558} 2870}
2559 2871
2560void 2872void
2561set_reverse_stereo (DC::Channel self, int flip) 2873set_reverse_stereo (DC::Channel self, int flip)
… …
2563 Mix_SetReverseStereo (self, flip); 2875 Mix_SetReverseStereo (self, flip);
2564 2876
2565MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2877MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2566 2878
2567PROTOTYPES: DISABLE 2879PROTOTYPES: DISABLE
2880
2881void
2882decoders ()
2883 PPCODE:
2884#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2885 int i, num = Mix_GetNumChunkDecoders ();
2886 EXTEND (SP, num);
2887 for (i = 0; i < num; ++i)
2888 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2889#else
2890 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2891#endif
2568 2892
2569DC::MixChunk 2893DC::MixChunk
2570new (SV *class, DC::RW rwops) 2894new (SV *class, DC::RW rwops)
2571 CODE: 2895 CODE:
2572 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2896 RETVAL = Mix_LoadWAV_RW (rwops, 1);
… …
2605 OUTPUT: 2929 OUTPUT:
2606 RETVAL 2930 RETVAL
2607 2931
2608MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2932MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2609 2933
2934void
2935decoders ()
2936 PPCODE:
2937#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2938 int i, num = Mix_GetNumMusicDecoders ();
2939 EXTEND (SP, num);
2940 for (i = 0; i < num; ++i)
2941 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2942#else
2943 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2944#endif
2945
2610int 2946int
2611volume (int volume = -1) 2947volume (int volume = -1)
2612 PROTOTYPE: ;$ 2948 PROTOTYPE: ;$
2613 CODE: 2949 CODE:
2614 if (items > 0) 2950 if (items > 0)
… …
2624 2960
2625void 2961void
2626halt () 2962halt ()
2627 CODE: 2963 CODE:
2628 Mix_HaltMusic (); 2964 Mix_HaltMusic ();
2965
2966int
2967playing ()
2968 CODE:
2969 RETVAL = Mix_PlayingMusic ();
2970 OUTPUT:
2971 RETVAL
2629 2972
2630DC::MixMusic 2973DC::MixMusic
2631new (SV *class, DC::RW rwops) 2974new (SV *class, DC::RW rwops)
2632 CODE: 2975 CODE:
2633 RETVAL = Mix_LoadMUS_RW (rwops); 2976 RETVAL = Mix_LoadMUS_RW (rwops);
… …
2664 } *civ, const_iv[] = { 3007 } *civ, const_iv[] = {
2665# define const_iv(name) { # name, (IV)name } 3008# define const_iv(name) { # name, (IV)name }
2666 const_iv (GL_VENDOR), 3009 const_iv (GL_VENDOR),
2667 const_iv (GL_VERSION), 3010 const_iv (GL_VERSION),
2668 const_iv (GL_EXTENSIONS), 3011 const_iv (GL_EXTENSIONS),
3012 const_iv (GL_MAX_TEXTURE_UNITS),
2669 const_iv (GL_COLOR_MATERIAL), 3013 const_iv (GL_COLOR_MATERIAL),
2670 const_iv (GL_SMOOTH), 3014 const_iv (GL_SMOOTH),
2671 const_iv (GL_FLAT), 3015 const_iv (GL_FLAT),
2672 const_iv (GL_DITHER), 3016 const_iv (GL_DITHER),
2673 const_iv (GL_BLEND), 3017 const_iv (GL_BLEND),
… …
2685 const_iv (GL_ZERO), 3029 const_iv (GL_ZERO),
2686 const_iv (GL_SRC_ALPHA), 3030 const_iv (GL_SRC_ALPHA),
2687 const_iv (GL_DST_ALPHA), 3031 const_iv (GL_DST_ALPHA),
2688 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3032 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2689 const_iv (GL_ONE_MINUS_DST_ALPHA), 3033 const_iv (GL_ONE_MINUS_DST_ALPHA),
3034 const_iv (GL_SRC_COLOR),
3035 const_iv (GL_DST_COLOR),
3036 const_iv (GL_ONE_MINUS_SRC_COLOR),
3037 const_iv (GL_ONE_MINUS_DST_COLOR),
2690 const_iv (GL_SRC_ALPHA_SATURATE), 3038 const_iv (GL_SRC_ALPHA_SATURATE),
2691 const_iv (GL_RGB), 3039 const_iv (GL_RGB),
2692 const_iv (GL_RGBA), 3040 const_iv (GL_RGBA),
2693 const_iv (GL_RGBA4), 3041 const_iv (GL_RGBA4),
2694 const_iv (GL_RGBA8), 3042 const_iv (GL_RGBA8),
… …
2762 const_iv (GL_NICEST), 3110 const_iv (GL_NICEST),
2763 const_iv (GL_V2F), 3111 const_iv (GL_V2F),
2764 const_iv (GL_V3F), 3112 const_iv (GL_V3F),
2765 const_iv (GL_T2F_V3F), 3113 const_iv (GL_T2F_V3F),
2766 const_iv (GL_T2F_N3F_V3F), 3114 const_iv (GL_T2F_N3F_V3F),
3115 const_iv (GL_FUNC_ADD),
3116 const_iv (GL_FUNC_SUBTRACT),
3117 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2767# undef const_iv 3118# undef const_iv
2768 }; 3119 };
2769 3120
2770 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3121 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2771 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3122 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2778disable_GL_EXT_blend_func_separate () 3129disable_GL_EXT_blend_func_separate ()
2779 CODE: 3130 CODE:
2780 gl.BlendFuncSeparate = 0; 3131 gl.BlendFuncSeparate = 0;
2781 gl.BlendFuncSeparateEXT = 0; 3132 gl.BlendFuncSeparateEXT = 0;
2782 3133
3134void
3135apple_nvidia_bug (int enable)
3136
2783char * 3137char *
2784gl_vendor () 3138gl_vendor ()
2785 CODE: 3139 CODE:
2786 RETVAL = (char *)glGetString (GL_VENDOR); 3140 RETVAL = (char *)glGetString (GL_VENDOR);
2787 OUTPUT: 3141 OUTPUT:
… …
2836 3190
2837void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3191void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2838 CODE: 3192 CODE:
2839 gl_BlendFuncSeparate (sa, da, saa, daa); 3193 gl_BlendFuncSeparate (sa, da, saa, daa);
2840 3194
3195# void glBlendEquation (int se)
3196
2841void glDepthMask (int flag) 3197void glDepthMask (int flag)
2842 3198
2843void glLogicOp (int opcode) 3199void glLogicOp (int opcode)
2844 3200
2845void glColorMask (int red, int green, int blue, int alpha) 3201void glColorMask (int red, int green, int blue, int alpha)
… …
2879void glRotate (float angle, float x, float y, float z) 3235void glRotate (float angle, float x, float y, float z)
2880 CODE: 3236 CODE:
2881 glRotatef (angle, x, y, z); 3237 glRotatef (angle, x, y, z);
2882 3238
2883void glColor (float r, float g, float b, float a = 1.0) 3239void glColor (float r, float g, float b, float a = 1.0)
3240 PROTOTYPE: @
2884 ALIAS: 3241 ALIAS:
2885 glColor_premultiply = 1 3242 glColor_premultiply = 1
2886 CODE: 3243 CODE:
2887 if (ix) 3244 if (ix)
2888 { 3245 {
… …
2993void glNewList (int list, int mode = GL_COMPILE) 3350void glNewList (int list, int mode = GL_COMPILE)
2994 3351
2995void glEndList () 3352void glEndList ()
2996 3353
2997void glCallList (int list) 3354void glCallList (int list)
3355
3356void c_init ()
3357 CODE:
3358 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3359 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2998 3360
2999MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3361MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3000 3362
3001PROTOTYPES: DISABLE 3363PROTOTYPES: DISABLE
3002 3364

Diff Legend

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