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.242 by root, Wed Dec 26 21:03:21 2007 UTC vs.
Revision 1.285 by root, Sat Dec 20 19:45:49 2008 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>
55
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)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
50 66
51#ifndef _WIN32 67#ifndef _WIN32
52# include <sys/types.h> 68# include <sys/types.h>
53# include <sys/socket.h> 69# include <sys/socket.h>
54# include <netinet/in.h> 70# include <netinet/in.h>
55# include <netinet/tcp.h> 71# include <netinet/tcp.h>
56# include <inttypes.h> 72# include <inttypes.h>
57#endif 73#endif
58 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
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 85
61#define FOW_DARKNESS 32 86#define FOW_DARKNESS 16
62 87
63#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
65 90
66#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
67 92
68#if 0 93/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 95
71# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
72#endif 97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
73 101
74static AV *texture_av; 102static AV *texture_av;
75 103
76static struct 104static struct
77{ 105{
… …
171 199
172static void 200static void
173layout_update_font (DC__Layout self) 201layout_update_font (DC__Layout self)
174{ 202{
175 /* 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
176 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
177 */ 205 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
179 207
180 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
209 int w, h; 237 int w, h;
210 float s, t; 238 float s, t;
211 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
212 tileid smoothtile; 240 tileid smoothtile;
213 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
214} maptex; 243} maptex;
215 244
216typedef struct { 245typedef struct {
217 uint32_t player; 246 uint32_t player;
218 tileid tile[3]; 247 tileid tile[3];
… …
350 self->oy = 0; 379 self->oy = 0;
351 self->row = 0; 380 self->row = 0;
352 self->rows = 0; 381 self->rows = 0;
353} 382}
354 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
355static void 394static void
356map_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)
357{ 396{
358 int x, y; 397 int x, y;
359 maprow *row; 398 maprow *row;
… …
373 if (x >= row->c1) 412 if (x >= row->c1)
374 break; 413 break;
375 414
376 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
377 416
378 cell->darkness = 0; 417 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 418 }
383 } 419 }
384} 420}
385 421
386typedef struct { 422typedef struct {
… …
497 if (!svp || !SvTRUE (*svp)) 533 if (!svp || !SvTRUE (*svp))
498 return 0; 534 return 0;
499 535
500 return 1; 536 return 1;
501} 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
502 590
503MODULE = Deliantra::Client PACKAGE = DC 591MODULE = Deliantra::Client PACKAGE = DC
504 592
505PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
506 594
… …
535 const_iv (SDL_USEREVENT), 623 const_iv (SDL_USEREVENT),
536 624
537 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
539 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),
540 678
541 const_iv (SDLK_FIRST), 679 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 680 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
… …
620 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
624 762
763 const_iv (KMOD_LRAM),
764
625 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)
626# undef const_iv 795# undef const_iv
627 }; 796 };
628 797
629 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; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
659 CODE: 828 CODE:
660{ 829{
661 opengl_fontmap = pango_opengl_font_map_new (); 830 opengl_fontmap = pango_opengl_font_map_new ();
662 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);
663 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);*/
834#if PANGO_VERSION_CHECK (1, 15, 2)
835 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
836 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
837#endif
664} 838}
665 839
666char *
667SDL_GetError () 840char *SDL_GetError ()
668 841
669int 842void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 843
672void 844int SDL_Init (U32 flags)
845
846int SDL_InitSubSystem (U32 flags)
847
848void SDL_QuitSubSystem (U32 flags)
849
673SDL_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
674 860
675void 861void
676SDL_ListModes (int rgb, int alpha) 862SDL_ListModes (int rgb, int alpha)
677 PPCODE: 863 PPCODE:
678{ 864{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 876 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 879
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 880 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 881 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 882
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 883 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 884
702 if (m && m != (SDL_Rect **)-1) 885 if (m && m != (SDL_Rect **)-1)
703 while (*m) 886 while (*m)
704 { 887 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 888 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 889 {
707 AV *av = newAV (); 890 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 891 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 892 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 893 av_push (av, newSViv (rgb));
… …
752SDL_GetKeyName (int sym) 935SDL_GetKeyName (int sym)
753 936
754int 937int
755SDL_GetAppState () 938SDL_GetAppState ()
756 939
940int
941SDL_GetModState ()
942
757void 943void
758poll_events () 944poll_events ()
759 PPCODE: 945 PPCODE:
760{ 946{
761 SDL_Event ev; 947 SDL_Event ev;
… …
770 { 956 {
771 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
772 case SDL_KEYUP: 958 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 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);
776 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 */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 964 break;
779 965
780 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 985 x = ev.motion.x;
800 y = ev.motion.y; 986 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 988 }
803 989
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 996 }
811 break; 997 break;
812 998
813 case SDL_MOUSEBUTTONDOWN: 999 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1000 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1001 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1002
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1003 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1004 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1005 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1006 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
894 } 1080 }
895 } 1081 }
896#endif 1082#endif
897} 1083}
898 1084
899void 1085int
900add_font (char *file) 1086add_font (char *file)
901 CODE: 1087 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT:
1090 RETVAL
903 1091
904void 1092void
905load_image_inline (SV *image_) 1093load_image_inline (SV *image_)
906 ALIAS: 1094 ALIAS:
907 load_image_file = 1 1095 load_image_file = 1
… …
1023#if DEBUG 1211#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
1025#endif 1213#endif
1026} 1214}
1027 1215
1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
1028MODULE = Deliantra::Client PACKAGE = DC::Font 1223MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1224
1030PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
1031 1226
1032DC::Font 1227DC::Font
… …
1165{ 1360{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1361 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1362
1168 do 1363 do
1169 { 1364 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1365 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1366
1172 if (run && shape_attr_p (run)) 1367 if (run && shape_attr_p (run))
1173 { 1368 {
1174 PangoRectangle extents; 1369 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1370 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1279int 1474int
1280descent (DC::Layout self) 1475descent (DC::Layout self)
1281 CODE: 1476 CODE:
1282{ 1477{
1283 PangoRectangle rect; 1478 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1479 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1480 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1481 RETVAL = PANGO_DESCENT (rect);
1287} 1482}
1288 OUTPUT: 1483 OUTPUT:
1289 RETVAL 1484 RETVAL
… …
1301 1496
1302void 1497void
1303cursor_pos (DC::Layout self, int index) 1498cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1499 PPCODE:
1305{ 1500{
1306 PangoRectangle strong_pos; 1501 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1502 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1503
1309 EXTEND (SP, 3); 1504 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1505 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1506 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1507 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1508}
1314 1509
1315void 1510void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1511index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1512 PPCODE:
1318{ 1513{
1319 int line, x; 1514 int line, x;
1320 1515
1321 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);
1517#if !PANGO_VERSION_CHECK (1, 17, 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1518 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1519 --line;
1520#endif
1324 EXTEND (SP, 2); 1521 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1522 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1523 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1524}
1328 1525
1329void 1526void
1330line_x_to_index (DC::Layout self, int line, int x) 1527line_x_to_index (DC::Layout self, int line, int x)
… …
1334 int index, trailing; 1531 int index, trailing;
1335 1532
1336 if (line < 0) 1533 if (line < 0)
1337 XSRETURN_EMPTY; 1534 XSRETURN_EMPTY;
1338 1535
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1536 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1537 XSRETURN_EMPTY; /* do better */
1341 1538
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1539 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1540
1344 EXTEND (SP, 2); 1541 EXTEND (SP, 2);
… …
1574 //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);
1575 // use uglier nearest interpolation because linear suffers 1772 // use uglier nearest interpolation because linear suffers
1576 // from transparent color bleeding and ugly wrapping effects. 1773 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1774 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 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 }
1579 1796
1580int 1797int
1581ox (DC::Map self) 1798ox (DC::Map self)
1582 ALIAS: 1799 ALIAS:
1583 oy = 1 1800 oy = 1
… …
1661 uint8_t ext, cmd; 1878 uint8_t ext, cmd;
1662 1879
1663 do 1880 do
1664 { 1881 {
1665 ext = *data++; 1882 ext = *data++;
1666 cmd = ext & 0x3f; 1883 cmd = ext & 0x7f;
1667 1884
1668 if (cmd < 4) 1885 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 1886 cell->darkness = 255 - ext * 64 + 1;
1670 else if (cmd == 5) // health 1887 else if (cmd == 5) // health
1671 { 1888 {
… …
1674 } 1891 }
1675 else if (cmd == 6) // monster width 1892 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 1893 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 1894 else if (cmd == 0x47)
1678 { 1895 {
1679 if (*data == 4) 1896 if (*data == 1) cell->player = data [1];
1680 ; // 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);
1681 1900
1682 data += *data + 1; 1901 data += *data + 1;
1683 } 1902 }
1684 else if (cmd == 8) // cell flags 1903 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 1904 cell->flags = *data++;
… …
1702 cell->tile [z] = self->face2tile [face]; 1921 cell->tile [z] = self->face2tile [face];
1703 1922
1704 if (cell->tile [z]) 1923 if (cell->tile [z])
1705 { 1924 {
1706 maptex *tex = self->tex + cell->tile [z]; 1925 maptex *tex = self->tex + cell->tile [z];
1926 tex->unused = 0;
1707 if (!tex->name) 1927 if (!tex->name)
1708 av_push (missing, newSViv (cell->tile [z])); 1928 av_push (missing, newSViv (cell->tile [z]));
1709 1929
1710 if (tex->smoothtile) 1930 if (tex->smoothtile)
1711 { 1931 {
1712 maptex *smooth = self->tex + tex->smoothtile; 1932 maptex *smooth = self->tex + tex->smoothtile;
1933 smooth->unused = 0;
1713 if (!smooth->name) 1934 if (!smooth->name)
1714 av_push (missing, newSViv (tex->smoothtile)); 1935 av_push (missing, newSViv (tex->smoothtile));
1715 } 1936 }
1716 } 1937 }
1717 } 1938 }
1718 } 1939 }
1719 else 1940 else
1720 cell->darkness = 0; 1941 CELL_CLEAR (cell);
1721 } 1942 }
1722} 1943}
1723 OUTPUT: 1944 OUTPUT:
1724 RETVAL 1945 RETVAL
1725 1946
… …
1777} 1998}
1778 OUTPUT: 1999 OUTPUT:
1779 RETVAL 2000 RETVAL
1780 2001
1781void 2002void
1782draw (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)
1783 CODE: 2004 CODE:
1784{ 2005{
1785 int x, y, z; 2006 int x, y, z;
1786 2007
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2008 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 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
1789 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)
1790 smooth_key skey; 2011 smooth_key skey;
1791 2012 int pl_x, pl_y;
2013 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 2014 rc_t *rc = rc_alloc ();
2015 rc_t *rc_ov = rc_alloc ();
1793 rc_key_t key; 2016 rc_key_t key;
1794 rc_array_t *arr; 2017 rc_array_t *arr, *arr_hidden;
2018
2019 pl_tex.name = 0;
1795 2020
1796 // thats current max. sorry. 2021 // thats current max. sorry.
1797 if (sw > 255) sw = 255; 2022 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 2023 if (sh > 255) sh = 255;
1799 2024
… …
1805 key.g = 255; 2030 key.g = 255;
1806 key.b = 255; 2031 key.b = 255;
1807 key.a = 255; 2032 key.a = 255;
1808 key.mode = GL_QUADS; 2033 key.mode = GL_QUADS;
1809 key.format = GL_T2F_V3F; 2034 key.format = GL_T2F_V3F;
1810 key.texname = -1;
1811 2035
1812 mx += self->x; 2036 mx += self->x;
1813 my += self->y; 2037 my += self->y;
1814 2038
1815 // first pass: determine smooth_max 2039 // first pass: determine smooth_max
… …
1836 2060
1837 glEnable (GL_BLEND); 2061 glEnable (GL_BLEND);
1838 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1840 2064
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067
1841 for (z = 0; z <= 2; z++) 2068 for (z = 0; z <= 2; z++)
1842 { 2069 {
1843 memset (smooth_level, 0, sizeof (smooth_level)); 2070 memset (smooth_level, 0, sizeof (smooth_level));
2071 key.texname = -1;
1844 2072
1845 for (y = 0; y < sh; y++) 2073 for (y = 0; y < sh; y++)
1846 if (0 <= y + my && y + my < self->rows) 2074 if (0 <= y + my && y + my < self->rows)
1847 { 2075 {
1848 maprow *row = self->row + (y + my); 2076 maprow *row = self->row + (y + my);
… …
1858 maptex tex = self->tex [tile]; 2086 maptex tex = self->tex [tile];
1859 int px, py; 2087 int px, py;
1860 2088
1861 if (key.texname != tex.name) 2089 if (key.texname != tex.name)
1862 { 2090 {
2091 self->tex [tile].unused = 0;
2092
1863 if (!tex.name) 2093 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 2094 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1865 2095
1866 key.texname = tex.name; 2096 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 2097 arr = rc_array (rc, &key);
1868 } 2098 }
1869 2099
1870 px = (x + 1) * T - tex.w; 2100 px = (x + 1) * T - tex.w;
1871 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 }
1872 2110
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2111 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 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);
1875 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);
1876 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);
1877
1878 if (cell->flags && z == 2)
1879 {
1880 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1)
1882 {
1883 maptex tex = self->tex [1];
1884 int px = x * T + T * 2 / 32;
1885 int py = y * T - T * 6 / 32;
1886
1887 if (tex.name)
1888 {
1889 if (key.texname != tex.name)
1890 {
1891 key.texname = tex.name;
1892 arr = rc_array (rc, &key);
1893 }
1894
1895 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1896 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1897 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1898 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1899 }
1900 }
1901 }
1902 2115
1903 // update smooth hash 2116 // update smooth hash
1904 if (tex.smoothtile) 2117 if (tex.smoothtile)
1905 { 2118 {
1906 skey.tile = tex.smoothtile; 2119 skey.tile = tex.smoothtile;
… …
1935 // corners 2148 // corners
1936 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);
1937 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);
1938 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);
1939 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
2180 key_ov.texname = tex.name;
2181 arr = rc_array (rc_ov, &key_ov);
2182
2183 int px = x * T + T * 2 / 32;
2184 int py = y * T - T * 6 / 32;
2185
2186 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2187 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2188 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2189 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2190 }
1940 } 2191 }
1941 } 2192 }
1942 } 2193 }
1943 } 2194 }
1944 2195
… …
1984 { 2235 {
1985 // this time avoiding texture state changes 2236 // this time avoiding texture state changes
1986 // save gobs of state changes. 2237 // save gobs of state changes.
1987 if (key.texname != tex.name) 2238 if (key.texname != tex.name)
1988 { 2239 {
2240 self->tex [skey->tile].unused = 0;
2241
1989 glEnd (); 2242 glEnd ();
1990 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2243 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1991 glBegin (GL_QUADS); 2244 glBegin (GL_QUADS);
1992 } 2245 }
1993 2246
… …
2022 } 2275 }
2023 2276
2024 hv_clear (smooth); 2277 hv_clear (smooth);
2025 } 2278 }
2026 2279
2280 if (pl_tex.name)
2281 {
2282 maptex tex = pl_tex;
2283 int px = pl_x + sdx;
2284 int py = pl_y + sdy;
2285
2286 key.texname = tex.name;
2287 arr = rc_array (rc, &key);
2288
2289 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2290 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2291 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2292 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2293
2294 rc_draw (rc);
2295 }
2296
2297 rc_draw (rc_ov);
2298 rc_clear (rc_ov);
2299
2027 glDisable (GL_BLEND); 2300 glDisable (GL_BLEND);
2028 rc_free (rc); 2301 rc_free (rc);
2302 rc_free (rc_ov);
2029 2303
2030 // top layer: overlays such as the health bar 2304 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2305 for (y = 0; y < sh; y++)
2032 if (0 <= y + my && y + my < self->rows) 2306 if (0 <= y + my && y + my < self->rows)
2033 { 2307 {
… …
2038 { 2312 {
2039 mapcell *cell = row->col + (x + mx - row->c0); 2313 mapcell *cell = row->col + (x + mx - row->c0);
2040 2314
2041 int px = x * T; 2315 int px = x * T;
2042 int py = y * T; 2316 int py = y * T;
2317
2318 if (expect_false (cell->player == player))
2319 {
2320 px += sdx;
2321 py += sdy;
2322 }
2043 2323
2044 if (cell->stat_hp) 2324 if (cell->stat_hp)
2045 { 2325 {
2046 int width = cell->stat_width * T; 2326 int width = cell->stat_width * T;
2047 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2327 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2416 SvCUR_set (darkness3_sv, sw34 * sh3);
2137 2417
2138 mx += self->x - 1; 2418 mx += self->x - 1;
2139 my += self->y - 1; 2419 my += self->y - 1;
2140 2420
2141 memset (darkness1, 255, sw1 * sh1); 2421 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2142 2422
2143 for (y = 0; y < sh1; y++) 2423 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2424 if (0 <= y + my && y + my < self->rows)
2145 { 2425 {
2146 maprow *row = self->row + (y + my); 2426 maprow *row = self->row + (y + my);
… …
2266 else 2546 else
2267 *data++ = 0; 2547 *data++ = 0;
2268 } 2548 }
2269 } 2549 }
2270 2550
2551 /* if size is w*h + 5 then no data has been found */
2552 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2553 {
2271 SvPOK_only (data_sv); 2554 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2555 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2556 }
2557
2273 RETVAL = data_sv; 2558 RETVAL = data_sv;
2274} 2559}
2275 OUTPUT: 2560 OUTPUT:
2276 RETVAL 2561 RETVAL
2277 2562
2278void 2563void
2279set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2564set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2565 PPCODE:
2281{ 2566{
2282 int x, y, z; 2567 int x, y, z;
2283 int w, h; 2568 int w, h;
2284 int x1, y1; 2569 int x1, y1;
2570 STRLEN len;
2571 uint8_t *data, *end;
2572
2573 len = SvLEN (data_sv);
2574 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2575 data = SvPVbyte_nolen (data_sv);
2576 end = data + len + 8;
2577
2578 if (len < 5)
2579 XSRETURN_EMPTY;
2285 2580
2286 if (*data++ != 0) 2581 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2582 XSRETURN_EMPTY; /* version mismatch */
2288 2583
2289 w = *data++ << 8; w |= *data++; 2584 w = *data++ << 8; w |= *data++;
… …
2304 { 2599 {
2305 maprow *row = map_get_row (self, y); 2600 maprow *row = map_get_row (self, y);
2306 2601
2307 for (x = x0; x < x1; x++) 2602 for (x = x0; x < x1; x++)
2308 { 2603 {
2604 uint8_t flags;
2605
2606 if (data + 7 >= end)
2607 XSRETURN_EMPTY;
2608
2309 uint8_t flags = *data++; 2609 flags = *data++;
2310 2610
2311 if (flags) 2611 if (flags)
2312 { 2612 {
2313 mapcell *cell = row_get_cell (row, x); 2613 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2614 tileid tile[3] = { 0, 0, 0 };
… …
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2617 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2618 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2619
2320 if (cell->darkness == 0) 2620 if (cell->darkness == 0)
2321 { 2621 {
2322 cell->darkness = 0; 2622 /*cell->darkness = 0;*/
2623 EXTEND (SP, 3);
2323 2624
2324 for (z = 0; z <= 2; z++) 2625 for (z = 0; z <= 2; z++)
2325 { 2626 {
2326 tileid t = tile [z]; 2627 tileid t = tile [z];
2327 2628
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2629 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2630 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2631 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2632 need_texid (self, t);
2332 } 2633 }
2333 2634
2334 cell->tile [z] = t; 2635 cell->tile [z] = t;
2335 } 2636 }
… …
2767void glRotate (float angle, float x, float y, float z) 3068void glRotate (float angle, float x, float y, float z)
2768 CODE: 3069 CODE:
2769 glRotatef (angle, x, y, z); 3070 glRotatef (angle, x, y, z);
2770 3071
2771void glColor (float r, float g, float b, float a = 1.0) 3072void glColor (float r, float g, float b, float a = 1.0)
3073 PROTOTYPE: @
2772 ALIAS: 3074 ALIAS:
2773 glColor_premultiply = 1 3075 glColor_premultiply = 1
2774 CODE: 3076 CODE:
2775 if (ix) 3077 if (ix)
2776 { 3078 {
… …
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3148void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 3149 CODE:
2848 if (gl.SeparableFilter2D) 3150 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3151 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3152
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3153void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 3154
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3155void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 3156
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3157void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3158

Diff Legend

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