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.256 by root, Mon Mar 24 00:24:46 2008 UTC vs.
Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC

… …
39#include <SDL_endian.h> 39#include <SDL_endian.h>
40#include <SDL_image.h> 40#include <SDL_image.h>
41#include <SDL_mixer.h> 41#include <SDL_mixer.h>
42#include <SDL_opengl.h> 42#include <SDL_opengl.h>
43 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
44#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
46 51
47#include <glib/gmacros.h> 52#include <glib/gmacros.h>
48 53
… …
65# include <netinet/in.h> 70# include <netinet/in.h>
66# include <netinet/tcp.h> 71# include <netinet/tcp.h>
67# include <inttypes.h> 72# include <inttypes.h>
68#endif 73#endif
69 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71 85
72#define FOW_DARKNESS 32 86#define FOW_DARKNESS 64
73 87
74#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
75#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
76 90
77#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
78 92
79/* mask out modifiers we are not interested in */ 93/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81 95
82#if 0 96#define KMOD_LRAM 0x10000 // our extension
83# define PARACHUTE SDL_INIT_NOPARACHUTE 97
84#else 98#define TEXID_SPEECH 1
85# define PARACHUTE 0 99#define TEXID_NOFACE 2
86#endif 100#define TEXID_HIDDEN 3
87 101
88static AV *texture_av; 102static AV *texture_av;
89 103
90static struct 104static struct
91{ 105{
… …
185 199
186static void 200static void
187layout_update_font (DC__Layout self) 201layout_update_font (DC__Layout self)
188{ 202{
189 /* use a random scale factor to account for unknown descenders, 0.8 works 203 /* use a random scale factor to account for unknown descenders, 0.8 works
190 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
191 */ 205 */
192 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
193 207
194 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
195 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
223 int w, h; 237 int w, h;
224 float s, t; 238 float s, t;
225 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
226 tileid smoothtile; 240 tileid smoothtile;
227 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
228} maptex; 243} maptex;
229 244
230typedef struct { 245typedef struct {
231 uint32_t player; 246 uint32_t player;
232 tileid tile[3]; 247 tileid tile[3];
… …
364 self->oy = 0; 379 self->oy = 0;
365 self->row = 0; 380 self->row = 0;
366 self->rows = 0; 381 self->rows = 0;
367} 382}
368 383
384#define CELL_CLEAR(cell) \
385 do { \
386 if ((cell)->player) \
387 (cell)->tile [2] = 0; \
388 (cell)->darkness = 0; \
389 (cell)->stat_hp = 0; \
390 (cell)->flags = 0; \
391 (cell)->player = 0; \
392 } while (0)
393
369static void 394static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 395map_blank (DC__Map self, int x0, int y0, int w, int h)
371{ 396{
372 int x, y; 397 int x, y;
373 maprow *row; 398 maprow *row;
… …
387 if (x >= row->c1) 412 if (x >= row->c1)
388 break; 413 break;
389 414
390 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
391 416
392 cell->darkness = 0; 417 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 418 }
397 } 419 }
398} 420}
399 421
400typedef struct { 422typedef struct {
… …
511 if (!svp || !SvTRUE (*svp)) 533 if (!svp || !SvTRUE (*svp))
512 return 0; 534 return 0;
513 535
514 return 1; 536 return 1;
515} 537}
538
539/******************************************************************************/
540
541/* process keyboard modifiers */
542static int
543mod_munge (int mod)
544{
545 mod &= MOD_MASK;
546
547 if (mod & (KMOD_META | KMOD_ALT))
548 mod |= KMOD_LRAM;
549
550 return mod;
551}
552
553static void
554deliantra_main ()
555{
556 char *argv[] = { 0 };
557 call_argv ("::main", G_DISCARD | G_VOID, argv);
558}
559
560#ifdef __MACOSX__
561 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back.
566 */
567 extern C_LINKAGE int
568 main (int argc, char *argv[])
569 {
570 deliantra_main ();
571 }
572
573 #undef main
574
575 extern C_LINKAGE int main (int argc, char *argv[]);
576
577 static void
578 SDL_braino (void)
579 {
580 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv);
582 }
583#else
584 static void
585 SDL_braino (void)
586 {
587 deliantra_main ();
588 }
589#endif
516 590
517MODULE = Deliantra::Client PACKAGE = DC 591MODULE = Deliantra::Client PACKAGE = DC
518 592
519PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
520 594
… …
549 const_iv (SDL_USEREVENT), 623 const_iv (SDL_USEREVENT),
550 624
551 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
553 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
628
629
630 const_iv (SDLK_UNKNOWN),
631 const_iv (SDLK_FIRST),
632 const_iv (SDLK_BACKSPACE),
633 const_iv (SDLK_TAB),
634 const_iv (SDLK_CLEAR),
635 const_iv (SDLK_RETURN),
636 const_iv (SDLK_PAUSE),
637 const_iv (SDLK_ESCAPE),
638 const_iv (SDLK_SPACE),
639 const_iv (SDLK_EXCLAIM),
640 const_iv (SDLK_QUOTEDBL),
641 const_iv (SDLK_HASH),
642 const_iv (SDLK_DOLLAR),
643 const_iv (SDLK_AMPERSAND),
644 const_iv (SDLK_QUOTE),
645 const_iv (SDLK_LEFTPAREN),
646 const_iv (SDLK_RIGHTPAREN),
647 const_iv (SDLK_ASTERISK),
648 const_iv (SDLK_PLUS),
649 const_iv (SDLK_COMMA),
650 const_iv (SDLK_MINUS),
651 const_iv (SDLK_PERIOD),
652 const_iv (SDLK_SLASH),
653 const_iv (SDLK_0),
654 const_iv (SDLK_1),
655 const_iv (SDLK_2),
656 const_iv (SDLK_3),
657 const_iv (SDLK_4),
658 const_iv (SDLK_5),
659 const_iv (SDLK_6),
660 const_iv (SDLK_7),
661 const_iv (SDLK_8),
662 const_iv (SDLK_9),
663 const_iv (SDLK_COLON),
664 const_iv (SDLK_SEMICOLON),
665 const_iv (SDLK_LESS),
666 const_iv (SDLK_EQUALS),
667 const_iv (SDLK_GREATER),
668 const_iv (SDLK_QUESTION),
669 const_iv (SDLK_AT),
670
671 const_iv (SDLK_LEFTBRACKET),
672 const_iv (SDLK_BACKSLASH),
673 const_iv (SDLK_RIGHTBRACKET),
674 const_iv (SDLK_CARET),
675 const_iv (SDLK_UNDERSCORE),
676 const_iv (SDLK_BACKQUOTE),
677 const_iv (SDLK_DELETE),
554 678
555 const_iv (SDLK_FIRST), 679 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 680 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
… …
634 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
638 762
763 const_iv (KMOD_LRAM),
764
639 const_iv (MIX_DEFAULT_FORMAT), 765 const_iv (MIX_DEFAULT_FORMAT),
766
767 const_iv (SDL_INIT_TIMER),
768 const_iv (SDL_INIT_AUDIO),
769 const_iv (SDL_INIT_VIDEO),
770 const_iv (SDL_INIT_CDROM),
771 const_iv (SDL_INIT_JOYSTICK),
772 const_iv (SDL_INIT_EVERYTHING),
773 const_iv (SDL_INIT_NOPARACHUTE),
774 const_iv (SDL_INIT_EVENTTHREAD),
775
776 const_iv (SDL_GL_RED_SIZE),
777 const_iv (SDL_GL_GREEN_SIZE),
778 const_iv (SDL_GL_BLUE_SIZE),
779 const_iv (SDL_GL_ALPHA_SIZE),
780 const_iv (SDL_GL_DOUBLEBUFFER),
781 const_iv (SDL_GL_BUFFER_SIZE),
782 const_iv (SDL_GL_DEPTH_SIZE),
783 const_iv (SDL_GL_STENCIL_SIZE),
784 const_iv (SDL_GL_ACCUM_RED_SIZE),
785 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
786 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
787 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
788 const_iv (SDL_GL_STEREO),
789 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
790 const_iv (SDL_GL_MULTISAMPLESAMPLES),
791 const_iv (SDL_GL_ACCELERATED_VISUAL),
792 const_iv (SDL_GL_SWAP_CONTROL),
793
794 const_iv (FOW_DARKNESS)
640# undef const_iv 795# undef const_iv
641 }; 796 };
642 797
643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
673 CODE: 828 CODE:
674{ 829{
675 opengl_fontmap = pango_opengl_font_map_new (); 830 opengl_fontmap = pango_opengl_font_map_new ();
676 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 831 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
677 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 832 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
833 /*pango_context_set_font_description (opengl_context, default_font);*/
678#if PANGO_VERSION_CHECK (1, 15, 2) 834#if PANGO_VERSION_CHECK (1, 15, 2)
679 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 835 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 836 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
681#endif 837#endif
682} 838}
683 839
684char *
685SDL_GetError () 840char *SDL_GetError ()
686 841
687int 842void SDL_braino ()
688SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
689 843
690void 844int SDL_Init (U32 flags)
845
846int SDL_InitSubSystem (U32 flags)
847
848void SDL_QuitSubSystem (U32 flags)
849
691SDL_Quit () 850void SDL_Quit ()
851
852int SDL_GL_SetAttribute (int attr, int value)
853
854int SDL_GL_GetAttribute (int attr)
855 CODE:
856 if (SDL_GL_GetAttribute (attr, &RETVAL))
857 XSRETURN_UNDEF;
858 OUTPUT:
859 RETVAL
692 860
693void 861void
694SDL_ListModes (int rgb, int alpha) 862SDL_ListModes (int rgb, int alpha)
695 PPCODE: 863 PPCODE:
696{ 864{
… …
708 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 876 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
711 879
712 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 880 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
713#if SDL_VERSION_ATLEAST(1,2,10)
714 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
715 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 881 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
716#endif
717 882
718 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 883 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
719 884
720 if (m && m != (SDL_Rect **)-1) 885 if (m && m != (SDL_Rect **)-1)
721 while (*m) 886 while (*m)
722 { 887 {
723 if ((*m)->w >= 800 && (*m)->h >= 480) 888 if ((*m)->w >= 400 && (*m)->h >= 300)
724 { 889 {
725 AV *av = newAV (); 890 AV *av = newAV ();
726 av_push (av, newSViv ((*m)->w)); 891 av_push (av, newSViv ((*m)->w));
727 av_push (av, newSViv ((*m)->h)); 892 av_push (av, newSViv ((*m)->h));
728 av_push (av, newSViv (rgb)); 893 av_push (av, newSViv (rgb));
… …
791 { 956 {
792 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
793 case SDL_KEYUP: 958 case SDL_KEYUP:
794 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
795 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
796 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 961 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
797 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 962 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
798 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
799 break; 964 break;
800 965
801 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
802 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
820 x = ev.motion.x; 985 x = ev.motion.x;
821 y = ev.motion.y; 986 y = ev.motion.y;
822 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
823 } 988 }
824 989
825 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
826 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
827 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
828 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
829 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
830 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
915 } 1080 }
916 } 1081 }
917#endif 1082#endif
918} 1083}
919 1084
920void 1085int
921add_font (char *file) 1086add_font (char *file)
922 CODE: 1087 CODE:
923 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT:
1090 RETVAL
924 1091
925void 1092void
926load_image_inline (SV *image_) 1093load_image_inline (SV *image_)
927 ALIAS: 1094 ALIAS:
928 load_image_file = 1 1095 load_image_file = 1
… …
1044#if DEBUG 1211#if DEBUG
1045 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
1046#endif 1213#endif
1047} 1214}
1048 1215
1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
1049MODULE = Deliantra::Client PACKAGE = DC::Font 1223MODULE = Deliantra::Client PACKAGE = DC::Font
1050 1224
1051PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
1052 1226
1053DC::Font 1227DC::Font
… …
1482 if (ix) 1656 if (ix)
1483 { 1657 {
1484 glDisable (GL_ALPHA_TEST); 1658 glDisable (GL_ALPHA_TEST);
1485 glDisable (GL_BLEND); 1659 glDisable (GL_BLEND);
1486 } 1660 }
1661}
1662
1663void
1664draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1)
1665 PROTOTYPE: @
1666 CODE:
1667{
1668 glEnable (GL_TEXTURE_2D);
1669 glEnable (GL_BLEND);
1670 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672
1673 glColor4f (intensity, intensity, intensity, 0.9);
1674 glPushMatrix ();
1675 glScalef (1./3, 1./3, 1.);
1676
1677 glBindTexture (GL_TEXTURE_2D, name1);
1678
1679 glBegin (GL_QUADS);
1680 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1681 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1682 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1683 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1684 glEnd ();
1685
1686 glPopMatrix ();
1687
1688 glDisable (GL_TEXTURE_2D);
1689 glDisable (GL_BLEND);
1487} 1690}
1488 1691
1489IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1692IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1490 CODE: 1693 CODE:
1491{ 1694{
… …
1597 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1800 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1598 // use uglier nearest interpolation because linear suffers 1801 // use uglier nearest interpolation because linear suffers
1599 // from transparent color bleeding and ugly wrapping effects. 1802 // from transparent color bleeding and ugly wrapping effects.
1600 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1803 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1601} 1804}
1805
1806void
1807expire_textures (DC::Map self, int texid, int count)
1808 PPCODE:
1809 for (; texid < self->texs && count; ++texid, --count)
1810 {
1811 maptex *tex = self->tex + texid;
1812
1813 if (tex->name)
1814 {
1815 if (tex->unused)
1816 {
1817 tex->name = 0;
1818 tex->unused = 0;
1819 XPUSHs (sv_2mortal (newSViv (texid)));
1820 }
1821 else
1822 tex->unused = 1;
1823 }
1824 }
1602 1825
1603int 1826int
1604ox (DC::Map self) 1827ox (DC::Map self)
1605 ALIAS: 1828 ALIAS:
1606 oy = 1 1829 oy = 1
… …
1684 uint8_t ext, cmd; 1907 uint8_t ext, cmd;
1685 1908
1686 do 1909 do
1687 { 1910 {
1688 ext = *data++; 1911 ext = *data++;
1689 cmd = ext & 0x3f; 1912 cmd = ext & 0x7f;
1690 1913
1691 if (cmd < 4) 1914 if (cmd < 4)
1692 cell->darkness = 255 - ext * 64 + 1; 1915 cell->darkness = 255 - ext * 64 + 1;
1693 else if (cmd == 5) // health 1916 else if (cmd == 5) // health
1694 { 1917 {
… …
1697 } 1920 }
1698 else if (cmd == 6) // monster width 1921 else if (cmd == 6) // monster width
1699 cell->stat_width = *data++ + 1; 1922 cell->stat_width = *data++ + 1;
1700 else if (cmd == 0x47) 1923 else if (cmd == 0x47)
1701 { 1924 {
1702 if (*data == 4) 1925 if (*data == 1) cell->player = data [1];
1703 ; // decode player count 1926 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1927 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1928 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1704 1929
1705 data += *data + 1; 1930 data += *data + 1;
1706 } 1931 }
1707 else if (cmd == 8) // cell flags 1932 else if (cmd == 8) // cell flags
1708 cell->flags = *data++; 1933 cell->flags = *data++;
… …
1725 cell->tile [z] = self->face2tile [face]; 1950 cell->tile [z] = self->face2tile [face];
1726 1951
1727 if (cell->tile [z]) 1952 if (cell->tile [z])
1728 { 1953 {
1729 maptex *tex = self->tex + cell->tile [z]; 1954 maptex *tex = self->tex + cell->tile [z];
1955 tex->unused = 0;
1730 if (!tex->name) 1956 if (!tex->name)
1731 av_push (missing, newSViv (cell->tile [z])); 1957 av_push (missing, newSViv (cell->tile [z]));
1732 1958
1733 if (tex->smoothtile) 1959 if (tex->smoothtile)
1734 { 1960 {
1735 maptex *smooth = self->tex + tex->smoothtile; 1961 maptex *smooth = self->tex + tex->smoothtile;
1962 smooth->unused = 0;
1736 if (!smooth->name) 1963 if (!smooth->name)
1737 av_push (missing, newSViv (tex->smoothtile)); 1964 av_push (missing, newSViv (tex->smoothtile));
1738 } 1965 }
1739 } 1966 }
1740 } 1967 }
1741 } 1968 }
1742 else 1969 else
1743 cell->darkness = 0; 1970 CELL_CLEAR (cell);
1744 } 1971 }
1745} 1972}
1746 OUTPUT: 1973 OUTPUT:
1747 RETVAL 1974 RETVAL
1748 1975
… …
1800} 2027}
1801 OUTPUT: 2028 OUTPUT:
1802 RETVAL 2029 RETVAL
1803 2030
1804void 2031void
1805draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2032draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1806 CODE: 2033 CODE:
1807{ 2034{
1808 int x, y, z; 2035 int x, y, z;
1809 2036
1810 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2037 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1811 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2038 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1812 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2039 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1813 smooth_key skey; 2040 smooth_key skey;
1814 2041 int pl_x, pl_y;
2042 maptex pl_tex;
1815 rc_t *rc = rc_alloc (); 2043 rc_t *rc = rc_alloc ();
2044 rc_t *rc_ov = rc_alloc ();
1816 rc_key_t key; 2045 rc_key_t key;
1817 rc_array_t *arr; 2046 rc_array_t *arr, *arr_hidden;
1818 2047
2048 pl_tex.name = 0;
2049
1819 // thats current max. sorry. 2050 // that's current max. sorry.
1820 if (sw > 255) sw = 255; 2051 if (sw > 255) sw = 255;
1821 if (sh > 255) sh = 255; 2052 if (sh > 255) sh = 255;
1822 2053
1823 // clear key, in case of extra padding 2054 // clear key, in case of extra padding
1824 memset (&skey, 0, sizeof (skey)); 2055 memset (&skey, 0, sizeof (skey));
… …
1828 key.g = 255; 2059 key.g = 255;
1829 key.b = 255; 2060 key.b = 255;
1830 key.a = 255; 2061 key.a = 255;
1831 key.mode = GL_QUADS; 2062 key.mode = GL_QUADS;
1832 key.format = GL_T2F_V3F; 2063 key.format = GL_T2F_V3F;
1833 key.texname = -1;
1834 2064
1835 mx += self->x; 2065 mx += self->x;
1836 my += self->y; 2066 my += self->y;
1837 2067
1838 // first pass: determine smooth_max 2068 // first pass: determine smooth_max
… …
1859 2089
1860 glEnable (GL_BLEND); 2090 glEnable (GL_BLEND);
1861 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2091 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1862 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1863 2093
2094 key.texname = self->tex [TEXID_HIDDEN].name;
2095 arr_hidden = rc_array (rc_ov, &key);
2096
1864 for (z = 0; z <= 2; z++) 2097 for (z = 0; z <= 2; z++)
1865 { 2098 {
1866 memset (smooth_level, 0, sizeof (smooth_level)); 2099 memset (smooth_level, 0, sizeof (smooth_level));
2100 key.texname = -1;
1867 2101
1868 for (y = 0; y < sh; y++) 2102 for (y = 0; y < sh; y++)
1869 if (0 <= y + my && y + my < self->rows) 2103 if (0 <= y + my && y + my < self->rows)
1870 { 2104 {
1871 maprow *row = self->row + (y + my); 2105 maprow *row = self->row + (y + my);
… …
1881 maptex tex = self->tex [tile]; 2115 maptex tex = self->tex [tile];
1882 int px, py; 2116 int px, py;
1883 2117
1884 if (key.texname != tex.name) 2118 if (key.texname != tex.name)
1885 { 2119 {
2120 self->tex [tile].unused = 0;
2121
1886 if (!tex.name) 2122 if (!tex.name)
1887 tex = self->tex [2]; /* missing, replace by noface */ 2123 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1888 2124
1889 key.texname = tex.name; 2125 key.texname = tex.name;
1890 arr = rc_array (rc, &key); 2126 arr = rc_array (rc, &key);
1891 } 2127 }
1892 2128
1893 px = (x + 1) * T - tex.w; 2129 px = (x + 1) * T - tex.w;
1894 py = (y + 1) * T - tex.h; 2130 py = (y + 1) * T - tex.h;
2131
2132 if (expect_false (cell->player == player) && expect_false (z == 2))
2133 {
2134 pl_x = px;
2135 pl_y = py;
2136 pl_tex = tex;
2137 continue;
2138 }
1895 2139
1896 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2140 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1897 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2141 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1898 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2142 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1899 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2143 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1900
1901 if (cell->flags && z == 2)
1902 {
1903 // overlays such as the speech bubble, probably more to come
1904 if (cell->flags & 1)
1905 {
1906 maptex tex = self->tex [1];
1907 int px = x * T + T * 2 / 32;
1908 int py = y * T - T * 6 / 32;
1909
1910 if (tex.name)
1911 {
1912 if (key.texname != tex.name)
1913 {
1914 key.texname = tex.name;
1915 arr = rc_array (rc, &key);
1916 }
1917
1918 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1919 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1920 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1921 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1922 }
1923 }
1924 }
1925 2144
1926 // update smooth hash 2145 // update smooth hash
1927 if (tex.smoothtile) 2146 if (tex.smoothtile)
1928 { 2147 {
1929 skey.tile = tex.smoothtile; 2148 skey.tile = tex.smoothtile;
… …
1958 // corners 2177 // corners
1959 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2178 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1960 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2179 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1961 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2180 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1962 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2181 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2182 }
2183 }
2184
2185 if (expect_false (z == 2))
2186 {
2187 /* draw question marks on top of hidden spaces */
2188 if (!cell->darkness)
2189 {
2190 maptex tex = self->tex [TEXID_HIDDEN];
2191 int px = (x + 1) * T - tex.w;
2192 int py = (y + 1) * T - tex.h;
2193
2194 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2195 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2196 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2197 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2198 }
2199
2200 if (expect_false (cell->flags))
2201 {
2202 // overlays such as the speech bubble, probably more to come
2203 if (cell->flags & 1)
2204 {
2205 rc_key_t key_ov = key;
2206 maptex tex = self->tex [TEXID_SPEECH];
2207 rc_array_t *arr;
2208 int px = x * T + T * 2 / 32;
2209 int py = y * T - T * 6 / 32;
2210
2211 key_ov.texname = tex.name;
2212 arr = rc_array (rc_ov, &key_ov);
2213
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2218 }
1963 } 2219 }
1964 } 2220 }
1965 } 2221 }
1966 } 2222 }
1967 2223
… …
2007 { 2263 {
2008 // this time avoiding texture state changes 2264 // this time avoiding texture state changes
2009 // save gobs of state changes. 2265 // save gobs of state changes.
2010 if (key.texname != tex.name) 2266 if (key.texname != tex.name)
2011 { 2267 {
2268 self->tex [skey->tile].unused = 0;
2269
2012 glEnd (); 2270 glEnd ();
2013 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2271 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2014 glBegin (GL_QUADS); 2272 glBegin (GL_QUADS);
2015 } 2273 }
2016 2274
… …
2045 } 2303 }
2046 2304
2047 hv_clear (smooth); 2305 hv_clear (smooth);
2048 } 2306 }
2049 2307
2308 if (pl_tex.name)
2309 {
2310 maptex tex = pl_tex;
2311 int px = pl_x + sdx;
2312 int py = pl_y + sdy;
2313
2314 key.texname = tex.name;
2315 arr = rc_array (rc, &key);
2316
2317 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2318 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2319 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2320 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2321
2322 rc_draw (rc);
2323 }
2324
2325 rc_draw (rc_ov);
2326 rc_clear (rc_ov);
2327
2050 glDisable (GL_BLEND); 2328 glDisable (GL_BLEND);
2051 rc_free (rc); 2329 rc_free (rc);
2330 rc_free (rc_ov);
2052 2331
2053 // top layer: overlays such as the health bar 2332 // top layer: overlays such as the health bar
2054 for (y = 0; y < sh; y++) 2333 for (y = 0; y < sh; y++)
2055 if (0 <= y + my && y + my < self->rows) 2334 if (0 <= y + my && y + my < self->rows)
2056 { 2335 {
… …
2061 { 2340 {
2062 mapcell *cell = row->col + (x + mx - row->c0); 2341 mapcell *cell = row->col + (x + mx - row->c0);
2063 2342
2064 int px = x * T; 2343 int px = x * T;
2065 int py = y * T; 2344 int py = y * T;
2345
2346 if (expect_false (cell->player == player))
2347 {
2348 px += sdx;
2349 py += sdy;
2350 }
2066 2351
2067 if (cell->stat_hp) 2352 if (cell->stat_hp)
2068 { 2353 {
2069 int width = cell->stat_width * T; 2354 int width = cell->stat_width * T;
2070 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2110 }; 2395 };
2111 2396
2112 int x, y; 2397 int x, y;
2113 2398
2114 glEnable (GL_TEXTURE_2D); 2399 glEnable (GL_TEXTURE_2D);
2400 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2401 * but the nvidia driver (185.18.14) mishandles alpha textures
2402 * ansd takes the colour from god knows where instead of using
2403 * Cp. MODULATE results in the same colour, but slightly different
2404 * alpha, but atcually gives us the correct colour with nvidia.
2405 */
2115 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2116 glEnable (GL_BLEND); 2407 glEnable (GL_BLEND);
2117 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2408 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2118 glBegin (GL_QUADS); 2409 glBegin (GL_QUADS);
2119 2410
2120 for (y = 0; y < h; y++) 2411 for (y = 0; y < h; y++)
… …
2127 float *c = color [m & 15]; 2418 float *c = color [m & 15];
2128 2419
2129 float tx1 = m & 0x40 ? 0.5 : 0.; 2420 float tx1 = m & 0x40 ? 0.5 : 0.;
2130 float tx2 = tx1 + 0.5; 2421 float tx2 = tx1 + 0.5;
2131 2422
2132 glColor4f (c[0], c[1], c[2], 0.75); 2423 glColor4f (c[0], c[1], c[2], 1);
2133 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2134 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2135 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2136 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2427 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2137 } 2428 }
… …
2159 SvCUR_set (darkness3_sv, sw34 * sh3); 2450 SvCUR_set (darkness3_sv, sw34 * sh3);
2160 2451
2161 mx += self->x - 1; 2452 mx += self->x - 1;
2162 my += self->y - 1; 2453 my += self->y - 1;
2163 2454
2164 memset (darkness1, 255, sw1 * sh1); 2455 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2165 2456
2166 for (y = 0; y < sh1; y++) 2457 for (y = 0; y < sh1; y++)
2167 if (0 <= y + my && y + my < self->rows) 2458 if (0 <= y + my && y + my < self->rows)
2168 { 2459 {
2169 maprow *row = self->row + (y + my); 2460 maprow *row = self->row + (y + my);
… …
2289 else 2580 else
2290 *data++ = 0; 2581 *data++ = 0;
2291 } 2582 }
2292 } 2583 }
2293 2584
2585 /* if size is w*h + 5 then no data has been found */
2586 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2587 {
2294 SvPOK_only (data_sv); 2588 SvPOK_only (data_sv);
2295 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2589 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2590 }
2591
2296 RETVAL = data_sv; 2592 RETVAL = data_sv;
2297} 2593}
2298 OUTPUT: 2594 OUTPUT:
2299 RETVAL 2595 RETVAL
2300 2596
2301void 2597void
2302set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2598set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2303 PPCODE: 2599 PPCODE:
2304{ 2600{
2305 int x, y, z; 2601 int x, y, z;
2306 int w, h; 2602 int w, h;
2307 int x1, y1; 2603 int x1, y1;
2604 STRLEN len;
2605 uint8_t *data, *end;
2606
2607 len = SvLEN (data_sv);
2608 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2609 data = SvPVbyte_nolen (data_sv);
2610 end = data + len + 8;
2611
2612 if (len < 5)
2613 XSRETURN_EMPTY;
2308 2614
2309 if (*data++ != 0) 2615 if (*data++ != 0)
2310 XSRETURN_EMPTY; /* version mismatch */ 2616 XSRETURN_EMPTY; /* version mismatch */
2311 2617
2312 w = *data++ << 8; w |= *data++; 2618 w = *data++ << 8; w |= *data++;
… …
2327 { 2633 {
2328 maprow *row = map_get_row (self, y); 2634 maprow *row = map_get_row (self, y);
2329 2635
2330 for (x = x0; x < x1; x++) 2636 for (x = x0; x < x1; x++)
2331 { 2637 {
2638 uint8_t flags;
2639
2640 if (data + 7 >= end)
2641 XSRETURN_EMPTY;
2642
2332 uint8_t flags = *data++; 2643 flags = *data++;
2333 2644
2334 if (flags) 2645 if (flags)
2335 { 2646 {
2336 mapcell *cell = row_get_cell (row, x); 2647 mapcell *cell = row_get_cell (row, x);
2337 tileid tile[3] = { 0, 0, 0 }; 2648 tileid tile[3] = { 0, 0, 0 };
… …
2340 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2651 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2341 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2652 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2342 2653
2343 if (cell->darkness == 0) 2654 if (cell->darkness == 0)
2344 { 2655 {
2345 cell->darkness = 0; 2656 /*cell->darkness = 0;*/
2657 EXTEND (SP, 3);
2346 2658
2347 for (z = 0; z <= 2; z++) 2659 for (z = 0; z <= 2; z++)
2348 { 2660 {
2349 tileid t = tile [z]; 2661 tileid t = tile [z];
2350 2662
2351 if (t >= self->texs || (t && !self->tex [t].name)) 2663 if (t >= self->texs || (t && !self->tex [t].name))
2352 { 2664 {
2353 XPUSHs (sv_2mortal (newSViv (t))); 2665 PUSHs (sv_2mortal (newSViv (t)));
2354 need_texid (self, t); 2666 need_texid (self, t);
2355 } 2667 }
2356 2668
2357 cell->tile [z] = t; 2669 cell->tile [z] = t;
2358 } 2670 }
… …
2575 } *civ, const_iv[] = { 2887 } *civ, const_iv[] = {
2576# define const_iv(name) { # name, (IV)name } 2888# define const_iv(name) { # name, (IV)name }
2577 const_iv (GL_VENDOR), 2889 const_iv (GL_VENDOR),
2578 const_iv (GL_VERSION), 2890 const_iv (GL_VERSION),
2579 const_iv (GL_EXTENSIONS), 2891 const_iv (GL_EXTENSIONS),
2892 const_iv (GL_MAX_TEXTURE_UNITS),
2580 const_iv (GL_COLOR_MATERIAL), 2893 const_iv (GL_COLOR_MATERIAL),
2581 const_iv (GL_SMOOTH), 2894 const_iv (GL_SMOOTH),
2582 const_iv (GL_FLAT), 2895 const_iv (GL_FLAT),
2583 const_iv (GL_DITHER), 2896 const_iv (GL_DITHER),
2584 const_iv (GL_BLEND), 2897 const_iv (GL_BLEND),
… …
2596 const_iv (GL_ZERO), 2909 const_iv (GL_ZERO),
2597 const_iv (GL_SRC_ALPHA), 2910 const_iv (GL_SRC_ALPHA),
2598 const_iv (GL_DST_ALPHA), 2911 const_iv (GL_DST_ALPHA),
2599 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2912 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2600 const_iv (GL_ONE_MINUS_DST_ALPHA), 2913 const_iv (GL_ONE_MINUS_DST_ALPHA),
2914 const_iv (GL_SRC_COLOR),
2915 const_iv (GL_DST_COLOR),
2916 const_iv (GL_ONE_MINUS_SRC_COLOR),
2917 const_iv (GL_ONE_MINUS_DST_COLOR),
2601 const_iv (GL_SRC_ALPHA_SATURATE), 2918 const_iv (GL_SRC_ALPHA_SATURATE),
2602 const_iv (GL_RGB), 2919 const_iv (GL_RGB),
2603 const_iv (GL_RGBA), 2920 const_iv (GL_RGBA),
2604 const_iv (GL_RGBA4), 2921 const_iv (GL_RGBA4),
2605 const_iv (GL_RGBA8), 2922 const_iv (GL_RGBA8),
… …
2673 const_iv (GL_NICEST), 2990 const_iv (GL_NICEST),
2674 const_iv (GL_V2F), 2991 const_iv (GL_V2F),
2675 const_iv (GL_V3F), 2992 const_iv (GL_V3F),
2676 const_iv (GL_T2F_V3F), 2993 const_iv (GL_T2F_V3F),
2677 const_iv (GL_T2F_N3F_V3F), 2994 const_iv (GL_T2F_N3F_V3F),
2995 const_iv (GL_FUNC_ADD),
2996 const_iv (GL_FUNC_SUBTRACT),
2997 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2678# undef const_iv 2998# undef const_iv
2679 }; 2999 };
2680 3000
2681 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3001 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2682 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2689disable_GL_EXT_blend_func_separate () 3009disable_GL_EXT_blend_func_separate ()
2690 CODE: 3010 CODE:
2691 gl.BlendFuncSeparate = 0; 3011 gl.BlendFuncSeparate = 0;
2692 gl.BlendFuncSeparateEXT = 0; 3012 gl.BlendFuncSeparateEXT = 0;
2693 3013
3014void
3015apple_nvidia_bug (int enable)
3016
2694char * 3017char *
2695gl_vendor () 3018gl_vendor ()
2696 CODE: 3019 CODE:
2697 RETVAL = (char *)glGetString (GL_VENDOR); 3020 RETVAL = (char *)glGetString (GL_VENDOR);
2698 OUTPUT: 3021 OUTPUT:
… …
2747 3070
2748void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3071void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2749 CODE: 3072 CODE:
2750 gl_BlendFuncSeparate (sa, da, saa, daa); 3073 gl_BlendFuncSeparate (sa, da, saa, daa);
2751 3074
3075# void glBlendEquation (int se)
3076
2752void glDepthMask (int flag) 3077void glDepthMask (int flag)
2753 3078
2754void glLogicOp (int opcode) 3079void glLogicOp (int opcode)
2755 3080
2756void glColorMask (int red, int green, int blue, int alpha) 3081void glColorMask (int red, int green, int blue, int alpha)
… …
2790void glRotate (float angle, float x, float y, float z) 3115void glRotate (float angle, float x, float y, float z)
2791 CODE: 3116 CODE:
2792 glRotatef (angle, x, y, z); 3117 glRotatef (angle, x, y, z);
2793 3118
2794void glColor (float r, float g, float b, float a = 1.0) 3119void glColor (float r, float g, float b, float a = 1.0)
3120 PROTOTYPE: @
2795 ALIAS: 3121 ALIAS:
2796 glColor_premultiply = 1 3122 glColor_premultiply = 1
2797 CODE: 3123 CODE:
2798 if (ix) 3124 if (ix)
2799 { 3125 {

Diff Legend

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