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.297 by root, Tue Dec 22 00:08:11 2009 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);
46#endif
43 47
44#define PANGO_ENABLE_BACKEND 48#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 49#define G_DISABLE_CAST_CHECKS
46 50
47#include <glib/gmacros.h> 51#include <glib/gmacros.h>
… …
76#define expect_false(expr) expect ((expr) != 0, 0) 80#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 81#define expect_true(expr) expect ((expr) != 0, 1)
78 82
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 84
85/* this is used as fow flag as well, so has to have a different value */
86/* then anything that is computed by incoming darkness */
81#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
82 89
83#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
85 92
86#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
87 94
88/* mask out modifiers we are not interested in */ 95/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
97
98#define KMOD_LRAM 0x10000 // our extension
99
100#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2
90 102
91static AV *texture_av; 103static AV *texture_av;
92 104
93static struct 105static struct
94{ 106{
… …
226 int w, h; 238 int w, h;
227 float s, t; 239 float s, t;
228 uint8_t r, g, b, a; 240 uint8_t r, g, b, a;
229 tileid smoothtile; 241 tileid smoothtile;
230 uint8_t smoothlevel; 242 uint8_t smoothlevel;
243 uint8_t unused; /* set to zero on use */
231} maptex; 244} maptex;
232 245
233typedef struct { 246typedef struct {
234 uint32_t player; 247 uint32_t player;
235 tileid tile[3]; 248 tileid tile[3];
… …
367 self->oy = 0; 380 self->oy = 0;
368 self->row = 0; 381 self->row = 0;
369 self->rows = 0; 382 self->rows = 0;
370} 383}
371 384
385#define CELL_CLEAR(cell) \
386 do { \
387 if ((cell)->player) \
388 (cell)->tile [2] = 0; \
389 (cell)->darkness = 0; \
390 (cell)->stat_hp = 0; \
391 (cell)->flags = 0; \
392 (cell)->player = 0; \
393 } while (0)
394
372static void 395static void
373map_blank (DC__Map self, int x0, int y0, int w, int h) 396map_blank (DC__Map self, int x0, int y0, int w, int h)
374{ 397{
375 int x, y; 398 int x, y;
376 maprow *row; 399 maprow *row;
… …
390 if (x >= row->c1) 413 if (x >= row->c1)
391 break; 414 break;
392 415
393 cell = row->col + x - row->c0; 416 cell = row->col + x - row->c0;
394 417
395 cell->darkness = 0; 418 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 419 }
400 } 420 }
401} 421}
402 422
403typedef struct { 423typedef struct {
… …
514 if (!svp || !SvTRUE (*svp)) 534 if (!svp || !SvTRUE (*svp))
515 return 0; 535 return 0;
516 536
517 return 1; 537 return 1;
518} 538}
539
540/******************************************************************************/
541
542/* process keyboard modifiers */
543static int
544mod_munge (int mod)
545{
546 mod &= MOD_MASK;
547
548 if (mod & (KMOD_META | KMOD_ALT))
549 mod |= KMOD_LRAM;
550
551 return mod;
552}
553
554static void
555deliantra_main ()
556{
557 char *argv[] = { 0 };
558 call_argv ("::main", G_DISCARD | G_VOID, argv);
559}
560
561#ifdef __MACOSX__
562 /* to due surprising braindamage on the side of SDL design, we
563 * do some mind-boggling hack here: SDL requires a custom main()
564 * on OS X, so... we provide one and call the original main(), which,
565 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
566 * and which calls our main (== SDL_main) back.
567 */
568 extern C_LINKAGE int
569 main (int argc, char *argv[])
570 {
571 deliantra_main ();
572 }
573
574 #undef main
575
576 extern C_LINKAGE int main (int argc, char *argv[]);
577
578 static void
579 SDL_braino (void)
580 {
581 char *argv[] = { "deliantra client", 0 };
582 (main) (1, argv);
583 }
584#else
585 static void
586 SDL_braino (void)
587 {
588 deliantra_main ();
589 }
590#endif
519 591
520MODULE = Deliantra::Client PACKAGE = DC 592MODULE = Deliantra::Client PACKAGE = DC
521 593
522PROTOTYPES: ENABLE 594PROTOTYPES: ENABLE
523 595
… …
552 const_iv (SDL_USEREVENT), 624 const_iv (SDL_USEREVENT),
553 625
554 const_iv (SDL_APPINPUTFOCUS), 626 const_iv (SDL_APPINPUTFOCUS),
555 const_iv (SDL_APPMOUSEFOCUS), 627 const_iv (SDL_APPMOUSEFOCUS),
556 const_iv (SDL_APPACTIVE), 628 const_iv (SDL_APPACTIVE),
629
630
631 const_iv (SDLK_UNKNOWN),
632 const_iv (SDLK_FIRST),
633 const_iv (SDLK_BACKSPACE),
634 const_iv (SDLK_TAB),
635 const_iv (SDLK_CLEAR),
636 const_iv (SDLK_RETURN),
637 const_iv (SDLK_PAUSE),
638 const_iv (SDLK_ESCAPE),
639 const_iv (SDLK_SPACE),
640 const_iv (SDLK_EXCLAIM),
641 const_iv (SDLK_QUOTEDBL),
642 const_iv (SDLK_HASH),
643 const_iv (SDLK_DOLLAR),
644 const_iv (SDLK_AMPERSAND),
645 const_iv (SDLK_QUOTE),
646 const_iv (SDLK_LEFTPAREN),
647 const_iv (SDLK_RIGHTPAREN),
648 const_iv (SDLK_ASTERISK),
649 const_iv (SDLK_PLUS),
650 const_iv (SDLK_COMMA),
651 const_iv (SDLK_MINUS),
652 const_iv (SDLK_PERIOD),
653 const_iv (SDLK_SLASH),
654 const_iv (SDLK_0),
655 const_iv (SDLK_1),
656 const_iv (SDLK_2),
657 const_iv (SDLK_3),
658 const_iv (SDLK_4),
659 const_iv (SDLK_5),
660 const_iv (SDLK_6),
661 const_iv (SDLK_7),
662 const_iv (SDLK_8),
663 const_iv (SDLK_9),
664 const_iv (SDLK_COLON),
665 const_iv (SDLK_SEMICOLON),
666 const_iv (SDLK_LESS),
667 const_iv (SDLK_EQUALS),
668 const_iv (SDLK_GREATER),
669 const_iv (SDLK_QUESTION),
670 const_iv (SDLK_AT),
671
672 const_iv (SDLK_LEFTBRACKET),
673 const_iv (SDLK_BACKSLASH),
674 const_iv (SDLK_RIGHTBRACKET),
675 const_iv (SDLK_CARET),
676 const_iv (SDLK_UNDERSCORE),
677 const_iv (SDLK_BACKQUOTE),
678 const_iv (SDLK_DELETE),
557 679
558 const_iv (SDLK_FIRST), 680 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST), 681 const_iv (SDLK_LAST),
560 const_iv (SDLK_KP0), 682 const_iv (SDLK_KP0),
561 const_iv (SDLK_KP1), 683 const_iv (SDLK_KP1),
… …
637 const_iv (KMOD_RMETA), 759 const_iv (KMOD_RMETA),
638 const_iv (KMOD_NUM), 760 const_iv (KMOD_NUM),
639 const_iv (KMOD_CAPS), 761 const_iv (KMOD_CAPS),
640 const_iv (KMOD_MODE), 762 const_iv (KMOD_MODE),
641 763
764 const_iv (KMOD_LRAM),
765
642 const_iv (MIX_DEFAULT_FORMAT), 766 const_iv (MIX_DEFAULT_FORMAT),
643 767
644 const_iv (SDL_INIT_TIMER), 768 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO), 769 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO), 770 const_iv (SDL_INIT_VIDEO),
… …
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 788 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO), 789 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 790 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES), 791 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL), 792 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL) 793 const_iv (SDL_GL_SWAP_CONTROL),
794
795 const_iv (FOW_DARKNESS)
670# undef const_iv 796# undef const_iv
671 }; 797 };
672 798
673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 799 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 800 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
695NV ceil (NV x) 821NV ceil (NV x)
696 822
697IV minpot (UV n) 823IV minpot (UV n)
698 824
699IV popcount (UV n) 825IV popcount (UV n)
826
827NV distance (NV dx, NV dy)
828 CODE:
829 RETVAL = pow (dx * dx + dy * dy, 0.5);
830 OUTPUT:
831 RETVAL
700 832
701void 833void
702pango_init () 834pango_init ()
703 CODE: 835 CODE:
704{ 836{
… …
711 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 843 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
712#endif 844#endif
713} 845}
714 846
715char *SDL_GetError () 847char *SDL_GetError ()
848
849void SDL_braino ()
716 850
717int SDL_Init (U32 flags) 851int SDL_Init (U32 flags)
718 852
719int SDL_InitSubSystem (U32 flags) 853int SDL_InitSubSystem (U32 flags)
720 854
… …
829 { 963 {
830 case SDL_KEYDOWN: 964 case SDL_KEYDOWN:
831 case SDL_KEYUP: 965 case SDL_KEYUP:
832 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 966 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
833 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 967 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); 968 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 */ 969 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); 970 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
837 break; 971 break;
838 972
839 case SDL_ACTIVEEVENT: 973 case SDL_ACTIVEEVENT:
840 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 974 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
858 x = ev.motion.x; 992 x = ev.motion.x;
859 y = ev.motion.y; 993 y = ev.motion.y;
860 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 994 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
861 } 995 }
862 996
863 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 997 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
864 hv_store (hv, "state", 5, newSViv (state), 0); 998 hv_store (hv, "state", 5, newSViv (state), 0);
865 hv_store (hv, "x", 1, newSViv (x), 0); 999 hv_store (hv, "x", 1, newSViv (x), 0);
866 hv_store (hv, "y", 1, newSViv (y), 0); 1000 hv_store (hv, "y", 1, newSViv (y), 0);
867 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1001 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
868 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1002 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1084#if DEBUG 1218#if DEBUG
1085 VALGRIND_DO_LEAK_CHECK; 1219 VALGRIND_DO_LEAK_CHECK;
1086#endif 1220#endif
1087} 1221}
1088 1222
1223int
1224SvREFCNT (SV *sv)
1225 CODE:
1226 RETVAL = SvREFCNT (sv);
1227 OUTPUT:
1228 RETVAL
1229
1089MODULE = Deliantra::Client PACKAGE = DC::Font 1230MODULE = Deliantra::Client PACKAGE = DC::Font
1090 1231
1091PROTOTYPES: DISABLE 1232PROTOTYPES: DISABLE
1092 1233
1093DC::Font 1234DC::Font
… …
1522 if (ix) 1663 if (ix)
1523 { 1664 {
1524 glDisable (GL_ALPHA_TEST); 1665 glDisable (GL_ALPHA_TEST);
1525 glDisable (GL_BLEND); 1666 glDisable (GL_BLEND);
1526 } 1667 }
1668}
1669
1670void
1671draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1672 PROTOTYPE: @
1673 CODE:
1674{
1675 glEnable (GL_TEXTURE_2D);
1676 glEnable (GL_BLEND);
1677 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1678 glBindTexture (GL_TEXTURE_2D, name1);
1679
1680 glColor3f (intensity, intensity, intensity);
1681 glPushMatrix ();
1682 glScalef (1./3, 1./3, 1.);
1683
1684 if (blend > 0.f)
1685 {
1686 float dx3 = dx * -3.f / w;
1687 float dy3 = dy * -3.f / h;
1688 GLfloat env_color[4] = { 0., 0., 0., blend };
1689
1690 /* interpolate the two shadow textures */
1691 /* stage 0 == rgb(glcolor) + alpha(t0) */
1692 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1693
1694 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1695 gl.ActiveTexture (GL_TEXTURE1);
1696 glEnable (GL_TEXTURE_2D);
1697 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699
1700 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704
1705 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707
1708 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1709 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1710 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1711
1712 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1713 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714
1715 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717
1718 glBegin (GL_QUADS);
1719 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1720 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1721 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1722 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1723 glEnd ();
1724
1725 glDisable (GL_TEXTURE_2D);
1726 gl.ActiveTexture (GL_TEXTURE0);
1727 }
1728 else
1729 {
1730 /* simple blending of one texture, also opengl <1.3 path */
1731 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1732
1733 glBegin (GL_QUADS);
1734 glTexCoord2f (0, 0); glVertex2f (0, 0);
1735 glTexCoord2f (0, t); glVertex2f (0, h);
1736 glTexCoord2f (s, t); glVertex2f (w, h);
1737 glTexCoord2f (s, 0); glVertex2f (w, 0);
1738 glEnd ();
1739 }
1740
1741 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1742 {
1743 int x, y;
1744 int dx3 = dx * 3;
1745 int dy3 = dy * 3;
1746
1747 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1748 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1749 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1750 glTranslatef (-1., -1., 0);
1751 glBegin (GL_QUADS);
1752
1753 for (y = 1; y < h; y += 3)
1754 {
1755 int y1 = y - dy3;
1756 int y1valid = y1 >= 0 && y1 < h;
1757
1758 for (x = 1; x < w; x += 3)
1759 {
1760 int x1 = x - dx3;
1761 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1762 uint8_t h2;
1763
1764 if (y1valid && x1 >= 0 && x1 < w)
1765 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1766 else
1767 h2 = 1; /* out of range == invisible */
1768
1769 if (h1 || h2)
1770 {
1771 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1772 glColor4f (1., 1., 1., alpha);
1773
1774 glTexCoord2f (0, 0.); glVertex2i (x , y );
1775 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1776 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1777 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1778 }
1779 }
1780 }
1781 }
1782
1783 glEnd ();
1784
1785 glPopMatrix ();
1786
1787 glDisable (GL_TEXTURE_2D);
1788 glDisable (GL_BLEND);
1527} 1789}
1528 1790
1529IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1791IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1530 CODE: 1792 CODE:
1531{ 1793{
… …
1637 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1899 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1638 // use uglier nearest interpolation because linear suffers 1900 // use uglier nearest interpolation because linear suffers
1639 // from transparent color bleeding and ugly wrapping effects. 1901 // from transparent color bleeding and ugly wrapping effects.
1640 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1902 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1641} 1903}
1904
1905void
1906expire_textures (DC::Map self, int texid, int count)
1907 PPCODE:
1908 for (; texid < self->texs && count; ++texid, --count)
1909 {
1910 maptex *tex = self->tex + texid;
1911
1912 if (tex->name)
1913 {
1914 if (tex->unused)
1915 {
1916 tex->name = 0;
1917 tex->unused = 0;
1918 XPUSHs (sv_2mortal (newSViv (texid)));
1919 }
1920 else
1921 tex->unused = 1;
1922 }
1923 }
1642 1924
1643int 1925int
1644ox (DC::Map self) 1926ox (DC::Map self)
1645 ALIAS: 1927 ALIAS:
1646 oy = 1 1928 oy = 1
… …
1727 { 2009 {
1728 ext = *data++; 2010 ext = *data++;
1729 cmd = ext & 0x7f; 2011 cmd = ext & 0x7f;
1730 2012
1731 if (cmd < 4) 2013 if (cmd < 4)
1732 cell->darkness = 255 - ext * 64 + 1; 2014 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1733 else if (cmd == 5) // health 2015 else if (cmd == 5) // health
1734 { 2016 {
1735 cell->stat_width = 1; 2017 cell->stat_width = 1;
1736 cell->stat_hp = *data++; 2018 cell->stat_hp = *data++;
1737 } 2019 }
… …
1767 cell->tile [z] = self->face2tile [face]; 2049 cell->tile [z] = self->face2tile [face];
1768 2050
1769 if (cell->tile [z]) 2051 if (cell->tile [z])
1770 { 2052 {
1771 maptex *tex = self->tex + cell->tile [z]; 2053 maptex *tex = self->tex + cell->tile [z];
2054 tex->unused = 0;
1772 if (!tex->name) 2055 if (!tex->name)
1773 av_push (missing, newSViv (cell->tile [z])); 2056 av_push (missing, newSViv (cell->tile [z]));
1774 2057
1775 if (tex->smoothtile) 2058 if (tex->smoothtile)
1776 { 2059 {
1777 maptex *smooth = self->tex + tex->smoothtile; 2060 maptex *smooth = self->tex + tex->smoothtile;
2061 smooth->unused = 0;
1778 if (!smooth->name) 2062 if (!smooth->name)
1779 av_push (missing, newSViv (tex->smoothtile)); 2063 av_push (missing, newSViv (tex->smoothtile));
1780 } 2064 }
1781 } 2065 }
1782 } 2066 }
1783 } 2067 }
1784 else 2068 else
1785 cell->darkness = 0; 2069 CELL_CLEAR (cell);
1786 } 2070 }
1787} 2071}
1788 OUTPUT: 2072 OUTPUT:
1789 RETVAL 2073 RETVAL
1790 2074
… …
1842} 2126}
1843 OUTPUT: 2127 OUTPUT:
1844 RETVAL 2128 RETVAL
1845 2129
1846void 2130void
1847draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2131draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1848 CODE: 2132 CODE:
1849{ 2133{
1850 int x, y, z; 2134 int x, y, z;
1851 2135
1852 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2136 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1853 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2137 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) 2138 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1855 smooth_key skey; 2139 smooth_key skey;
1856 int pl_x, pl_y; 2140 int pl_x, pl_y;
1857 maptex pl_tex; 2141 maptex pl_tex;
1858 rc_t *rc = rc_alloc (); 2142 rc_t *rc = rc_alloc ();
2143 rc_t *rc_ov = rc_alloc ();
1859 rc_key_t key; 2144 rc_key_t key;
1860 rc_array_t *arr; 2145 rc_array_t *arr;
1861 2146
1862 pl_tex.name = 0; 2147 pl_tex.name = 0;
1863 2148
1864 // thats current max. sorry. 2149 // that's current max. sorry.
1865 if (sw > 255) sw = 255; 2150 if (sw > 255) sw = 255;
1866 if (sh > 255) sh = 255; 2151 if (sh > 255) sh = 255;
1867 2152
1868 // clear key, in case of extra padding 2153 // clear key, in case of extra padding
1869 memset (&skey, 0, sizeof (skey)); 2154 memset (&skey, 0, sizeof (skey));
… …
1873 key.g = 255; 2158 key.g = 255;
1874 key.b = 255; 2159 key.b = 255;
1875 key.a = 255; 2160 key.a = 255;
1876 key.mode = GL_QUADS; 2161 key.mode = GL_QUADS;
1877 key.format = GL_T2F_V3F; 2162 key.format = GL_T2F_V3F;
1878 key.texname = -1;
1879 2163
1880 mx += self->x; 2164 mx += self->x;
1881 my += self->y; 2165 my += self->y;
1882 2166
1883 // first pass: determine smooth_max 2167 // first pass: determine smooth_max
… …
1907 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2191 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1908 2192
1909 for (z = 0; z <= 2; z++) 2193 for (z = 0; z <= 2; z++)
1910 { 2194 {
1911 memset (smooth_level, 0, sizeof (smooth_level)); 2195 memset (smooth_level, 0, sizeof (smooth_level));
2196 key.texname = -1;
1912 2197
1913 for (y = 0; y < sh; y++) 2198 for (y = 0; y < sh; y++)
1914 if (0 <= y + my && y + my < self->rows) 2199 if (0 <= y + my && y + my < self->rows)
1915 { 2200 {
1916 maprow *row = self->row + (y + my); 2201 maprow *row = self->row + (y + my);
… …
1922 tileid tile = cell->tile [z]; 2207 tileid tile = cell->tile [z];
1923 2208
1924 if (tile) 2209 if (tile)
1925 { 2210 {
1926 maptex tex = self->tex [tile]; 2211 maptex tex = self->tex [tile];
1927 int px = (x + 1) * T - tex.w; 2212 int px, py;
1928 int py = (y + 1) * T - tex.h;
1929 2213
1930 if (key.texname != tex.name) 2214 if (key.texname != tex.name)
1931 { 2215 {
2216 self->tex [tile].unused = 0;
2217
1932 if (!tex.name) 2218 if (!tex.name)
1933 tex = self->tex [2]; /* missing, replace by noface */ 2219 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1934 2220
1935 key.texname = tex.name; 2221 key.texname = tex.name;
1936 arr = rc_array (rc, &key); 2222 arr = rc_array (rc, &key);
1937 } 2223 }
2224
2225 px = (x + 1) * T - tex.w;
2226 py = (y + 1) * T - tex.h;
1938 2227
1939 if (expect_false (cell->player == player) && expect_false (z == 2)) 2228 if (expect_false (cell->player == player) && expect_false (z == 2))
1940 { 2229 {
1941 pl_x = px; 2230 pl_x = px;
1942 pl_y = py; 2231 pl_y = py;
… …
1947 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2236 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1948 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2237 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); 2238 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); 2239 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1951 2240
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 2241 // update smooth hash
1978 if (tex.smoothtile) 2242 if (tex.smoothtile)
1979 { 2243 {
1980 skey.tile = tex.smoothtile; 2244 skey.tile = tex.smoothtile;
1981 skey.level = tex.smoothlevel; 2245 skey.level = tex.smoothlevel;
… …
2009 // corners 2273 // corners
2010 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2274 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); 2275 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); 2276 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); 2277 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2278 }
2279 }
2280
2281 if (expect_false (z == 2) && expect_false (cell->flags))
2282 {
2283 // overlays such as the speech bubble, probably more to come
2284 if (cell->flags & 1)
2285 {
2286 rc_key_t key_ov = key;
2287 maptex tex = self->tex [TEXID_SPEECH];
2288 rc_array_t *arr;
2289 int px = x * T + T * 2 / 32;
2290 int py = y * T - T * 6 / 32;
2291
2292 key_ov.texname = tex.name;
2293 arr = rc_array (rc_ov, &key_ov);
2294
2295 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2296 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2297 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2298 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2014 } 2299 }
2015 } 2300 }
2016 } 2301 }
2017 } 2302 }
2018 2303
… …
2058 { 2343 {
2059 // this time avoiding texture state changes 2344 // this time avoiding texture state changes
2060 // save gobs of state changes. 2345 // save gobs of state changes.
2061 if (key.texname != tex.name) 2346 if (key.texname != tex.name)
2062 { 2347 {
2348 self->tex [skey->tile].unused = 0;
2349
2063 glEnd (); 2350 glEnd ();
2064 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2351 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2065 glBegin (GL_QUADS); 2352 glBegin (GL_QUADS);
2066 } 2353 }
2067 2354
… …
2099 } 2386 }
2100 2387
2101 if (pl_tex.name) 2388 if (pl_tex.name)
2102 { 2389 {
2103 maptex tex = pl_tex; 2390 maptex tex = pl_tex;
2104 int px = pl_x + pdx; 2391 int px = pl_x + sdx;
2105 int py = pl_y + pdy; 2392 int py = pl_y + sdy;
2106 2393
2107 key.texname = tex.name; 2394 key.texname = tex.name;
2108 arr = rc_array (rc, &key); 2395 arr = rc_array (rc, &key);
2109 2396
2110 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2397 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
… …
2113 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2400 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2114 2401
2115 rc_draw (rc); 2402 rc_draw (rc);
2116 } 2403 }
2117 2404
2405 rc_draw (rc_ov);
2406 rc_clear (rc_ov);
2407
2118 glDisable (GL_BLEND); 2408 glDisable (GL_BLEND);
2119 rc_free (rc); 2409 rc_free (rc);
2410 rc_free (rc_ov);
2120 2411
2121 // top layer: overlays such as the health bar 2412 // top layer: overlays such as the health bar
2122 for (y = 0; y < sh; y++) 2413 for (y = 0; y < sh; y++)
2123 if (0 <= y + my && y + my < self->rows) 2414 if (0 <= y + my && y + my < self->rows)
2124 { 2415 {
… …
2129 { 2420 {
2130 mapcell *cell = row->col + (x + mx - row->c0); 2421 mapcell *cell = row->col + (x + mx - row->c0);
2131 2422
2132 int px = x * T; 2423 int px = x * T;
2133 int py = y * T; 2424 int py = y * T;
2425
2426 if (expect_false (cell->player == player))
2427 {
2428 px += sdx;
2429 py += sdy;
2430 }
2134 2431
2135 if (cell->stat_hp) 2432 if (cell->stat_hp)
2136 { 2433 {
2137 int width = cell->stat_width * T; 2434 int width = cell->stat_width * T;
2138 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2435 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2149 } 2446 }
2150 } 2447 }
2151} 2448}
2152 2449
2153void 2450void
2154draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2451draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2155 CODE: 2452 CODE:
2156{ 2453{
2157 static float color[16][3] = { 2454 static float color[16][3] = {
2158 { 0.00F, 0.00F, 0.00F }, 2455 { 0.00f, 0.00f, 0.00f },
2159 { 1.00F, 1.00F, 1.00F }, 2456 { 1.00f, 1.00f, 1.00f },
2160 { 0.00F, 0.00F, 0.55F }, 2457 { 0.00f, 0.00f, 0.55f },
2161 { 1.00F, 0.00F, 0.00F }, 2458 { 1.00f, 0.00f, 0.00f },
2162 2459
2163 { 1.00F, 0.54F, 0.00F }, 2460 { 1.00f, 0.54f, 0.00f },
2164 { 0.11F, 0.56F, 1.00F }, 2461 { 0.11f, 0.56f, 1.00f },
2165 { 0.93F, 0.46F, 0.00F }, 2462 { 0.93f, 0.46f, 0.00f },
2166 { 0.18F, 0.54F, 0.34F }, 2463 { 0.18f, 0.54f, 0.34f },
2167 2464
2168 { 0.56F, 0.73F, 0.56F }, 2465 { 0.56f, 0.73f, 0.56f },
2169 { 0.80F, 0.80F, 0.80F }, 2466 { 0.80f, 0.80f, 0.80f },
2170 { 0.55F, 0.41F, 0.13F }, 2467 { 0.55f, 0.41f, 0.13f },
2171 { 0.99F, 0.77F, 0.26F }, 2468 { 0.99f, 0.77f, 0.26f },
2172 2469
2173 { 0.74F, 0.65F, 0.41F }, 2470 { 0.74f, 0.65f, 0.41f },
2174 2471
2175 { 0.00F, 1.00F, 1.00F }, 2472 { 0.00f, 1.00f, 1.00f },
2176 { 1.00F, 0.00F, 1.00F }, 2473 { 1.00f, 0.00f, 1.00f },
2177 { 1.00F, 1.00F, 0.00F }, 2474 { 1.00f, 1.00f, 0.00f },
2178 }; 2475 };
2179 2476
2180 int x, y; 2477 int x, y;
2181 2478
2182 glEnable (GL_TEXTURE_2D); 2479 glEnable (GL_TEXTURE_2D);
2480 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2481 * but the nvidia driver (185.18.14) mishandles alpha textures
2482 * and takes the colour from god knows where instead of using
2483 * Cp. MODULATE results in the same colour, but slightly different
2484 * alpha, but atcually gives us the correct colour with nvidia.
2485 */
2183 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2486 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2184 glEnable (GL_BLEND); 2487 glEnable (GL_BLEND);
2185 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2488 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2186 glBegin (GL_QUADS); 2489 glBegin (GL_QUADS);
2187 2490
2188 for (y = 0; y < h; y++) 2491 for (y = 0; y < h; y++)
… …
2192 2495
2193 if (m) 2496 if (m)
2194 { 2497 {
2195 float *c = color [m & 15]; 2498 float *c = color [m & 15];
2196 2499
2197 float tx1 = m & 0x40 ? 0.5 : 0.; 2500 float tx1 = m & 0x40 ? 0.5f : 0.f;
2198 float tx2 = tx1 + 0.5; 2501 float tx2 = tx1 + 0.5f;
2199 2502
2200 glColor4f (c[0], c[1], c[2], 0.75); 2503 glColor4f (c[0], c[1], c[2], 1);
2201 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2504 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2202 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2505 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2203 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2506 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2204 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2507 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2205 } 2508 }
… …
2213void 2516void
2214fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2517fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2215 PPCODE: 2518 PPCODE:
2216{ 2519{
2217 int x, y; 2520 int x, y;
2218 int sw1 = sw + 2; 2521 int sw1 = sw + 2;
2219 int sh1 = sh + 2; 2522 int sh1 = sh + 2;
2220 int sh3 = sh * 3; 2523 int sh3 = sh * 3;
2221 int sw34 = (sw * 3 + 3) & ~3; 2524 int sw3 = sw * 3;
2222 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2525 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2223 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2526 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2224 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2527 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2225 2528
2226 SvPOK_only (darkness3_sv); 2529 SvPOK_only (darkness3_sv);
2227 SvCUR_set (darkness3_sv, sw34 * sh3); 2530 SvCUR_set (darkness3_sv, sw3 * sh3);
2228 2531
2229 mx += self->x - 1; 2532 mx += self->x - 1;
2230 my += self->y - 1; 2533 my += self->y - 1;
2231
2232 memset (darkness1, 255, sw1 * sh1);
2233 2534
2234 for (y = 0; y < sh1; y++) 2535 for (y = 0; y < sh1; y++)
2235 if (0 <= y + my && y + my < self->rows) 2536 if (0 <= y + my && y + my < self->rows)
2236 { 2537 {
2237 maprow *row = self->row + (y + my); 2538 maprow *row = self->row + (y + my);
… …
2240 if (row->c0 <= x + mx && x + mx < row->c1) 2541 if (row->c0 <= x + mx && x + mx < row->c1)
2241 { 2542 {
2242 mapcell *cell = row->col + (x + mx - row->c0); 2543 mapcell *cell = row->col + (x + mx - row->c0);
2243 2544
2244 darkness1 [y * sw1 + x] = cell->darkness 2545 darkness1 [y * sw1 + x] = cell->darkness
2245 ? 255 - (cell->darkness - 1) 2546 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2246 : 255 - FOW_DARKNESS; 2547 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2247 } 2548 }
2248 } 2549 }
2249 2550
2250 for (y = 0; y < sh; ++y) 2551 for (y = 0; y < sh; ++y)
2251 for (x = 0; x < sw; ++x) 2552 for (x = 0; x < sw; ++x)
… …
2270 2571
2271 uint8_t r13 = (d13 + d23 + d12) / 3; 2572 uint8_t r13 = (d13 + d23 + d12) / 3;
2272 uint8_t r23 = d23; 2573 uint8_t r23 = d23;
2273 uint8_t r33 = (d23 + d33 + d32) / 3; 2574 uint8_t r33 = (d23 + d33 + d32) / 3;
2274 2575
2275 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2576 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2276 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2577 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2277 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2578 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2278 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2579 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2279 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2580 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); 2581 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2281 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2582 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2282 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2583 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2283 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2584 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2284 } 2585 }
2285 2586
2286 free (darkness1); 2587 free (darkness1);
2287 2588
2288 EXTEND (SP, 3); 2589 EXTEND (SP, 3);
2289 PUSHs (sv_2mortal (newSViv (sw34))); 2590 PUSHs (sv_2mortal (newSViv (sw3)));
2290 PUSHs (sv_2mortal (newSViv (sh3))); 2591 PUSHs (sv_2mortal (newSViv (sh3)));
2291 PUSHs (darkness3_sv); 2592 PUSHs (darkness3_sv);
2292} 2593}
2293 2594
2294SV * 2595SV *
… …
2551void 2852void
2552set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2853set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2553 CODE: 2854 CODE:
2554{ 2855{
2555 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2856 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); 2857 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2557 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2858 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2558} 2859}
2559 2860
2560void 2861void
2561set_reverse_stereo (DC::Channel self, int flip) 2862set_reverse_stereo (DC::Channel self, int flip)
… …
2664 } *civ, const_iv[] = { 2965 } *civ, const_iv[] = {
2665# define const_iv(name) { # name, (IV)name } 2966# define const_iv(name) { # name, (IV)name }
2666 const_iv (GL_VENDOR), 2967 const_iv (GL_VENDOR),
2667 const_iv (GL_VERSION), 2968 const_iv (GL_VERSION),
2668 const_iv (GL_EXTENSIONS), 2969 const_iv (GL_EXTENSIONS),
2970 const_iv (GL_MAX_TEXTURE_UNITS),
2669 const_iv (GL_COLOR_MATERIAL), 2971 const_iv (GL_COLOR_MATERIAL),
2670 const_iv (GL_SMOOTH), 2972 const_iv (GL_SMOOTH),
2671 const_iv (GL_FLAT), 2973 const_iv (GL_FLAT),
2672 const_iv (GL_DITHER), 2974 const_iv (GL_DITHER),
2673 const_iv (GL_BLEND), 2975 const_iv (GL_BLEND),
… …
2685 const_iv (GL_ZERO), 2987 const_iv (GL_ZERO),
2686 const_iv (GL_SRC_ALPHA), 2988 const_iv (GL_SRC_ALPHA),
2687 const_iv (GL_DST_ALPHA), 2989 const_iv (GL_DST_ALPHA),
2688 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2990 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2689 const_iv (GL_ONE_MINUS_DST_ALPHA), 2991 const_iv (GL_ONE_MINUS_DST_ALPHA),
2992 const_iv (GL_SRC_COLOR),
2993 const_iv (GL_DST_COLOR),
2994 const_iv (GL_ONE_MINUS_SRC_COLOR),
2995 const_iv (GL_ONE_MINUS_DST_COLOR),
2690 const_iv (GL_SRC_ALPHA_SATURATE), 2996 const_iv (GL_SRC_ALPHA_SATURATE),
2691 const_iv (GL_RGB), 2997 const_iv (GL_RGB),
2692 const_iv (GL_RGBA), 2998 const_iv (GL_RGBA),
2693 const_iv (GL_RGBA4), 2999 const_iv (GL_RGBA4),
2694 const_iv (GL_RGBA8), 3000 const_iv (GL_RGBA8),
… …
2762 const_iv (GL_NICEST), 3068 const_iv (GL_NICEST),
2763 const_iv (GL_V2F), 3069 const_iv (GL_V2F),
2764 const_iv (GL_V3F), 3070 const_iv (GL_V3F),
2765 const_iv (GL_T2F_V3F), 3071 const_iv (GL_T2F_V3F),
2766 const_iv (GL_T2F_N3F_V3F), 3072 const_iv (GL_T2F_N3F_V3F),
3073 const_iv (GL_FUNC_ADD),
3074 const_iv (GL_FUNC_SUBTRACT),
3075 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2767# undef const_iv 3076# undef const_iv
2768 }; 3077 };
2769 3078
2770 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3079 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2771 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3080 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2778disable_GL_EXT_blend_func_separate () 3087disable_GL_EXT_blend_func_separate ()
2779 CODE: 3088 CODE:
2780 gl.BlendFuncSeparate = 0; 3089 gl.BlendFuncSeparate = 0;
2781 gl.BlendFuncSeparateEXT = 0; 3090 gl.BlendFuncSeparateEXT = 0;
2782 3091
3092void
3093apple_nvidia_bug (int enable)
3094
2783char * 3095char *
2784gl_vendor () 3096gl_vendor ()
2785 CODE: 3097 CODE:
2786 RETVAL = (char *)glGetString (GL_VENDOR); 3098 RETVAL = (char *)glGetString (GL_VENDOR);
2787 OUTPUT: 3099 OUTPUT:
… …
2836 3148
2837void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3149void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2838 CODE: 3150 CODE:
2839 gl_BlendFuncSeparate (sa, da, saa, daa); 3151 gl_BlendFuncSeparate (sa, da, saa, daa);
2840 3152
3153# void glBlendEquation (int se)
3154
2841void glDepthMask (int flag) 3155void glDepthMask (int flag)
2842 3156
2843void glLogicOp (int opcode) 3157void glLogicOp (int opcode)
2844 3158
2845void glColorMask (int red, int green, int blue, int alpha) 3159void glColorMask (int red, int green, int blue, int alpha)
… …
2879void glRotate (float angle, float x, float y, float z) 3193void glRotate (float angle, float x, float y, float z)
2880 CODE: 3194 CODE:
2881 glRotatef (angle, x, y, z); 3195 glRotatef (angle, x, y, z);
2882 3196
2883void glColor (float r, float g, float b, float a = 1.0) 3197void glColor (float r, float g, float b, float a = 1.0)
3198 PROTOTYPE: @
2884 ALIAS: 3199 ALIAS:
2885 glColor_premultiply = 1 3200 glColor_premultiply = 1
2886 CODE: 3201 CODE:
2887 if (ix) 3202 if (ix)
2888 { 3203 {
… …
2993void glNewList (int list, int mode = GL_COMPILE) 3308void glNewList (int list, int mode = GL_COMPILE)
2994 3309
2995void glEndList () 3310void glEndList ()
2996 3311
2997void glCallList (int list) 3312void glCallList (int list)
3313
3314void c_init ()
3315 CODE:
3316 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3317 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2998 3318
2999MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3319MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3000 3320
3001PROTOTYPES: DISABLE 3321PROTOTYPES: DISABLE
3002 3322

Diff Legend

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