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.273 by root, Wed Aug 20 13:30:02 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>
… …
81#define expect_false(expr) expect ((expr) != 0, 0) 80#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 81#define expect_true(expr) expect ((expr) != 0, 1)
83 82
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 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 */
86#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
87 89
88#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
90 92
91#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
92 94
93/* mask out modifiers we are not interested in */ 95/* mask out modifiers we are not interested in */
94#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
95 102
96static AV *texture_av; 103static AV *texture_av;
97 104
98static struct 105static struct
99{ 106{
… …
231 int w, h; 238 int w, h;
232 float s, t; 239 float s, t;
233 uint8_t r, g, b, a; 240 uint8_t r, g, b, a;
234 tileid smoothtile; 241 tileid smoothtile;
235 uint8_t smoothlevel; 242 uint8_t smoothlevel;
243 uint8_t unused; /* set to zero on use */
236} maptex; 244} maptex;
237 245
238typedef struct { 246typedef struct {
239 uint32_t player; 247 uint32_t player;
240 tileid tile[3]; 248 tileid tile[3];
… …
527 return 0; 535 return 0;
528 536
529 return 1; 537 return 1;
530} 538}
531 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
532static void 554static void
533deliantra_main () 555deliantra_main ()
534{ 556{
535 char *argv[] = { 0 }; 557 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv); 558 call_argv ("::main", G_DISCARD | G_VOID, argv);
537 dSP;
538} 559}
539 560
540#ifdef __MACOSX__ 561#ifdef __MACOSX__
541 /* to due surprising braindamage on the side of SDL design, we 562 /* to due surprising braindamage on the side of SDL design, we
542 * do some mind-boggling hack here: SDL requires a custom main() 563 * do some mind-boggling hack here: SDL requires a custom main()
… …
603 const_iv (SDL_USEREVENT), 624 const_iv (SDL_USEREVENT),
604 625
605 const_iv (SDL_APPINPUTFOCUS), 626 const_iv (SDL_APPINPUTFOCUS),
606 const_iv (SDL_APPMOUSEFOCUS), 627 const_iv (SDL_APPMOUSEFOCUS),
607 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),
608 679
609 const_iv (SDLK_FIRST), 680 const_iv (SDLK_FIRST),
610 const_iv (SDLK_LAST), 681 const_iv (SDLK_LAST),
611 const_iv (SDLK_KP0), 682 const_iv (SDLK_KP0),
612 const_iv (SDLK_KP1), 683 const_iv (SDLK_KP1),
… …
688 const_iv (KMOD_RMETA), 759 const_iv (KMOD_RMETA),
689 const_iv (KMOD_NUM), 760 const_iv (KMOD_NUM),
690 const_iv (KMOD_CAPS), 761 const_iv (KMOD_CAPS),
691 const_iv (KMOD_MODE), 762 const_iv (KMOD_MODE),
692 763
764 const_iv (KMOD_LRAM),
765
693 const_iv (MIX_DEFAULT_FORMAT), 766 const_iv (MIX_DEFAULT_FORMAT),
694 767
695 const_iv (SDL_INIT_TIMER), 768 const_iv (SDL_INIT_TIMER),
696 const_iv (SDL_INIT_AUDIO), 769 const_iv (SDL_INIT_AUDIO),
697 const_iv (SDL_INIT_VIDEO), 770 const_iv (SDL_INIT_VIDEO),
… …
749 822
750IV minpot (UV n) 823IV minpot (UV n)
751 824
752IV popcount (UV n) 825IV popcount (UV n)
753 826
827NV distance (NV dx, NV dy)
828 CODE:
829 RETVAL = pow (dx * dx + dy * dy, 0.5);
830 OUTPUT:
831 RETVAL
832
754void 833void
755pango_init () 834pango_init ()
756 CODE: 835 CODE:
757{ 836{
758 opengl_fontmap = pango_opengl_font_map_new (); 837 opengl_fontmap = pango_opengl_font_map_new ();
… …
884 { 963 {
885 case SDL_KEYDOWN: 964 case SDL_KEYDOWN:
886 case SDL_KEYUP: 965 case SDL_KEYUP:
887 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 966 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
888 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 967 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
889 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);
890 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 */
891 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 970 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
892 break; 971 break;
893 972
894 case SDL_ACTIVEEVENT: 973 case SDL_ACTIVEEVENT:
895 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 974 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
913 x = ev.motion.x; 992 x = ev.motion.x;
914 y = ev.motion.y; 993 y = ev.motion.y;
915 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 994 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
916 } 995 }
917 996
918 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 997 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
919 hv_store (hv, "state", 5, newSViv (state), 0); 998 hv_store (hv, "state", 5, newSViv (state), 0);
920 hv_store (hv, "x", 1, newSViv (x), 0); 999 hv_store (hv, "x", 1, newSViv (x), 0);
921 hv_store (hv, "y", 1, newSViv (y), 0); 1000 hv_store (hv, "y", 1, newSViv (y), 0);
922 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1001 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
923 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1002 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1139#if DEBUG 1218#if DEBUG
1140 VALGRIND_DO_LEAK_CHECK; 1219 VALGRIND_DO_LEAK_CHECK;
1141#endif 1220#endif
1142} 1221}
1143 1222
1223int
1224SvREFCNT (SV *sv)
1225 CODE:
1226 RETVAL = SvREFCNT (sv);
1227 OUTPUT:
1228 RETVAL
1229
1144MODULE = Deliantra::Client PACKAGE = DC::Font 1230MODULE = Deliantra::Client PACKAGE = DC::Font
1145 1231
1146PROTOTYPES: DISABLE 1232PROTOTYPES: DISABLE
1147 1233
1148DC::Font 1234DC::Font
… …
1577 if (ix) 1663 if (ix)
1578 { 1664 {
1579 glDisable (GL_ALPHA_TEST); 1665 glDisable (GL_ALPHA_TEST);
1580 glDisable (GL_BLEND); 1666 glDisable (GL_BLEND);
1581 } 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);
1582} 1789}
1583 1790
1584IV 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)
1585 CODE: 1792 CODE:
1586{ 1793{
… …
1692 //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);
1693 // use uglier nearest interpolation because linear suffers 1900 // use uglier nearest interpolation because linear suffers
1694 // from transparent color bleeding and ugly wrapping effects. 1901 // from transparent color bleeding and ugly wrapping effects.
1695 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1902 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1696} 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 }
1697 1924
1698int 1925int
1699ox (DC::Map self) 1926ox (DC::Map self)
1700 ALIAS: 1927 ALIAS:
1701 oy = 1 1928 oy = 1
… …
1782 { 2009 {
1783 ext = *data++; 2010 ext = *data++;
1784 cmd = ext & 0x7f; 2011 cmd = ext & 0x7f;
1785 2012
1786 if (cmd < 4) 2013 if (cmd < 4)
1787 cell->darkness = 255 - ext * 64 + 1; 2014 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1788 else if (cmd == 5) // health 2015 else if (cmd == 5) // health
1789 { 2016 {
1790 cell->stat_width = 1; 2017 cell->stat_width = 1;
1791 cell->stat_hp = *data++; 2018 cell->stat_hp = *data++;
1792 } 2019 }
… …
1822 cell->tile [z] = self->face2tile [face]; 2049 cell->tile [z] = self->face2tile [face];
1823 2050
1824 if (cell->tile [z]) 2051 if (cell->tile [z])
1825 { 2052 {
1826 maptex *tex = self->tex + cell->tile [z]; 2053 maptex *tex = self->tex + cell->tile [z];
2054 tex->unused = 0;
1827 if (!tex->name) 2055 if (!tex->name)
1828 av_push (missing, newSViv (cell->tile [z])); 2056 av_push (missing, newSViv (cell->tile [z]));
1829 2057
1830 if (tex->smoothtile) 2058 if (tex->smoothtile)
1831 { 2059 {
1832 maptex *smooth = self->tex + tex->smoothtile; 2060 maptex *smooth = self->tex + tex->smoothtile;
2061 smooth->unused = 0;
1833 if (!smooth->name) 2062 if (!smooth->name)
1834 av_push (missing, newSViv (tex->smoothtile)); 2063 av_push (missing, newSViv (tex->smoothtile));
1835 } 2064 }
1836 } 2065 }
1837 } 2066 }
… …
1908 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
1909 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)
1910 smooth_key skey; 2139 smooth_key skey;
1911 int pl_x, pl_y; 2140 int pl_x, pl_y;
1912 maptex pl_tex; 2141 maptex pl_tex;
1913 rc_t *rc = rc_alloc (); 2142 rc_t *rc = rc_alloc ();
2143 rc_t *rc_ov = rc_alloc ();
1914 rc_key_t key; 2144 rc_key_t key;
1915 rc_array_t *arr; 2145 rc_array_t *arr;
1916 2146
1917 pl_tex.name = 0; 2147 pl_tex.name = 0;
1918 2148
1919 // thats current max. sorry. 2149 // that's current max. sorry.
1920 if (sw > 255) sw = 255; 2150 if (sw > 255) sw = 255;
1921 if (sh > 255) sh = 255; 2151 if (sh > 255) sh = 255;
1922 2152
1923 // clear key, in case of extra padding 2153 // clear key, in case of extra padding
1924 memset (&skey, 0, sizeof (skey)); 2154 memset (&skey, 0, sizeof (skey));
… …
1928 key.g = 255; 2158 key.g = 255;
1929 key.b = 255; 2159 key.b = 255;
1930 key.a = 255; 2160 key.a = 255;
1931 key.mode = GL_QUADS; 2161 key.mode = GL_QUADS;
1932 key.format = GL_T2F_V3F; 2162 key.format = GL_T2F_V3F;
1933 key.texname = -1;
1934 2163
1935 mx += self->x; 2164 mx += self->x;
1936 my += self->y; 2165 my += self->y;
1937 2166
1938 // first pass: determine smooth_max 2167 // first pass: determine smooth_max
… …
1962 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2191 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1963 2192
1964 for (z = 0; z <= 2; z++) 2193 for (z = 0; z <= 2; z++)
1965 { 2194 {
1966 memset (smooth_level, 0, sizeof (smooth_level)); 2195 memset (smooth_level, 0, sizeof (smooth_level));
2196 key.texname = -1;
1967 2197
1968 for (y = 0; y < sh; y++) 2198 for (y = 0; y < sh; y++)
1969 if (0 <= y + my && y + my < self->rows) 2199 if (0 <= y + my && y + my < self->rows)
1970 { 2200 {
1971 maprow *row = self->row + (y + my); 2201 maprow *row = self->row + (y + my);
… …
1977 tileid tile = cell->tile [z]; 2207 tileid tile = cell->tile [z];
1978 2208
1979 if (tile) 2209 if (tile)
1980 { 2210 {
1981 maptex tex = self->tex [tile]; 2211 maptex tex = self->tex [tile];
1982 int px = (x + 1) * T - tex.w; 2212 int px, py;
1983 int py = (y + 1) * T - tex.h;
1984 2213
1985 if (key.texname != tex.name) 2214 if (key.texname != tex.name)
1986 { 2215 {
2216 self->tex [tile].unused = 0;
2217
1987 if (!tex.name) 2218 if (!tex.name)
1988 tex = self->tex [2]; /* missing, replace by noface */ 2219 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1989 2220
1990 key.texname = tex.name; 2221 key.texname = tex.name;
1991 arr = rc_array (rc, &key); 2222 arr = rc_array (rc, &key);
1992 } 2223 }
2224
2225 px = (x + 1) * T - tex.w;
2226 py = (y + 1) * T - tex.h;
1993 2227
1994 if (expect_false (cell->player == player) && expect_false (z == 2)) 2228 if (expect_false (cell->player == player) && expect_false (z == 2))
1995 { 2229 {
1996 pl_x = px; 2230 pl_x = px;
1997 pl_y = py; 2231 pl_y = py;
… …
2002 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2236 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2003 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);
2004 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);
2005 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);
2006 2240
2007 if (expect_false (cell->flags) && expect_false (z == 2))
2008 {
2009 // overlays such as the speech bubble, probably more to come
2010 if (cell->flags & 1)
2011 {
2012 maptex tex = self->tex [1];
2013 int px = x * T + T * 2 / 32;
2014 int py = y * T - T * 6 / 32;
2015
2016 if (tex.name)
2017 {
2018 if (key.texname != tex.name)
2019 {
2020 key.texname = tex.name;
2021 arr = rc_array (rc, &key);
2022 }
2023
2024 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2025 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2026 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2027 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2028 }
2029 }
2030 }
2031
2032 // update smooth hash 2241 // update smooth hash
2033 if (tex.smoothtile) 2242 if (tex.smoothtile)
2034 { 2243 {
2035 skey.tile = tex.smoothtile; 2244 skey.tile = tex.smoothtile;
2036 skey.level = tex.smoothlevel; 2245 skey.level = tex.smoothlevel;
… …
2064 // corners 2273 // corners
2065 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);
2066 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);
2067 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);
2068 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);
2069 } 2299 }
2070 } 2300 }
2071 } 2301 }
2072 } 2302 }
2073 2303
… …
2113 { 2343 {
2114 // this time avoiding texture state changes 2344 // this time avoiding texture state changes
2115 // save gobs of state changes. 2345 // save gobs of state changes.
2116 if (key.texname != tex.name) 2346 if (key.texname != tex.name)
2117 { 2347 {
2348 self->tex [skey->tile].unused = 0;
2349
2118 glEnd (); 2350 glEnd ();
2119 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2351 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2120 glBegin (GL_QUADS); 2352 glBegin (GL_QUADS);
2121 } 2353 }
2122 2354
… …
2168 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);
2169 2401
2170 rc_draw (rc); 2402 rc_draw (rc);
2171 } 2403 }
2172 2404
2405 rc_draw (rc_ov);
2406 rc_clear (rc_ov);
2407
2173 glDisable (GL_BLEND); 2408 glDisable (GL_BLEND);
2174 rc_free (rc); 2409 rc_free (rc);
2410 rc_free (rc_ov);
2175 2411
2176 // top layer: overlays such as the health bar 2412 // top layer: overlays such as the health bar
2177 for (y = 0; y < sh; y++) 2413 for (y = 0; y < sh; y++)
2178 if (0 <= y + my && y + my < self->rows) 2414 if (0 <= y + my && y + my < self->rows)
2179 { 2415 {
… …
2184 { 2420 {
2185 mapcell *cell = row->col + (x + mx - row->c0); 2421 mapcell *cell = row->col + (x + mx - row->c0);
2186 2422
2187 int px = x * T; 2423 int px = x * T;
2188 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 }
2189 2431
2190 if (cell->stat_hp) 2432 if (cell->stat_hp)
2191 { 2433 {
2192 int width = cell->stat_width * T; 2434 int width = cell->stat_width * T;
2193 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2435 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2204 } 2446 }
2205 } 2447 }
2206} 2448}
2207 2449
2208void 2450void
2209draw_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)
2210 CODE: 2452 CODE:
2211{ 2453{
2212 static float color[16][3] = { 2454 static float color[16][3] = {
2213 { 0.00F, 0.00F, 0.00F }, 2455 { 0.00f, 0.00f, 0.00f },
2214 { 1.00F, 1.00F, 1.00F }, 2456 { 1.00f, 1.00f, 1.00f },
2215 { 0.00F, 0.00F, 0.55F }, 2457 { 0.00f, 0.00f, 0.55f },
2216 { 1.00F, 0.00F, 0.00F }, 2458 { 1.00f, 0.00f, 0.00f },
2217 2459
2218 { 1.00F, 0.54F, 0.00F }, 2460 { 1.00f, 0.54f, 0.00f },
2219 { 0.11F, 0.56F, 1.00F }, 2461 { 0.11f, 0.56f, 1.00f },
2220 { 0.93F, 0.46F, 0.00F }, 2462 { 0.93f, 0.46f, 0.00f },
2221 { 0.18F, 0.54F, 0.34F }, 2463 { 0.18f, 0.54f, 0.34f },
2222 2464
2223 { 0.56F, 0.73F, 0.56F }, 2465 { 0.56f, 0.73f, 0.56f },
2224 { 0.80F, 0.80F, 0.80F }, 2466 { 0.80f, 0.80f, 0.80f },
2225 { 0.55F, 0.41F, 0.13F }, 2467 { 0.55f, 0.41f, 0.13f },
2226 { 0.99F, 0.77F, 0.26F }, 2468 { 0.99f, 0.77f, 0.26f },
2227 2469
2228 { 0.74F, 0.65F, 0.41F }, 2470 { 0.74f, 0.65f, 0.41f },
2229 2471
2230 { 0.00F, 1.00F, 1.00F }, 2472 { 0.00f, 1.00f, 1.00f },
2231 { 1.00F, 0.00F, 1.00F }, 2473 { 1.00f, 0.00f, 1.00f },
2232 { 1.00F, 1.00F, 0.00F }, 2474 { 1.00f, 1.00f, 0.00f },
2233 }; 2475 };
2234 2476
2235 int x, y; 2477 int x, y;
2236 2478
2237 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 */
2238 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2486 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2239 glEnable (GL_BLEND); 2487 glEnable (GL_BLEND);
2240 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2488 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2241 glBegin (GL_QUADS); 2489 glBegin (GL_QUADS);
2242 2490
2243 for (y = 0; y < h; y++) 2491 for (y = 0; y < h; y++)
… …
2247 2495
2248 if (m) 2496 if (m)
2249 { 2497 {
2250 float *c = color [m & 15]; 2498 float *c = color [m & 15];
2251 2499
2252 float tx1 = m & 0x40 ? 0.5 : 0.; 2500 float tx1 = m & 0x40 ? 0.5f : 0.f;
2253 float tx2 = tx1 + 0.5; 2501 float tx2 = tx1 + 0.5f;
2254 2502
2255 glColor4f (c[0], c[1], c[2], 0.75); 2503 glColor4f (c[0], c[1], c[2], 1);
2256 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2504 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2257 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2505 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2258 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2506 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2259 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2507 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2260 } 2508 }
… …
2268void 2516void
2269fow_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)
2270 PPCODE: 2518 PPCODE:
2271{ 2519{
2272 int x, y; 2520 int x, y;
2273 int sw1 = sw + 2; 2521 int sw1 = sw + 2;
2274 int sh1 = sh + 2; 2522 int sh1 = sh + 2;
2275 int sh3 = sh * 3; 2523 int sh3 = sh * 3;
2276 int sw34 = (sw * 3 + 3) & ~3; 2524 int sw3 = sw * 3;
2277 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2525 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2278 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2526 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2279 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2527 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2280 2528
2281 SvPOK_only (darkness3_sv); 2529 SvPOK_only (darkness3_sv);
2282 SvCUR_set (darkness3_sv, sw34 * sh3); 2530 SvCUR_set (darkness3_sv, sw3 * sh3);
2283 2531
2284 mx += self->x - 1; 2532 mx += self->x - 1;
2285 my += self->y - 1; 2533 my += self->y - 1;
2286
2287 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2288 2534
2289 for (y = 0; y < sh1; y++) 2535 for (y = 0; y < sh1; y++)
2290 if (0 <= y + my && y + my < self->rows) 2536 if (0 <= y + my && y + my < self->rows)
2291 { 2537 {
2292 maprow *row = self->row + (y + my); 2538 maprow *row = self->row + (y + my);
… …
2295 if (row->c0 <= x + mx && x + mx < row->c1) 2541 if (row->c0 <= x + mx && x + mx < row->c1)
2296 { 2542 {
2297 mapcell *cell = row->col + (x + mx - row->c0); 2543 mapcell *cell = row->col + (x + mx - row->c0);
2298 2544
2299 darkness1 [y * sw1 + x] = cell->darkness 2545 darkness1 [y * sw1 + x] = cell->darkness
2300 ? 255 - (cell->darkness - 1) 2546 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2301 : 255 - FOW_DARKNESS; 2547 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2302 } 2548 }
2303 } 2549 }
2304 2550
2305 for (y = 0; y < sh; ++y) 2551 for (y = 0; y < sh; ++y)
2306 for (x = 0; x < sw; ++x) 2552 for (x = 0; x < sw; ++x)
… …
2325 2571
2326 uint8_t r13 = (d13 + d23 + d12) / 3; 2572 uint8_t r13 = (d13 + d23 + d12) / 3;
2327 uint8_t r23 = d23; 2573 uint8_t r23 = d23;
2328 uint8_t r33 = (d23 + d33 + d32) / 3; 2574 uint8_t r33 = (d23 + d33 + d32) / 3;
2329 2575
2330 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2576 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2331 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2577 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2332 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2578 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2333 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2579 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2334 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 */
2335 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2581 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2336 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2582 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2337 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2583 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2338 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2584 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2339 } 2585 }
2340 2586
2341 free (darkness1); 2587 free (darkness1);
2342 2588
2343 EXTEND (SP, 3); 2589 EXTEND (SP, 3);
2344 PUSHs (sv_2mortal (newSViv (sw34))); 2590 PUSHs (sv_2mortal (newSViv (sw3)));
2345 PUSHs (sv_2mortal (newSViv (sh3))); 2591 PUSHs (sv_2mortal (newSViv (sh3)));
2346 PUSHs (darkness3_sv); 2592 PUSHs (darkness3_sv);
2347} 2593}
2348 2594
2349SV * 2595SV *
… …
2606void 2852void
2607set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2853set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2608 CODE: 2854 CODE:
2609{ 2855{
2610 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));
2611 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;
2612 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2858 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2613} 2859}
2614 2860
2615void 2861void
2616set_reverse_stereo (DC::Channel self, int flip) 2862set_reverse_stereo (DC::Channel self, int flip)
… …
2719 } *civ, const_iv[] = { 2965 } *civ, const_iv[] = {
2720# define const_iv(name) { # name, (IV)name } 2966# define const_iv(name) { # name, (IV)name }
2721 const_iv (GL_VENDOR), 2967 const_iv (GL_VENDOR),
2722 const_iv (GL_VERSION), 2968 const_iv (GL_VERSION),
2723 const_iv (GL_EXTENSIONS), 2969 const_iv (GL_EXTENSIONS),
2970 const_iv (GL_MAX_TEXTURE_UNITS),
2724 const_iv (GL_COLOR_MATERIAL), 2971 const_iv (GL_COLOR_MATERIAL),
2725 const_iv (GL_SMOOTH), 2972 const_iv (GL_SMOOTH),
2726 const_iv (GL_FLAT), 2973 const_iv (GL_FLAT),
2727 const_iv (GL_DITHER), 2974 const_iv (GL_DITHER),
2728 const_iv (GL_BLEND), 2975 const_iv (GL_BLEND),
… …
2740 const_iv (GL_ZERO), 2987 const_iv (GL_ZERO),
2741 const_iv (GL_SRC_ALPHA), 2988 const_iv (GL_SRC_ALPHA),
2742 const_iv (GL_DST_ALPHA), 2989 const_iv (GL_DST_ALPHA),
2743 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2990 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2744 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),
2745 const_iv (GL_SRC_ALPHA_SATURATE), 2996 const_iv (GL_SRC_ALPHA_SATURATE),
2746 const_iv (GL_RGB), 2997 const_iv (GL_RGB),
2747 const_iv (GL_RGBA), 2998 const_iv (GL_RGBA),
2748 const_iv (GL_RGBA4), 2999 const_iv (GL_RGBA4),
2749 const_iv (GL_RGBA8), 3000 const_iv (GL_RGBA8),
… …
2817 const_iv (GL_NICEST), 3068 const_iv (GL_NICEST),
2818 const_iv (GL_V2F), 3069 const_iv (GL_V2F),
2819 const_iv (GL_V3F), 3070 const_iv (GL_V3F),
2820 const_iv (GL_T2F_V3F), 3071 const_iv (GL_T2F_V3F),
2821 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),
2822# undef const_iv 3076# undef const_iv
2823 }; 3077 };
2824 3078
2825 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; )
2826 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3080 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2833disable_GL_EXT_blend_func_separate () 3087disable_GL_EXT_blend_func_separate ()
2834 CODE: 3088 CODE:
2835 gl.BlendFuncSeparate = 0; 3089 gl.BlendFuncSeparate = 0;
2836 gl.BlendFuncSeparateEXT = 0; 3090 gl.BlendFuncSeparateEXT = 0;
2837 3091
3092void
3093apple_nvidia_bug (int enable)
3094
2838char * 3095char *
2839gl_vendor () 3096gl_vendor ()
2840 CODE: 3097 CODE:
2841 RETVAL = (char *)glGetString (GL_VENDOR); 3098 RETVAL = (char *)glGetString (GL_VENDOR);
2842 OUTPUT: 3099 OUTPUT:
… …
2891 3148
2892void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3149void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2893 CODE: 3150 CODE:
2894 gl_BlendFuncSeparate (sa, da, saa, daa); 3151 gl_BlendFuncSeparate (sa, da, saa, daa);
2895 3152
3153# void glBlendEquation (int se)
3154
2896void glDepthMask (int flag) 3155void glDepthMask (int flag)
2897 3156
2898void glLogicOp (int opcode) 3157void glLogicOp (int opcode)
2899 3158
2900void glColorMask (int red, int green, int blue, int alpha) 3159void glColorMask (int red, int green, int blue, int alpha)
… …
2934void glRotate (float angle, float x, float y, float z) 3193void glRotate (float angle, float x, float y, float z)
2935 CODE: 3194 CODE:
2936 glRotatef (angle, x, y, z); 3195 glRotatef (angle, x, y, z);
2937 3196
2938void 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: @
2939 ALIAS: 3199 ALIAS:
2940 glColor_premultiply = 1 3200 glColor_premultiply = 1
2941 CODE: 3201 CODE:
2942 if (ix) 3202 if (ix)
2943 { 3203 {
… …
3048void glNewList (int list, int mode = GL_COMPILE) 3308void glNewList (int list, int mode = GL_COMPILE)
3049 3309
3050void glEndList () 3310void glEndList ()
3051 3311
3052void 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);
3053 3318
3054MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3319MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3055 3320
3056PROTOTYPES: DISABLE 3321PROTOTYPES: DISABLE
3057 3322

Diff Legend

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