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.253 by root, Fri Dec 28 20:59:14 2007 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
49#include <pango/pango.h> 54#include <pango/pango.h>
50 55
51#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)) 56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
52# define pango_layout_get_line_readonly pango_layout_get_line_readonly 61# define pango_layout_get_line_readonly pango_layout_get_line
53# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly 62# define pango_layout_get_lines_readonly pango_layout_get_lines
54# 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
55# 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
56#endif 65#endif
57 66
58#ifndef _WIN32 67#ifndef _WIN32
59# include <sys/types.h> 68# include <sys/types.h>
60# include <sys/socket.h> 69# include <sys/socket.h>
61# include <netinet/in.h> 70# include <netinet/in.h>
62# include <netinet/tcp.h> 71# include <netinet/tcp.h>
63# include <inttypes.h> 72# include <inttypes.h>
64#endif 73#endif
65 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
66#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
67 85
68#define FOW_DARKNESS 32 86#define FOW_DARKNESS 64
69 87
70#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
71#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
72 90
73#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
74 92
75/* mask out modifiers we are not interested in */ 93/* mask out modifiers we are not interested in */
76#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77 95
78#if 0 96#define KMOD_LRAM 0x10000 // our extension
79# define PARACHUTE SDL_INIT_NOPARACHUTE 97
80#else 98#define TEXID_SPEECH 1
81# define PARACHUTE 0 99#define TEXID_NOFACE 2
82#endif 100#define TEXID_HIDDEN 3
83 101
84static AV *texture_av; 102static AV *texture_av;
85 103
86static struct 104static struct
87{ 105{
… …
181 199
182static void 200static void
183layout_update_font (DC__Layout self) 201layout_update_font (DC__Layout self)
184{ 202{
185 /* 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
186 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
187 */ 205 */
188 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
189 207
190 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
191 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
219 int w, h; 237 int w, h;
220 float s, t; 238 float s, t;
221 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
222 tileid smoothtile; 240 tileid smoothtile;
223 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
224} maptex; 243} maptex;
225 244
226typedef struct { 245typedef struct {
227 uint32_t player; 246 uint32_t player;
228 tileid tile[3]; 247 tileid tile[3];
… …
360 self->oy = 0; 379 self->oy = 0;
361 self->row = 0; 380 self->row = 0;
362 self->rows = 0; 381 self->rows = 0;
363} 382}
364 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
365static void 394static void
366map_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)
367{ 396{
368 int x, y; 397 int x, y;
369 maprow *row; 398 maprow *row;
… …
383 if (x >= row->c1) 412 if (x >= row->c1)
384 break; 413 break;
385 414
386 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
387 416
388 cell->darkness = 0; 417 CELL_CLEAR (cell);
389 cell->stat_hp = 0;
390 cell->flags = 0;
391 cell->player = 0;
392 } 418 }
393 } 419 }
394} 420}
395 421
396typedef struct { 422typedef struct {
… …
507 if (!svp || !SvTRUE (*svp)) 533 if (!svp || !SvTRUE (*svp))
508 return 0; 534 return 0;
509 535
510 return 1; 536 return 1;
511} 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
512 590
513MODULE = Deliantra::Client PACKAGE = DC 591MODULE = Deliantra::Client PACKAGE = DC
514 592
515PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
516 594
… …
545 const_iv (SDL_USEREVENT), 623 const_iv (SDL_USEREVENT),
546 624
547 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
548 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
549 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),
550 678
551 const_iv (SDLK_FIRST), 679 const_iv (SDLK_FIRST),
552 const_iv (SDLK_LAST), 680 const_iv (SDLK_LAST),
553 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
554 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
… …
630 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
631 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
632 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
633 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
634 762
763 const_iv (KMOD_LRAM),
764
635 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)
636# undef const_iv 795# undef const_iv
637 }; 796 };
638 797
639 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; )
640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
669 CODE: 828 CODE:
670{ 829{
671 opengl_fontmap = pango_opengl_font_map_new (); 830 opengl_fontmap = pango_opengl_font_map_new ();
672 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);
673 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 832 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2) 833 /*pango_context_set_font_description (opengl_context, default_font);*/
834#if PANGO_VERSION_CHECK (1, 15, 2)
675 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 835 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 836 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
677#endif 837#endif
678} 838}
679 839
680char *
681SDL_GetError () 840char *SDL_GetError ()
682 841
683int 842void SDL_braino ()
684SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
685 843
686void 844int SDL_Init (U32 flags)
845
846int SDL_InitSubSystem (U32 flags)
847
848void SDL_QuitSubSystem (U32 flags)
849
687SDL_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
688 860
689void 861void
690SDL_ListModes (int rgb, int alpha) 862SDL_ListModes (int rgb, int alpha)
691 PPCODE: 863 PPCODE:
692{ 864{
… …
704 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 876 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
705 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
706 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
707 879
708 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 880 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
709#if SDL_VERSION_ATLEAST(1,2,10)
710 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
711 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 881 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
712#endif
713 882
714 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 883 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
715 884
716 if (m && m != (SDL_Rect **)-1) 885 if (m && m != (SDL_Rect **)-1)
717 while (*m) 886 while (*m)
718 { 887 {
719 if ((*m)->w >= 800 && (*m)->h >= 480) 888 if ((*m)->w >= 400 && (*m)->h >= 300)
720 { 889 {
721 AV *av = newAV (); 890 AV *av = newAV ();
722 av_push (av, newSViv ((*m)->w)); 891 av_push (av, newSViv ((*m)->w));
723 av_push (av, newSViv ((*m)->h)); 892 av_push (av, newSViv ((*m)->h));
724 av_push (av, newSViv (rgb)); 893 av_push (av, newSViv (rgb));
… …
766SDL_GetKeyName (int sym) 935SDL_GetKeyName (int sym)
767 936
768int 937int
769SDL_GetAppState () 938SDL_GetAppState ()
770 939
940int
941SDL_GetModState ()
942
771void 943void
772poll_events () 944poll_events ()
773 PPCODE: 945 PPCODE:
774{ 946{
775 SDL_Event ev; 947 SDL_Event ev;
… …
784 { 956 {
785 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
786 case SDL_KEYUP: 958 case SDL_KEYUP:
787 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
788 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
789 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);
790 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 */
791 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
792 break; 964 break;
793 965
794 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
795 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
813 x = ev.motion.x; 985 x = ev.motion.x;
814 y = ev.motion.y; 986 y = ev.motion.y;
815 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
816 } 988 }
817 989
818 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
819 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
820 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
821 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
822 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
823 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
908 } 1080 }
909 } 1081 }
910#endif 1082#endif
911} 1083}
912 1084
913void 1085int
914add_font (char *file) 1086add_font (char *file)
915 CODE: 1087 CODE:
916 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT:
1090 RETVAL
917 1091
918void 1092void
919load_image_inline (SV *image_) 1093load_image_inline (SV *image_)
920 ALIAS: 1094 ALIAS:
921 load_image_file = 1 1095 load_image_file = 1
… …
1037#if DEBUG 1211#if DEBUG
1038 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
1039#endif 1213#endif
1040} 1214}
1041 1215
1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
1042MODULE = Deliantra::Client PACKAGE = DC::Font 1223MODULE = Deliantra::Client PACKAGE = DC::Font
1043 1224
1044PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
1045 1226
1046DC::Font 1227DC::Font
… …
1331 PPCODE: 1512 PPCODE:
1332{ 1513{
1333 int line, x; 1514 int line, x;
1334 1515
1335 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1516 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1336#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1517#if !PANGO_VERSION_CHECK (1, 17, 3)
1337 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1518 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1338 --line; 1519 --line;
1339#endif 1520#endif
1340 EXTEND (SP, 2); 1521 EXTEND (SP, 2);
1341 PUSHs (sv_2mortal (newSViv (line))); 1522 PUSHs (sv_2mortal (newSViv (line)));
… …
1475 if (ix) 1656 if (ix)
1476 { 1657 {
1477 glDisable (GL_ALPHA_TEST); 1658 glDisable (GL_ALPHA_TEST);
1478 glDisable (GL_BLEND); 1659 glDisable (GL_BLEND);
1479 } 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);
1480} 1690}
1481 1691
1482IV 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)
1483 CODE: 1693 CODE:
1484{ 1694{
… …
1590 //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);
1591 // use uglier nearest interpolation because linear suffers 1801 // use uglier nearest interpolation because linear suffers
1592 // from transparent color bleeding and ugly wrapping effects. 1802 // from transparent color bleeding and ugly wrapping effects.
1593 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1803 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1594} 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 }
1595 1825
1596int 1826int
1597ox (DC::Map self) 1827ox (DC::Map self)
1598 ALIAS: 1828 ALIAS:
1599 oy = 1 1829 oy = 1
… …
1677 uint8_t ext, cmd; 1907 uint8_t ext, cmd;
1678 1908
1679 do 1909 do
1680 { 1910 {
1681 ext = *data++; 1911 ext = *data++;
1682 cmd = ext & 0x3f; 1912 cmd = ext & 0x7f;
1683 1913
1684 if (cmd < 4) 1914 if (cmd < 4)
1685 cell->darkness = 255 - ext * 64 + 1; 1915 cell->darkness = 255 - ext * 64 + 1;
1686 else if (cmd == 5) // health 1916 else if (cmd == 5) // health
1687 { 1917 {
… …
1690 } 1920 }
1691 else if (cmd == 6) // monster width 1921 else if (cmd == 6) // monster width
1692 cell->stat_width = *data++ + 1; 1922 cell->stat_width = *data++ + 1;
1693 else if (cmd == 0x47) 1923 else if (cmd == 0x47)
1694 { 1924 {
1695 if (*data == 4) 1925 if (*data == 1) cell->player = data [1];
1696 ; // 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);
1697 1929
1698 data += *data + 1; 1930 data += *data + 1;
1699 } 1931 }
1700 else if (cmd == 8) // cell flags 1932 else if (cmd == 8) // cell flags
1701 cell->flags = *data++; 1933 cell->flags = *data++;
… …
1718 cell->tile [z] = self->face2tile [face]; 1950 cell->tile [z] = self->face2tile [face];
1719 1951
1720 if (cell->tile [z]) 1952 if (cell->tile [z])
1721 { 1953 {
1722 maptex *tex = self->tex + cell->tile [z]; 1954 maptex *tex = self->tex + cell->tile [z];
1955 tex->unused = 0;
1723 if (!tex->name) 1956 if (!tex->name)
1724 av_push (missing, newSViv (cell->tile [z])); 1957 av_push (missing, newSViv (cell->tile [z]));
1725 1958
1726 if (tex->smoothtile) 1959 if (tex->smoothtile)
1727 { 1960 {
1728 maptex *smooth = self->tex + tex->smoothtile; 1961 maptex *smooth = self->tex + tex->smoothtile;
1962 smooth->unused = 0;
1729 if (!smooth->name) 1963 if (!smooth->name)
1730 av_push (missing, newSViv (tex->smoothtile)); 1964 av_push (missing, newSViv (tex->smoothtile));
1731 } 1965 }
1732 } 1966 }
1733 } 1967 }
1734 } 1968 }
1735 else 1969 else
1736 cell->darkness = 0; 1970 CELL_CLEAR (cell);
1737 } 1971 }
1738} 1972}
1739 OUTPUT: 1973 OUTPUT:
1740 RETVAL 1974 RETVAL
1741 1975
… …
1793} 2027}
1794 OUTPUT: 2028 OUTPUT:
1795 RETVAL 2029 RETVAL
1796 2030
1797void 2031void
1798draw (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)
1799 CODE: 2033 CODE:
1800{ 2034{
1801 int x, y, z; 2035 int x, y, z;
1802 2036
1803 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2037 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1804 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
1805 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)
1806 smooth_key skey; 2040 smooth_key skey;
1807 2041 int pl_x, pl_y;
2042 maptex pl_tex;
1808 rc_t *rc = rc_alloc (); 2043 rc_t *rc = rc_alloc ();
2044 rc_t *rc_ov = rc_alloc ();
1809 rc_key_t key; 2045 rc_key_t key;
1810 rc_array_t *arr; 2046 rc_array_t *arr, *arr_hidden;
1811 2047
2048 pl_tex.name = 0;
2049
1812 // thats current max. sorry. 2050 // that's current max. sorry.
1813 if (sw > 255) sw = 255; 2051 if (sw > 255) sw = 255;
1814 if (sh > 255) sh = 255; 2052 if (sh > 255) sh = 255;
1815 2053
1816 // clear key, in case of extra padding 2054 // clear key, in case of extra padding
1817 memset (&skey, 0, sizeof (skey)); 2055 memset (&skey, 0, sizeof (skey));
… …
1821 key.g = 255; 2059 key.g = 255;
1822 key.b = 255; 2060 key.b = 255;
1823 key.a = 255; 2061 key.a = 255;
1824 key.mode = GL_QUADS; 2062 key.mode = GL_QUADS;
1825 key.format = GL_T2F_V3F; 2063 key.format = GL_T2F_V3F;
1826 key.texname = -1;
1827 2064
1828 mx += self->x; 2065 mx += self->x;
1829 my += self->y; 2066 my += self->y;
1830 2067
1831 // first pass: determine smooth_max 2068 // first pass: determine smooth_max
… …
1852 2089
1853 glEnable (GL_BLEND); 2090 glEnable (GL_BLEND);
1854 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2091 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1855 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1856 2093
2094 key.texname = self->tex [TEXID_HIDDEN].name;
2095 arr_hidden = rc_array (rc_ov, &key);
2096
1857 for (z = 0; z <= 2; z++) 2097 for (z = 0; z <= 2; z++)
1858 { 2098 {
1859 memset (smooth_level, 0, sizeof (smooth_level)); 2099 memset (smooth_level, 0, sizeof (smooth_level));
2100 key.texname = -1;
1860 2101
1861 for (y = 0; y < sh; y++) 2102 for (y = 0; y < sh; y++)
1862 if (0 <= y + my && y + my < self->rows) 2103 if (0 <= y + my && y + my < self->rows)
1863 { 2104 {
1864 maprow *row = self->row + (y + my); 2105 maprow *row = self->row + (y + my);
… …
1874 maptex tex = self->tex [tile]; 2115 maptex tex = self->tex [tile];
1875 int px, py; 2116 int px, py;
1876 2117
1877 if (key.texname != tex.name) 2118 if (key.texname != tex.name)
1878 { 2119 {
2120 self->tex [tile].unused = 0;
2121
1879 if (!tex.name) 2122 if (!tex.name)
1880 tex = self->tex [2]; /* missing, replace by noface */ 2123 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1881 2124
1882 key.texname = tex.name; 2125 key.texname = tex.name;
1883 arr = rc_array (rc, &key); 2126 arr = rc_array (rc, &key);
1884 } 2127 }
1885 2128
1886 px = (x + 1) * T - tex.w; 2129 px = (x + 1) * T - tex.w;
1887 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 }
1888 2139
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2140 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890 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);
1891 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);
1892 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);
1893
1894 if (cell->flags && z == 2)
1895 {
1896 // overlays such as the speech bubble, probably more to come
1897 if (cell->flags & 1)
1898 {
1899 maptex tex = self->tex [1];
1900 int px = x * T + T * 2 / 32;
1901 int py = y * T - T * 6 / 32;
1902
1903 if (tex.name)
1904 {
1905 if (key.texname != tex.name)
1906 {
1907 key.texname = tex.name;
1908 arr = rc_array (rc, &key);
1909 }
1910
1911 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1912 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1913 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1914 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1915 }
1916 }
1917 }
1918 2144
1919 // update smooth hash 2145 // update smooth hash
1920 if (tex.smoothtile) 2146 if (tex.smoothtile)
1921 { 2147 {
1922 skey.tile = tex.smoothtile; 2148 skey.tile = tex.smoothtile;
… …
1951 // corners 2177 // corners
1952 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);
1953 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);
1954 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);
1955 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 }
1956 } 2219 }
1957 } 2220 }
1958 } 2221 }
1959 } 2222 }
1960 2223
… …
2000 { 2263 {
2001 // this time avoiding texture state changes 2264 // this time avoiding texture state changes
2002 // save gobs of state changes. 2265 // save gobs of state changes.
2003 if (key.texname != tex.name) 2266 if (key.texname != tex.name)
2004 { 2267 {
2268 self->tex [skey->tile].unused = 0;
2269
2005 glEnd (); 2270 glEnd ();
2006 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2271 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2007 glBegin (GL_QUADS); 2272 glBegin (GL_QUADS);
2008 } 2273 }
2009 2274
… …
2038 } 2303 }
2039 2304
2040 hv_clear (smooth); 2305 hv_clear (smooth);
2041 } 2306 }
2042 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
2043 glDisable (GL_BLEND); 2328 glDisable (GL_BLEND);
2044 rc_free (rc); 2329 rc_free (rc);
2330 rc_free (rc_ov);
2045 2331
2046 // top layer: overlays such as the health bar 2332 // top layer: overlays such as the health bar
2047 for (y = 0; y < sh; y++) 2333 for (y = 0; y < sh; y++)
2048 if (0 <= y + my && y + my < self->rows) 2334 if (0 <= y + my && y + my < self->rows)
2049 { 2335 {
… …
2054 { 2340 {
2055 mapcell *cell = row->col + (x + mx - row->c0); 2341 mapcell *cell = row->col + (x + mx - row->c0);
2056 2342
2057 int px = x * T; 2343 int px = x * T;
2058 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 }
2059 2351
2060 if (cell->stat_hp) 2352 if (cell->stat_hp)
2061 { 2353 {
2062 int width = cell->stat_width * T; 2354 int width = cell->stat_width * T;
2063 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2103 }; 2395 };
2104 2396
2105 int x, y; 2397 int x, y;
2106 2398
2107 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 */
2108 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2109 glEnable (GL_BLEND); 2407 glEnable (GL_BLEND);
2110 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2408 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2111 glBegin (GL_QUADS); 2409 glBegin (GL_QUADS);
2112 2410
2113 for (y = 0; y < h; y++) 2411 for (y = 0; y < h; y++)
… …
2120 float *c = color [m & 15]; 2418 float *c = color [m & 15];
2121 2419
2122 float tx1 = m & 0x40 ? 0.5 : 0.; 2420 float tx1 = m & 0x40 ? 0.5 : 0.;
2123 float tx2 = tx1 + 0.5; 2421 float tx2 = tx1 + 0.5;
2124 2422
2125 glColor4f (c[0], c[1], c[2], 0.75); 2423 glColor4f (c[0], c[1], c[2], 1);
2126 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2127 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2128 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2129 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2427 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2130 } 2428 }
… …
2152 SvCUR_set (darkness3_sv, sw34 * sh3); 2450 SvCUR_set (darkness3_sv, sw34 * sh3);
2153 2451
2154 mx += self->x - 1; 2452 mx += self->x - 1;
2155 my += self->y - 1; 2453 my += self->y - 1;
2156 2454
2157 memset (darkness1, 255, sw1 * sh1); 2455 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2158 2456
2159 for (y = 0; y < sh1; y++) 2457 for (y = 0; y < sh1; y++)
2160 if (0 <= y + my && y + my < self->rows) 2458 if (0 <= y + my && y + my < self->rows)
2161 { 2459 {
2162 maprow *row = self->row + (y + my); 2460 maprow *row = self->row + (y + my);
… …
2282 else 2580 else
2283 *data++ = 0; 2581 *data++ = 0;
2284 } 2582 }
2285 } 2583 }
2286 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 {
2287 SvPOK_only (data_sv); 2588 SvPOK_only (data_sv);
2288 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2589 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2590 }
2591
2289 RETVAL = data_sv; 2592 RETVAL = data_sv;
2290} 2593}
2291 OUTPUT: 2594 OUTPUT:
2292 RETVAL 2595 RETVAL
2293 2596
2294void 2597void
2295set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2598set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2296 PPCODE: 2599 PPCODE:
2297{ 2600{
2298 int x, y, z; 2601 int x, y, z;
2299 int w, h; 2602 int w, h;
2300 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;
2301 2614
2302 if (*data++ != 0) 2615 if (*data++ != 0)
2303 XSRETURN_EMPTY; /* version mismatch */ 2616 XSRETURN_EMPTY; /* version mismatch */
2304 2617
2305 w = *data++ << 8; w |= *data++; 2618 w = *data++ << 8; w |= *data++;
… …
2320 { 2633 {
2321 maprow *row = map_get_row (self, y); 2634 maprow *row = map_get_row (self, y);
2322 2635
2323 for (x = x0; x < x1; x++) 2636 for (x = x0; x < x1; x++)
2324 { 2637 {
2638 uint8_t flags;
2639
2640 if (data + 7 >= end)
2641 XSRETURN_EMPTY;
2642
2325 uint8_t flags = *data++; 2643 flags = *data++;
2326 2644
2327 if (flags) 2645 if (flags)
2328 { 2646 {
2329 mapcell *cell = row_get_cell (row, x); 2647 mapcell *cell = row_get_cell (row, x);
2330 tileid tile[3] = { 0, 0, 0 }; 2648 tileid tile[3] = { 0, 0, 0 };
… …
2333 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2651 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2334 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2652 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2335 2653
2336 if (cell->darkness == 0) 2654 if (cell->darkness == 0)
2337 { 2655 {
2338 cell->darkness = 0; 2656 /*cell->darkness = 0;*/
2657 EXTEND (SP, 3);
2339 2658
2340 for (z = 0; z <= 2; z++) 2659 for (z = 0; z <= 2; z++)
2341 { 2660 {
2342 tileid t = tile [z]; 2661 tileid t = tile [z];
2343 2662
2344 if (t >= self->texs || (t && !self->tex [t].name)) 2663 if (t >= self->texs || (t && !self->tex [t].name))
2345 { 2664 {
2346 XPUSHs (sv_2mortal (newSViv (t))); 2665 PUSHs (sv_2mortal (newSViv (t)));
2347 need_texid (self, t); 2666 need_texid (self, t);
2348 } 2667 }
2349 2668
2350 cell->tile [z] = t; 2669 cell->tile [z] = t;
2351 } 2670 }
… …
2568 } *civ, const_iv[] = { 2887 } *civ, const_iv[] = {
2569# define const_iv(name) { # name, (IV)name } 2888# define const_iv(name) { # name, (IV)name }
2570 const_iv (GL_VENDOR), 2889 const_iv (GL_VENDOR),
2571 const_iv (GL_VERSION), 2890 const_iv (GL_VERSION),
2572 const_iv (GL_EXTENSIONS), 2891 const_iv (GL_EXTENSIONS),
2892 const_iv (GL_MAX_TEXTURE_UNITS),
2573 const_iv (GL_COLOR_MATERIAL), 2893 const_iv (GL_COLOR_MATERIAL),
2574 const_iv (GL_SMOOTH), 2894 const_iv (GL_SMOOTH),
2575 const_iv (GL_FLAT), 2895 const_iv (GL_FLAT),
2576 const_iv (GL_DITHER), 2896 const_iv (GL_DITHER),
2577 const_iv (GL_BLEND), 2897 const_iv (GL_BLEND),
… …
2589 const_iv (GL_ZERO), 2909 const_iv (GL_ZERO),
2590 const_iv (GL_SRC_ALPHA), 2910 const_iv (GL_SRC_ALPHA),
2591 const_iv (GL_DST_ALPHA), 2911 const_iv (GL_DST_ALPHA),
2592 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2912 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2593 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),
2594 const_iv (GL_SRC_ALPHA_SATURATE), 2918 const_iv (GL_SRC_ALPHA_SATURATE),
2595 const_iv (GL_RGB), 2919 const_iv (GL_RGB),
2596 const_iv (GL_RGBA), 2920 const_iv (GL_RGBA),
2597 const_iv (GL_RGBA4), 2921 const_iv (GL_RGBA4),
2598 const_iv (GL_RGBA8), 2922 const_iv (GL_RGBA8),
… …
2666 const_iv (GL_NICEST), 2990 const_iv (GL_NICEST),
2667 const_iv (GL_V2F), 2991 const_iv (GL_V2F),
2668 const_iv (GL_V3F), 2992 const_iv (GL_V3F),
2669 const_iv (GL_T2F_V3F), 2993 const_iv (GL_T2F_V3F),
2670 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),
2671# undef const_iv 2998# undef const_iv
2672 }; 2999 };
2673 3000
2674 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; )
2675 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2682disable_GL_EXT_blend_func_separate () 3009disable_GL_EXT_blend_func_separate ()
2683 CODE: 3010 CODE:
2684 gl.BlendFuncSeparate = 0; 3011 gl.BlendFuncSeparate = 0;
2685 gl.BlendFuncSeparateEXT = 0; 3012 gl.BlendFuncSeparateEXT = 0;
2686 3013
3014void
3015apple_nvidia_bug (int enable)
3016
2687char * 3017char *
2688gl_vendor () 3018gl_vendor ()
2689 CODE: 3019 CODE:
2690 RETVAL = (char *)glGetString (GL_VENDOR); 3020 RETVAL = (char *)glGetString (GL_VENDOR);
2691 OUTPUT: 3021 OUTPUT:
… …
2740 3070
2741void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3071void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2742 CODE: 3072 CODE:
2743 gl_BlendFuncSeparate (sa, da, saa, daa); 3073 gl_BlendFuncSeparate (sa, da, saa, daa);
2744 3074
3075# void glBlendEquation (int se)
3076
2745void glDepthMask (int flag) 3077void glDepthMask (int flag)
2746 3078
2747void glLogicOp (int opcode) 3079void glLogicOp (int opcode)
2748 3080
2749void glColorMask (int red, int green, int blue, int alpha) 3081void glColorMask (int red, int green, int blue, int alpha)
… …
2783void glRotate (float angle, float x, float y, float z) 3115void glRotate (float angle, float x, float y, float z)
2784 CODE: 3116 CODE:
2785 glRotatef (angle, x, y, z); 3117 glRotatef (angle, x, y, z);
2786 3118
2787void 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: @
2788 ALIAS: 3121 ALIAS:
2789 glColor_premultiply = 1 3122 glColor_premultiply = 1
2790 CODE: 3123 CODE:
2791 if (ix) 3124 if (ix)
2792 { 3125 {

Diff Legend

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