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.254 by root, Sun Jan 6 18:12:20 2008 UTC vs.
Revision 1.291 by root, Thu Nov 26 07:19:11 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
… …
51#ifndef PANGO_VERSION_CHECK 56#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 57# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif 58#endif
54 59
55#if !PANGO_VERSION_CHECK (1, 15, 2) 60#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line_readonly 61# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly 62# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly 63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly 64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif 65#endif
61 66
62#ifndef _WIN32 67#ifndef _WIN32
63# include <sys/types.h> 68# include <sys/types.h>
64# include <sys/socket.h> 69# include <sys/socket.h>
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));
… …
770SDL_GetKeyName (int sym) 935SDL_GetKeyName (int sym)
771 936
772int 937int
773SDL_GetAppState () 938SDL_GetAppState ()
774 939
940int
941SDL_GetModState ()
942
775void 943void
776poll_events () 944poll_events ()
777 PPCODE: 945 PPCODE:
778{ 946{
779 SDL_Event ev; 947 SDL_Event ev;
… …
788 { 956 {
789 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
790 case SDL_KEYUP: 958 case SDL_KEYUP:
791 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
792 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
793 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);
794 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 */
795 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
796 break; 964 break;
797 965
798 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
799 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
817 x = ev.motion.x; 985 x = ev.motion.x;
818 y = ev.motion.y; 986 y = ev.motion.y;
819 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
820 } 988 }
821 989
822 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
823 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
824 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
825 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
826 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
827 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
912 } 1080 }
913 } 1081 }
914#endif 1082#endif
915} 1083}
916 1084
917void 1085int
918add_font (char *file) 1086add_font (char *file)
919 CODE: 1087 CODE:
920 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT:
1090 RETVAL
921 1091
922void 1092void
923load_image_inline (SV *image_) 1093load_image_inline (SV *image_)
924 ALIAS: 1094 ALIAS:
925 load_image_file = 1 1095 load_image_file = 1
… …
1041#if DEBUG 1211#if DEBUG
1042 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
1043#endif 1213#endif
1044} 1214}
1045 1215
1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
1046MODULE = Deliantra::Client PACKAGE = DC::Font 1223MODULE = Deliantra::Client PACKAGE = DC::Font
1047 1224
1048PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
1049 1226
1050DC::Font 1227DC::Font
… …
1594 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1771 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1595 // use uglier nearest interpolation because linear suffers 1772 // use uglier nearest interpolation because linear suffers
1596 // from transparent color bleeding and ugly wrapping effects. 1773 // from transparent color bleeding and ugly wrapping effects.
1597 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1774 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1598} 1775}
1776
1777void
1778expire_textures (DC::Map self, int texid, int count)
1779 PPCODE:
1780 for (; texid < self->texs && count; ++texid, --count)
1781 {
1782 maptex *tex = self->tex + texid;
1783
1784 if (tex->name)
1785 {
1786 if (tex->unused)
1787 {
1788 tex->name = 0;
1789 tex->unused = 0;
1790 XPUSHs (sv_2mortal (newSViv (texid)));
1791 }
1792 else
1793 tex->unused = 1;
1794 }
1795 }
1599 1796
1600int 1797int
1601ox (DC::Map self) 1798ox (DC::Map self)
1602 ALIAS: 1799 ALIAS:
1603 oy = 1 1800 oy = 1
… …
1681 uint8_t ext, cmd; 1878 uint8_t ext, cmd;
1682 1879
1683 do 1880 do
1684 { 1881 {
1685 ext = *data++; 1882 ext = *data++;
1686 cmd = ext & 0x3f; 1883 cmd = ext & 0x7f;
1687 1884
1688 if (cmd < 4) 1885 if (cmd < 4)
1689 cell->darkness = 255 - ext * 64 + 1; 1886 cell->darkness = 255 - ext * 64 + 1;
1690 else if (cmd == 5) // health 1887 else if (cmd == 5) // health
1691 { 1888 {
… …
1694 } 1891 }
1695 else if (cmd == 6) // monster width 1892 else if (cmd == 6) // monster width
1696 cell->stat_width = *data++ + 1; 1893 cell->stat_width = *data++ + 1;
1697 else if (cmd == 0x47) 1894 else if (cmd == 0x47)
1698 { 1895 {
1699 if (*data == 4) 1896 if (*data == 1) cell->player = data [1];
1700 ; // decode player count 1897 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1898 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1899 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1701 1900
1702 data += *data + 1; 1901 data += *data + 1;
1703 } 1902 }
1704 else if (cmd == 8) // cell flags 1903 else if (cmd == 8) // cell flags
1705 cell->flags = *data++; 1904 cell->flags = *data++;
… …
1722 cell->tile [z] = self->face2tile [face]; 1921 cell->tile [z] = self->face2tile [face];
1723 1922
1724 if (cell->tile [z]) 1923 if (cell->tile [z])
1725 { 1924 {
1726 maptex *tex = self->tex + cell->tile [z]; 1925 maptex *tex = self->tex + cell->tile [z];
1926 tex->unused = 0;
1727 if (!tex->name) 1927 if (!tex->name)
1728 av_push (missing, newSViv (cell->tile [z])); 1928 av_push (missing, newSViv (cell->tile [z]));
1729 1929
1730 if (tex->smoothtile) 1930 if (tex->smoothtile)
1731 { 1931 {
1732 maptex *smooth = self->tex + tex->smoothtile; 1932 maptex *smooth = self->tex + tex->smoothtile;
1933 smooth->unused = 0;
1733 if (!smooth->name) 1934 if (!smooth->name)
1734 av_push (missing, newSViv (tex->smoothtile)); 1935 av_push (missing, newSViv (tex->smoothtile));
1735 } 1936 }
1736 } 1937 }
1737 } 1938 }
1738 } 1939 }
1739 else 1940 else
1740 cell->darkness = 0; 1941 CELL_CLEAR (cell);
1741 } 1942 }
1742} 1943}
1743 OUTPUT: 1944 OUTPUT:
1744 RETVAL 1945 RETVAL
1745 1946
… …
1797} 1998}
1798 OUTPUT: 1999 OUTPUT:
1799 RETVAL 2000 RETVAL
1800 2001
1801void 2002void
1802draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2003draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1803 CODE: 2004 CODE:
1804{ 2005{
1805 int x, y, z; 2006 int x, y, z;
1806 2007
1807 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2008 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1808 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2009 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1809 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2010 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1810 smooth_key skey; 2011 smooth_key skey;
1811 2012 int pl_x, pl_y;
2013 maptex pl_tex;
1812 rc_t *rc = rc_alloc (); 2014 rc_t *rc = rc_alloc ();
2015 rc_t *rc_ov = rc_alloc ();
1813 rc_key_t key; 2016 rc_key_t key;
1814 rc_array_t *arr; 2017 rc_array_t *arr, *arr_hidden;
1815 2018
2019 pl_tex.name = 0;
2020
1816 // thats current max. sorry. 2021 // that's current max. sorry.
1817 if (sw > 255) sw = 255; 2022 if (sw > 255) sw = 255;
1818 if (sh > 255) sh = 255; 2023 if (sh > 255) sh = 255;
1819 2024
1820 // clear key, in case of extra padding 2025 // clear key, in case of extra padding
1821 memset (&skey, 0, sizeof (skey)); 2026 memset (&skey, 0, sizeof (skey));
… …
1825 key.g = 255; 2030 key.g = 255;
1826 key.b = 255; 2031 key.b = 255;
1827 key.a = 255; 2032 key.a = 255;
1828 key.mode = GL_QUADS; 2033 key.mode = GL_QUADS;
1829 key.format = GL_T2F_V3F; 2034 key.format = GL_T2F_V3F;
1830 key.texname = -1;
1831 2035
1832 mx += self->x; 2036 mx += self->x;
1833 my += self->y; 2037 my += self->y;
1834 2038
1835 // first pass: determine smooth_max 2039 // first pass: determine smooth_max
… …
1856 2060
1857 glEnable (GL_BLEND); 2061 glEnable (GL_BLEND);
1858 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1859 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1860 2064
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067
1861 for (z = 0; z <= 2; z++) 2068 for (z = 0; z <= 2; z++)
1862 { 2069 {
1863 memset (smooth_level, 0, sizeof (smooth_level)); 2070 memset (smooth_level, 0, sizeof (smooth_level));
2071 key.texname = -1;
1864 2072
1865 for (y = 0; y < sh; y++) 2073 for (y = 0; y < sh; y++)
1866 if (0 <= y + my && y + my < self->rows) 2074 if (0 <= y + my && y + my < self->rows)
1867 { 2075 {
1868 maprow *row = self->row + (y + my); 2076 maprow *row = self->row + (y + my);
… …
1878 maptex tex = self->tex [tile]; 2086 maptex tex = self->tex [tile];
1879 int px, py; 2087 int px, py;
1880 2088
1881 if (key.texname != tex.name) 2089 if (key.texname != tex.name)
1882 { 2090 {
2091 self->tex [tile].unused = 0;
2092
1883 if (!tex.name) 2093 if (!tex.name)
1884 tex = self->tex [2]; /* missing, replace by noface */ 2094 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1885 2095
1886 key.texname = tex.name; 2096 key.texname = tex.name;
1887 arr = rc_array (rc, &key); 2097 arr = rc_array (rc, &key);
1888 } 2098 }
1889 2099
1890 px = (x + 1) * T - tex.w; 2100 px = (x + 1) * T - tex.w;
1891 py = (y + 1) * T - tex.h; 2101 py = (y + 1) * T - tex.h;
2102
2103 if (expect_false (cell->player == player) && expect_false (z == 2))
2104 {
2105 pl_x = px;
2106 pl_y = py;
2107 pl_tex = tex;
2108 continue;
2109 }
1892 2110
1893 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2111 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1894 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2112 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1895 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2113 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1896 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2114 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1897
1898 if (cell->flags && z == 2)
1899 {
1900 // overlays such as the speech bubble, probably more to come
1901 if (cell->flags & 1)
1902 {
1903 maptex tex = self->tex [1];
1904 int px = x * T + T * 2 / 32;
1905 int py = y * T - T * 6 / 32;
1906
1907 if (tex.name)
1908 {
1909 if (key.texname != tex.name)
1910 {
1911 key.texname = tex.name;
1912 arr = rc_array (rc, &key);
1913 }
1914
1915 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1916 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1917 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1918 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1919 }
1920 }
1921 }
1922 2115
1923 // update smooth hash 2116 // update smooth hash
1924 if (tex.smoothtile) 2117 if (tex.smoothtile)
1925 { 2118 {
1926 skey.tile = tex.smoothtile; 2119 skey.tile = tex.smoothtile;
… …
1955 // corners 2148 // corners
1956 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2149 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1957 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2150 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1958 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2151 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1959 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2152 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2153 }
2154 }
2155
2156 if (expect_false (z == 2))
2157 {
2158 /* draw question marks on top of hidden spaces */
2159 if (!cell->darkness)
2160 {
2161 maptex tex = self->tex [TEXID_HIDDEN];
2162 int px = (x + 1) * T - tex.w;
2163 int py = (y + 1) * T - tex.h;
2164
2165 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2166 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2167 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2169 }
2170
2171 if (expect_false (cell->flags))
2172 {
2173 // overlays such as the speech bubble, probably more to come
2174 if (cell->flags & 1)
2175 {
2176 rc_key_t key_ov = key;
2177 maptex tex = self->tex [TEXID_SPEECH];
2178 rc_array_t *arr;
2179 int px = x * T + T * 2 / 32;
2180 int py = y * T - T * 6 / 32;
2181
2182 key_ov.texname = tex.name;
2183 arr = rc_array (rc_ov, &key_ov);
2184
2185 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2186 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2187 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2188 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2189 }
1960 } 2190 }
1961 } 2191 }
1962 } 2192 }
1963 } 2193 }
1964 2194
… …
2004 { 2234 {
2005 // this time avoiding texture state changes 2235 // this time avoiding texture state changes
2006 // save gobs of state changes. 2236 // save gobs of state changes.
2007 if (key.texname != tex.name) 2237 if (key.texname != tex.name)
2008 { 2238 {
2239 self->tex [skey->tile].unused = 0;
2240
2009 glEnd (); 2241 glEnd ();
2010 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2242 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2011 glBegin (GL_QUADS); 2243 glBegin (GL_QUADS);
2012 } 2244 }
2013 2245
… …
2042 } 2274 }
2043 2275
2044 hv_clear (smooth); 2276 hv_clear (smooth);
2045 } 2277 }
2046 2278
2279 if (pl_tex.name)
2280 {
2281 maptex tex = pl_tex;
2282 int px = pl_x + sdx;
2283 int py = pl_y + sdy;
2284
2285 key.texname = tex.name;
2286 arr = rc_array (rc, &key);
2287
2288 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2289 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2290 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2291 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2292
2293 rc_draw (rc);
2294 }
2295
2296 rc_draw (rc_ov);
2297 rc_clear (rc_ov);
2298
2047 glDisable (GL_BLEND); 2299 glDisable (GL_BLEND);
2048 rc_free (rc); 2300 rc_free (rc);
2301 rc_free (rc_ov);
2049 2302
2050 // top layer: overlays such as the health bar 2303 // top layer: overlays such as the health bar
2051 for (y = 0; y < sh; y++) 2304 for (y = 0; y < sh; y++)
2052 if (0 <= y + my && y + my < self->rows) 2305 if (0 <= y + my && y + my < self->rows)
2053 { 2306 {
… …
2058 { 2311 {
2059 mapcell *cell = row->col + (x + mx - row->c0); 2312 mapcell *cell = row->col + (x + mx - row->c0);
2060 2313
2061 int px = x * T; 2314 int px = x * T;
2062 int py = y * T; 2315 int py = y * T;
2316
2317 if (expect_false (cell->player == player))
2318 {
2319 px += sdx;
2320 py += sdy;
2321 }
2063 2322
2064 if (cell->stat_hp) 2323 if (cell->stat_hp)
2065 { 2324 {
2066 int width = cell->stat_width * T; 2325 int width = cell->stat_width * T;
2067 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2326 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2107 }; 2366 };
2108 2367
2109 int x, y; 2368 int x, y;
2110 2369
2111 glEnable (GL_TEXTURE_2D); 2370 glEnable (GL_TEXTURE_2D);
2371 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2372 * but the nvidia driver (185.18.14) mishandles alpha textures
2373 * ansd takes the colour from god knows where instead of using
2374 * Cp. MODULATE results in the same colour, but slightly different
2375 * alpha, but atcually gives us the correct colour with nvidia.
2376 */
2112 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2377 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2113 glEnable (GL_BLEND); 2378 glEnable (GL_BLEND);
2114 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2379 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2115 glBegin (GL_QUADS); 2380 glBegin (GL_QUADS);
2116 2381
2117 for (y = 0; y < h; y++) 2382 for (y = 0; y < h; y++)
… …
2124 float *c = color [m & 15]; 2389 float *c = color [m & 15];
2125 2390
2126 float tx1 = m & 0x40 ? 0.5 : 0.; 2391 float tx1 = m & 0x40 ? 0.5 : 0.;
2127 float tx2 = tx1 + 0.5; 2392 float tx2 = tx1 + 0.5;
2128 2393
2129 glColor4f (c[0], c[1], c[2], 0.75); 2394 glColor4f (c[0], c[1], c[2], 1);
2130 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2395 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2131 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2396 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2132 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2397 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2133 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2398 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2134 } 2399 }
… …
2156 SvCUR_set (darkness3_sv, sw34 * sh3); 2421 SvCUR_set (darkness3_sv, sw34 * sh3);
2157 2422
2158 mx += self->x - 1; 2423 mx += self->x - 1;
2159 my += self->y - 1; 2424 my += self->y - 1;
2160 2425
2161 memset (darkness1, 255, sw1 * sh1); 2426 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2162 2427
2163 for (y = 0; y < sh1; y++) 2428 for (y = 0; y < sh1; y++)
2164 if (0 <= y + my && y + my < self->rows) 2429 if (0 <= y + my && y + my < self->rows)
2165 { 2430 {
2166 maprow *row = self->row + (y + my); 2431 maprow *row = self->row + (y + my);
… …
2286 else 2551 else
2287 *data++ = 0; 2552 *data++ = 0;
2288 } 2553 }
2289 } 2554 }
2290 2555
2556 /* if size is w*h + 5 then no data has been found */
2557 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2558 {
2291 SvPOK_only (data_sv); 2559 SvPOK_only (data_sv);
2292 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2560 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2561 }
2562
2293 RETVAL = data_sv; 2563 RETVAL = data_sv;
2294} 2564}
2295 OUTPUT: 2565 OUTPUT:
2296 RETVAL 2566 RETVAL
2297 2567
2298void 2568void
2299set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2569set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2300 PPCODE: 2570 PPCODE:
2301{ 2571{
2302 int x, y, z; 2572 int x, y, z;
2303 int w, h; 2573 int w, h;
2304 int x1, y1; 2574 int x1, y1;
2575 STRLEN len;
2576 uint8_t *data, *end;
2577
2578 len = SvLEN (data_sv);
2579 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2580 data = SvPVbyte_nolen (data_sv);
2581 end = data + len + 8;
2582
2583 if (len < 5)
2584 XSRETURN_EMPTY;
2305 2585
2306 if (*data++ != 0) 2586 if (*data++ != 0)
2307 XSRETURN_EMPTY; /* version mismatch */ 2587 XSRETURN_EMPTY; /* version mismatch */
2308 2588
2309 w = *data++ << 8; w |= *data++; 2589 w = *data++ << 8; w |= *data++;
… …
2324 { 2604 {
2325 maprow *row = map_get_row (self, y); 2605 maprow *row = map_get_row (self, y);
2326 2606
2327 for (x = x0; x < x1; x++) 2607 for (x = x0; x < x1; x++)
2328 { 2608 {
2609 uint8_t flags;
2610
2611 if (data + 7 >= end)
2612 XSRETURN_EMPTY;
2613
2329 uint8_t flags = *data++; 2614 flags = *data++;
2330 2615
2331 if (flags) 2616 if (flags)
2332 { 2617 {
2333 mapcell *cell = row_get_cell (row, x); 2618 mapcell *cell = row_get_cell (row, x);
2334 tileid tile[3] = { 0, 0, 0 }; 2619 tileid tile[3] = { 0, 0, 0 };
… …
2337 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2622 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2338 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2623 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2339 2624
2340 if (cell->darkness == 0) 2625 if (cell->darkness == 0)
2341 { 2626 {
2342 cell->darkness = 0; 2627 /*cell->darkness = 0;*/
2628 EXTEND (SP, 3);
2343 2629
2344 for (z = 0; z <= 2; z++) 2630 for (z = 0; z <= 2; z++)
2345 { 2631 {
2346 tileid t = tile [z]; 2632 tileid t = tile [z];
2347 2633
2348 if (t >= self->texs || (t && !self->tex [t].name)) 2634 if (t >= self->texs || (t && !self->tex [t].name))
2349 { 2635 {
2350 XPUSHs (sv_2mortal (newSViv (t))); 2636 PUSHs (sv_2mortal (newSViv (t)));
2351 need_texid (self, t); 2637 need_texid (self, t);
2352 } 2638 }
2353 2639
2354 cell->tile [z] = t; 2640 cell->tile [z] = t;
2355 } 2641 }
… …
2670 const_iv (GL_NICEST), 2956 const_iv (GL_NICEST),
2671 const_iv (GL_V2F), 2957 const_iv (GL_V2F),
2672 const_iv (GL_V3F), 2958 const_iv (GL_V3F),
2673 const_iv (GL_T2F_V3F), 2959 const_iv (GL_T2F_V3F),
2674 const_iv (GL_T2F_N3F_V3F), 2960 const_iv (GL_T2F_N3F_V3F),
2961 const_iv (GL_FUNC_ADD),
2962 const_iv (GL_FUNC_SUBTRACT),
2963 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2675# undef const_iv 2964# undef const_iv
2676 }; 2965 };
2677 2966
2678 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2967 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2679 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2968 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2686disable_GL_EXT_blend_func_separate () 2975disable_GL_EXT_blend_func_separate ()
2687 CODE: 2976 CODE:
2688 gl.BlendFuncSeparate = 0; 2977 gl.BlendFuncSeparate = 0;
2689 gl.BlendFuncSeparateEXT = 0; 2978 gl.BlendFuncSeparateEXT = 0;
2690 2979
2980void
2981apple_nvidia_bug (int enable)
2982
2691char * 2983char *
2692gl_vendor () 2984gl_vendor ()
2693 CODE: 2985 CODE:
2694 RETVAL = (char *)glGetString (GL_VENDOR); 2986 RETVAL = (char *)glGetString (GL_VENDOR);
2695 OUTPUT: 2987 OUTPUT:
… …
2744 3036
2745void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3037void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2746 CODE: 3038 CODE:
2747 gl_BlendFuncSeparate (sa, da, saa, daa); 3039 gl_BlendFuncSeparate (sa, da, saa, daa);
2748 3040
3041void glBlendEquation (int se)
3042
2749void glDepthMask (int flag) 3043void glDepthMask (int flag)
2750 3044
2751void glLogicOp (int opcode) 3045void glLogicOp (int opcode)
2752 3046
2753void glColorMask (int red, int green, int blue, int alpha) 3047void glColorMask (int red, int green, int blue, int alpha)
… …
2787void glRotate (float angle, float x, float y, float z) 3081void glRotate (float angle, float x, float y, float z)
2788 CODE: 3082 CODE:
2789 glRotatef (angle, x, y, z); 3083 glRotatef (angle, x, y, z);
2790 3084
2791void glColor (float r, float g, float b, float a = 1.0) 3085void glColor (float r, float g, float b, float a = 1.0)
3086 PROTOTYPE: @
2792 ALIAS: 3087 ALIAS:
2793 glColor_premultiply = 1 3088 glColor_premultiply = 1
2794 CODE: 3089 CODE:
2795 if (ix) 3090 if (ix)
2796 { 3091 {

Diff Legend

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