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

Diff Legend

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