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.274 by root, Wed Aug 20 17:50:47 2008 UTC vs.
Revision 1.298 by root, Tue Dec 22 00:46:05 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>
… …
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
44/* work around os x broken headers */ 43/* work around os x broken headers */
45#ifdef __MACOSX__ 44#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 48#endif
48 49
49#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
51 52
… …
81#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
83 84
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
87 91
88#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
90 94
91#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
92 96
93/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
99
100#define KMOD_LRAM 0x10000 // our extension
101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
95 104
96static AV *texture_av; 105static AV *texture_av;
97 106
98static struct 107static struct
99{ 108{
… …
231 int w, h; 240 int w, h;
232 float s, t; 241 float s, t;
233 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
234 tileid smoothtile; 243 tileid smoothtile;
235 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
236} maptex; 246} maptex;
237 247
238typedef struct { 248typedef struct {
239 uint32_t player; 249 uint32_t player;
240 tileid tile[3]; 250 tileid tile[3];
… …
525 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0); 535 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
526 if (!svp || !SvTRUE (*svp)) 536 if (!svp || !SvTRUE (*svp))
527 return 0; 537 return 0;
528 538
529 return 1; 539 return 1;
540}
541
542/******************************************************************************/
543
544/* process keyboard modifiers */
545static int
546mod_munge (int mod)
547{
548 mod &= MOD_MASK;
549
550 if (mod & (KMOD_META | KMOD_ALT))
551 mod |= KMOD_LRAM;
552
553 return mod;
530} 554}
531 555
532static void 556static void
533deliantra_main () 557deliantra_main ()
534{ 558{
… …
602 const_iv (SDL_USEREVENT), 626 const_iv (SDL_USEREVENT),
603 627
604 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
605 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
606 const_iv (SDL_APPACTIVE), 630 const_iv (SDL_APPACTIVE),
631
632
633 const_iv (SDLK_UNKNOWN),
634 const_iv (SDLK_FIRST),
635 const_iv (SDLK_BACKSPACE),
636 const_iv (SDLK_TAB),
637 const_iv (SDLK_CLEAR),
638 const_iv (SDLK_RETURN),
639 const_iv (SDLK_PAUSE),
640 const_iv (SDLK_ESCAPE),
641 const_iv (SDLK_SPACE),
642 const_iv (SDLK_EXCLAIM),
643 const_iv (SDLK_QUOTEDBL),
644 const_iv (SDLK_HASH),
645 const_iv (SDLK_DOLLAR),
646 const_iv (SDLK_AMPERSAND),
647 const_iv (SDLK_QUOTE),
648 const_iv (SDLK_LEFTPAREN),
649 const_iv (SDLK_RIGHTPAREN),
650 const_iv (SDLK_ASTERISK),
651 const_iv (SDLK_PLUS),
652 const_iv (SDLK_COMMA),
653 const_iv (SDLK_MINUS),
654 const_iv (SDLK_PERIOD),
655 const_iv (SDLK_SLASH),
656 const_iv (SDLK_0),
657 const_iv (SDLK_1),
658 const_iv (SDLK_2),
659 const_iv (SDLK_3),
660 const_iv (SDLK_4),
661 const_iv (SDLK_5),
662 const_iv (SDLK_6),
663 const_iv (SDLK_7),
664 const_iv (SDLK_8),
665 const_iv (SDLK_9),
666 const_iv (SDLK_COLON),
667 const_iv (SDLK_SEMICOLON),
668 const_iv (SDLK_LESS),
669 const_iv (SDLK_EQUALS),
670 const_iv (SDLK_GREATER),
671 const_iv (SDLK_QUESTION),
672 const_iv (SDLK_AT),
673
674 const_iv (SDLK_LEFTBRACKET),
675 const_iv (SDLK_BACKSLASH),
676 const_iv (SDLK_RIGHTBRACKET),
677 const_iv (SDLK_CARET),
678 const_iv (SDLK_UNDERSCORE),
679 const_iv (SDLK_BACKQUOTE),
680 const_iv (SDLK_DELETE),
607 681
608 const_iv (SDLK_FIRST), 682 const_iv (SDLK_FIRST),
609 const_iv (SDLK_LAST), 683 const_iv (SDLK_LAST),
610 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
611 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
… …
687 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
688 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
689 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
690 const_iv (KMOD_MODE), 764 const_iv (KMOD_MODE),
691 765
766 const_iv (KMOD_LRAM),
767
692 const_iv (MIX_DEFAULT_FORMAT), 768 const_iv (MIX_DEFAULT_FORMAT),
693 769
694 const_iv (SDL_INIT_TIMER), 770 const_iv (SDL_INIT_TIMER),
695 const_iv (SDL_INIT_AUDIO), 771 const_iv (SDL_INIT_AUDIO),
696 const_iv (SDL_INIT_VIDEO), 772 const_iv (SDL_INIT_VIDEO),
… …
748 824
749IV minpot (UV n) 825IV minpot (UV n)
750 826
751IV popcount (UV n) 827IV popcount (UV n)
752 828
829NV distance (NV dx, NV dy)
830 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT:
833 RETVAL
834
753void 835void
754pango_init () 836pango_init ()
755 CODE: 837 CODE:
756{ 838{
757 opengl_fontmap = pango_opengl_font_map_new (); 839 opengl_fontmap = pango_opengl_font_map_new ();
… …
883 { 965 {
884 case SDL_KEYDOWN: 966 case SDL_KEYDOWN:
885 case SDL_KEYUP: 967 case SDL_KEYUP:
886 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 968 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
887 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 969 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
888 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 970 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
889 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 971 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
890 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 972 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
891 break; 973 break;
892 974
893 case SDL_ACTIVEEVENT: 975 case SDL_ACTIVEEVENT:
894 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 976 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
912 x = ev.motion.x; 994 x = ev.motion.x;
913 y = ev.motion.y; 995 y = ev.motion.y;
914 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 996 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
915 } 997 }
916 998
917 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 999 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
918 hv_store (hv, "state", 5, newSViv (state), 0); 1000 hv_store (hv, "state", 5, newSViv (state), 0);
919 hv_store (hv, "x", 1, newSViv (x), 0); 1001 hv_store (hv, "x", 1, newSViv (x), 0);
920 hv_store (hv, "y", 1, newSViv (y), 0); 1002 hv_store (hv, "y", 1, newSViv (y), 0);
921 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1003 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
922 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1004 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1138#if DEBUG 1220#if DEBUG
1139 VALGRIND_DO_LEAK_CHECK; 1221 VALGRIND_DO_LEAK_CHECK;
1140#endif 1222#endif
1141} 1223}
1142 1224
1225int
1226SvREFCNT (SV *sv)
1227 CODE:
1228 RETVAL = SvREFCNT (sv);
1229 OUTPUT:
1230 RETVAL
1231
1143MODULE = Deliantra::Client PACKAGE = DC::Font 1232MODULE = Deliantra::Client PACKAGE = DC::Font
1144 1233
1145PROTOTYPES: DISABLE 1234PROTOTYPES: DISABLE
1146 1235
1147DC::Font 1236DC::Font
… …
1576 if (ix) 1665 if (ix)
1577 { 1666 {
1578 glDisable (GL_ALPHA_TEST); 1667 glDisable (GL_ALPHA_TEST);
1579 glDisable (GL_BLEND); 1668 glDisable (GL_BLEND);
1580 } 1669 }
1670}
1671
1672void
1673draw_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)
1674 PROTOTYPE: @
1675 CODE:
1676{
1677 glEnable (GL_TEXTURE_2D);
1678 glEnable (GL_BLEND);
1679 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1680 glBindTexture (GL_TEXTURE_2D, name1);
1681
1682 glColor3f (intensity, intensity, intensity);
1683 glPushMatrix ();
1684 glScalef (1./3, 1./3, 1.);
1685
1686 if (blend > 0.f)
1687 {
1688 float dx3 = dx * -3.f / w;
1689 float dy3 = dy * -3.f / h;
1690 GLfloat env_color[4] = { 0., 0., 0., blend };
1691
1692 /* interpolate the two shadow textures */
1693 /* stage 0 == rgb(glcolor) + alpha(t0) */
1694 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1695
1696 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1697 gl.ActiveTexture (GL_TEXTURE1);
1698 glEnable (GL_TEXTURE_2D);
1699 glBindTexture (GL_TEXTURE_2D, name2);
1700 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1701
1702 /* rgb == rgb(glcolor) */
1703 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1705 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1706
1707 /* alpha = interpolate t0, t1 by env_alpha */
1708 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1709
1710 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1712 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1713
1714 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1715 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1716
1717 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1718 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1719
1720 glBegin (GL_QUADS);
1721 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1722 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1723 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1724 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1725 glEnd ();
1726
1727 glDisable (GL_TEXTURE_2D);
1728 gl.ActiveTexture (GL_TEXTURE0);
1729 }
1730 else
1731 {
1732 /* simple blending of one texture, also opengl <1.3 path */
1733 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1734
1735 glBegin (GL_QUADS);
1736 glTexCoord2f (0, 0); glVertex2f (0, 0);
1737 glTexCoord2f (0, t); glVertex2f (0, h);
1738 glTexCoord2f (s, t); glVertex2f (w, h);
1739 glTexCoord2f (s, 0); glVertex2f (w, 0);
1740 glEnd ();
1741 }
1742
1743 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1744 {
1745 int x, y;
1746 int dx3 = dx * 3;
1747 int dy3 = dy * 3;
1748
1749 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1750 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1751 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1752 glTranslatef (-1., -1., 0);
1753 glBegin (GL_QUADS);
1754
1755 for (y = 1; y < h; y += 3)
1756 {
1757 int y1 = y - dy3;
1758 int y1valid = y1 >= 0 && y1 < h;
1759
1760 for (x = 1; x < w; x += 3)
1761 {
1762 int x1 = x - dx3;
1763 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1764 uint8_t h2;
1765
1766 if (y1valid && x1 >= 0 && x1 < w)
1767 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1768 else
1769 h2 = 1; /* out of range == invisible */
1770
1771 if (h1 || h2)
1772 {
1773 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1774 glColor4f (1., 1., 1., alpha);
1775
1776 glTexCoord2f (0, 0.); glVertex2i (x , y );
1777 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1778 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1779 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1780 }
1781 }
1782 }
1783 }
1784
1785 glEnd ();
1786
1787 glPopMatrix ();
1788
1789 glDisable (GL_TEXTURE_2D);
1790 glDisable (GL_BLEND);
1581} 1791}
1582 1792
1583IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1793IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1584 CODE: 1794 CODE:
1585{ 1795{
… …
1691 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1901 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1692 // use uglier nearest interpolation because linear suffers 1902 // use uglier nearest interpolation because linear suffers
1693 // from transparent color bleeding and ugly wrapping effects. 1903 // from transparent color bleeding and ugly wrapping effects.
1694 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1904 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1695} 1905}
1906
1907void
1908expire_textures (DC::Map self, int texid, int count)
1909 PPCODE:
1910 for (; texid < self->texs && count; ++texid, --count)
1911 {
1912 maptex *tex = self->tex + texid;
1913
1914 if (tex->name)
1915 {
1916 if (tex->unused)
1917 {
1918 tex->name = 0;
1919 tex->unused = 0;
1920 XPUSHs (sv_2mortal (newSViv (texid)));
1921 }
1922 else
1923 tex->unused = 1;
1924 }
1925 }
1696 1926
1697int 1927int
1698ox (DC::Map self) 1928ox (DC::Map self)
1699 ALIAS: 1929 ALIAS:
1700 oy = 1 1930 oy = 1
… …
1781 { 2011 {
1782 ext = *data++; 2012 ext = *data++;
1783 cmd = ext & 0x7f; 2013 cmd = ext & 0x7f;
1784 2014
1785 if (cmd < 4) 2015 if (cmd < 4)
1786 cell->darkness = 255 - ext * 64 + 1; 2016 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1787 else if (cmd == 5) // health 2017 else if (cmd == 5) // health
1788 { 2018 {
1789 cell->stat_width = 1; 2019 cell->stat_width = 1;
1790 cell->stat_hp = *data++; 2020 cell->stat_hp = *data++;
1791 } 2021 }
… …
1821 cell->tile [z] = self->face2tile [face]; 2051 cell->tile [z] = self->face2tile [face];
1822 2052
1823 if (cell->tile [z]) 2053 if (cell->tile [z])
1824 { 2054 {
1825 maptex *tex = self->tex + cell->tile [z]; 2055 maptex *tex = self->tex + cell->tile [z];
2056 tex->unused = 0;
1826 if (!tex->name) 2057 if (!tex->name)
1827 av_push (missing, newSViv (cell->tile [z])); 2058 av_push (missing, newSViv (cell->tile [z]));
1828 2059
1829 if (tex->smoothtile) 2060 if (tex->smoothtile)
1830 { 2061 {
1831 maptex *smooth = self->tex + tex->smoothtile; 2062 maptex *smooth = self->tex + tex->smoothtile;
2063 smooth->unused = 0;
1832 if (!smooth->name) 2064 if (!smooth->name)
1833 av_push (missing, newSViv (tex->smoothtile)); 2065 av_push (missing, newSViv (tex->smoothtile));
1834 } 2066 }
1835 } 2067 }
1836 } 2068 }
… …
1907 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2139 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1908 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2140 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1909 smooth_key skey; 2141 smooth_key skey;
1910 int pl_x, pl_y; 2142 int pl_x, pl_y;
1911 maptex pl_tex; 2143 maptex pl_tex;
1912 rc_t *rc = rc_alloc (); 2144 rc_t *rc = rc_alloc ();
2145 rc_t *rc_ov = rc_alloc ();
1913 rc_key_t key; 2146 rc_key_t key;
1914 rc_array_t *arr; 2147 rc_array_t *arr;
1915 2148
1916 pl_tex.name = 0; 2149 pl_tex.name = 0;
1917 2150
1918 // thats current max. sorry. 2151 // that's current max. sorry.
1919 if (sw > 255) sw = 255; 2152 if (sw > 255) sw = 255;
1920 if (sh > 255) sh = 255; 2153 if (sh > 255) sh = 255;
1921 2154
1922 // clear key, in case of extra padding 2155 // clear key, in case of extra padding
1923 memset (&skey, 0, sizeof (skey)); 2156 memset (&skey, 0, sizeof (skey));
… …
1927 key.g = 255; 2160 key.g = 255;
1928 key.b = 255; 2161 key.b = 255;
1929 key.a = 255; 2162 key.a = 255;
1930 key.mode = GL_QUADS; 2163 key.mode = GL_QUADS;
1931 key.format = GL_T2F_V3F; 2164 key.format = GL_T2F_V3F;
1932 key.texname = -1;
1933 2165
1934 mx += self->x; 2166 mx += self->x;
1935 my += self->y; 2167 my += self->y;
1936 2168
1937 // first pass: determine smooth_max 2169 // first pass: determine smooth_max
… …
1961 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2193 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1962 2194
1963 for (z = 0; z <= 2; z++) 2195 for (z = 0; z <= 2; z++)
1964 { 2196 {
1965 memset (smooth_level, 0, sizeof (smooth_level)); 2197 memset (smooth_level, 0, sizeof (smooth_level));
2198 key.texname = -1;
1966 2199
1967 for (y = 0; y < sh; y++) 2200 for (y = 0; y < sh; y++)
1968 if (0 <= y + my && y + my < self->rows) 2201 if (0 <= y + my && y + my < self->rows)
1969 { 2202 {
1970 maprow *row = self->row + (y + my); 2203 maprow *row = self->row + (y + my);
… …
1976 tileid tile = cell->tile [z]; 2209 tileid tile = cell->tile [z];
1977 2210
1978 if (tile) 2211 if (tile)
1979 { 2212 {
1980 maptex tex = self->tex [tile]; 2213 maptex tex = self->tex [tile];
1981 int px = (x + 1) * T - tex.w; 2214 int px, py;
1982 int py = (y + 1) * T - tex.h;
1983 2215
1984 if (key.texname != tex.name) 2216 if (key.texname != tex.name)
1985 { 2217 {
2218 self->tex [tile].unused = 0;
2219
1986 if (!tex.name) 2220 if (!tex.name)
1987 tex = self->tex [2]; /* missing, replace by noface */ 2221 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1988 2222
1989 key.texname = tex.name; 2223 key.texname = tex.name;
1990 arr = rc_array (rc, &key); 2224 arr = rc_array (rc, &key);
1991 } 2225 }
2226
2227 px = (x + 1) * T - tex.w;
2228 py = (y + 1) * T - tex.h;
1992 2229
1993 if (expect_false (cell->player == player) && expect_false (z == 2)) 2230 if (expect_false (cell->player == player) && expect_false (z == 2))
1994 { 2231 {
1995 pl_x = px; 2232 pl_x = px;
1996 pl_y = py; 2233 pl_y = py;
… …
2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2238 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2002 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2239 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2003 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2240 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2004 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2241 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2005 2242
2006 if (expect_false (cell->flags) && expect_false (z == 2))
2007 {
2008 // overlays such as the speech bubble, probably more to come
2009 if (cell->flags & 1)
2010 {
2011 maptex tex = self->tex [1];
2012 int px = x * T + T * 2 / 32;
2013 int py = y * T - T * 6 / 32;
2014
2015 if (tex.name)
2016 {
2017 if (key.texname != tex.name)
2018 {
2019 key.texname = tex.name;
2020 arr = rc_array (rc, &key);
2021 }
2022
2023 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2024 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2025 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2026 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2027 }
2028 }
2029 }
2030
2031 // update smooth hash 2243 // update smooth hash
2032 if (tex.smoothtile) 2244 if (tex.smoothtile)
2033 { 2245 {
2034 skey.tile = tex.smoothtile; 2246 skey.tile = tex.smoothtile;
2035 skey.level = tex.smoothlevel; 2247 skey.level = tex.smoothlevel;
… …
2063 // corners 2275 // corners
2064 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2276 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2065 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2277 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2066 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2278 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2067 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2279 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2280 }
2281 }
2282
2283 if (expect_false (z == 2) && expect_false (cell->flags))
2284 {
2285 // overlays such as the speech bubble, probably more to come
2286 if (cell->flags & 1)
2287 {
2288 rc_key_t key_ov = key;
2289 maptex tex = self->tex [TEXID_SPEECH];
2290 rc_array_t *arr;
2291 int px = x * T + T * 2 / 32;
2292 int py = y * T - T * 6 / 32;
2293
2294 key_ov.texname = tex.name;
2295 arr = rc_array (rc_ov, &key_ov);
2296
2297 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2298 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2299 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2300 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2068 } 2301 }
2069 } 2302 }
2070 } 2303 }
2071 } 2304 }
2072 2305
… …
2112 { 2345 {
2113 // this time avoiding texture state changes 2346 // this time avoiding texture state changes
2114 // save gobs of state changes. 2347 // save gobs of state changes.
2115 if (key.texname != tex.name) 2348 if (key.texname != tex.name)
2116 { 2349 {
2350 self->tex [skey->tile].unused = 0;
2351
2117 glEnd (); 2352 glEnd ();
2118 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2353 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2119 glBegin (GL_QUADS); 2354 glBegin (GL_QUADS);
2120 } 2355 }
2121 2356
… …
2167 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2402 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2168 2403
2169 rc_draw (rc); 2404 rc_draw (rc);
2170 } 2405 }
2171 2406
2407 rc_draw (rc_ov);
2408 rc_clear (rc_ov);
2409
2172 glDisable (GL_BLEND); 2410 glDisable (GL_BLEND);
2173 rc_free (rc); 2411 rc_free (rc);
2412 rc_free (rc_ov);
2174 2413
2175 // top layer: overlays such as the health bar 2414 // top layer: overlays such as the health bar
2176 for (y = 0; y < sh; y++) 2415 for (y = 0; y < sh; y++)
2177 if (0 <= y + my && y + my < self->rows) 2416 if (0 <= y + my && y + my < self->rows)
2178 { 2417 {
… …
2183 { 2422 {
2184 mapcell *cell = row->col + (x + mx - row->c0); 2423 mapcell *cell = row->col + (x + mx - row->c0);
2185 2424
2186 int px = x * T; 2425 int px = x * T;
2187 int py = y * T; 2426 int py = y * T;
2427
2428 if (expect_false (cell->player == player))
2429 {
2430 px += sdx;
2431 py += sdy;
2432 }
2188 2433
2189 if (cell->stat_hp) 2434 if (cell->stat_hp)
2190 { 2435 {
2191 int width = cell->stat_width * T; 2436 int width = cell->stat_width * T;
2192 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2437 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2203 } 2448 }
2204 } 2449 }
2205} 2450}
2206 2451
2207void 2452void
2208draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2453draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2209 CODE: 2454 CODE:
2210{ 2455{
2211 static float color[16][3] = { 2456 static float color[16][3] = {
2212 { 0.00F, 0.00F, 0.00F }, 2457 { 0.00f, 0.00f, 0.00f },
2213 { 1.00F, 1.00F, 1.00F }, 2458 { 1.00f, 1.00f, 1.00f },
2214 { 0.00F, 0.00F, 0.55F }, 2459 { 0.00f, 0.00f, 0.55f },
2215 { 1.00F, 0.00F, 0.00F }, 2460 { 1.00f, 0.00f, 0.00f },
2216 2461
2217 { 1.00F, 0.54F, 0.00F }, 2462 { 1.00f, 0.54f, 0.00f },
2218 { 0.11F, 0.56F, 1.00F }, 2463 { 0.11f, 0.56f, 1.00f },
2219 { 0.93F, 0.46F, 0.00F }, 2464 { 0.93f, 0.46f, 0.00f },
2220 { 0.18F, 0.54F, 0.34F }, 2465 { 0.18f, 0.54f, 0.34f },
2221 2466
2222 { 0.56F, 0.73F, 0.56F }, 2467 { 0.56f, 0.73f, 0.56f },
2223 { 0.80F, 0.80F, 0.80F }, 2468 { 0.80f, 0.80f, 0.80f },
2224 { 0.55F, 0.41F, 0.13F }, 2469 { 0.55f, 0.41f, 0.13f },
2225 { 0.99F, 0.77F, 0.26F }, 2470 { 0.99f, 0.77f, 0.26f },
2226 2471
2227 { 0.74F, 0.65F, 0.41F }, 2472 { 0.74f, 0.65f, 0.41f },
2228 2473
2229 { 0.00F, 1.00F, 1.00F }, 2474 { 0.00f, 1.00f, 1.00f },
2230 { 1.00F, 0.00F, 1.00F }, 2475 { 1.00f, 0.00f, 1.00f },
2231 { 1.00F, 1.00F, 0.00F }, 2476 { 1.00f, 1.00f, 0.00f },
2232 }; 2477 };
2233 2478
2234 int x, y; 2479 int x, y;
2235 2480
2236 glEnable (GL_TEXTURE_2D); 2481 glEnable (GL_TEXTURE_2D);
2482 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2483 * but the nvidia driver (185.18.14) mishandles alpha textures
2484 * and takes the colour from god knows where instead of using
2485 * Cp. MODULATE results in the same colour, but slightly different
2486 * alpha, but atcually gives us the correct colour with nvidia.
2487 */
2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2488 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2238 glEnable (GL_BLEND); 2489 glEnable (GL_BLEND);
2239 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2490 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2240 glBegin (GL_QUADS); 2491 glBegin (GL_QUADS);
2241 2492
2242 for (y = 0; y < h; y++) 2493 for (y = 0; y < h; y++)
… …
2246 2497
2247 if (m) 2498 if (m)
2248 { 2499 {
2249 float *c = color [m & 15]; 2500 float *c = color [m & 15];
2250 2501
2251 float tx1 = m & 0x40 ? 0.5 : 0.; 2502 float tx1 = m & 0x40 ? 0.5f : 0.f;
2252 float tx2 = tx1 + 0.5; 2503 float tx2 = tx1 + 0.5f;
2253 2504
2254 glColor4f (c[0], c[1], c[2], 0.75); 2505 glColor4f (c[0], c[1], c[2], 1);
2255 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2506 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2256 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2507 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2257 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2508 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2258 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2509 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2259 } 2510 }
… …
2267void 2518void
2268fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2519fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2269 PPCODE: 2520 PPCODE:
2270{ 2521{
2271 int x, y; 2522 int x, y;
2272 int sw1 = sw + 2; 2523 int sw1 = sw + 2;
2273 int sh1 = sh + 2; 2524 int sh1 = sh + 2;
2274 int sh3 = sh * 3; 2525 int sh3 = sh * 3;
2275 int sw34 = (sw * 3 + 3) & ~3; 2526 int sw3 = sw * 3;
2276 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2527 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2277 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2528 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2278 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2529 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2279 2530
2280 SvPOK_only (darkness3_sv); 2531 SvPOK_only (darkness3_sv);
2281 SvCUR_set (darkness3_sv, sw34 * sh3); 2532 SvCUR_set (darkness3_sv, sw3 * sh3);
2282 2533
2283 mx += self->x - 1; 2534 mx += self->x - 1;
2284 my += self->y - 1; 2535 my += self->y - 1;
2285
2286 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2287 2536
2288 for (y = 0; y < sh1; y++) 2537 for (y = 0; y < sh1; y++)
2289 if (0 <= y + my && y + my < self->rows) 2538 if (0 <= y + my && y + my < self->rows)
2290 { 2539 {
2291 maprow *row = self->row + (y + my); 2540 maprow *row = self->row + (y + my);
… …
2294 if (row->c0 <= x + mx && x + mx < row->c1) 2543 if (row->c0 <= x + mx && x + mx < row->c1)
2295 { 2544 {
2296 mapcell *cell = row->col + (x + mx - row->c0); 2545 mapcell *cell = row->col + (x + mx - row->c0);
2297 2546
2298 darkness1 [y * sw1 + x] = cell->darkness 2547 darkness1 [y * sw1 + x] = cell->darkness
2299 ? 255 - (cell->darkness - 1) 2548 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2300 : 255 - FOW_DARKNESS; 2549 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2301 } 2550 }
2302 } 2551 }
2303 2552
2304 for (y = 0; y < sh; ++y) 2553 for (y = 0; y < sh; ++y)
2305 for (x = 0; x < sw; ++x) 2554 for (x = 0; x < sw; ++x)
… …
2324 2573
2325 uint8_t r13 = (d13 + d23 + d12) / 3; 2574 uint8_t r13 = (d13 + d23 + d12) / 3;
2326 uint8_t r23 = d23; 2575 uint8_t r23 = d23;
2327 uint8_t r33 = (d23 + d33 + d32) / 3; 2576 uint8_t r33 = (d23 + d33 + d32) / 3;
2328 2577
2329 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2578 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2330 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2579 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2331 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2580 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2332 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2581 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2333 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2582 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2334 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2583 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2335 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2584 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2336 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2585 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2337 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2586 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2338 } 2587 }
2339 2588
2340 free (darkness1); 2589 free (darkness1);
2341 2590
2342 EXTEND (SP, 3); 2591 EXTEND (SP, 3);
2343 PUSHs (sv_2mortal (newSViv (sw34))); 2592 PUSHs (sv_2mortal (newSViv (sw3)));
2344 PUSHs (sv_2mortal (newSViv (sh3))); 2593 PUSHs (sv_2mortal (newSViv (sh3)));
2345 PUSHs (darkness3_sv); 2594 PUSHs (darkness3_sv);
2346} 2595}
2347 2596
2348SV * 2597SV *
… …
2605void 2854void
2606set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2855set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2607 CODE: 2856 CODE:
2608{ 2857{
2609 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2858 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2610 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2859 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2611 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2860 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2612} 2861}
2613 2862
2614void 2863void
2615set_reverse_stereo (DC::Channel self, int flip) 2864set_reverse_stereo (DC::Channel self, int flip)
… …
2718 } *civ, const_iv[] = { 2967 } *civ, const_iv[] = {
2719# define const_iv(name) { # name, (IV)name } 2968# define const_iv(name) { # name, (IV)name }
2720 const_iv (GL_VENDOR), 2969 const_iv (GL_VENDOR),
2721 const_iv (GL_VERSION), 2970 const_iv (GL_VERSION),
2722 const_iv (GL_EXTENSIONS), 2971 const_iv (GL_EXTENSIONS),
2972 const_iv (GL_MAX_TEXTURE_UNITS),
2723 const_iv (GL_COLOR_MATERIAL), 2973 const_iv (GL_COLOR_MATERIAL),
2724 const_iv (GL_SMOOTH), 2974 const_iv (GL_SMOOTH),
2725 const_iv (GL_FLAT), 2975 const_iv (GL_FLAT),
2726 const_iv (GL_DITHER), 2976 const_iv (GL_DITHER),
2727 const_iv (GL_BLEND), 2977 const_iv (GL_BLEND),
… …
2739 const_iv (GL_ZERO), 2989 const_iv (GL_ZERO),
2740 const_iv (GL_SRC_ALPHA), 2990 const_iv (GL_SRC_ALPHA),
2741 const_iv (GL_DST_ALPHA), 2991 const_iv (GL_DST_ALPHA),
2742 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2992 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2743 const_iv (GL_ONE_MINUS_DST_ALPHA), 2993 const_iv (GL_ONE_MINUS_DST_ALPHA),
2994 const_iv (GL_SRC_COLOR),
2995 const_iv (GL_DST_COLOR),
2996 const_iv (GL_ONE_MINUS_SRC_COLOR),
2997 const_iv (GL_ONE_MINUS_DST_COLOR),
2744 const_iv (GL_SRC_ALPHA_SATURATE), 2998 const_iv (GL_SRC_ALPHA_SATURATE),
2745 const_iv (GL_RGB), 2999 const_iv (GL_RGB),
2746 const_iv (GL_RGBA), 3000 const_iv (GL_RGBA),
2747 const_iv (GL_RGBA4), 3001 const_iv (GL_RGBA4),
2748 const_iv (GL_RGBA8), 3002 const_iv (GL_RGBA8),
… …
2816 const_iv (GL_NICEST), 3070 const_iv (GL_NICEST),
2817 const_iv (GL_V2F), 3071 const_iv (GL_V2F),
2818 const_iv (GL_V3F), 3072 const_iv (GL_V3F),
2819 const_iv (GL_T2F_V3F), 3073 const_iv (GL_T2F_V3F),
2820 const_iv (GL_T2F_N3F_V3F), 3074 const_iv (GL_T2F_N3F_V3F),
3075 const_iv (GL_FUNC_ADD),
3076 const_iv (GL_FUNC_SUBTRACT),
3077 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2821# undef const_iv 3078# undef const_iv
2822 }; 3079 };
2823 3080
2824 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3081 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2825 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3082 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2832disable_GL_EXT_blend_func_separate () 3089disable_GL_EXT_blend_func_separate ()
2833 CODE: 3090 CODE:
2834 gl.BlendFuncSeparate = 0; 3091 gl.BlendFuncSeparate = 0;
2835 gl.BlendFuncSeparateEXT = 0; 3092 gl.BlendFuncSeparateEXT = 0;
2836 3093
3094void
3095apple_nvidia_bug (int enable)
3096
2837char * 3097char *
2838gl_vendor () 3098gl_vendor ()
2839 CODE: 3099 CODE:
2840 RETVAL = (char *)glGetString (GL_VENDOR); 3100 RETVAL = (char *)glGetString (GL_VENDOR);
2841 OUTPUT: 3101 OUTPUT:
… …
2890 3150
2891void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3151void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2892 CODE: 3152 CODE:
2893 gl_BlendFuncSeparate (sa, da, saa, daa); 3153 gl_BlendFuncSeparate (sa, da, saa, daa);
2894 3154
3155# void glBlendEquation (int se)
3156
2895void glDepthMask (int flag) 3157void glDepthMask (int flag)
2896 3158
2897void glLogicOp (int opcode) 3159void glLogicOp (int opcode)
2898 3160
2899void glColorMask (int red, int green, int blue, int alpha) 3161void glColorMask (int red, int green, int blue, int alpha)
… …
2933void glRotate (float angle, float x, float y, float z) 3195void glRotate (float angle, float x, float y, float z)
2934 CODE: 3196 CODE:
2935 glRotatef (angle, x, y, z); 3197 glRotatef (angle, x, y, z);
2936 3198
2937void glColor (float r, float g, float b, float a = 1.0) 3199void glColor (float r, float g, float b, float a = 1.0)
3200 PROTOTYPE: @
2938 ALIAS: 3201 ALIAS:
2939 glColor_premultiply = 1 3202 glColor_premultiply = 1
2940 CODE: 3203 CODE:
2941 if (ix) 3204 if (ix)
2942 { 3205 {
… …
3047void glNewList (int list, int mode = GL_COMPILE) 3310void glNewList (int list, int mode = GL_COMPILE)
3048 3311
3049void glEndList () 3312void glEndList ()
3050 3313
3051void glCallList (int list) 3314void glCallList (int list)
3315
3316void c_init ()
3317 CODE:
3318 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3319 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3052 3320
3053MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3321MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3054 3322
3055PROTOTYPES: DISABLE 3323PROTOTYPES: DISABLE
3056 3324

Diff Legend

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