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.271 by root, Sun Jul 20 15:09:29 2008 UTC vs.
Revision 1.296 by root, Mon Dec 21 23:52:34 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>
… …
38#include <SDL_thread.h> 37#include <SDL_thread.h>
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46#endif
43 47
44#define PANGO_ENABLE_BACKEND 48#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 49#define G_DISABLE_CAST_CHECKS
46 50
47#include <glib/gmacros.h> 51#include <glib/gmacros.h>
… …
76#define expect_false(expr) expect ((expr) != 0, 0) 80#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 81#define expect_true(expr) expect ((expr) != 0, 1)
78 82
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 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 */
81#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
82 89
83#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
85 92
86#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
87 94
88/* mask out modifiers we are not interested in */ 95/* mask out modifiers we are not interested in */
89#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
102#define TEXID_HIDDEN 3
90 103
91static AV *texture_av; 104static AV *texture_av;
92 105
93static struct 106static struct
94{ 107{
… …
226 int w, h; 239 int w, h;
227 float s, t; 240 float s, t;
228 uint8_t r, g, b, a; 241 uint8_t r, g, b, a;
229 tileid smoothtile; 242 tileid smoothtile;
230 uint8_t smoothlevel; 243 uint8_t smoothlevel;
244 uint8_t unused; /* set to zero on use */
231} maptex; 245} maptex;
232 246
233typedef struct { 247typedef struct {
234 uint32_t player; 248 uint32_t player;
235 tileid tile[3]; 249 tileid tile[3];
… …
521 if (!svp || !SvTRUE (*svp)) 535 if (!svp || !SvTRUE (*svp))
522 return 0; 536 return 0;
523 537
524 return 1; 538 return 1;
525} 539}
540
541/******************************************************************************/
542
543/* process keyboard modifiers */
544static int
545mod_munge (int mod)
546{
547 mod &= MOD_MASK;
548
549 if (mod & (KMOD_META | KMOD_ALT))
550 mod |= KMOD_LRAM;
551
552 return mod;
553}
554
555static void
556deliantra_main ()
557{
558 char *argv[] = { 0 };
559 call_argv ("::main", G_DISCARD | G_VOID, argv);
560}
561
562#ifdef __MACOSX__
563 /* to due surprising braindamage on the side of SDL design, we
564 * do some mind-boggling hack here: SDL requires a custom main()
565 * on OS X, so... we provide one and call the original main(), which,
566 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
567 * and which calls our main (== SDL_main) back.
568 */
569 extern C_LINKAGE int
570 main (int argc, char *argv[])
571 {
572 deliantra_main ();
573 }
574
575 #undef main
576
577 extern C_LINKAGE int main (int argc, char *argv[]);
578
579 static void
580 SDL_braino (void)
581 {
582 char *argv[] = { "deliantra client", 0 };
583 (main) (1, argv);
584 }
585#else
586 static void
587 SDL_braino (void)
588 {
589 deliantra_main ();
590 }
591#endif
526 592
527MODULE = Deliantra::Client PACKAGE = DC 593MODULE = Deliantra::Client PACKAGE = DC
528 594
529PROTOTYPES: ENABLE 595PROTOTYPES: ENABLE
530 596
… …
559 const_iv (SDL_USEREVENT), 625 const_iv (SDL_USEREVENT),
560 626
561 const_iv (SDL_APPINPUTFOCUS), 627 const_iv (SDL_APPINPUTFOCUS),
562 const_iv (SDL_APPMOUSEFOCUS), 628 const_iv (SDL_APPMOUSEFOCUS),
563 const_iv (SDL_APPACTIVE), 629 const_iv (SDL_APPACTIVE),
630
631
632 const_iv (SDLK_UNKNOWN),
633 const_iv (SDLK_FIRST),
634 const_iv (SDLK_BACKSPACE),
635 const_iv (SDLK_TAB),
636 const_iv (SDLK_CLEAR),
637 const_iv (SDLK_RETURN),
638 const_iv (SDLK_PAUSE),
639 const_iv (SDLK_ESCAPE),
640 const_iv (SDLK_SPACE),
641 const_iv (SDLK_EXCLAIM),
642 const_iv (SDLK_QUOTEDBL),
643 const_iv (SDLK_HASH),
644 const_iv (SDLK_DOLLAR),
645 const_iv (SDLK_AMPERSAND),
646 const_iv (SDLK_QUOTE),
647 const_iv (SDLK_LEFTPAREN),
648 const_iv (SDLK_RIGHTPAREN),
649 const_iv (SDLK_ASTERISK),
650 const_iv (SDLK_PLUS),
651 const_iv (SDLK_COMMA),
652 const_iv (SDLK_MINUS),
653 const_iv (SDLK_PERIOD),
654 const_iv (SDLK_SLASH),
655 const_iv (SDLK_0),
656 const_iv (SDLK_1),
657 const_iv (SDLK_2),
658 const_iv (SDLK_3),
659 const_iv (SDLK_4),
660 const_iv (SDLK_5),
661 const_iv (SDLK_6),
662 const_iv (SDLK_7),
663 const_iv (SDLK_8),
664 const_iv (SDLK_9),
665 const_iv (SDLK_COLON),
666 const_iv (SDLK_SEMICOLON),
667 const_iv (SDLK_LESS),
668 const_iv (SDLK_EQUALS),
669 const_iv (SDLK_GREATER),
670 const_iv (SDLK_QUESTION),
671 const_iv (SDLK_AT),
672
673 const_iv (SDLK_LEFTBRACKET),
674 const_iv (SDLK_BACKSLASH),
675 const_iv (SDLK_RIGHTBRACKET),
676 const_iv (SDLK_CARET),
677 const_iv (SDLK_UNDERSCORE),
678 const_iv (SDLK_BACKQUOTE),
679 const_iv (SDLK_DELETE),
564 680
565 const_iv (SDLK_FIRST), 681 const_iv (SDLK_FIRST),
566 const_iv (SDLK_LAST), 682 const_iv (SDLK_LAST),
567 const_iv (SDLK_KP0), 683 const_iv (SDLK_KP0),
568 const_iv (SDLK_KP1), 684 const_iv (SDLK_KP1),
… …
644 const_iv (KMOD_RMETA), 760 const_iv (KMOD_RMETA),
645 const_iv (KMOD_NUM), 761 const_iv (KMOD_NUM),
646 const_iv (KMOD_CAPS), 762 const_iv (KMOD_CAPS),
647 const_iv (KMOD_MODE), 763 const_iv (KMOD_MODE),
648 764
765 const_iv (KMOD_LRAM),
766
649 const_iv (MIX_DEFAULT_FORMAT), 767 const_iv (MIX_DEFAULT_FORMAT),
650 768
651 const_iv (SDL_INIT_TIMER), 769 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO), 770 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO), 771 const_iv (SDL_INIT_VIDEO),
… …
705 823
706IV minpot (UV n) 824IV minpot (UV n)
707 825
708IV popcount (UV n) 826IV popcount (UV n)
709 827
828NV distance (NV dx, NV dy)
829 CODE:
830 RETVAL = pow (dx * dx + dy * dy, 0.5);
831 OUTPUT:
832 RETVAL
833
710void 834void
711pango_init () 835pango_init ()
712 CODE: 836 CODE:
713{ 837{
714 opengl_fontmap = pango_opengl_font_map_new (); 838 opengl_fontmap = pango_opengl_font_map_new ();
… …
720 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 844 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
721#endif 845#endif
722} 846}
723 847
724char *SDL_GetError () 848char *SDL_GetError ()
849
850void SDL_braino ()
725 851
726int SDL_Init (U32 flags) 852int SDL_Init (U32 flags)
727 853
728int SDL_InitSubSystem (U32 flags) 854int SDL_InitSubSystem (U32 flags)
729 855
… …
838 { 964 {
839 case SDL_KEYDOWN: 965 case SDL_KEYDOWN:
840 case SDL_KEYUP: 966 case SDL_KEYUP:
841 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 967 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
842 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 968 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
843 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 969 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
844 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 970 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
845 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 971 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
846 break; 972 break;
847 973
848 case SDL_ACTIVEEVENT: 974 case SDL_ACTIVEEVENT:
849 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 975 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
867 x = ev.motion.x; 993 x = ev.motion.x;
868 y = ev.motion.y; 994 y = ev.motion.y;
869 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 995 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
870 } 996 }
871 997
872 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 998 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
873 hv_store (hv, "state", 5, newSViv (state), 0); 999 hv_store (hv, "state", 5, newSViv (state), 0);
874 hv_store (hv, "x", 1, newSViv (x), 0); 1000 hv_store (hv, "x", 1, newSViv (x), 0);
875 hv_store (hv, "y", 1, newSViv (y), 0); 1001 hv_store (hv, "y", 1, newSViv (y), 0);
876 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1002 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
877 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1003 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1093#if DEBUG 1219#if DEBUG
1094 VALGRIND_DO_LEAK_CHECK; 1220 VALGRIND_DO_LEAK_CHECK;
1095#endif 1221#endif
1096} 1222}
1097 1223
1224int
1225SvREFCNT (SV *sv)
1226 CODE:
1227 RETVAL = SvREFCNT (sv);
1228 OUTPUT:
1229 RETVAL
1230
1098MODULE = Deliantra::Client PACKAGE = DC::Font 1231MODULE = Deliantra::Client PACKAGE = DC::Font
1099 1232
1100PROTOTYPES: DISABLE 1233PROTOTYPES: DISABLE
1101 1234
1102DC::Font 1235DC::Font
… …
1531 if (ix) 1664 if (ix)
1532 { 1665 {
1533 glDisable (GL_ALPHA_TEST); 1666 glDisable (GL_ALPHA_TEST);
1534 glDisable (GL_BLEND); 1667 glDisable (GL_BLEND);
1535 } 1668 }
1669}
1670
1671void
1672draw_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)
1673 PROTOTYPE: @
1674 CODE:
1675{
1676 glEnable (GL_TEXTURE_2D);
1677 glEnable (GL_BLEND);
1678 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1679 glBindTexture (GL_TEXTURE_2D, name1);
1680
1681 glColor3f (intensity, intensity, intensity);
1682 glPushMatrix ();
1683 glScalef (1./3, 1./3, 1.);
1684
1685 if (blend > 0.f)
1686 {
1687 float dx3 = dx * -3.f / w;
1688 float dy3 = dy * -3.f / h;
1689 GLfloat env_color[4] = { 0., 0., 0., blend };
1690
1691 /* interpolate the two shadow textures */
1692 /* stage 0 == rgb(glcolor) + alpha(t0) */
1693 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1694
1695 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1696 gl.ActiveTexture (GL_TEXTURE1);
1697 glEnable (GL_TEXTURE_2D);
1698 glBindTexture (GL_TEXTURE_2D, name2);
1699 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1700
1701 /* rgb == rgb(glcolor) */
1702 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1705
1706 /* alpha = interpolate t0, t1 by env_alpha */
1707 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1708
1709 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1710 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1712
1713 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1714 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1715
1716 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1717 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1718
1719 glBegin (GL_QUADS);
1720 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1721 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1722 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1723 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1724 glEnd ();
1725
1726 glDisable (GL_TEXTURE_2D);
1727 gl.ActiveTexture (GL_TEXTURE0);
1728 }
1729 else
1730 {
1731 /* simple blending of one texture, also opengl <1.3 path */
1732 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1733
1734 glBegin (GL_QUADS);
1735 glTexCoord2f (0, 0); glVertex2f (0, 0);
1736 glTexCoord2f (0, t); glVertex2f (0, h);
1737 glTexCoord2f (s, t); glVertex2f (w, h);
1738 glTexCoord2f (s, 0); glVertex2f (w, 0);
1739 glEnd ();
1740 }
1741
1742 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1743 {
1744 int x, y;
1745 int dx3 = dx * 3;
1746 int dy3 = dy * 3;
1747
1748 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1749 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1750 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1751 glTranslatef (-1., -1., 0);
1752 glBegin (GL_QUADS);
1753
1754 for (y = 1; y < h; y += 3)
1755 {
1756 int y1 = y - dy3;
1757 int y1valid = y1 >= 0 && y1 < h;
1758
1759 for (x = 1; x < w; x += 3)
1760 {
1761 int x1 = x - dx3;
1762 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1763 uint8_t h2;
1764
1765 if (y1valid && x1 >= 0 && x1 < w)
1766 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1767 else
1768 h2 = 1; /* out of range == invisible */
1769
1770 if (h1 || h2)
1771 {
1772 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1773 glColor4f (1., 1., 1., alpha);
1774
1775 glTexCoord2f (0, 0.); glVertex2i (x , y );
1776 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1777 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1778 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1779 }
1780 }
1781 }
1782 }
1783
1784 glEnd ();
1785
1786 glPopMatrix ();
1787
1788 glDisable (GL_TEXTURE_2D);
1789 glDisable (GL_BLEND);
1536} 1790}
1537 1791
1538IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1792IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1539 CODE: 1793 CODE:
1540{ 1794{
… …
1646 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1900 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1647 // use uglier nearest interpolation because linear suffers 1901 // use uglier nearest interpolation because linear suffers
1648 // from transparent color bleeding and ugly wrapping effects. 1902 // from transparent color bleeding and ugly wrapping effects.
1649 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1903 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1650} 1904}
1905
1906void
1907expire_textures (DC::Map self, int texid, int count)
1908 PPCODE:
1909 for (; texid < self->texs && count; ++texid, --count)
1910 {
1911 maptex *tex = self->tex + texid;
1912
1913 if (tex->name)
1914 {
1915 if (tex->unused)
1916 {
1917 tex->name = 0;
1918 tex->unused = 0;
1919 XPUSHs (sv_2mortal (newSViv (texid)));
1920 }
1921 else
1922 tex->unused = 1;
1923 }
1924 }
1651 1925
1652int 1926int
1653ox (DC::Map self) 1927ox (DC::Map self)
1654 ALIAS: 1928 ALIAS:
1655 oy = 1 1929 oy = 1
… …
1736 { 2010 {
1737 ext = *data++; 2011 ext = *data++;
1738 cmd = ext & 0x7f; 2012 cmd = ext & 0x7f;
1739 2013
1740 if (cmd < 4) 2014 if (cmd < 4)
1741 cell->darkness = 255 - ext * 64 + 1; 2015 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1742 else if (cmd == 5) // health 2016 else if (cmd == 5) // health
1743 { 2017 {
1744 cell->stat_width = 1; 2018 cell->stat_width = 1;
1745 cell->stat_hp = *data++; 2019 cell->stat_hp = *data++;
1746 } 2020 }
… …
1776 cell->tile [z] = self->face2tile [face]; 2050 cell->tile [z] = self->face2tile [face];
1777 2051
1778 if (cell->tile [z]) 2052 if (cell->tile [z])
1779 { 2053 {
1780 maptex *tex = self->tex + cell->tile [z]; 2054 maptex *tex = self->tex + cell->tile [z];
2055 tex->unused = 0;
1781 if (!tex->name) 2056 if (!tex->name)
1782 av_push (missing, newSViv (cell->tile [z])); 2057 av_push (missing, newSViv (cell->tile [z]));
1783 2058
1784 if (tex->smoothtile) 2059 if (tex->smoothtile)
1785 { 2060 {
1786 maptex *smooth = self->tex + tex->smoothtile; 2061 maptex *smooth = self->tex + tex->smoothtile;
2062 smooth->unused = 0;
1787 if (!smooth->name) 2063 if (!smooth->name)
1788 av_push (missing, newSViv (tex->smoothtile)); 2064 av_push (missing, newSViv (tex->smoothtile));
1789 } 2065 }
1790 } 2066 }
1791 } 2067 }
… …
1862 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2138 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1863 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2139 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1864 smooth_key skey; 2140 smooth_key skey;
1865 int pl_x, pl_y; 2141 int pl_x, pl_y;
1866 maptex pl_tex; 2142 maptex pl_tex;
1867 rc_t *rc = rc_alloc (); 2143 rc_t *rc = rc_alloc ();
2144 rc_t *rc_ov = rc_alloc ();
1868 rc_key_t key; 2145 rc_key_t key;
1869 rc_array_t *arr; 2146 rc_array_t *arr, *arr_hidden;
1870 2147
1871 pl_tex.name = 0; 2148 pl_tex.name = 0;
1872 2149
1873 // thats current max. sorry. 2150 // that's current max. sorry.
1874 if (sw > 255) sw = 255; 2151 if (sw > 255) sw = 255;
1875 if (sh > 255) sh = 255; 2152 if (sh > 255) sh = 255;
1876 2153
1877 // clear key, in case of extra padding 2154 // clear key, in case of extra padding
1878 memset (&skey, 0, sizeof (skey)); 2155 memset (&skey, 0, sizeof (skey));
… …
1882 key.g = 255; 2159 key.g = 255;
1883 key.b = 255; 2160 key.b = 255;
1884 key.a = 255; 2161 key.a = 255;
1885 key.mode = GL_QUADS; 2162 key.mode = GL_QUADS;
1886 key.format = GL_T2F_V3F; 2163 key.format = GL_T2F_V3F;
1887 key.texname = -1;
1888 2164
1889 mx += self->x; 2165 mx += self->x;
1890 my += self->y; 2166 my += self->y;
1891 2167
1892 // first pass: determine smooth_max 2168 // first pass: determine smooth_max
… …
1913 2189
1914 glEnable (GL_BLEND); 2190 glEnable (GL_BLEND);
1915 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2191 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1916 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2192 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1917 2193
2194 key.texname = self->tex [TEXID_HIDDEN].name;
2195 arr_hidden = rc_array (rc_ov, &key);
2196
1918 for (z = 0; z <= 2; z++) 2197 for (z = 0; z <= 2; z++)
1919 { 2198 {
1920 memset (smooth_level, 0, sizeof (smooth_level)); 2199 memset (smooth_level, 0, sizeof (smooth_level));
2200 key.texname = -1;
1921 2201
1922 for (y = 0; y < sh; y++) 2202 for (y = 0; y < sh; y++)
1923 if (0 <= y + my && y + my < self->rows) 2203 if (0 <= y + my && y + my < self->rows)
1924 { 2204 {
1925 maprow *row = self->row + (y + my); 2205 maprow *row = self->row + (y + my);
… …
1931 tileid tile = cell->tile [z]; 2211 tileid tile = cell->tile [z];
1932 2212
1933 if (tile) 2213 if (tile)
1934 { 2214 {
1935 maptex tex = self->tex [tile]; 2215 maptex tex = self->tex [tile];
1936 int px = (x + 1) * T - tex.w; 2216 int px, py;
1937 int py = (y + 1) * T - tex.h;
1938 2217
1939 if (key.texname != tex.name) 2218 if (key.texname != tex.name)
1940 { 2219 {
2220 self->tex [tile].unused = 0;
2221
1941 if (!tex.name) 2222 if (!tex.name)
1942 tex = self->tex [2]; /* missing, replace by noface */ 2223 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1943 2224
1944 key.texname = tex.name; 2225 key.texname = tex.name;
1945 arr = rc_array (rc, &key); 2226 arr = rc_array (rc, &key);
1946 } 2227 }
2228
2229 px = (x + 1) * T - tex.w;
2230 py = (y + 1) * T - tex.h;
1947 2231
1948 if (expect_false (cell->player == player) && expect_false (z == 2)) 2232 if (expect_false (cell->player == player) && expect_false (z == 2))
1949 { 2233 {
1950 pl_x = px; 2234 pl_x = px;
1951 pl_y = py; 2235 pl_y = py;
… …
1956 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2240 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1957 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2241 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1958 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2242 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1959 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2243 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1960 2244
1961 if (expect_false (cell->flags) && expect_false (z == 2))
1962 {
1963 // overlays such as the speech bubble, probably more to come
1964 if (cell->flags & 1)
1965 {
1966 maptex tex = self->tex [1];
1967 int px = x * T + T * 2 / 32;
1968 int py = y * T - T * 6 / 32;
1969
1970 if (tex.name)
1971 {
1972 if (key.texname != tex.name)
1973 {
1974 key.texname = tex.name;
1975 arr = rc_array (rc, &key);
1976 }
1977
1978 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1979 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1980 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1981 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1982 }
1983 }
1984 }
1985
1986 // update smooth hash 2245 // update smooth hash
1987 if (tex.smoothtile) 2246 if (tex.smoothtile)
1988 { 2247 {
1989 skey.tile = tex.smoothtile; 2248 skey.tile = tex.smoothtile;
1990 skey.level = tex.smoothlevel; 2249 skey.level = tex.smoothlevel;
… …
2018 // corners 2277 // corners
2019 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2278 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2020 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2279 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2021 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2280 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2022 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2281 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2282 }
2283 }
2284
2285 if (expect_false (z == 2) && expect_false (cell->flags))
2286 {
2287 // overlays such as the speech bubble, probably more to come
2288 if (cell->flags & 1)
2289 {
2290 rc_key_t key_ov = key;
2291 maptex tex = self->tex [TEXID_SPEECH];
2292 rc_array_t *arr;
2293 int px = x * T + T * 2 / 32;
2294 int py = y * T - T * 6 / 32;
2295
2296 key_ov.texname = tex.name;
2297 arr = rc_array (rc_ov, &key_ov);
2298
2299 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2300 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2301 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2302 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2023 } 2303 }
2024 } 2304 }
2025 } 2305 }
2026 } 2306 }
2027 2307
… …
2067 { 2347 {
2068 // this time avoiding texture state changes 2348 // this time avoiding texture state changes
2069 // save gobs of state changes. 2349 // save gobs of state changes.
2070 if (key.texname != tex.name) 2350 if (key.texname != tex.name)
2071 { 2351 {
2352 self->tex [skey->tile].unused = 0;
2353
2072 glEnd (); 2354 glEnd ();
2073 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2355 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2074 glBegin (GL_QUADS); 2356 glBegin (GL_QUADS);
2075 } 2357 }
2076 2358
… …
2122 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2404 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2123 2405
2124 rc_draw (rc); 2406 rc_draw (rc);
2125 } 2407 }
2126 2408
2409 rc_draw (rc_ov);
2410 rc_clear (rc_ov);
2411
2127 glDisable (GL_BLEND); 2412 glDisable (GL_BLEND);
2128 rc_free (rc); 2413 rc_free (rc);
2414 rc_free (rc_ov);
2129 2415
2130 // top layer: overlays such as the health bar 2416 // top layer: overlays such as the health bar
2131 for (y = 0; y < sh; y++) 2417 for (y = 0; y < sh; y++)
2132 if (0 <= y + my && y + my < self->rows) 2418 if (0 <= y + my && y + my < self->rows)
2133 { 2419 {
… …
2138 { 2424 {
2139 mapcell *cell = row->col + (x + mx - row->c0); 2425 mapcell *cell = row->col + (x + mx - row->c0);
2140 2426
2141 int px = x * T; 2427 int px = x * T;
2142 int py = y * T; 2428 int py = y * T;
2429
2430 if (expect_false (cell->player == player))
2431 {
2432 px += sdx;
2433 py += sdy;
2434 }
2143 2435
2144 if (cell->stat_hp) 2436 if (cell->stat_hp)
2145 { 2437 {
2146 int width = cell->stat_width * T; 2438 int width = cell->stat_width * T;
2147 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2439 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2158 } 2450 }
2159 } 2451 }
2160} 2452}
2161 2453
2162void 2454void
2163draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2455draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2164 CODE: 2456 CODE:
2165{ 2457{
2166 static float color[16][3] = { 2458 static float color[16][3] = {
2167 { 0.00F, 0.00F, 0.00F }, 2459 { 0.00f, 0.00f, 0.00f },
2168 { 1.00F, 1.00F, 1.00F }, 2460 { 1.00f, 1.00f, 1.00f },
2169 { 0.00F, 0.00F, 0.55F }, 2461 { 0.00f, 0.00f, 0.55f },
2170 { 1.00F, 0.00F, 0.00F }, 2462 { 1.00f, 0.00f, 0.00f },
2171 2463
2172 { 1.00F, 0.54F, 0.00F }, 2464 { 1.00f, 0.54f, 0.00f },
2173 { 0.11F, 0.56F, 1.00F }, 2465 { 0.11f, 0.56f, 1.00f },
2174 { 0.93F, 0.46F, 0.00F }, 2466 { 0.93f, 0.46f, 0.00f },
2175 { 0.18F, 0.54F, 0.34F }, 2467 { 0.18f, 0.54f, 0.34f },
2176 2468
2177 { 0.56F, 0.73F, 0.56F }, 2469 { 0.56f, 0.73f, 0.56f },
2178 { 0.80F, 0.80F, 0.80F }, 2470 { 0.80f, 0.80f, 0.80f },
2179 { 0.55F, 0.41F, 0.13F }, 2471 { 0.55f, 0.41f, 0.13f },
2180 { 0.99F, 0.77F, 0.26F }, 2472 { 0.99f, 0.77f, 0.26f },
2181 2473
2182 { 0.74F, 0.65F, 0.41F }, 2474 { 0.74f, 0.65f, 0.41f },
2183 2475
2184 { 0.00F, 1.00F, 1.00F }, 2476 { 0.00f, 1.00f, 1.00f },
2185 { 1.00F, 0.00F, 1.00F }, 2477 { 1.00f, 0.00f, 1.00f },
2186 { 1.00F, 1.00F, 0.00F }, 2478 { 1.00f, 1.00f, 0.00f },
2187 }; 2479 };
2188 2480
2189 int x, y; 2481 int x, y;
2190 2482
2191 glEnable (GL_TEXTURE_2D); 2483 glEnable (GL_TEXTURE_2D);
2484 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2485 * but the nvidia driver (185.18.14) mishandles alpha textures
2486 * and takes the colour from god knows where instead of using
2487 * Cp. MODULATE results in the same colour, but slightly different
2488 * alpha, but atcually gives us the correct colour with nvidia.
2489 */
2192 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2490 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2193 glEnable (GL_BLEND); 2491 glEnable (GL_BLEND);
2194 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2492 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2195 glBegin (GL_QUADS); 2493 glBegin (GL_QUADS);
2196 2494
2197 for (y = 0; y < h; y++) 2495 for (y = 0; y < h; y++)
… …
2201 2499
2202 if (m) 2500 if (m)
2203 { 2501 {
2204 float *c = color [m & 15]; 2502 float *c = color [m & 15];
2205 2503
2206 float tx1 = m & 0x40 ? 0.5 : 0.; 2504 float tx1 = m & 0x40 ? 0.5f : 0.f;
2207 float tx2 = tx1 + 0.5; 2505 float tx2 = tx1 + 0.5f;
2208 2506
2209 glColor4f (c[0], c[1], c[2], 0.75); 2507 glColor4f (c[0], c[1], c[2], 1);
2210 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2508 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2211 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2509 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2212 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2510 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2213 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2511 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2214 } 2512 }
… …
2222void 2520void
2223fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2521fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2224 PPCODE: 2522 PPCODE:
2225{ 2523{
2226 int x, y; 2524 int x, y;
2227 int sw1 = sw + 2; 2525 int sw1 = sw + 2;
2228 int sh1 = sh + 2; 2526 int sh1 = sh + 2;
2229 int sh3 = sh * 3; 2527 int sh3 = sh * 3;
2230 int sw34 = (sw * 3 + 3) & ~3; 2528 int sw3 = sw * 3;
2231 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2529 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2232 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2530 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2233 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2531 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2234 2532
2235 SvPOK_only (darkness3_sv); 2533 SvPOK_only (darkness3_sv);
2236 SvCUR_set (darkness3_sv, sw34 * sh3); 2534 SvCUR_set (darkness3_sv, sw3 * sh3);
2237 2535
2238 mx += self->x - 1; 2536 mx += self->x - 1;
2239 my += self->y - 1; 2537 my += self->y - 1;
2240
2241 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2242 2538
2243 for (y = 0; y < sh1; y++) 2539 for (y = 0; y < sh1; y++)
2244 if (0 <= y + my && y + my < self->rows) 2540 if (0 <= y + my && y + my < self->rows)
2245 { 2541 {
2246 maprow *row = self->row + (y + my); 2542 maprow *row = self->row + (y + my);
… …
2249 if (row->c0 <= x + mx && x + mx < row->c1) 2545 if (row->c0 <= x + mx && x + mx < row->c1)
2250 { 2546 {
2251 mapcell *cell = row->col + (x + mx - row->c0); 2547 mapcell *cell = row->col + (x + mx - row->c0);
2252 2548
2253 darkness1 [y * sw1 + x] = cell->darkness 2549 darkness1 [y * sw1 + x] = cell->darkness
2254 ? 255 - (cell->darkness - 1) 2550 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2255 : 255 - FOW_DARKNESS; 2551 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2256 } 2552 }
2257 } 2553 }
2258 2554
2259 for (y = 0; y < sh; ++y) 2555 for (y = 0; y < sh; ++y)
2260 for (x = 0; x < sw; ++x) 2556 for (x = 0; x < sw; ++x)
… …
2279 2575
2280 uint8_t r13 = (d13 + d23 + d12) / 3; 2576 uint8_t r13 = (d13 + d23 + d12) / 3;
2281 uint8_t r23 = d23; 2577 uint8_t r23 = d23;
2282 uint8_t r33 = (d23 + d33 + d32) / 3; 2578 uint8_t r33 = (d23 + d33 + d32) / 3;
2283 2579
2284 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2580 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2285 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2581 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2286 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2582 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2287 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2583 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2288 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2584 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2289 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2585 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2290 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2586 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2291 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2587 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2292 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2588 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2293 } 2589 }
2294 2590
2295 free (darkness1); 2591 free (darkness1);
2296 2592
2297 EXTEND (SP, 3); 2593 EXTEND (SP, 3);
2298 PUSHs (sv_2mortal (newSViv (sw34))); 2594 PUSHs (sv_2mortal (newSViv (sw3)));
2299 PUSHs (sv_2mortal (newSViv (sh3))); 2595 PUSHs (sv_2mortal (newSViv (sh3)));
2300 PUSHs (darkness3_sv); 2596 PUSHs (darkness3_sv);
2301} 2597}
2302 2598
2303SV * 2599SV *
… …
2560void 2856void
2561set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2857set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2562 CODE: 2858 CODE:
2563{ 2859{
2564 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2860 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2565 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2861 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2566 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2862 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2567} 2863}
2568 2864
2569void 2865void
2570set_reverse_stereo (DC::Channel self, int flip) 2866set_reverse_stereo (DC::Channel self, int flip)
… …
2673 } *civ, const_iv[] = { 2969 } *civ, const_iv[] = {
2674# define const_iv(name) { # name, (IV)name } 2970# define const_iv(name) { # name, (IV)name }
2675 const_iv (GL_VENDOR), 2971 const_iv (GL_VENDOR),
2676 const_iv (GL_VERSION), 2972 const_iv (GL_VERSION),
2677 const_iv (GL_EXTENSIONS), 2973 const_iv (GL_EXTENSIONS),
2974 const_iv (GL_MAX_TEXTURE_UNITS),
2678 const_iv (GL_COLOR_MATERIAL), 2975 const_iv (GL_COLOR_MATERIAL),
2679 const_iv (GL_SMOOTH), 2976 const_iv (GL_SMOOTH),
2680 const_iv (GL_FLAT), 2977 const_iv (GL_FLAT),
2681 const_iv (GL_DITHER), 2978 const_iv (GL_DITHER),
2682 const_iv (GL_BLEND), 2979 const_iv (GL_BLEND),
… …
2694 const_iv (GL_ZERO), 2991 const_iv (GL_ZERO),
2695 const_iv (GL_SRC_ALPHA), 2992 const_iv (GL_SRC_ALPHA),
2696 const_iv (GL_DST_ALPHA), 2993 const_iv (GL_DST_ALPHA),
2697 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2994 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2698 const_iv (GL_ONE_MINUS_DST_ALPHA), 2995 const_iv (GL_ONE_MINUS_DST_ALPHA),
2996 const_iv (GL_SRC_COLOR),
2997 const_iv (GL_DST_COLOR),
2998 const_iv (GL_ONE_MINUS_SRC_COLOR),
2999 const_iv (GL_ONE_MINUS_DST_COLOR),
2699 const_iv (GL_SRC_ALPHA_SATURATE), 3000 const_iv (GL_SRC_ALPHA_SATURATE),
2700 const_iv (GL_RGB), 3001 const_iv (GL_RGB),
2701 const_iv (GL_RGBA), 3002 const_iv (GL_RGBA),
2702 const_iv (GL_RGBA4), 3003 const_iv (GL_RGBA4),
2703 const_iv (GL_RGBA8), 3004 const_iv (GL_RGBA8),
… …
2771 const_iv (GL_NICEST), 3072 const_iv (GL_NICEST),
2772 const_iv (GL_V2F), 3073 const_iv (GL_V2F),
2773 const_iv (GL_V3F), 3074 const_iv (GL_V3F),
2774 const_iv (GL_T2F_V3F), 3075 const_iv (GL_T2F_V3F),
2775 const_iv (GL_T2F_N3F_V3F), 3076 const_iv (GL_T2F_N3F_V3F),
3077 const_iv (GL_FUNC_ADD),
3078 const_iv (GL_FUNC_SUBTRACT),
3079 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2776# undef const_iv 3080# undef const_iv
2777 }; 3081 };
2778 3082
2779 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3083 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2780 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3084 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2787disable_GL_EXT_blend_func_separate () 3091disable_GL_EXT_blend_func_separate ()
2788 CODE: 3092 CODE:
2789 gl.BlendFuncSeparate = 0; 3093 gl.BlendFuncSeparate = 0;
2790 gl.BlendFuncSeparateEXT = 0; 3094 gl.BlendFuncSeparateEXT = 0;
2791 3095
3096void
3097apple_nvidia_bug (int enable)
3098
2792char * 3099char *
2793gl_vendor () 3100gl_vendor ()
2794 CODE: 3101 CODE:
2795 RETVAL = (char *)glGetString (GL_VENDOR); 3102 RETVAL = (char *)glGetString (GL_VENDOR);
2796 OUTPUT: 3103 OUTPUT:
… …
2845 3152
2846void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3153void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2847 CODE: 3154 CODE:
2848 gl_BlendFuncSeparate (sa, da, saa, daa); 3155 gl_BlendFuncSeparate (sa, da, saa, daa);
2849 3156
3157# void glBlendEquation (int se)
3158
2850void glDepthMask (int flag) 3159void glDepthMask (int flag)
2851 3160
2852void glLogicOp (int opcode) 3161void glLogicOp (int opcode)
2853 3162
2854void glColorMask (int red, int green, int blue, int alpha) 3163void glColorMask (int red, int green, int blue, int alpha)
… …
2888void glRotate (float angle, float x, float y, float z) 3197void glRotate (float angle, float x, float y, float z)
2889 CODE: 3198 CODE:
2890 glRotatef (angle, x, y, z); 3199 glRotatef (angle, x, y, z);
2891 3200
2892void glColor (float r, float g, float b, float a = 1.0) 3201void glColor (float r, float g, float b, float a = 1.0)
3202 PROTOTYPE: @
2893 ALIAS: 3203 ALIAS:
2894 glColor_premultiply = 1 3204 glColor_premultiply = 1
2895 CODE: 3205 CODE:
2896 if (ix) 3206 if (ix)
2897 { 3207 {
… …
3002void glNewList (int list, int mode = GL_COMPILE) 3312void glNewList (int list, int mode = GL_COMPILE)
3003 3313
3004void glEndList () 3314void glEndList ()
3005 3315
3006void glCallList (int list) 3316void glCallList (int list)
3317
3318void c_init ()
3319 CODE:
3320 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3321 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3007 3322
3008MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3323MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3009 3324
3010PROTOTYPES: DISABLE 3325PROTOTYPES: DISABLE
3011 3326

Diff Legend

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