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.250 by root, Fri Dec 28 16:09:03 2007 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
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#if 0 93/* mask out modifiers we are not interested in */
76# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77#else 95
78# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
79#endif 97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
80 101
81static AV *texture_av; 102static AV *texture_av;
82 103
83static struct 104static struct
84{ 105{
… …
178 199
179static void 200static void
180layout_update_font (DC__Layout self) 201layout_update_font (DC__Layout self)
181{ 202{
182 /* 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
183 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
184 */ 205 */
185 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
186 207
187 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
188 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
216 int w, h; 237 int w, h;
217 float s, t; 238 float s, t;
218 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
219 tileid smoothtile; 240 tileid smoothtile;
220 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
221} maptex; 243} maptex;
222 244
223typedef struct { 245typedef struct {
224 uint32_t player; 246 uint32_t player;
225 tileid tile[3]; 247 tileid tile[3];
… …
357 self->oy = 0; 379 self->oy = 0;
358 self->row = 0; 380 self->row = 0;
359 self->rows = 0; 381 self->rows = 0;
360} 382}
361 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
362static void 394static void
363map_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)
364{ 396{
365 int x, y; 397 int x, y;
366 maprow *row; 398 maprow *row;
… …
380 if (x >= row->c1) 412 if (x >= row->c1)
381 break; 413 break;
382 414
383 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
384 416
385 cell->darkness = 0; 417 CELL_CLEAR (cell);
386 cell->stat_hp = 0;
387 cell->flags = 0;
388 cell->player = 0;
389 } 418 }
390 } 419 }
391} 420}
392 421
393typedef struct { 422typedef struct {
… …
504 if (!svp || !SvTRUE (*svp)) 533 if (!svp || !SvTRUE (*svp))
505 return 0; 534 return 0;
506 535
507 return 1; 536 return 1;
508} 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
509 590
510MODULE = Deliantra::Client PACKAGE = DC 591MODULE = Deliantra::Client PACKAGE = DC
511 592
512PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
513 594
… …
542 const_iv (SDL_USEREVENT), 623 const_iv (SDL_USEREVENT),
543 624
544 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
545 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
546 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),
547 678
548 const_iv (SDLK_FIRST), 679 const_iv (SDLK_FIRST),
549 const_iv (SDLK_LAST), 680 const_iv (SDLK_LAST),
550 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
551 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
… …
627 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
628 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
629 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
630 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
631 762
763 const_iv (KMOD_LRAM),
764
632 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)
633# undef const_iv 795# undef const_iv
634 }; 796 };
635 797
636 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; )
637 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
666 CODE: 828 CODE:
667{ 829{
668 opengl_fontmap = pango_opengl_font_map_new (); 830 opengl_fontmap = pango_opengl_font_map_new ();
669 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);
670 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 832 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
671#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)
672 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 835 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
673 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 836 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
674#endif 837#endif
675} 838}
676 839
677char *
678SDL_GetError () 840char *SDL_GetError ()
679 841
680int 842void SDL_braino ()
681SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
682 843
683void 844int SDL_Init (U32 flags)
845
846int SDL_InitSubSystem (U32 flags)
847
848void SDL_QuitSubSystem (U32 flags)
849
684SDL_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
685 860
686void 861void
687SDL_ListModes (int rgb, int alpha) 862SDL_ListModes (int rgb, int alpha)
688 PPCODE: 863 PPCODE:
689{ 864{
… …
701 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 876 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
702 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
703 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
704 879
705 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 880 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
706#if SDL_VERSION_ATLEAST(1,2,10)
707 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
708 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 881 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
709#endif
710 882
711 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 883 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
712 884
713 if (m && m != (SDL_Rect **)-1) 885 if (m && m != (SDL_Rect **)-1)
714 while (*m) 886 while (*m)
715 { 887 {
716 if ((*m)->w >= 800 && (*m)->h >= 480) 888 if ((*m)->w >= 400 && (*m)->h >= 300)
717 { 889 {
718 AV *av = newAV (); 890 AV *av = newAV ();
719 av_push (av, newSViv ((*m)->w)); 891 av_push (av, newSViv ((*m)->w));
720 av_push (av, newSViv ((*m)->h)); 892 av_push (av, newSViv ((*m)->h));
721 av_push (av, newSViv (rgb)); 893 av_push (av, newSViv (rgb));
… …
763SDL_GetKeyName (int sym) 935SDL_GetKeyName (int sym)
764 936
765int 937int
766SDL_GetAppState () 938SDL_GetAppState ()
767 939
940int
941SDL_GetModState ()
942
768void 943void
769poll_events () 944poll_events ()
770 PPCODE: 945 PPCODE:
771{ 946{
772 SDL_Event ev; 947 SDL_Event ev;
… …
781 { 956 {
782 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
783 case SDL_KEYUP: 958 case SDL_KEYUP:
784 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
785 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
786 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 961 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
787 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 962 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
788 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
789 break; 964 break;
790 965
791 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
792 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
810 x = ev.motion.x; 985 x = ev.motion.x;
811 y = ev.motion.y; 986 y = ev.motion.y;
812 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
813 } 988 }
814 989
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
816 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
817 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
818 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
819 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
820 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
821 } 996 }
822 break; 997 break;
823 998
824 case SDL_MOUSEBUTTONDOWN: 999 case SDL_MOUSEBUTTONDOWN:
825 case SDL_MOUSEBUTTONUP: 1000 case SDL_MOUSEBUTTONUP:
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1001 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
827 1002
828 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1003 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
829 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1004 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
830 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1005 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
831 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1006 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
905 } 1080 }
906 } 1081 }
907#endif 1082#endif
908} 1083}
909 1084
910void 1085int
911add_font (char *file) 1086add_font (char *file)
912 CODE: 1087 CODE:
913 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT:
1090 RETVAL
914 1091
915void 1092void
916load_image_inline (SV *image_) 1093load_image_inline (SV *image_)
917 ALIAS: 1094 ALIAS:
918 load_image_file = 1 1095 load_image_file = 1
… …
1034#if DEBUG 1211#if DEBUG
1035 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
1036#endif 1213#endif
1037} 1214}
1038 1215
1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
1039MODULE = Deliantra::Client PACKAGE = DC::Font 1223MODULE = Deliantra::Client PACKAGE = DC::Font
1040 1224
1041PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
1042 1226
1043DC::Font 1227DC::Font
… …
1312 1496
1313void 1497void
1314cursor_pos (DC::Layout self, int index) 1498cursor_pos (DC::Layout self, int index)
1315 PPCODE: 1499 PPCODE:
1316{ 1500{
1317 PangoRectangle strong_pos; 1501 PangoRectangle pos;
1318 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1502 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1319 1503
1320 EXTEND (SP, 3); 1504 EXTEND (SP, 3);
1321 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1505 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1322 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1506 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1323 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1507 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1324} 1508}
1325 1509
1326void 1510void
1327index_to_line_x (DC::Layout self, int index, int trailing = 0) 1511index_to_line_x (DC::Layout self, int index, int trailing = 0)
1328 PPCODE: 1512 PPCODE:
1329{ 1513{
1330 int line, x; 1514 int line, x;
1331 1515
1332 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);
1333#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1517#if !PANGO_VERSION_CHECK (1, 17, 3)
1334 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1518 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1335 --line; 1519 --line;
1336#endif 1520#endif
1337 EXTEND (SP, 2); 1521 EXTEND (SP, 2);
1338 PUSHs (sv_2mortal (newSViv (line))); 1522 PUSHs (sv_2mortal (newSViv (line)));
… …
1587 //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);
1588 // use uglier nearest interpolation because linear suffers 1772 // use uglier nearest interpolation because linear suffers
1589 // from transparent color bleeding and ugly wrapping effects. 1773 // from transparent color bleeding and ugly wrapping effects.
1590 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1774 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1591} 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 }
1592 1796
1593int 1797int
1594ox (DC::Map self) 1798ox (DC::Map self)
1595 ALIAS: 1799 ALIAS:
1596 oy = 1 1800 oy = 1
… …
1674 uint8_t ext, cmd; 1878 uint8_t ext, cmd;
1675 1879
1676 do 1880 do
1677 { 1881 {
1678 ext = *data++; 1882 ext = *data++;
1679 cmd = ext & 0x3f; 1883 cmd = ext & 0x7f;
1680 1884
1681 if (cmd < 4) 1885 if (cmd < 4)
1682 cell->darkness = 255 - ext * 64 + 1; 1886 cell->darkness = 255 - ext * 64 + 1;
1683 else if (cmd == 5) // health 1887 else if (cmd == 5) // health
1684 { 1888 {
… …
1687 } 1891 }
1688 else if (cmd == 6) // monster width 1892 else if (cmd == 6) // monster width
1689 cell->stat_width = *data++ + 1; 1893 cell->stat_width = *data++ + 1;
1690 else if (cmd == 0x47) 1894 else if (cmd == 0x47)
1691 { 1895 {
1692 if (*data == 4) 1896 if (*data == 1) cell->player = data [1];
1693 ; // 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);
1694 1900
1695 data += *data + 1; 1901 data += *data + 1;
1696 } 1902 }
1697 else if (cmd == 8) // cell flags 1903 else if (cmd == 8) // cell flags
1698 cell->flags = *data++; 1904 cell->flags = *data++;
… …
1715 cell->tile [z] = self->face2tile [face]; 1921 cell->tile [z] = self->face2tile [face];
1716 1922
1717 if (cell->tile [z]) 1923 if (cell->tile [z])
1718 { 1924 {
1719 maptex *tex = self->tex + cell->tile [z]; 1925 maptex *tex = self->tex + cell->tile [z];
1926 tex->unused = 0;
1720 if (!tex->name) 1927 if (!tex->name)
1721 av_push (missing, newSViv (cell->tile [z])); 1928 av_push (missing, newSViv (cell->tile [z]));
1722 1929
1723 if (tex->smoothtile) 1930 if (tex->smoothtile)
1724 { 1931 {
1725 maptex *smooth = self->tex + tex->smoothtile; 1932 maptex *smooth = self->tex + tex->smoothtile;
1933 smooth->unused = 0;
1726 if (!smooth->name) 1934 if (!smooth->name)
1727 av_push (missing, newSViv (tex->smoothtile)); 1935 av_push (missing, newSViv (tex->smoothtile));
1728 } 1936 }
1729 } 1937 }
1730 } 1938 }
1731 } 1939 }
1732 else 1940 else
1733 cell->darkness = 0; 1941 CELL_CLEAR (cell);
1734 } 1942 }
1735} 1943}
1736 OUTPUT: 1944 OUTPUT:
1737 RETVAL 1945 RETVAL
1738 1946
… …
1790} 1998}
1791 OUTPUT: 1999 OUTPUT:
1792 RETVAL 2000 RETVAL
1793 2001
1794void 2002void
1795draw (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)
1796 CODE: 2004 CODE:
1797{ 2005{
1798 int x, y, z; 2006 int x, y, z;
1799 2007
1800 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2008 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1801 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
1802 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)
1803 smooth_key skey; 2011 smooth_key skey;
1804 2012 int pl_x, pl_y;
2013 maptex pl_tex;
1805 rc_t *rc = rc_alloc (); 2014 rc_t *rc = rc_alloc ();
2015 rc_t *rc_ov = rc_alloc ();
1806 rc_key_t key; 2016 rc_key_t key;
1807 rc_array_t *arr; 2017 rc_array_t *arr, *arr_hidden;
1808 2018
2019 pl_tex.name = 0;
2020
1809 // thats current max. sorry. 2021 // that's current max. sorry.
1810 if (sw > 255) sw = 255; 2022 if (sw > 255) sw = 255;
1811 if (sh > 255) sh = 255; 2023 if (sh > 255) sh = 255;
1812 2024
1813 // clear key, in case of extra padding 2025 // clear key, in case of extra padding
1814 memset (&skey, 0, sizeof (skey)); 2026 memset (&skey, 0, sizeof (skey));
… …
1818 key.g = 255; 2030 key.g = 255;
1819 key.b = 255; 2031 key.b = 255;
1820 key.a = 255; 2032 key.a = 255;
1821 key.mode = GL_QUADS; 2033 key.mode = GL_QUADS;
1822 key.format = GL_T2F_V3F; 2034 key.format = GL_T2F_V3F;
1823 key.texname = -1;
1824 2035
1825 mx += self->x; 2036 mx += self->x;
1826 my += self->y; 2037 my += self->y;
1827 2038
1828 // first pass: determine smooth_max 2039 // first pass: determine smooth_max
… …
1849 2060
1850 glEnable (GL_BLEND); 2061 glEnable (GL_BLEND);
1851 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1852 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1853 2064
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067
1854 for (z = 0; z <= 2; z++) 2068 for (z = 0; z <= 2; z++)
1855 { 2069 {
1856 memset (smooth_level, 0, sizeof (smooth_level)); 2070 memset (smooth_level, 0, sizeof (smooth_level));
2071 key.texname = -1;
1857 2072
1858 for (y = 0; y < sh; y++) 2073 for (y = 0; y < sh; y++)
1859 if (0 <= y + my && y + my < self->rows) 2074 if (0 <= y + my && y + my < self->rows)
1860 { 2075 {
1861 maprow *row = self->row + (y + my); 2076 maprow *row = self->row + (y + my);
… …
1871 maptex tex = self->tex [tile]; 2086 maptex tex = self->tex [tile];
1872 int px, py; 2087 int px, py;
1873 2088
1874 if (key.texname != tex.name) 2089 if (key.texname != tex.name)
1875 { 2090 {
2091 self->tex [tile].unused = 0;
2092
1876 if (!tex.name) 2093 if (!tex.name)
1877 tex = self->tex [2]; /* missing, replace by noface */ 2094 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1878 2095
1879 key.texname = tex.name; 2096 key.texname = tex.name;
1880 arr = rc_array (rc, &key); 2097 arr = rc_array (rc, &key);
1881 } 2098 }
1882 2099
1883 px = (x + 1) * T - tex.w; 2100 px = (x + 1) * T - tex.w;
1884 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 }
1885 2110
1886 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2111 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1887 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);
1888 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);
1889 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);
1890
1891 if (cell->flags && z == 2)
1892 {
1893 // overlays such as the speech bubble, probably more to come
1894 if (cell->flags & 1)
1895 {
1896 maptex tex = self->tex [1];
1897 int px = x * T + T * 2 / 32;
1898 int py = y * T - T * 6 / 32;
1899
1900 if (tex.name)
1901 {
1902 if (key.texname != tex.name)
1903 {
1904 key.texname = tex.name;
1905 arr = rc_array (rc, &key);
1906 }
1907
1908 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1909 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1910 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1911 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1912 }
1913 }
1914 }
1915 2115
1916 // update smooth hash 2116 // update smooth hash
1917 if (tex.smoothtile) 2117 if (tex.smoothtile)
1918 { 2118 {
1919 skey.tile = tex.smoothtile; 2119 skey.tile = tex.smoothtile;
… …
1948 // corners 2148 // corners
1949 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);
1950 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);
1951 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);
1952 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 }
1953 } 2190 }
1954 } 2191 }
1955 } 2192 }
1956 } 2193 }
1957 2194
… …
1997 { 2234 {
1998 // this time avoiding texture state changes 2235 // this time avoiding texture state changes
1999 // save gobs of state changes. 2236 // save gobs of state changes.
2000 if (key.texname != tex.name) 2237 if (key.texname != tex.name)
2001 { 2238 {
2239 self->tex [skey->tile].unused = 0;
2240
2002 glEnd (); 2241 glEnd ();
2003 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2242 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2004 glBegin (GL_QUADS); 2243 glBegin (GL_QUADS);
2005 } 2244 }
2006 2245
… …
2035 } 2274 }
2036 2275
2037 hv_clear (smooth); 2276 hv_clear (smooth);
2038 } 2277 }
2039 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
2040 glDisable (GL_BLEND); 2299 glDisable (GL_BLEND);
2041 rc_free (rc); 2300 rc_free (rc);
2301 rc_free (rc_ov);
2042 2302
2043 // top layer: overlays such as the health bar 2303 // top layer: overlays such as the health bar
2044 for (y = 0; y < sh; y++) 2304 for (y = 0; y < sh; y++)
2045 if (0 <= y + my && y + my < self->rows) 2305 if (0 <= y + my && y + my < self->rows)
2046 { 2306 {
… …
2051 { 2311 {
2052 mapcell *cell = row->col + (x + mx - row->c0); 2312 mapcell *cell = row->col + (x + mx - row->c0);
2053 2313
2054 int px = x * T; 2314 int px = x * T;
2055 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 }
2056 2322
2057 if (cell->stat_hp) 2323 if (cell->stat_hp)
2058 { 2324 {
2059 int width = cell->stat_width * T; 2325 int width = cell->stat_width * T;
2060 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2326 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2100 }; 2366 };
2101 2367
2102 int x, y; 2368 int x, y;
2103 2369
2104 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 */
2105 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2377 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2106 glEnable (GL_BLEND); 2378 glEnable (GL_BLEND);
2107 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2379 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2108 glBegin (GL_QUADS); 2380 glBegin (GL_QUADS);
2109 2381
2110 for (y = 0; y < h; y++) 2382 for (y = 0; y < h; y++)
… …
2117 float *c = color [m & 15]; 2389 float *c = color [m & 15];
2118 2390
2119 float tx1 = m & 0x40 ? 0.5 : 0.; 2391 float tx1 = m & 0x40 ? 0.5 : 0.;
2120 float tx2 = tx1 + 0.5; 2392 float tx2 = tx1 + 0.5;
2121 2393
2122 glColor4f (c[0], c[1], c[2], 0.75); 2394 glColor4f (c[0], c[1], c[2], 1);
2123 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2395 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2124 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2396 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2125 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2397 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2126 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2398 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2127 } 2399 }
… …
2149 SvCUR_set (darkness3_sv, sw34 * sh3); 2421 SvCUR_set (darkness3_sv, sw34 * sh3);
2150 2422
2151 mx += self->x - 1; 2423 mx += self->x - 1;
2152 my += self->y - 1; 2424 my += self->y - 1;
2153 2425
2154 memset (darkness1, 255, sw1 * sh1); 2426 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2155 2427
2156 for (y = 0; y < sh1; y++) 2428 for (y = 0; y < sh1; y++)
2157 if (0 <= y + my && y + my < self->rows) 2429 if (0 <= y + my && y + my < self->rows)
2158 { 2430 {
2159 maprow *row = self->row + (y + my); 2431 maprow *row = self->row + (y + my);
… …
2279 else 2551 else
2280 *data++ = 0; 2552 *data++ = 0;
2281 } 2553 }
2282 } 2554 }
2283 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 {
2284 SvPOK_only (data_sv); 2559 SvPOK_only (data_sv);
2285 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2560 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2561 }
2562
2286 RETVAL = data_sv; 2563 RETVAL = data_sv;
2287} 2564}
2288 OUTPUT: 2565 OUTPUT:
2289 RETVAL 2566 RETVAL
2290 2567
2291void 2568void
2292set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2569set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2293 PPCODE: 2570 PPCODE:
2294{ 2571{
2295 int x, y, z; 2572 int x, y, z;
2296 int w, h; 2573 int w, h;
2297 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;
2298 2585
2299 if (*data++ != 0) 2586 if (*data++ != 0)
2300 XSRETURN_EMPTY; /* version mismatch */ 2587 XSRETURN_EMPTY; /* version mismatch */
2301 2588
2302 w = *data++ << 8; w |= *data++; 2589 w = *data++ << 8; w |= *data++;
… …
2317 { 2604 {
2318 maprow *row = map_get_row (self, y); 2605 maprow *row = map_get_row (self, y);
2319 2606
2320 for (x = x0; x < x1; x++) 2607 for (x = x0; x < x1; x++)
2321 { 2608 {
2609 uint8_t flags;
2610
2611 if (data + 7 >= end)
2612 XSRETURN_EMPTY;
2613
2322 uint8_t flags = *data++; 2614 flags = *data++;
2323 2615
2324 if (flags) 2616 if (flags)
2325 { 2617 {
2326 mapcell *cell = row_get_cell (row, x); 2618 mapcell *cell = row_get_cell (row, x);
2327 tileid tile[3] = { 0, 0, 0 }; 2619 tileid tile[3] = { 0, 0, 0 };
… …
2330 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2622 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2331 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2623 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2332 2624
2333 if (cell->darkness == 0) 2625 if (cell->darkness == 0)
2334 { 2626 {
2335 cell->darkness = 0; 2627 /*cell->darkness = 0;*/
2628 EXTEND (SP, 3);
2336 2629
2337 for (z = 0; z <= 2; z++) 2630 for (z = 0; z <= 2; z++)
2338 { 2631 {
2339 tileid t = tile [z]; 2632 tileid t = tile [z];
2340 2633
2341 if (t >= self->texs || (t && !self->tex [t].name)) 2634 if (t >= self->texs || (t && !self->tex [t].name))
2342 { 2635 {
2343 XPUSHs (sv_2mortal (newSViv (t))); 2636 PUSHs (sv_2mortal (newSViv (t)));
2344 need_texid (self, t); 2637 need_texid (self, t);
2345 } 2638 }
2346 2639
2347 cell->tile [z] = t; 2640 cell->tile [z] = t;
2348 } 2641 }
… …
2663 const_iv (GL_NICEST), 2956 const_iv (GL_NICEST),
2664 const_iv (GL_V2F), 2957 const_iv (GL_V2F),
2665 const_iv (GL_V3F), 2958 const_iv (GL_V3F),
2666 const_iv (GL_T2F_V3F), 2959 const_iv (GL_T2F_V3F),
2667 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),
2668# undef const_iv 2964# undef const_iv
2669 }; 2965 };
2670 2966
2671 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; )
2672 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2968 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2679disable_GL_EXT_blend_func_separate () 2975disable_GL_EXT_blend_func_separate ()
2680 CODE: 2976 CODE:
2681 gl.BlendFuncSeparate = 0; 2977 gl.BlendFuncSeparate = 0;
2682 gl.BlendFuncSeparateEXT = 0; 2978 gl.BlendFuncSeparateEXT = 0;
2683 2979
2980void
2981apple_nvidia_bug (int enable)
2982
2684char * 2983char *
2685gl_vendor () 2984gl_vendor ()
2686 CODE: 2985 CODE:
2687 RETVAL = (char *)glGetString (GL_VENDOR); 2986 RETVAL = (char *)glGetString (GL_VENDOR);
2688 OUTPUT: 2987 OUTPUT:
… …
2737 3036
2738void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3037void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2739 CODE: 3038 CODE:
2740 gl_BlendFuncSeparate (sa, da, saa, daa); 3039 gl_BlendFuncSeparate (sa, da, saa, daa);
2741 3040
3041void glBlendEquation (int se)
3042
2742void glDepthMask (int flag) 3043void glDepthMask (int flag)
2743 3044
2744void glLogicOp (int opcode) 3045void glLogicOp (int opcode)
2745 3046
2746void glColorMask (int red, int green, int blue, int alpha) 3047void glColorMask (int red, int green, int blue, int alpha)
… …
2780void glRotate (float angle, float x, float y, float z) 3081void glRotate (float angle, float x, float y, float z)
2781 CODE: 3082 CODE:
2782 glRotatef (angle, x, y, z); 3083 glRotatef (angle, x, y, z);
2783 3084
2784void 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: @
2785 ALIAS: 3087 ALIAS:
2786 glColor_premultiply = 1 3088 glColor_premultiply = 1
2787 CODE: 3089 CODE:
2788 if (ix) 3090 if (ix)
2789 { 3091 {

Diff Legend

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