ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.270 by root, Sun Jul 20 15:05:13 2008 UTC vs.
Revision 1.294 by root, Sat Dec 19 05:06:56 2009 UTC

… …
39#include <SDL_endian.h> 39#include <SDL_endian.h>
40#include <SDL_image.h> 40#include <SDL_image.h>
41#include <SDL_mixer.h> 41#include <SDL_mixer.h>
42#include <SDL_opengl.h> 42#include <SDL_opengl.h>
43 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
44#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
46 51
47#include <glib/gmacros.h> 52#include <glib/gmacros.h>
48 53
… …
76#define expect_false(expr) expect ((expr) != 0, 0) 81#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 82#define expect_true(expr) expect ((expr) != 0, 1)
78 83
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 85
81#define FOW_DARKNESS 32 86#define FOW_DARKNESS 64
87#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */
82 88
83#define MAP_EXTEND_X 32 89#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 90#define MAP_EXTEND_Y 512
85 91
86#define MIN_FONT_HEIGHT 10 92#define MIN_FONT_HEIGHT 10
87 93
88/* mask out modifiers we are not interested in */ 94/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 95#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
96
97#define KMOD_LRAM 0x10000 // our extension
98
99#define TEXID_SPEECH 1
100#define TEXID_NOFACE 2
101#define TEXID_HIDDEN 3
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];
… …
521 if (!svp || !SvTRUE (*svp)) 534 if (!svp || !SvTRUE (*svp))
522 return 0; 535 return 0;
523 536
524 return 1; 537 return 1;
525} 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
526 591
527MODULE = Deliantra::Client PACKAGE = DC 592MODULE = Deliantra::Client PACKAGE = DC
528 593
529PROTOTYPES: ENABLE 594PROTOTYPES: ENABLE
530 595
… …
559 const_iv (SDL_USEREVENT), 624 const_iv (SDL_USEREVENT),
560 625
561 const_iv (SDL_APPINPUTFOCUS), 626 const_iv (SDL_APPINPUTFOCUS),
562 const_iv (SDL_APPMOUSEFOCUS), 627 const_iv (SDL_APPMOUSEFOCUS),
563 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),
564 679
565 const_iv (SDLK_FIRST), 680 const_iv (SDLK_FIRST),
566 const_iv (SDLK_LAST), 681 const_iv (SDLK_LAST),
567 const_iv (SDLK_KP0), 682 const_iv (SDLK_KP0),
568 const_iv (SDLK_KP1), 683 const_iv (SDLK_KP1),
… …
644 const_iv (KMOD_RMETA), 759 const_iv (KMOD_RMETA),
645 const_iv (KMOD_NUM), 760 const_iv (KMOD_NUM),
646 const_iv (KMOD_CAPS), 761 const_iv (KMOD_CAPS),
647 const_iv (KMOD_MODE), 762 const_iv (KMOD_MODE),
648 763
764 const_iv (KMOD_LRAM),
765
649 const_iv (MIX_DEFAULT_FORMAT), 766 const_iv (MIX_DEFAULT_FORMAT),
650 767
651 const_iv (SDL_INIT_TIMER), 768 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO), 769 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO), 770 const_iv (SDL_INIT_VIDEO),
… …
701 818
702NV floor (NV x) 819NV floor (NV x)
703 820
704NV ceil (NV x) 821NV ceil (NV x)
705 822
706NV ceilabs (NV x)
707 CODE:
708 RETVAL = x < 0. ? - ceil (-x) : ceil (x);
709 OUTPUT:
710 RETVAL
711
712IV minpot (UV n) 823IV minpot (UV n)
713 824
714IV popcount (UV n) 825IV popcount (UV n)
715 826
716void 827void
… …
726 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 837 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
727#endif 838#endif
728} 839}
729 840
730char *SDL_GetError () 841char *SDL_GetError ()
842
843void SDL_braino ()
731 844
732int SDL_Init (U32 flags) 845int SDL_Init (U32 flags)
733 846
734int SDL_InitSubSystem (U32 flags) 847int SDL_InitSubSystem (U32 flags)
735 848
… …
844 { 957 {
845 case SDL_KEYDOWN: 958 case SDL_KEYDOWN:
846 case SDL_KEYUP: 959 case SDL_KEYUP:
847 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 960 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
848 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 961 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
849 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 962 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
850 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 963 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
851 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 964 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
852 break; 965 break;
853 966
854 case SDL_ACTIVEEVENT: 967 case SDL_ACTIVEEVENT:
855 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 968 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
873 x = ev.motion.x; 986 x = ev.motion.x;
874 y = ev.motion.y; 987 y = ev.motion.y;
875 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 988 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
876 } 989 }
877 990
878 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 991 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
879 hv_store (hv, "state", 5, newSViv (state), 0); 992 hv_store (hv, "state", 5, newSViv (state), 0);
880 hv_store (hv, "x", 1, newSViv (x), 0); 993 hv_store (hv, "x", 1, newSViv (x), 0);
881 hv_store (hv, "y", 1, newSViv (y), 0); 994 hv_store (hv, "y", 1, newSViv (y), 0);
882 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 995 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
883 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 996 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1099#if DEBUG 1212#if DEBUG
1100 VALGRIND_DO_LEAK_CHECK; 1213 VALGRIND_DO_LEAK_CHECK;
1101#endif 1214#endif
1102} 1215}
1103 1216
1217int
1218SvREFCNT (SV *sv)
1219 CODE:
1220 RETVAL = SvREFCNT (sv);
1221 OUTPUT:
1222 RETVAL
1223
1104MODULE = Deliantra::Client PACKAGE = DC::Font 1224MODULE = Deliantra::Client PACKAGE = DC::Font
1105 1225
1106PROTOTYPES: DISABLE 1226PROTOTYPES: DISABLE
1107 1227
1108DC::Font 1228DC::Font
… …
1537 if (ix) 1657 if (ix)
1538 { 1658 {
1539 glDisable (GL_ALPHA_TEST); 1659 glDisable (GL_ALPHA_TEST);
1540 glDisable (GL_BLEND); 1660 glDisable (GL_BLEND);
1541 } 1661 }
1662}
1663
1664void
1665draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f)
1666 PROTOTYPE: @
1667 CODE:
1668{
1669 glEnable (GL_TEXTURE_2D);
1670 glEnable (GL_BLEND);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672 glBindTexture (GL_TEXTURE_2D, name1);
1673
1674 glColor3f (intensity, intensity, intensity);
1675 glPushMatrix ();
1676 glScalef (1./3, 1./3, 1.);
1677
1678 if (blend > 0.f)
1679 {
1680 float S2, T2; /* 0. 0. for texture 2 */
1681 float w = w1 > w2 ? w1 : w2;
1682 float h = h1 > h2 ? h1 : h2;
1683 GLfloat env_color[4] = { 0., 0., 0., blend };
1684
1685 /* interpolate the two shadow textures */
1686 /* stage 0 == rgb(glcolor) + alpha(t0) */
1687 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1688
1689 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1690 gl.ActiveTexture (GL_TEXTURE1);
1691 glEnable (GL_TEXTURE_2D);
1692 glBindTexture (GL_TEXTURE_2D, name2);
1693 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1694
1695 /* rgb == rgb(glcolor) */
1696 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1697 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1699
1700 /* alpha = interpolate t0, t1 by env_alpha */
1701 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1702
1703 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1705 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1706
1707 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1708 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1709
1710 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1712
1713 s1 *= w / w1;
1714 t1 *= h / h1;
1715
1716 dx *= -3.f / w2;
1717 dy *= -3.f / h2;
1718 dx *= w / w2;
1719 dy *= h / h2;
1720
1721 s2 *= w / w2;
1722 t2 *= h / h2;
1723
1724 glBegin (GL_QUADS);
1725 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);
1726 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);
1727 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);
1728 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);
1729 glEnd ();
1730
1731 glDisable (GL_TEXTURE_2D);
1732 gl.ActiveTexture (GL_TEXTURE0);
1733 }
1734 else
1735 {
1736 /* simple blending of one texture, also opengl <1.3 path */
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1738
1739 glBegin (GL_QUADS);
1740 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1741 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1742 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1743 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1744 glEnd ();
1745 }
1746
1747 glPopMatrix ();
1748
1749 glDisable (GL_TEXTURE_2D);
1750 glDisable (GL_BLEND);
1542} 1751}
1543 1752
1544IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1753IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1545 CODE: 1754 CODE:
1546{ 1755{
… …
1652 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1861 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1653 // use uglier nearest interpolation because linear suffers 1862 // use uglier nearest interpolation because linear suffers
1654 // from transparent color bleeding and ugly wrapping effects. 1863 // from transparent color bleeding and ugly wrapping effects.
1655 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1864 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1656} 1865}
1866
1867void
1868expire_textures (DC::Map self, int texid, int count)
1869 PPCODE:
1870 for (; texid < self->texs && count; ++texid, --count)
1871 {
1872 maptex *tex = self->tex + texid;
1873
1874 if (tex->name)
1875 {
1876 if (tex->unused)
1877 {
1878 tex->name = 0;
1879 tex->unused = 0;
1880 XPUSHs (sv_2mortal (newSViv (texid)));
1881 }
1882 else
1883 tex->unused = 1;
1884 }
1885 }
1657 1886
1658int 1887int
1659ox (DC::Map self) 1888ox (DC::Map self)
1660 ALIAS: 1889 ALIAS:
1661 oy = 1 1890 oy = 1
… …
1782 cell->tile [z] = self->face2tile [face]; 2011 cell->tile [z] = self->face2tile [face];
1783 2012
1784 if (cell->tile [z]) 2013 if (cell->tile [z])
1785 { 2014 {
1786 maptex *tex = self->tex + cell->tile [z]; 2015 maptex *tex = self->tex + cell->tile [z];
2016 tex->unused = 0;
1787 if (!tex->name) 2017 if (!tex->name)
1788 av_push (missing, newSViv (cell->tile [z])); 2018 av_push (missing, newSViv (cell->tile [z]));
1789 2019
1790 if (tex->smoothtile) 2020 if (tex->smoothtile)
1791 { 2021 {
1792 maptex *smooth = self->tex + tex->smoothtile; 2022 maptex *smooth = self->tex + tex->smoothtile;
2023 smooth->unused = 0;
1793 if (!smooth->name) 2024 if (!smooth->name)
1794 av_push (missing, newSViv (tex->smoothtile)); 2025 av_push (missing, newSViv (tex->smoothtile));
1795 } 2026 }
1796 } 2027 }
1797 } 2028 }
… …
1868 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2099 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1869 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2100 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1870 smooth_key skey; 2101 smooth_key skey;
1871 int pl_x, pl_y; 2102 int pl_x, pl_y;
1872 maptex pl_tex; 2103 maptex pl_tex;
1873 rc_t *rc = rc_alloc (); 2104 rc_t *rc = rc_alloc ();
2105 rc_t *rc_ov = rc_alloc ();
1874 rc_key_t key; 2106 rc_key_t key;
1875 rc_array_t *arr; 2107 rc_array_t *arr, *arr_hidden;
1876 2108
1877 pl_tex.name = 0; 2109 pl_tex.name = 0;
1878 2110
1879 // thats current max. sorry. 2111 // that's current max. sorry.
1880 if (sw > 255) sw = 255; 2112 if (sw > 255) sw = 255;
1881 if (sh > 255) sh = 255; 2113 if (sh > 255) sh = 255;
1882 2114
1883 // clear key, in case of extra padding 2115 // clear key, in case of extra padding
1884 memset (&skey, 0, sizeof (skey)); 2116 memset (&skey, 0, sizeof (skey));
… …
1888 key.g = 255; 2120 key.g = 255;
1889 key.b = 255; 2121 key.b = 255;
1890 key.a = 255; 2122 key.a = 255;
1891 key.mode = GL_QUADS; 2123 key.mode = GL_QUADS;
1892 key.format = GL_T2F_V3F; 2124 key.format = GL_T2F_V3F;
1893 key.texname = -1;
1894 2125
1895 mx += self->x; 2126 mx += self->x;
1896 my += self->y; 2127 my += self->y;
1897 2128
1898 // first pass: determine smooth_max 2129 // first pass: determine smooth_max
… …
1919 2150
1920 glEnable (GL_BLEND); 2151 glEnable (GL_BLEND);
1921 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2152 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1922 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2153 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1923 2154
2155 key.texname = self->tex [TEXID_HIDDEN].name;
2156 arr_hidden = rc_array (rc_ov, &key);
2157
1924 for (z = 0; z <= 2; z++) 2158 for (z = 0; z <= 2; z++)
1925 { 2159 {
1926 memset (smooth_level, 0, sizeof (smooth_level)); 2160 memset (smooth_level, 0, sizeof (smooth_level));
2161 key.texname = -1;
1927 2162
1928 for (y = 0; y < sh; y++) 2163 for (y = 0; y < sh; y++)
1929 if (0 <= y + my && y + my < self->rows) 2164 if (0 <= y + my && y + my < self->rows)
1930 { 2165 {
1931 maprow *row = self->row + (y + my); 2166 maprow *row = self->row + (y + my);
… …
1937 tileid tile = cell->tile [z]; 2172 tileid tile = cell->tile [z];
1938 2173
1939 if (tile) 2174 if (tile)
1940 { 2175 {
1941 maptex tex = self->tex [tile]; 2176 maptex tex = self->tex [tile];
1942 int px = (x + 1) * T - tex.w; 2177 int px, py;
1943 int py = (y + 1) * T - tex.h;
1944 2178
1945 if (key.texname != tex.name) 2179 if (key.texname != tex.name)
1946 { 2180 {
2181 self->tex [tile].unused = 0;
2182
1947 if (!tex.name) 2183 if (!tex.name)
1948 tex = self->tex [2]; /* missing, replace by noface */ 2184 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1949 2185
1950 key.texname = tex.name; 2186 key.texname = tex.name;
1951 arr = rc_array (rc, &key); 2187 arr = rc_array (rc, &key);
1952 } 2188 }
2189
2190 px = (x + 1) * T - tex.w;
2191 py = (y + 1) * T - tex.h;
1953 2192
1954 if (expect_false (cell->player == player) && expect_false (z == 2)) 2193 if (expect_false (cell->player == player) && expect_false (z == 2))
1955 { 2194 {
1956 pl_x = px; 2195 pl_x = px;
1957 pl_y = py; 2196 pl_y = py;
… …
1962 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2201 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1963 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2202 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1964 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2203 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1965 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2204 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1966 2205
1967 if (expect_false (cell->flags) && expect_false (z == 2))
1968 {
1969 // overlays such as the speech bubble, probably more to come
1970 if (cell->flags & 1)
1971 {
1972 maptex tex = self->tex [1];
1973 int px = x * T + T * 2 / 32;
1974 int py = y * T - T * 6 / 32;
1975
1976 if (tex.name)
1977 {
1978 if (key.texname != tex.name)
1979 {
1980 key.texname = tex.name;
1981 arr = rc_array (rc, &key);
1982 }
1983
1984 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1985 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1986 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1987 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1988 }
1989 }
1990 }
1991
1992 // update smooth hash 2206 // update smooth hash
1993 if (tex.smoothtile) 2207 if (tex.smoothtile)
1994 { 2208 {
1995 skey.tile = tex.smoothtile; 2209 skey.tile = tex.smoothtile;
1996 skey.level = tex.smoothlevel; 2210 skey.level = tex.smoothlevel;
… …
2024 // corners 2238 // corners
2025 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2239 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2026 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2240 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2027 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2241 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2028 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2242 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2243 }
2244 }
2245
2246 if (expect_false (z == 2))
2247 {
2248 /* draw question marks on top of hidden spaces */
2249 if (!cell->darkness)
2250 {
2251 maptex tex = self->tex [TEXID_HIDDEN];
2252 int px = (x + 1) * T - tex.w;
2253 int py = (y + 1) * T - tex.h;
2254
2255 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2256 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2257 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2258 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2259 }
2260
2261 if (expect_false (cell->flags))
2262 {
2263 // overlays such as the speech bubble, probably more to come
2264 if (cell->flags & 1)
2265 {
2266 rc_key_t key_ov = key;
2267 maptex tex = self->tex [TEXID_SPEECH];
2268 rc_array_t *arr;
2269 int px = x * T + T * 2 / 32;
2270 int py = y * T - T * 6 / 32;
2271
2272 key_ov.texname = tex.name;
2273 arr = rc_array (rc_ov, &key_ov);
2274
2275 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2276 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2277 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2278 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2279 }
2029 } 2280 }
2030 } 2281 }
2031 } 2282 }
2032 } 2283 }
2033 2284
… …
2073 { 2324 {
2074 // this time avoiding texture state changes 2325 // this time avoiding texture state changes
2075 // save gobs of state changes. 2326 // save gobs of state changes.
2076 if (key.texname != tex.name) 2327 if (key.texname != tex.name)
2077 { 2328 {
2329 self->tex [skey->tile].unused = 0;
2330
2078 glEnd (); 2331 glEnd ();
2079 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2332 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2080 glBegin (GL_QUADS); 2333 glBegin (GL_QUADS);
2081 } 2334 }
2082 2335
… …
2128 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2381 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2129 2382
2130 rc_draw (rc); 2383 rc_draw (rc);
2131 } 2384 }
2132 2385
2386 rc_draw (rc_ov);
2387 rc_clear (rc_ov);
2388
2133 glDisable (GL_BLEND); 2389 glDisable (GL_BLEND);
2134 rc_free (rc); 2390 rc_free (rc);
2391 rc_free (rc_ov);
2135 2392
2136 // top layer: overlays such as the health bar 2393 // top layer: overlays such as the health bar
2137 for (y = 0; y < sh; y++) 2394 for (y = 0; y < sh; y++)
2138 if (0 <= y + my && y + my < self->rows) 2395 if (0 <= y + my && y + my < self->rows)
2139 { 2396 {
… …
2144 { 2401 {
2145 mapcell *cell = row->col + (x + mx - row->c0); 2402 mapcell *cell = row->col + (x + mx - row->c0);
2146 2403
2147 int px = x * T; 2404 int px = x * T;
2148 int py = y * T; 2405 int py = y * T;
2406
2407 if (expect_false (cell->player == player))
2408 {
2409 px += sdx;
2410 py += sdy;
2411 }
2149 2412
2150 if (cell->stat_hp) 2413 if (cell->stat_hp)
2151 { 2414 {
2152 int width = cell->stat_width * T; 2415 int width = cell->stat_width * T;
2153 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2416 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2193 }; 2456 };
2194 2457
2195 int x, y; 2458 int x, y;
2196 2459
2197 glEnable (GL_TEXTURE_2D); 2460 glEnable (GL_TEXTURE_2D);
2461 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2462 * but the nvidia driver (185.18.14) mishandles alpha textures
2463 * ansd takes the colour from god knows where instead of using
2464 * Cp. MODULATE results in the same colour, but slightly different
2465 * alpha, but atcually gives us the correct colour with nvidia.
2466 */
2198 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2467 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2199 glEnable (GL_BLEND); 2468 glEnable (GL_BLEND);
2200 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2469 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2201 glBegin (GL_QUADS); 2470 glBegin (GL_QUADS);
2202 2471
2203 for (y = 0; y < h; y++) 2472 for (y = 0; y < h; y++)
… …
2210 float *c = color [m & 15]; 2479 float *c = color [m & 15];
2211 2480
2212 float tx1 = m & 0x40 ? 0.5 : 0.; 2481 float tx1 = m & 0x40 ? 0.5 : 0.;
2213 float tx2 = tx1 + 0.5; 2482 float tx2 = tx1 + 0.5;
2214 2483
2215 glColor4f (c[0], c[1], c[2], 0.75); 2484 glColor4f (c[0], c[1], c[2], 1);
2216 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2485 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2217 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2486 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2218 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2487 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2219 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2488 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2220 } 2489 }
… …
2242 SvCUR_set (darkness3_sv, sw34 * sh3); 2511 SvCUR_set (darkness3_sv, sw34 * sh3);
2243 2512
2244 mx += self->x - 1; 2513 mx += self->x - 1;
2245 my += self->y - 1; 2514 my += self->y - 1;
2246 2515
2247 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1); 2516 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2248 2517
2249 for (y = 0; y < sh1; y++) 2518 for (y = 0; y < sh1; y++)
2250 if (0 <= y + my && y + my < self->rows) 2519 if (0 <= y + my && y + my < self->rows)
2251 { 2520 {
2252 maprow *row = self->row + (y + my); 2521 maprow *row = self->row + (y + my);
… …
2255 if (row->c0 <= x + mx && x + mx < row->c1) 2524 if (row->c0 <= x + mx && x + mx < row->c1)
2256 { 2525 {
2257 mapcell *cell = row->col + (x + mx - row->c0); 2526 mapcell *cell = row->col + (x + mx - row->c0);
2258 2527
2259 darkness1 [y * sw1 + x] = cell->darkness 2528 darkness1 [y * sw1 + x] = cell->darkness
2260 ? 255 - (cell->darkness - 1) 2529 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2261 : 255 - FOW_DARKNESS; 2530 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2262 } 2531 }
2263 } 2532 }
2264 2533
2265 for (y = 0; y < sh; ++y) 2534 for (y = 0; y < sh; ++y)
2266 for (x = 0; x < sw; ++x) 2535 for (x = 0; x < sw; ++x)
… …
2679 } *civ, const_iv[] = { 2948 } *civ, const_iv[] = {
2680# define const_iv(name) { # name, (IV)name } 2949# define const_iv(name) { # name, (IV)name }
2681 const_iv (GL_VENDOR), 2950 const_iv (GL_VENDOR),
2682 const_iv (GL_VERSION), 2951 const_iv (GL_VERSION),
2683 const_iv (GL_EXTENSIONS), 2952 const_iv (GL_EXTENSIONS),
2953 const_iv (GL_MAX_TEXTURE_UNITS),
2684 const_iv (GL_COLOR_MATERIAL), 2954 const_iv (GL_COLOR_MATERIAL),
2685 const_iv (GL_SMOOTH), 2955 const_iv (GL_SMOOTH),
2686 const_iv (GL_FLAT), 2956 const_iv (GL_FLAT),
2687 const_iv (GL_DITHER), 2957 const_iv (GL_DITHER),
2688 const_iv (GL_BLEND), 2958 const_iv (GL_BLEND),
… …
2700 const_iv (GL_ZERO), 2970 const_iv (GL_ZERO),
2701 const_iv (GL_SRC_ALPHA), 2971 const_iv (GL_SRC_ALPHA),
2702 const_iv (GL_DST_ALPHA), 2972 const_iv (GL_DST_ALPHA),
2703 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2973 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2704 const_iv (GL_ONE_MINUS_DST_ALPHA), 2974 const_iv (GL_ONE_MINUS_DST_ALPHA),
2975 const_iv (GL_SRC_COLOR),
2976 const_iv (GL_DST_COLOR),
2977 const_iv (GL_ONE_MINUS_SRC_COLOR),
2978 const_iv (GL_ONE_MINUS_DST_COLOR),
2705 const_iv (GL_SRC_ALPHA_SATURATE), 2979 const_iv (GL_SRC_ALPHA_SATURATE),
2706 const_iv (GL_RGB), 2980 const_iv (GL_RGB),
2707 const_iv (GL_RGBA), 2981 const_iv (GL_RGBA),
2708 const_iv (GL_RGBA4), 2982 const_iv (GL_RGBA4),
2709 const_iv (GL_RGBA8), 2983 const_iv (GL_RGBA8),
… …
2777 const_iv (GL_NICEST), 3051 const_iv (GL_NICEST),
2778 const_iv (GL_V2F), 3052 const_iv (GL_V2F),
2779 const_iv (GL_V3F), 3053 const_iv (GL_V3F),
2780 const_iv (GL_T2F_V3F), 3054 const_iv (GL_T2F_V3F),
2781 const_iv (GL_T2F_N3F_V3F), 3055 const_iv (GL_T2F_N3F_V3F),
3056 const_iv (GL_FUNC_ADD),
3057 const_iv (GL_FUNC_SUBTRACT),
3058 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2782# undef const_iv 3059# undef const_iv
2783 }; 3060 };
2784 3061
2785 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3062 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2786 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3063 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2793disable_GL_EXT_blend_func_separate () 3070disable_GL_EXT_blend_func_separate ()
2794 CODE: 3071 CODE:
2795 gl.BlendFuncSeparate = 0; 3072 gl.BlendFuncSeparate = 0;
2796 gl.BlendFuncSeparateEXT = 0; 3073 gl.BlendFuncSeparateEXT = 0;
2797 3074
3075void
3076apple_nvidia_bug (int enable)
3077
2798char * 3078char *
2799gl_vendor () 3079gl_vendor ()
2800 CODE: 3080 CODE:
2801 RETVAL = (char *)glGetString (GL_VENDOR); 3081 RETVAL = (char *)glGetString (GL_VENDOR);
2802 OUTPUT: 3082 OUTPUT:
… …
2851 3131
2852void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3132void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2853 CODE: 3133 CODE:
2854 gl_BlendFuncSeparate (sa, da, saa, daa); 3134 gl_BlendFuncSeparate (sa, da, saa, daa);
2855 3135
3136# void glBlendEquation (int se)
3137
2856void glDepthMask (int flag) 3138void glDepthMask (int flag)
2857 3139
2858void glLogicOp (int opcode) 3140void glLogicOp (int opcode)
2859 3141
2860void glColorMask (int red, int green, int blue, int alpha) 3142void glColorMask (int red, int green, int blue, int alpha)
… …
2894void glRotate (float angle, float x, float y, float z) 3176void glRotate (float angle, float x, float y, float z)
2895 CODE: 3177 CODE:
2896 glRotatef (angle, x, y, z); 3178 glRotatef (angle, x, y, z);
2897 3179
2898void glColor (float r, float g, float b, float a = 1.0) 3180void glColor (float r, float g, float b, float a = 1.0)
3181 PROTOTYPE: @
2899 ALIAS: 3182 ALIAS:
2900 glColor_premultiply = 1 3183 glColor_premultiply = 1
2901 CODE: 3184 CODE:
2902 if (ix) 3185 if (ix)
2903 { 3186 {

Diff Legend

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