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.293 by root, Thu Dec 17 02:49:38 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
82 87
83#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
85 90
86#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
87 92
88/* mask out modifiers we are not interested in */ 93/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95
96#define KMOD_LRAM 0x10000 // our extension
97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
90 101
91static AV *texture_av; 102static AV *texture_av;
92 103
93static struct 104static struct
94{ 105{
… …
226 int w, h; 237 int w, h;
227 float s, t; 238 float s, t;
228 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
229 tileid smoothtile; 240 tileid smoothtile;
230 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
231} maptex; 243} maptex;
232 244
233typedef struct { 245typedef struct {
234 uint32_t player; 246 uint32_t player;
235 tileid tile[3]; 247 tileid tile[3];
… …
367 self->oy = 0; 379 self->oy = 0;
368 self->row = 0; 380 self->row = 0;
369 self->rows = 0; 381 self->rows = 0;
370} 382}
371 383
384#define CELL_CLEAR(cell) \
385 do { \
386 if ((cell)->player) \
387 (cell)->tile [2] = 0; \
388 (cell)->darkness = 0; \
389 (cell)->stat_hp = 0; \
390 (cell)->flags = 0; \
391 (cell)->player = 0; \
392 } while (0)
393
372static void 394static void
373map_blank (DC__Map self, int x0, int y0, int w, int h) 395map_blank (DC__Map self, int x0, int y0, int w, int h)
374{ 396{
375 int x, y; 397 int x, y;
376 maprow *row; 398 maprow *row;
… …
390 if (x >= row->c1) 412 if (x >= row->c1)
391 break; 413 break;
392 414
393 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
394 416
395 cell->darkness = 0; 417 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 418 }
400 } 419 }
401} 420}
402 421
403typedef struct { 422typedef struct {
… …
514 if (!svp || !SvTRUE (*svp)) 533 if (!svp || !SvTRUE (*svp))
515 return 0; 534 return 0;
516 535
517 return 1; 536 return 1;
518} 537}
538
539/******************************************************************************/
540
541/* process keyboard modifiers */
542static int
543mod_munge (int mod)
544{
545 mod &= MOD_MASK;
546
547 if (mod & (KMOD_META | KMOD_ALT))
548 mod |= KMOD_LRAM;
549
550 return mod;
551}
552
553static void
554deliantra_main ()
555{
556 char *argv[] = { 0 };
557 call_argv ("::main", G_DISCARD | G_VOID, argv);
558}
559
560#ifdef __MACOSX__
561 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back.
566 */
567 extern C_LINKAGE int
568 main (int argc, char *argv[])
569 {
570 deliantra_main ();
571 }
572
573 #undef main
574
575 extern C_LINKAGE int main (int argc, char *argv[]);
576
577 static void
578 SDL_braino (void)
579 {
580 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv);
582 }
583#else
584 static void
585 SDL_braino (void)
586 {
587 deliantra_main ();
588 }
589#endif
519 590
520MODULE = Deliantra::Client PACKAGE = DC 591MODULE = Deliantra::Client PACKAGE = DC
521 592
522PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
523 594
… …
552 const_iv (SDL_USEREVENT), 623 const_iv (SDL_USEREVENT),
553 624
554 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
555 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
556 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
628
629
630 const_iv (SDLK_UNKNOWN),
631 const_iv (SDLK_FIRST),
632 const_iv (SDLK_BACKSPACE),
633 const_iv (SDLK_TAB),
634 const_iv (SDLK_CLEAR),
635 const_iv (SDLK_RETURN),
636 const_iv (SDLK_PAUSE),
637 const_iv (SDLK_ESCAPE),
638 const_iv (SDLK_SPACE),
639 const_iv (SDLK_EXCLAIM),
640 const_iv (SDLK_QUOTEDBL),
641 const_iv (SDLK_HASH),
642 const_iv (SDLK_DOLLAR),
643 const_iv (SDLK_AMPERSAND),
644 const_iv (SDLK_QUOTE),
645 const_iv (SDLK_LEFTPAREN),
646 const_iv (SDLK_RIGHTPAREN),
647 const_iv (SDLK_ASTERISK),
648 const_iv (SDLK_PLUS),
649 const_iv (SDLK_COMMA),
650 const_iv (SDLK_MINUS),
651 const_iv (SDLK_PERIOD),
652 const_iv (SDLK_SLASH),
653 const_iv (SDLK_0),
654 const_iv (SDLK_1),
655 const_iv (SDLK_2),
656 const_iv (SDLK_3),
657 const_iv (SDLK_4),
658 const_iv (SDLK_5),
659 const_iv (SDLK_6),
660 const_iv (SDLK_7),
661 const_iv (SDLK_8),
662 const_iv (SDLK_9),
663 const_iv (SDLK_COLON),
664 const_iv (SDLK_SEMICOLON),
665 const_iv (SDLK_LESS),
666 const_iv (SDLK_EQUALS),
667 const_iv (SDLK_GREATER),
668 const_iv (SDLK_QUESTION),
669 const_iv (SDLK_AT),
670
671 const_iv (SDLK_LEFTBRACKET),
672 const_iv (SDLK_BACKSLASH),
673 const_iv (SDLK_RIGHTBRACKET),
674 const_iv (SDLK_CARET),
675 const_iv (SDLK_UNDERSCORE),
676 const_iv (SDLK_BACKQUOTE),
677 const_iv (SDLK_DELETE),
557 678
558 const_iv (SDLK_FIRST), 679 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST), 680 const_iv (SDLK_LAST),
560 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
561 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
… …
637 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
638 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
639 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
640 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
641 762
763 const_iv (KMOD_LRAM),
764
642 const_iv (MIX_DEFAULT_FORMAT), 765 const_iv (MIX_DEFAULT_FORMAT),
643 766
644 const_iv (SDL_INIT_TIMER), 767 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO), 768 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO), 769 const_iv (SDL_INIT_VIDEO),
… …
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 787 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO), 788 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 789 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES), 790 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL), 791 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL) 792 const_iv (SDL_GL_SWAP_CONTROL),
793
794 const_iv (FOW_DARKNESS)
670# undef const_iv 795# undef const_iv
671 }; 796 };
672 797
673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
711 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 836 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
712#endif 837#endif
713} 838}
714 839
715char *SDL_GetError () 840char *SDL_GetError ()
841
842void SDL_braino ()
716 843
717int SDL_Init (U32 flags) 844int SDL_Init (U32 flags)
718 845
719int SDL_InitSubSystem (U32 flags) 846int SDL_InitSubSystem (U32 flags)
720 847
… …
829 { 956 {
830 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
831 case SDL_KEYUP: 958 case SDL_KEYUP:
832 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
833 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 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); 961 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 */ 962 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); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
837 break; 964 break;
838 965
839 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
840 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
858 x = ev.motion.x; 985 x = ev.motion.x;
859 y = ev.motion.y; 986 y = ev.motion.y;
860 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
861 } 988 }
862 989
863 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
864 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
865 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
866 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
867 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
868 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1084#if DEBUG 1211#if DEBUG
1085 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
1086#endif 1213#endif
1087} 1214}
1088 1215
1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
1089MODULE = Deliantra::Client PACKAGE = DC::Font 1223MODULE = Deliantra::Client PACKAGE = DC::Font
1090 1224
1091PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
1092 1226
1093DC::Font 1227DC::Font
… …
1522 if (ix) 1656 if (ix)
1523 { 1657 {
1524 glDisable (GL_ALPHA_TEST); 1658 glDisable (GL_ALPHA_TEST);
1525 glDisable (GL_BLEND); 1659 glDisable (GL_BLEND);
1526 } 1660 }
1661}
1662
1663void
1664draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1)
1665 PROTOTYPE: @
1666 CODE:
1667{
1668 glEnable (GL_TEXTURE_2D);
1669 glEnable (GL_BLEND);
1670 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672
1673 glColor4f (intensity, intensity, intensity, 0.9);
1674 glPushMatrix ();
1675 glScalef (1./3, 1./3, 1.);
1676
1677 glBindTexture (GL_TEXTURE_2D, name1);
1678
1679 glBegin (GL_QUADS);
1680 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1681 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1682 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1683 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1684 glEnd ();
1685
1686 glPopMatrix ();
1687
1688 glDisable (GL_TEXTURE_2D);
1689 glDisable (GL_BLEND);
1527} 1690}
1528 1691
1529IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1692IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1530 CODE: 1693 CODE:
1531{ 1694{
… …
1637 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1800 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1638 // use uglier nearest interpolation because linear suffers 1801 // use uglier nearest interpolation because linear suffers
1639 // from transparent color bleeding and ugly wrapping effects. 1802 // from transparent color bleeding and ugly wrapping effects.
1640 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1803 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1641} 1804}
1805
1806void
1807expire_textures (DC::Map self, int texid, int count)
1808 PPCODE:
1809 for (; texid < self->texs && count; ++texid, --count)
1810 {
1811 maptex *tex = self->tex + texid;
1812
1813 if (tex->name)
1814 {
1815 if (tex->unused)
1816 {
1817 tex->name = 0;
1818 tex->unused = 0;
1819 XPUSHs (sv_2mortal (newSViv (texid)));
1820 }
1821 else
1822 tex->unused = 1;
1823 }
1824 }
1642 1825
1643int 1826int
1644ox (DC::Map self) 1827ox (DC::Map self)
1645 ALIAS: 1828 ALIAS:
1646 oy = 1 1829 oy = 1
… …
1767 cell->tile [z] = self->face2tile [face]; 1950 cell->tile [z] = self->face2tile [face];
1768 1951
1769 if (cell->tile [z]) 1952 if (cell->tile [z])
1770 { 1953 {
1771 maptex *tex = self->tex + cell->tile [z]; 1954 maptex *tex = self->tex + cell->tile [z];
1955 tex->unused = 0;
1772 if (!tex->name) 1956 if (!tex->name)
1773 av_push (missing, newSViv (cell->tile [z])); 1957 av_push (missing, newSViv (cell->tile [z]));
1774 1958
1775 if (tex->smoothtile) 1959 if (tex->smoothtile)
1776 { 1960 {
1777 maptex *smooth = self->tex + tex->smoothtile; 1961 maptex *smooth = self->tex + tex->smoothtile;
1962 smooth->unused = 0;
1778 if (!smooth->name) 1963 if (!smooth->name)
1779 av_push (missing, newSViv (tex->smoothtile)); 1964 av_push (missing, newSViv (tex->smoothtile));
1780 } 1965 }
1781 } 1966 }
1782 } 1967 }
1783 } 1968 }
1784 else 1969 else
1785 cell->darkness = 0; 1970 CELL_CLEAR (cell);
1786 } 1971 }
1787} 1972}
1788 OUTPUT: 1973 OUTPUT:
1789 RETVAL 1974 RETVAL
1790 1975
… …
1842} 2027}
1843 OUTPUT: 2028 OUTPUT:
1844 RETVAL 2029 RETVAL
1845 2030
1846void 2031void
1847draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2032draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1848 CODE: 2033 CODE:
1849{ 2034{
1850 int x, y, z; 2035 int x, y, z;
1851 2036
1852 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2037 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1853 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2038 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) 2039 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1855 smooth_key skey; 2040 smooth_key skey;
1856 int pl_x, pl_y; 2041 int pl_x, pl_y;
1857 maptex pl_tex; 2042 maptex pl_tex;
1858 rc_t *rc = rc_alloc (); 2043 rc_t *rc = rc_alloc ();
2044 rc_t *rc_ov = rc_alloc ();
1859 rc_key_t key; 2045 rc_key_t key;
1860 rc_array_t *arr; 2046 rc_array_t *arr, *arr_hidden;
1861 2047
1862 pl_tex.name = 0; 2048 pl_tex.name = 0;
1863 2049
1864 // thats current max. sorry. 2050 // that's current max. sorry.
1865 if (sw > 255) sw = 255; 2051 if (sw > 255) sw = 255;
1866 if (sh > 255) sh = 255; 2052 if (sh > 255) sh = 255;
1867 2053
1868 // clear key, in case of extra padding 2054 // clear key, in case of extra padding
1869 memset (&skey, 0, sizeof (skey)); 2055 memset (&skey, 0, sizeof (skey));
… …
1873 key.g = 255; 2059 key.g = 255;
1874 key.b = 255; 2060 key.b = 255;
1875 key.a = 255; 2061 key.a = 255;
1876 key.mode = GL_QUADS; 2062 key.mode = GL_QUADS;
1877 key.format = GL_T2F_V3F; 2063 key.format = GL_T2F_V3F;
1878 key.texname = -1;
1879 2064
1880 mx += self->x; 2065 mx += self->x;
1881 my += self->y; 2066 my += self->y;
1882 2067
1883 // first pass: determine smooth_max 2068 // first pass: determine smooth_max
… …
1904 2089
1905 glEnable (GL_BLEND); 2090 glEnable (GL_BLEND);
1906 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2091 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1907 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1908 2093
2094 key.texname = self->tex [TEXID_HIDDEN].name;
2095 arr_hidden = rc_array (rc_ov, &key);
2096
1909 for (z = 0; z <= 2; z++) 2097 for (z = 0; z <= 2; z++)
1910 { 2098 {
1911 memset (smooth_level, 0, sizeof (smooth_level)); 2099 memset (smooth_level, 0, sizeof (smooth_level));
2100 key.texname = -1;
1912 2101
1913 for (y = 0; y < sh; y++) 2102 for (y = 0; y < sh; y++)
1914 if (0 <= y + my && y + my < self->rows) 2103 if (0 <= y + my && y + my < self->rows)
1915 { 2104 {
1916 maprow *row = self->row + (y + my); 2105 maprow *row = self->row + (y + my);
… …
1922 tileid tile = cell->tile [z]; 2111 tileid tile = cell->tile [z];
1923 2112
1924 if (tile) 2113 if (tile)
1925 { 2114 {
1926 maptex tex = self->tex [tile]; 2115 maptex tex = self->tex [tile];
1927 int px = (x + 1) * T - tex.w; 2116 int px, py;
1928 int py = (y + 1) * T - tex.h;
1929 2117
1930 if (key.texname != tex.name) 2118 if (key.texname != tex.name)
1931 { 2119 {
2120 self->tex [tile].unused = 0;
2121
1932 if (!tex.name) 2122 if (!tex.name)
1933 tex = self->tex [2]; /* missing, replace by noface */ 2123 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1934 2124
1935 key.texname = tex.name; 2125 key.texname = tex.name;
1936 arr = rc_array (rc, &key); 2126 arr = rc_array (rc, &key);
1937 } 2127 }
2128
2129 px = (x + 1) * T - tex.w;
2130 py = (y + 1) * T - tex.h;
1938 2131
1939 if (expect_false (cell->player == player) && expect_false (z == 2)) 2132 if (expect_false (cell->player == player) && expect_false (z == 2))
1940 { 2133 {
1941 pl_x = px; 2134 pl_x = px;
1942 pl_y = py; 2135 pl_y = py;
… …
1947 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2140 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1948 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2141 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); 2142 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); 2143 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1951 2144
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 2145 // update smooth hash
1978 if (tex.smoothtile) 2146 if (tex.smoothtile)
1979 { 2147 {
1980 skey.tile = tex.smoothtile; 2148 skey.tile = tex.smoothtile;
1981 skey.level = tex.smoothlevel; 2149 skey.level = tex.smoothlevel;
… …
2009 // corners 2177 // corners
2010 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2178 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); 2179 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); 2180 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); 2181 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2182 }
2183 }
2184
2185 if (expect_false (z == 2))
2186 {
2187 /* draw question marks on top of hidden spaces */
2188 if (!cell->darkness)
2189 {
2190 maptex tex = self->tex [TEXID_HIDDEN];
2191 int px = (x + 1) * T - tex.w;
2192 int py = (y + 1) * T - tex.h;
2193
2194 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2195 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2196 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2197 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2198 }
2199
2200 if (expect_false (cell->flags))
2201 {
2202 // overlays such as the speech bubble, probably more to come
2203 if (cell->flags & 1)
2204 {
2205 rc_key_t key_ov = key;
2206 maptex tex = self->tex [TEXID_SPEECH];
2207 rc_array_t *arr;
2208 int px = x * T + T * 2 / 32;
2209 int py = y * T - T * 6 / 32;
2210
2211 key_ov.texname = tex.name;
2212 arr = rc_array (rc_ov, &key_ov);
2213
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2218 }
2014 } 2219 }
2015 } 2220 }
2016 } 2221 }
2017 } 2222 }
2018 2223
… …
2058 { 2263 {
2059 // this time avoiding texture state changes 2264 // this time avoiding texture state changes
2060 // save gobs of state changes. 2265 // save gobs of state changes.
2061 if (key.texname != tex.name) 2266 if (key.texname != tex.name)
2062 { 2267 {
2268 self->tex [skey->tile].unused = 0;
2269
2063 glEnd (); 2270 glEnd ();
2064 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2271 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2065 glBegin (GL_QUADS); 2272 glBegin (GL_QUADS);
2066 } 2273 }
2067 2274
… …
2099 } 2306 }
2100 2307
2101 if (pl_tex.name) 2308 if (pl_tex.name)
2102 { 2309 {
2103 maptex tex = pl_tex; 2310 maptex tex = pl_tex;
2104 int px = pl_x + pdx; 2311 int px = pl_x + sdx;
2105 int py = pl_y + pdy; 2312 int py = pl_y + sdy;
2106 2313
2107 key.texname = tex.name; 2314 key.texname = tex.name;
2108 arr = rc_array (rc, &key); 2315 arr = rc_array (rc, &key);
2109 2316
2110 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2317 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
… …
2113 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2320 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2114 2321
2115 rc_draw (rc); 2322 rc_draw (rc);
2116 } 2323 }
2117 2324
2325 rc_draw (rc_ov);
2326 rc_clear (rc_ov);
2327
2118 glDisable (GL_BLEND); 2328 glDisable (GL_BLEND);
2119 rc_free (rc); 2329 rc_free (rc);
2330 rc_free (rc_ov);
2120 2331
2121 // top layer: overlays such as the health bar 2332 // top layer: overlays such as the health bar
2122 for (y = 0; y < sh; y++) 2333 for (y = 0; y < sh; y++)
2123 if (0 <= y + my && y + my < self->rows) 2334 if (0 <= y + my && y + my < self->rows)
2124 { 2335 {
… …
2129 { 2340 {
2130 mapcell *cell = row->col + (x + mx - row->c0); 2341 mapcell *cell = row->col + (x + mx - row->c0);
2131 2342
2132 int px = x * T; 2343 int px = x * T;
2133 int py = y * T; 2344 int py = y * T;
2345
2346 if (expect_false (cell->player == player))
2347 {
2348 px += sdx;
2349 py += sdy;
2350 }
2134 2351
2135 if (cell->stat_hp) 2352 if (cell->stat_hp)
2136 { 2353 {
2137 int width = cell->stat_width * T; 2354 int width = cell->stat_width * T;
2138 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2178 }; 2395 };
2179 2396
2180 int x, y; 2397 int x, y;
2181 2398
2182 glEnable (GL_TEXTURE_2D); 2399 glEnable (GL_TEXTURE_2D);
2400 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2401 * but the nvidia driver (185.18.14) mishandles alpha textures
2402 * ansd takes the colour from god knows where instead of using
2403 * Cp. MODULATE results in the same colour, but slightly different
2404 * alpha, but atcually gives us the correct colour with nvidia.
2405 */
2183 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2184 glEnable (GL_BLEND); 2407 glEnable (GL_BLEND);
2185 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2408 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2186 glBegin (GL_QUADS); 2409 glBegin (GL_QUADS);
2187 2410
2188 for (y = 0; y < h; y++) 2411 for (y = 0; y < h; y++)
… …
2195 float *c = color [m & 15]; 2418 float *c = color [m & 15];
2196 2419
2197 float tx1 = m & 0x40 ? 0.5 : 0.; 2420 float tx1 = m & 0x40 ? 0.5 : 0.;
2198 float tx2 = tx1 + 0.5; 2421 float tx2 = tx1 + 0.5;
2199 2422
2200 glColor4f (c[0], c[1], c[2], 0.75); 2423 glColor4f (c[0], c[1], c[2], 1);
2201 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2202 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2203 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2204 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2427 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2205 } 2428 }
… …
2227 SvCUR_set (darkness3_sv, sw34 * sh3); 2450 SvCUR_set (darkness3_sv, sw34 * sh3);
2228 2451
2229 mx += self->x - 1; 2452 mx += self->x - 1;
2230 my += self->y - 1; 2453 my += self->y - 1;
2231 2454
2232 memset (darkness1, 255, sw1 * sh1); 2455 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2233 2456
2234 for (y = 0; y < sh1; y++) 2457 for (y = 0; y < sh1; y++)
2235 if (0 <= y + my && y + my < self->rows) 2458 if (0 <= y + my && y + my < self->rows)
2236 { 2459 {
2237 maprow *row = self->row + (y + my); 2460 maprow *row = self->row + (y + my);
… …
2664 } *civ, const_iv[] = { 2887 } *civ, const_iv[] = {
2665# define const_iv(name) { # name, (IV)name } 2888# define const_iv(name) { # name, (IV)name }
2666 const_iv (GL_VENDOR), 2889 const_iv (GL_VENDOR),
2667 const_iv (GL_VERSION), 2890 const_iv (GL_VERSION),
2668 const_iv (GL_EXTENSIONS), 2891 const_iv (GL_EXTENSIONS),
2892 const_iv (GL_MAX_TEXTURE_UNITS),
2669 const_iv (GL_COLOR_MATERIAL), 2893 const_iv (GL_COLOR_MATERIAL),
2670 const_iv (GL_SMOOTH), 2894 const_iv (GL_SMOOTH),
2671 const_iv (GL_FLAT), 2895 const_iv (GL_FLAT),
2672 const_iv (GL_DITHER), 2896 const_iv (GL_DITHER),
2673 const_iv (GL_BLEND), 2897 const_iv (GL_BLEND),
… …
2685 const_iv (GL_ZERO), 2909 const_iv (GL_ZERO),
2686 const_iv (GL_SRC_ALPHA), 2910 const_iv (GL_SRC_ALPHA),
2687 const_iv (GL_DST_ALPHA), 2911 const_iv (GL_DST_ALPHA),
2688 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2912 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2689 const_iv (GL_ONE_MINUS_DST_ALPHA), 2913 const_iv (GL_ONE_MINUS_DST_ALPHA),
2914 const_iv (GL_SRC_COLOR),
2915 const_iv (GL_DST_COLOR),
2916 const_iv (GL_ONE_MINUS_SRC_COLOR),
2917 const_iv (GL_ONE_MINUS_DST_COLOR),
2690 const_iv (GL_SRC_ALPHA_SATURATE), 2918 const_iv (GL_SRC_ALPHA_SATURATE),
2691 const_iv (GL_RGB), 2919 const_iv (GL_RGB),
2692 const_iv (GL_RGBA), 2920 const_iv (GL_RGBA),
2693 const_iv (GL_RGBA4), 2921 const_iv (GL_RGBA4),
2694 const_iv (GL_RGBA8), 2922 const_iv (GL_RGBA8),
… …
2762 const_iv (GL_NICEST), 2990 const_iv (GL_NICEST),
2763 const_iv (GL_V2F), 2991 const_iv (GL_V2F),
2764 const_iv (GL_V3F), 2992 const_iv (GL_V3F),
2765 const_iv (GL_T2F_V3F), 2993 const_iv (GL_T2F_V3F),
2766 const_iv (GL_T2F_N3F_V3F), 2994 const_iv (GL_T2F_N3F_V3F),
2995 const_iv (GL_FUNC_ADD),
2996 const_iv (GL_FUNC_SUBTRACT),
2997 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2767# undef const_iv 2998# undef const_iv
2768 }; 2999 };
2769 3000
2770 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3001 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2771 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2778disable_GL_EXT_blend_func_separate () 3009disable_GL_EXT_blend_func_separate ()
2779 CODE: 3010 CODE:
2780 gl.BlendFuncSeparate = 0; 3011 gl.BlendFuncSeparate = 0;
2781 gl.BlendFuncSeparateEXT = 0; 3012 gl.BlendFuncSeparateEXT = 0;
2782 3013
3014void
3015apple_nvidia_bug (int enable)
3016
2783char * 3017char *
2784gl_vendor () 3018gl_vendor ()
2785 CODE: 3019 CODE:
2786 RETVAL = (char *)glGetString (GL_VENDOR); 3020 RETVAL = (char *)glGetString (GL_VENDOR);
2787 OUTPUT: 3021 OUTPUT:
… …
2836 3070
2837void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3071void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2838 CODE: 3072 CODE:
2839 gl_BlendFuncSeparate (sa, da, saa, daa); 3073 gl_BlendFuncSeparate (sa, da, saa, daa);
2840 3074
3075# void glBlendEquation (int se)
3076
2841void glDepthMask (int flag) 3077void glDepthMask (int flag)
2842 3078
2843void glLogicOp (int opcode) 3079void glLogicOp (int opcode)
2844 3080
2845void glColorMask (int red, int green, int blue, int alpha) 3081void glColorMask (int red, int green, int blue, int alpha)
… …
2879void glRotate (float angle, float x, float y, float z) 3115void glRotate (float angle, float x, float y, float z)
2880 CODE: 3116 CODE:
2881 glRotatef (angle, x, y, z); 3117 glRotatef (angle, x, y, z);
2882 3118
2883void glColor (float r, float g, float b, float a = 1.0) 3119void glColor (float r, float g, float b, float a = 1.0)
3120 PROTOTYPE: @
2884 ALIAS: 3121 ALIAS:
2885 glColor_premultiply = 1 3122 glColor_premultiply = 1
2886 CODE: 3123 CODE:
2887 if (ix) 3124 if (ix)
2888 { 3125 {

Diff Legend

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