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.263 by root, Fri Jul 18 21:18:42 2008 UTC vs.
Revision 1.292 by root, Fri Dec 4 15:04: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
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),
647 const_iv (SDL_INIT_CDROM), 770 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK), 771 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING), 772 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE), 773 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD), 774 const_iv (SDL_INIT_EVENTTHREAD),
775
776 const_iv (SDL_GL_RED_SIZE),
777 const_iv (SDL_GL_GREEN_SIZE),
778 const_iv (SDL_GL_BLUE_SIZE),
779 const_iv (SDL_GL_ALPHA_SIZE),
780 const_iv (SDL_GL_DOUBLEBUFFER),
781 const_iv (SDL_GL_BUFFER_SIZE),
782 const_iv (SDL_GL_DEPTH_SIZE),
783 const_iv (SDL_GL_STENCIL_SIZE),
784 const_iv (SDL_GL_ACCUM_RED_SIZE),
785 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
786 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
787 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
788 const_iv (SDL_GL_STEREO),
789 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
790 const_iv (SDL_GL_MULTISAMPLESAMPLES),
791 const_iv (SDL_GL_ACCELERATED_VISUAL),
792 const_iv (SDL_GL_SWAP_CONTROL),
793
794 const_iv (FOW_DARKNESS)
652# undef const_iv 795# undef const_iv
653 }; 796 };
654 797
655 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; )
656 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
694#endif 837#endif
695} 838}
696 839
697char *SDL_GetError () 840char *SDL_GetError ()
698 841
842void SDL_braino ()
843
699int SDL_Init (U32 flags) 844int SDL_Init (U32 flags)
700 845
701int SDL_InitSubSystem (U32 flags) 846int SDL_InitSubSystem (U32 flags)
702 847
703void SDL_QuitSubSystem (U32 flags) 848void SDL_QuitSubSystem (U32 flags)
704 849
705void SDL_Quit () 850void SDL_Quit ()
851
852int SDL_GL_SetAttribute (int attr, int value)
853
854int SDL_GL_GetAttribute (int attr)
855 CODE:
856 if (SDL_GL_GetAttribute (attr, &RETVAL))
857 XSRETURN_UNDEF;
858 OUTPUT:
859 RETVAL
706 860
707void 861void
708SDL_ListModes (int rgb, int alpha) 862SDL_ListModes (int rgb, int alpha)
709 PPCODE: 863 PPCODE:
710{ 864{
… …
722 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 876 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
723 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
724 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
725 879
726 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 880 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
727#if SDL_VERSION_ATLEAST(1,2,10)
728 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
729 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 881 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
730#endif
731 882
732 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 883 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
733 884
734 if (m && m != (SDL_Rect **)-1) 885 if (m && m != (SDL_Rect **)-1)
735 while (*m) 886 while (*m)
736 { 887 {
888 if ((*m)->w >= 400 && (*m)->h >= 300)
889 {
737 AV *av = newAV (); 890 AV *av = newAV ();
738 av_push (av, newSViv ((*m)->w)); 891 av_push (av, newSViv ((*m)->w));
739 av_push (av, newSViv ((*m)->h)); 892 av_push (av, newSViv ((*m)->h));
740 av_push (av, newSViv (rgb)); 893 av_push (av, newSViv (rgb));
741 av_push (av, newSViv (alpha)); 894 av_push (av, newSViv (alpha));
742 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 895 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
896 }
743 897
744 ++m; 898 ++m;
745 } 899 }
746} 900}
747 901
… …
802 { 956 {
803 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
804 case SDL_KEYUP: 958 case SDL_KEYUP:
805 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
806 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
807 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);
808 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 */
809 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
810 break; 964 break;
811 965
812 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
813 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
831 x = ev.motion.x; 985 x = ev.motion.x;
832 y = ev.motion.y; 986 y = ev.motion.y;
833 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
834 } 988 }
835 989
836 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
837 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
838 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
839 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
840 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
841 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1057#if DEBUG 1211#if DEBUG
1058 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
1059#endif 1213#endif
1060} 1214}
1061 1215
1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
1062MODULE = Deliantra::Client PACKAGE = DC::Font 1223MODULE = Deliantra::Client PACKAGE = DC::Font
1063 1224
1064PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
1065 1226
1066DC::Font 1227DC::Font
… …
1610 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1771 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1611 // use uglier nearest interpolation because linear suffers 1772 // use uglier nearest interpolation because linear suffers
1612 // from transparent color bleeding and ugly wrapping effects. 1773 // from transparent color bleeding and ugly wrapping effects.
1613 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1774 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1614} 1775}
1776
1777void
1778expire_textures (DC::Map self, int texid, int count)
1779 PPCODE:
1780 for (; texid < self->texs && count; ++texid, --count)
1781 {
1782 maptex *tex = self->tex + texid;
1783
1784 if (tex->name)
1785 {
1786 if (tex->unused)
1787 {
1788 tex->name = 0;
1789 tex->unused = 0;
1790 XPUSHs (sv_2mortal (newSViv (texid)));
1791 }
1792 else
1793 tex->unused = 1;
1794 }
1795 }
1615 1796
1616int 1797int
1617ox (DC::Map self) 1798ox (DC::Map self)
1618 ALIAS: 1799 ALIAS:
1619 oy = 1 1800 oy = 1
… …
1740 cell->tile [z] = self->face2tile [face]; 1921 cell->tile [z] = self->face2tile [face];
1741 1922
1742 if (cell->tile [z]) 1923 if (cell->tile [z])
1743 { 1924 {
1744 maptex *tex = self->tex + cell->tile [z]; 1925 maptex *tex = self->tex + cell->tile [z];
1926 tex->unused = 0;
1745 if (!tex->name) 1927 if (!tex->name)
1746 av_push (missing, newSViv (cell->tile [z])); 1928 av_push (missing, newSViv (cell->tile [z]));
1747 1929
1748 if (tex->smoothtile) 1930 if (tex->smoothtile)
1749 { 1931 {
1750 maptex *smooth = self->tex + tex->smoothtile; 1932 maptex *smooth = self->tex + tex->smoothtile;
1933 smooth->unused = 0;
1751 if (!smooth->name) 1934 if (!smooth->name)
1752 av_push (missing, newSViv (tex->smoothtile)); 1935 av_push (missing, newSViv (tex->smoothtile));
1753 } 1936 }
1754 } 1937 }
1755 } 1938 }
1756 } 1939 }
1757 else 1940 else
1758 cell->darkness = 0; 1941 CELL_CLEAR (cell);
1759 } 1942 }
1760} 1943}
1761 OUTPUT: 1944 OUTPUT:
1762 RETVAL 1945 RETVAL
1763 1946
… …
1815} 1998}
1816 OUTPUT: 1999 OUTPUT:
1817 RETVAL 2000 RETVAL
1818 2001
1819void 2002void
1820draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2003draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1821 CODE: 2004 CODE:
1822{ 2005{
1823 int x, y, z; 2006 int x, y, z;
1824 2007
1825 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2008 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1826 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2009 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1827 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2010 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1828 smooth_key skey; 2011 smooth_key skey;
1829 int pl_x, pl_y; 2012 int pl_x, pl_y;
1830 maptex pl_tex; 2013 maptex pl_tex;
1831 rc_t *rc = rc_alloc (); 2014 rc_t *rc = rc_alloc ();
2015 rc_t *rc_ov = rc_alloc ();
1832 rc_key_t key; 2016 rc_key_t key;
1833 rc_array_t *arr; 2017 rc_array_t *arr, *arr_hidden;
1834 2018
1835 pl_tex.name = 0; 2019 pl_tex.name = 0;
1836 2020
1837 // thats current max. sorry. 2021 // that's current max. sorry.
1838 if (sw > 255) sw = 255; 2022 if (sw > 255) sw = 255;
1839 if (sh > 255) sh = 255; 2023 if (sh > 255) sh = 255;
1840 2024
1841 // clear key, in case of extra padding 2025 // clear key, in case of extra padding
1842 memset (&skey, 0, sizeof (skey)); 2026 memset (&skey, 0, sizeof (skey));
… …
1846 key.g = 255; 2030 key.g = 255;
1847 key.b = 255; 2031 key.b = 255;
1848 key.a = 255; 2032 key.a = 255;
1849 key.mode = GL_QUADS; 2033 key.mode = GL_QUADS;
1850 key.format = GL_T2F_V3F; 2034 key.format = GL_T2F_V3F;
1851 key.texname = -1;
1852 2035
1853 mx += self->x; 2036 mx += self->x;
1854 my += self->y; 2037 my += self->y;
1855 2038
1856 // first pass: determine smooth_max 2039 // first pass: determine smooth_max
… …
1877 2060
1878 glEnable (GL_BLEND); 2061 glEnable (GL_BLEND);
1879 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1880 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1881 2064
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067
1882 for (z = 0; z <= 2; z++) 2068 for (z = 0; z <= 2; z++)
1883 { 2069 {
1884 memset (smooth_level, 0, sizeof (smooth_level)); 2070 memset (smooth_level, 0, sizeof (smooth_level));
2071 key.texname = -1;
1885 2072
1886 for (y = 0; y < sh; y++) 2073 for (y = 0; y < sh; y++)
1887 if (0 <= y + my && y + my < self->rows) 2074 if (0 <= y + my && y + my < self->rows)
1888 { 2075 {
1889 maprow *row = self->row + (y + my); 2076 maprow *row = self->row + (y + my);
… …
1895 tileid tile = cell->tile [z]; 2082 tileid tile = cell->tile [z];
1896 2083
1897 if (tile) 2084 if (tile)
1898 { 2085 {
1899 maptex tex = self->tex [tile]; 2086 maptex tex = self->tex [tile];
1900 int px = (x + 1) * T - tex.w; 2087 int px, py;
1901 int py = (y + 1) * T - tex.h;
1902 2088
1903 if (key.texname != tex.name) 2089 if (key.texname != tex.name)
1904 { 2090 {
2091 self->tex [tile].unused = 0;
2092
1905 if (!tex.name) 2093 if (!tex.name)
1906 tex = self->tex [2]; /* missing, replace by noface */ 2094 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1907 2095
1908 key.texname = tex.name; 2096 key.texname = tex.name;
1909 arr = rc_array (rc, &key); 2097 arr = rc_array (rc, &key);
1910 } 2098 }
2099
2100 px = (x + 1) * T - tex.w;
2101 py = (y + 1) * T - tex.h;
1911 2102
1912 if (expect_false (cell->player == player) && expect_false (z == 2)) 2103 if (expect_false (cell->player == player) && expect_false (z == 2))
1913 { 2104 {
1914 pl_x = px; 2105 pl_x = px;
1915 pl_y = py; 2106 pl_y = py;
… …
1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2111 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1921 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2112 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1922 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2113 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1923 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2114 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1924 2115
1925 if (expect_false (cell->flags) && expect_false (z == 2))
1926 {
1927 // overlays such as the speech bubble, probably more to come
1928 if (cell->flags & 1)
1929 {
1930 maptex tex = self->tex [1];
1931 int px = x * T + T * 2 / 32;
1932 int py = y * T - T * 6 / 32;
1933
1934 if (tex.name)
1935 {
1936 if (key.texname != tex.name)
1937 {
1938 key.texname = tex.name;
1939 arr = rc_array (rc, &key);
1940 }
1941
1942 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1943 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1944 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1945 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1946 }
1947 }
1948 }
1949
1950 // update smooth hash 2116 // update smooth hash
1951 if (tex.smoothtile) 2117 if (tex.smoothtile)
1952 { 2118 {
1953 skey.tile = tex.smoothtile; 2119 skey.tile = tex.smoothtile;
1954 skey.level = tex.smoothlevel; 2120 skey.level = tex.smoothlevel;
… …
1982 // corners 2148 // corners
1983 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2149 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1984 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2150 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1985 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2151 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1986 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2152 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2153 }
2154 }
2155
2156 if (expect_false (z == 2))
2157 {
2158 /* draw question marks on top of hidden spaces */
2159 if (!cell->darkness)
2160 {
2161 maptex tex = self->tex [TEXID_HIDDEN];
2162 int px = (x + 1) * T - tex.w;
2163 int py = (y + 1) * T - tex.h;
2164
2165 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2166 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2167 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2169 }
2170
2171 if (expect_false (cell->flags))
2172 {
2173 // overlays such as the speech bubble, probably more to come
2174 if (cell->flags & 1)
2175 {
2176 rc_key_t key_ov = key;
2177 maptex tex = self->tex [TEXID_SPEECH];
2178 rc_array_t *arr;
2179 int px = x * T + T * 2 / 32;
2180 int py = y * T - T * 6 / 32;
2181
2182 key_ov.texname = tex.name;
2183 arr = rc_array (rc_ov, &key_ov);
2184
2185 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2186 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2187 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2188 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2189 }
1987 } 2190 }
1988 } 2191 }
1989 } 2192 }
1990 } 2193 }
1991 2194
… …
2031 { 2234 {
2032 // this time avoiding texture state changes 2235 // this time avoiding texture state changes
2033 // save gobs of state changes. 2236 // save gobs of state changes.
2034 if (key.texname != tex.name) 2237 if (key.texname != tex.name)
2035 { 2238 {
2239 self->tex [skey->tile].unused = 0;
2240
2036 glEnd (); 2241 glEnd ();
2037 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2242 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2038 glBegin (GL_QUADS); 2243 glBegin (GL_QUADS);
2039 } 2244 }
2040 2245
… …
2072 } 2277 }
2073 2278
2074 if (pl_tex.name) 2279 if (pl_tex.name)
2075 { 2280 {
2076 maptex tex = pl_tex; 2281 maptex tex = pl_tex;
2077 int px = pl_x + pdx; 2282 int px = pl_x + sdx;
2078 int py = pl_y + pdy; 2283 int py = pl_y + sdy;
2079 2284
2080 key.texname = tex.name; 2285 key.texname = tex.name;
2081 arr = rc_array (rc, &key); 2286 arr = rc_array (rc, &key);
2082 2287
2083 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2288 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
… …
2086 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2291 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2087 2292
2088 rc_draw (rc); 2293 rc_draw (rc);
2089 } 2294 }
2090 2295
2296 rc_draw (rc_ov);
2297 rc_clear (rc_ov);
2298
2091 glDisable (GL_BLEND); 2299 glDisable (GL_BLEND);
2092 rc_free (rc); 2300 rc_free (rc);
2301 rc_free (rc_ov);
2093 2302
2094 // top layer: overlays such as the health bar 2303 // top layer: overlays such as the health bar
2095 for (y = 0; y < sh; y++) 2304 for (y = 0; y < sh; y++)
2096 if (0 <= y + my && y + my < self->rows) 2305 if (0 <= y + my && y + my < self->rows)
2097 { 2306 {
… …
2102 { 2311 {
2103 mapcell *cell = row->col + (x + mx - row->c0); 2312 mapcell *cell = row->col + (x + mx - row->c0);
2104 2313
2105 int px = x * T; 2314 int px = x * T;
2106 int py = y * T; 2315 int py = y * T;
2316
2317 if (expect_false (cell->player == player))
2318 {
2319 px += sdx;
2320 py += sdy;
2321 }
2107 2322
2108 if (cell->stat_hp) 2323 if (cell->stat_hp)
2109 { 2324 {
2110 int width = cell->stat_width * T; 2325 int width = cell->stat_width * T;
2111 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2326 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2151 }; 2366 };
2152 2367
2153 int x, y; 2368 int x, y;
2154 2369
2155 glEnable (GL_TEXTURE_2D); 2370 glEnable (GL_TEXTURE_2D);
2371 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2372 * but the nvidia driver (185.18.14) mishandles alpha textures
2373 * ansd takes the colour from god knows where instead of using
2374 * Cp. MODULATE results in the same colour, but slightly different
2375 * alpha, but atcually gives us the correct colour with nvidia.
2376 */
2156 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2377 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2157 glEnable (GL_BLEND); 2378 glEnable (GL_BLEND);
2158 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2379 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2159 glBegin (GL_QUADS); 2380 glBegin (GL_QUADS);
2160 2381
2161 for (y = 0; y < h; y++) 2382 for (y = 0; y < h; y++)
… …
2168 float *c = color [m & 15]; 2389 float *c = color [m & 15];
2169 2390
2170 float tx1 = m & 0x40 ? 0.5 : 0.; 2391 float tx1 = m & 0x40 ? 0.5 : 0.;
2171 float tx2 = tx1 + 0.5; 2392 float tx2 = tx1 + 0.5;
2172 2393
2173 glColor4f (c[0], c[1], c[2], 0.75); 2394 glColor4f (c[0], c[1], c[2], 1);
2174 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2395 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2175 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2396 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2176 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2397 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2177 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2398 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2178 } 2399 }
… …
2200 SvCUR_set (darkness3_sv, sw34 * sh3); 2421 SvCUR_set (darkness3_sv, sw34 * sh3);
2201 2422
2202 mx += self->x - 1; 2423 mx += self->x - 1;
2203 my += self->y - 1; 2424 my += self->y - 1;
2204 2425
2205 memset (darkness1, 255, sw1 * sh1); 2426 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2206 2427
2207 for (y = 0; y < sh1; y++) 2428 for (y = 0; y < sh1; y++)
2208 if (0 <= y + my && y + my < self->rows) 2429 if (0 <= y + my && y + my < self->rows)
2209 { 2430 {
2210 maprow *row = self->row + (y + my); 2431 maprow *row = self->row + (y + my);
… …
2735 const_iv (GL_NICEST), 2956 const_iv (GL_NICEST),
2736 const_iv (GL_V2F), 2957 const_iv (GL_V2F),
2737 const_iv (GL_V3F), 2958 const_iv (GL_V3F),
2738 const_iv (GL_T2F_V3F), 2959 const_iv (GL_T2F_V3F),
2739 const_iv (GL_T2F_N3F_V3F), 2960 const_iv (GL_T2F_N3F_V3F),
2961 const_iv (GL_FUNC_ADD),
2962 const_iv (GL_FUNC_SUBTRACT),
2963 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2740# undef const_iv 2964# undef const_iv
2741 }; 2965 };
2742 2966
2743 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2967 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2744 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2968 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2751disable_GL_EXT_blend_func_separate () 2975disable_GL_EXT_blend_func_separate ()
2752 CODE: 2976 CODE:
2753 gl.BlendFuncSeparate = 0; 2977 gl.BlendFuncSeparate = 0;
2754 gl.BlendFuncSeparateEXT = 0; 2978 gl.BlendFuncSeparateEXT = 0;
2755 2979
2980void
2981apple_nvidia_bug (int enable)
2982
2756char * 2983char *
2757gl_vendor () 2984gl_vendor ()
2758 CODE: 2985 CODE:
2759 RETVAL = (char *)glGetString (GL_VENDOR); 2986 RETVAL = (char *)glGetString (GL_VENDOR);
2760 OUTPUT: 2987 OUTPUT:
… …
2809 3036
2810void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3037void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2811 CODE: 3038 CODE:
2812 gl_BlendFuncSeparate (sa, da, saa, daa); 3039 gl_BlendFuncSeparate (sa, da, saa, daa);
2813 3040
3041# void glBlendEquation (int se)
3042
2814void glDepthMask (int flag) 3043void glDepthMask (int flag)
2815 3044
2816void glLogicOp (int opcode) 3045void glLogicOp (int opcode)
2817 3046
2818void glColorMask (int red, int green, int blue, int alpha) 3047void glColorMask (int red, int green, int blue, int alpha)
… …
2852void glRotate (float angle, float x, float y, float z) 3081void glRotate (float angle, float x, float y, float z)
2853 CODE: 3082 CODE:
2854 glRotatef (angle, x, y, z); 3083 glRotatef (angle, x, y, z);
2855 3084
2856void glColor (float r, float g, float b, float a = 1.0) 3085void glColor (float r, float g, float b, float a = 1.0)
3086 PROTOTYPE: @
2857 ALIAS: 3087 ALIAS:
2858 glColor_premultiply = 1 3088 glColor_premultiply = 1
2859 CODE: 3089 CODE:
2860 if (ix) 3090 if (ix)
2861 { 3091 {

Diff Legend

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