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.247 by root, Fri Dec 28 15:06:08 2007 UTC vs.
Revision 1.304 by root, Fri Apr 23 16:30:38 2010 UTC

19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib/gmacros.h>
48 54
49#include <pango/pango.h> 55#include <pango/pango.h>
56
57#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0
59#endif
60
61#if !PANGO_VERSION_CHECK (1, 15, 2)
62# define pango_layout_get_line_readonly pango_layout_get_line
63# define pango_layout_get_lines_readonly pango_layout_get_lines
64# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
65# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
66#endif
50 67
51#ifndef _WIN32 68#ifndef _WIN32
52# include <sys/types.h> 69# include <sys/types.h>
53# include <sys/socket.h> 70# include <sys/socket.h>
54# include <netinet/in.h> 71# include <netinet/in.h>
55# include <netinet/tcp.h> 72# include <netinet/tcp.h>
56# include <inttypes.h> 73# include <inttypes.h>
57#endif 74#endif
58 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
61#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
62 91
63#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
65 94
66#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
67 96
68#if 0 97/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 99
71# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
72#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
73 104
74static AV *texture_av; 105static AV *texture_av;
75 106
76static struct 107static struct
77{ 108{
171 202
172static void 203static void
173layout_update_font (DC__Layout self) 204layout_update_font (DC__Layout self)
174{ 205{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 206 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 207 * reasonably well with dejavu/bistream fonts
177 */ 208 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 209 PangoFontDescription *font = self->font ? self->font : default_font;
179 210
180 pango_font_description_set_absolute_size (font, 211 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 212 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
209 int w, h; 240 int w, h;
210 float s, t; 241 float s, t;
211 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
212 tileid smoothtile; 243 tileid smoothtile;
213 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
214} maptex; 246} maptex;
215 247
216typedef struct { 248typedef struct {
217 uint32_t player; 249 uint32_t player;
218 tileid tile[3]; 250 tileid tile[3];
350 self->oy = 0; 382 self->oy = 0;
351 self->row = 0; 383 self->row = 0;
352 self->rows = 0; 384 self->rows = 0;
353} 385}
354 386
387#define CELL_CLEAR(cell) \
388 do { \
389 if ((cell)->player) \
390 (cell)->tile [2] = 0; \
391 (cell)->darkness = 0; \
392 (cell)->stat_hp = 0; \
393 (cell)->flags = 0; \
394 (cell)->player = 0; \
395 } while (0)
396
355static void 397static void
356map_blank (DC__Map self, int x0, int y0, int w, int h) 398map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 399{
358 int x, y; 400 int x, y;
359 maprow *row; 401 maprow *row;
373 if (x >= row->c1) 415 if (x >= row->c1)
374 break; 416 break;
375 417
376 cell = row->col + x - row->c0; 418 cell = row->col + x - row->c0;
377 419
378 cell->darkness = 0; 420 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 421 }
383 } 422 }
384} 423}
385 424
386typedef struct { 425typedef struct {
497 if (!svp || !SvTRUE (*svp)) 536 if (!svp || !SvTRUE (*svp))
498 return 0; 537 return 0;
499 538
500 return 1; 539 return 1;
501} 540}
541
542/******************************************************************************/
543
544/* process keyboard modifiers */
545static int
546mod_munge (int mod)
547{
548 mod &= MOD_MASK;
549
550 if (mod & (KMOD_META | KMOD_ALT))
551 mod |= KMOD_LRAM;
552
553 return mod;
554}
555
556static void
557deliantra_main ()
558{
559 char *argv[] = { 0 };
560 call_argv ("::main", G_DISCARD | G_VOID, argv);
561}
562
563#ifdef __MACOSX__
564 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back.
569 */
570 extern C_LINKAGE int
571 main (int argc, char *argv[])
572 {
573 deliantra_main ();
574 }
575
576 #undef main
577
578 extern C_LINKAGE int main (int argc, char *argv[]);
579
580 static void
581 SDL_braino (void)
582 {
583 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv);
585 }
586#else
587 static void
588 SDL_braino (void)
589 {
590 deliantra_main ();
591 }
592#endif
502 593
503MODULE = Deliantra::Client PACKAGE = DC 594MODULE = Deliantra::Client PACKAGE = DC
504 595
505PROTOTYPES: ENABLE 596PROTOTYPES: ENABLE
506 597
535 const_iv (SDL_USEREVENT), 626 const_iv (SDL_USEREVENT),
536 627
537 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 630 const_iv (SDL_APPACTIVE),
631
632
633 const_iv (SDLK_UNKNOWN),
634 const_iv (SDLK_FIRST),
635 const_iv (SDLK_BACKSPACE),
636 const_iv (SDLK_TAB),
637 const_iv (SDLK_CLEAR),
638 const_iv (SDLK_RETURN),
639 const_iv (SDLK_PAUSE),
640 const_iv (SDLK_ESCAPE),
641 const_iv (SDLK_SPACE),
642 const_iv (SDLK_EXCLAIM),
643 const_iv (SDLK_QUOTEDBL),
644 const_iv (SDLK_HASH),
645 const_iv (SDLK_DOLLAR),
646 const_iv (SDLK_AMPERSAND),
647 const_iv (SDLK_QUOTE),
648 const_iv (SDLK_LEFTPAREN),
649 const_iv (SDLK_RIGHTPAREN),
650 const_iv (SDLK_ASTERISK),
651 const_iv (SDLK_PLUS),
652 const_iv (SDLK_COMMA),
653 const_iv (SDLK_MINUS),
654 const_iv (SDLK_PERIOD),
655 const_iv (SDLK_SLASH),
656 const_iv (SDLK_0),
657 const_iv (SDLK_1),
658 const_iv (SDLK_2),
659 const_iv (SDLK_3),
660 const_iv (SDLK_4),
661 const_iv (SDLK_5),
662 const_iv (SDLK_6),
663 const_iv (SDLK_7),
664 const_iv (SDLK_8),
665 const_iv (SDLK_9),
666 const_iv (SDLK_COLON),
667 const_iv (SDLK_SEMICOLON),
668 const_iv (SDLK_LESS),
669 const_iv (SDLK_EQUALS),
670 const_iv (SDLK_GREATER),
671 const_iv (SDLK_QUESTION),
672 const_iv (SDLK_AT),
673
674 const_iv (SDLK_LEFTBRACKET),
675 const_iv (SDLK_BACKSLASH),
676 const_iv (SDLK_RIGHTBRACKET),
677 const_iv (SDLK_CARET),
678 const_iv (SDLK_UNDERSCORE),
679 const_iv (SDLK_BACKQUOTE),
680 const_iv (SDLK_DELETE),
540 681
541 const_iv (SDLK_FIRST), 682 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 683 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
620 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 764 const_iv (KMOD_MODE),
624 765
766 const_iv (KMOD_LRAM),
767
625 const_iv (MIX_DEFAULT_FORMAT), 768 const_iv (MIX_DEFAULT_FORMAT),
769
770 const_iv (SDL_INIT_TIMER),
771 const_iv (SDL_INIT_AUDIO),
772 const_iv (SDL_INIT_VIDEO),
773 const_iv (SDL_INIT_CDROM),
774 const_iv (SDL_INIT_JOYSTICK),
775 const_iv (SDL_INIT_EVERYTHING),
776 const_iv (SDL_INIT_NOPARACHUTE),
777 const_iv (SDL_INIT_EVENTTHREAD),
778
779 const_iv (SDL_GL_RED_SIZE),
780 const_iv (SDL_GL_GREEN_SIZE),
781 const_iv (SDL_GL_BLUE_SIZE),
782 const_iv (SDL_GL_ALPHA_SIZE),
783 const_iv (SDL_GL_DOUBLEBUFFER),
784 const_iv (SDL_GL_BUFFER_SIZE),
785 const_iv (SDL_GL_DEPTH_SIZE),
786 const_iv (SDL_GL_STENCIL_SIZE),
787 const_iv (SDL_GL_ACCUM_RED_SIZE),
788 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
789 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
790 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
791 const_iv (SDL_GL_STEREO),
792 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
793 const_iv (SDL_GL_MULTISAMPLESAMPLES),
794 const_iv (SDL_GL_ACCELERATED_VISUAL),
795 const_iv (SDL_GL_SWAP_CONTROL),
796
797 const_iv (FOW_DARKNESS)
626# undef const_iv 798# undef const_iv
627 }; 799 };
628 800
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
652 824
653IV minpot (UV n) 825IV minpot (UV n)
654 826
655IV popcount (UV n) 827IV popcount (UV n)
656 828
829NV distance (NV dx, NV dy)
830 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT:
833 RETVAL
834
657void 835void
658pango_init () 836pango_init ()
659 CODE: 837 CODE:
660{ 838{
661 opengl_fontmap = pango_opengl_font_map_new (); 839 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 840 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); 841 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
842 /*pango_context_set_font_description (opengl_context, default_font);*/
843#if PANGO_VERSION_CHECK (1, 15, 2)
844 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
845 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
846#endif
664} 847}
665 848
666char *
667SDL_GetError () 849char *SDL_GetError ()
668 850
669int 851void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 852
672void 853int SDL_Init (U32 flags)
854
855int SDL_InitSubSystem (U32 flags)
856
857void SDL_QuitSubSystem (U32 flags)
858
673SDL_Quit () 859void SDL_Quit ()
860
861int SDL_GL_SetAttribute (int attr, int value)
862
863int SDL_GL_GetAttribute (int attr)
864 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL))
866 XSRETURN_UNDEF;
867 OUTPUT:
868 RETVAL
674 869
675void 870void
676SDL_ListModes (int rgb, int alpha) 871SDL_ListModes (int rgb, int alpha)
677 PPCODE: 872 PPCODE:
678{ 873{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 887 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 888
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 889 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); 890 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 891
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 892 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 893
702 if (m && m != (SDL_Rect **)-1) 894 if (m && m != (SDL_Rect **)-1)
703 while (*m) 895 while (*m)
704 { 896 {
705 if ((*m)->w >= 800 && (*m)->h >= 480) 897 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 898 {
707 AV *av = newAV (); 899 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 900 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 901 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 902 av_push (av, newSViv (rgb));
738 930
739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 932#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
741#include "glfunc.h" 933#include "glfunc.h"
742#undef GL_FUNC 934#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
743 } 938 }
744} 939}
745 OUTPUT: 940 OUTPUT:
746 RETVAL 941 RETVAL
747 942
751char * 946char *
752SDL_GetKeyName (int sym) 947SDL_GetKeyName (int sym)
753 948
754int 949int
755SDL_GetAppState () 950SDL_GetAppState ()
951
952int
953SDL_GetModState ()
756 954
757void 955void
758poll_events () 956poll_events ()
759 PPCODE: 957 PPCODE:
760{ 958{
770 { 968 {
771 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
772 case SDL_KEYUP: 970 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 973 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 */ 974 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); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 976 break;
779 977
780 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 997 x = ev.motion.x;
800 y = ev.motion.y; 998 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 1000 }
803 1001
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1008 }
811 break; 1009 break;
812 1010
813 case SDL_MOUSEBUTTONDOWN: 1011 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1012 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1013 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1014
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1015 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1016 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1017 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1018 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
828 } 1026 }
829 1027
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1028 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 1029 }
832} 1030}
1031
1032char *
1033SDL_AudioDriverName ()
1034 CODE:
1035{
1036 char buf [256];
1037 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1038 XSRETURN_UNDEF;
1039
1040 RETVAL = buf;
1041}
1042 OUTPUT:
1043 RETVAL
833 1044
834int 1045int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1046Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
836 POSTCALL: 1047 POSTCALL:
837 Mix_HookMusicFinished (music_finished); 1048 Mix_HookMusicFinished (music_finished);
894 } 1105 }
895 } 1106 }
896#endif 1107#endif
897} 1108}
898 1109
899void 1110int
900add_font (char *file) 1111add_font (char *file)
901 CODE: 1112 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1113 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1114 OUTPUT:
1115 RETVAL
903 1116
904void 1117void
905load_image_inline (SV *image_) 1118load_image_inline (SV *image_)
906 ALIAS: 1119 ALIAS:
907 load_image_file = 1 1120 load_image_file = 1
1023#if DEBUG 1236#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1237 VALGRIND_DO_LEAK_CHECK;
1025#endif 1238#endif
1026} 1239}
1027 1240
1241int
1242SvREFCNT (SV *sv)
1243 CODE:
1244 RETVAL = SvREFCNT (sv);
1245 OUTPUT:
1246 RETVAL
1247
1028MODULE = Deliantra::Client PACKAGE = DC::Font 1248MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1249
1030PROTOTYPES: DISABLE 1250PROTOTYPES: DISABLE
1031 1251
1032DC::Font 1252DC::Font
1165{ 1385{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1386 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1387
1168 do 1388 do
1169 { 1389 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1390 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1391
1172 if (run && shape_attr_p (run)) 1392 if (run && shape_attr_p (run))
1173 { 1393 {
1174 PangoRectangle extents; 1394 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1395 pango_layout_iter_get_run_extents (iter, 0, &extents);
1279int 1499int
1280descent (DC::Layout self) 1500descent (DC::Layout self)
1281 CODE: 1501 CODE:
1282{ 1502{
1283 PangoRectangle rect; 1503 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1504 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1505 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1506 RETVAL = PANGO_DESCENT (rect);
1287} 1507}
1288 OUTPUT: 1508 OUTPUT:
1289 RETVAL 1509 RETVAL
1301 1521
1302void 1522void
1303cursor_pos (DC::Layout self, int index) 1523cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1524 PPCODE:
1305{ 1525{
1306 PangoRectangle strong_pos; 1526 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1527 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1528
1309 EXTEND (SP, 3); 1529 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1530 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1531 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1532 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1533}
1314 1534
1315void 1535void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1536index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1537 PPCODE:
1336 int index, trailing; 1556 int index, trailing;
1337 1557
1338 if (line < 0) 1558 if (line < 0)
1339 XSRETURN_EMPTY; 1559 XSRETURN_EMPTY;
1340 1560
1341 if (!(lp = pango_layout_get_line (self->pl, line))) 1561 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1342 XSRETURN_EMPTY; /* do better */ 1562 XSRETURN_EMPTY; /* do better */
1343 1563
1344 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1564 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1345 1565
1346 EXTEND (SP, 2); 1566 EXTEND (SP, 2);
1461 if (ix) 1681 if (ix)
1462 { 1682 {
1463 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1464 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1465 } 1685 }
1686}
1687
1688void
1689draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1690 PROTOTYPE: @
1691 CODE:
1692{
1693 glEnable (GL_BLEND);
1694 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1695 glEnable (GL_TEXTURE_2D);
1696 glBindTexture (GL_TEXTURE_2D, name1);
1697
1698 glColor3f (intensity, intensity, intensity);
1699 glPushMatrix ();
1700 glScalef (1./3, 1./3, 1.);
1701
1702 if (blend > 0.f)
1703 {
1704 float dx3 = dx * -3.f / w;
1705 float dy3 = dy * -3.f / h;
1706 GLfloat env_color[4] = { 0., 0., 0., blend };
1707
1708 /* interpolate the two shadow textures */
1709 /* stage 0 == rgb(glcolor) + alpha(t0) */
1710 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1711
1712 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1713 gl.ActiveTexture (GL_TEXTURE1);
1714 glEnable (GL_TEXTURE_2D);
1715 glBindTexture (GL_TEXTURE_2D, name2);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1717
1718 /* rgb == rgb(glcolor) */
1719 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1720 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1721 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1722
1723 /* alpha = interpolate t0, t1 by env_alpha */
1724 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1725
1726 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1727 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1728 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1729
1730 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1731 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1732
1733 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1734 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1735
1736 glBegin (GL_QUADS);
1737 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1738 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1739 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1740 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1741 glEnd ();
1742
1743 glDisable (GL_TEXTURE_2D);
1744 gl.ActiveTexture (GL_TEXTURE0);
1745 }
1746 else
1747 {
1748 /* simple blending of one texture, also opengl <1.3 path */
1749 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1750
1751 glBegin (GL_QUADS);
1752 glTexCoord2f (0, 0); glVertex2f (0, 0);
1753 glTexCoord2f (0, t); glVertex2f (0, h);
1754 glTexCoord2f (s, t); glVertex2f (w, h);
1755 glTexCoord2f (s, 0); glVertex2f (w, 0);
1756 glEnd ();
1757 }
1758
1759 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1760 {
1761 int x, y;
1762 int dx3 = dx * 3;
1763 int dy3 = dy * 3;
1764
1765 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1766 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1767 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1768 glTranslatef (-1., -1., 0);
1769 glBegin (GL_QUADS);
1770
1771 for (y = 1; y < h; y += 3)
1772 {
1773 int y1 = y - dy3;
1774 int y1valid = y1 >= 0 && y1 < h;
1775
1776 for (x = 1; x < w; x += 3)
1777 {
1778 int x1 = x - dx3;
1779 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1780 uint8_t h2;
1781
1782 if (y1valid && x1 >= 0 && x1 < w)
1783 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1784 else
1785 h2 = 1; /* out of range == invisible */
1786
1787 if (h1 || h2)
1788 {
1789 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1790 glColor4f (1., 1., 1., alpha);
1791
1792 glTexCoord2f (0, 0.); glVertex2i (x , y );
1793 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1794 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1795 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1796 }
1797 }
1798 }
1799 }
1800
1801 glEnd ();
1802
1803 glPopMatrix ();
1804
1805 glDisable (GL_TEXTURE_2D);
1806 glDisable (GL_BLEND);
1466} 1807}
1467 1808
1468IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1809IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1469 CODE: 1810 CODE:
1470{ 1811{
1576 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1917 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1577 // use uglier nearest interpolation because linear suffers 1918 // use uglier nearest interpolation because linear suffers
1578 // from transparent color bleeding and ugly wrapping effects. 1919 // from transparent color bleeding and ugly wrapping effects.
1579 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1920 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1580} 1921}
1922
1923void
1924expire_textures (DC::Map self, int texid, int count)
1925 PPCODE:
1926 for (; texid < self->texs && count; ++texid, --count)
1927 {
1928 maptex *tex = self->tex + texid;
1929
1930 if (tex->name)
1931 {
1932 if (tex->unused)
1933 {
1934 tex->name = 0;
1935 tex->unused = 0;
1936 XPUSHs (sv_2mortal (newSViv (texid)));
1937 }
1938 else
1939 tex->unused = 1;
1940 }
1941 }
1581 1942
1582int 1943int
1583ox (DC::Map self) 1944ox (DC::Map self)
1584 ALIAS: 1945 ALIAS:
1585 oy = 1 1946 oy = 1
1663 uint8_t ext, cmd; 2024 uint8_t ext, cmd;
1664 2025
1665 do 2026 do
1666 { 2027 {
1667 ext = *data++; 2028 ext = *data++;
1668 cmd = ext & 0x3f; 2029 cmd = ext & 0x7f;
1669 2030
1670 if (cmd < 4) 2031 if (cmd < 4)
1671 cell->darkness = 255 - ext * 64 + 1; 2032 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1672 else if (cmd == 5) // health 2033 else if (cmd == 5) // health
1673 { 2034 {
1674 cell->stat_width = 1; 2035 cell->stat_width = 1;
1675 cell->stat_hp = *data++; 2036 cell->stat_hp = *data++;
1676 } 2037 }
1677 else if (cmd == 6) // monster width 2038 else if (cmd == 6) // monster width
1678 cell->stat_width = *data++ + 1; 2039 cell->stat_width = *data++ + 1;
1679 else if (cmd == 0x47) 2040 else if (cmd == 0x47)
1680 { 2041 {
1681 if (*data == 4) 2042 if (*data == 1) cell->player = data [1];
1682 ; // decode player count 2043 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2044 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2045 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1683 2046
1684 data += *data + 1; 2047 data += *data + 1;
1685 } 2048 }
1686 else if (cmd == 8) // cell flags 2049 else if (cmd == 8) // cell flags
1687 cell->flags = *data++; 2050 cell->flags = *data++;
1704 cell->tile [z] = self->face2tile [face]; 2067 cell->tile [z] = self->face2tile [face];
1705 2068
1706 if (cell->tile [z]) 2069 if (cell->tile [z])
1707 { 2070 {
1708 maptex *tex = self->tex + cell->tile [z]; 2071 maptex *tex = self->tex + cell->tile [z];
2072 tex->unused = 0;
1709 if (!tex->name) 2073 if (!tex->name)
1710 av_push (missing, newSViv (cell->tile [z])); 2074 av_push (missing, newSViv (cell->tile [z]));
1711 2075
1712 if (tex->smoothtile) 2076 if (tex->smoothtile)
1713 { 2077 {
1714 maptex *smooth = self->tex + tex->smoothtile; 2078 maptex *smooth = self->tex + tex->smoothtile;
2079 smooth->unused = 0;
1715 if (!smooth->name) 2080 if (!smooth->name)
1716 av_push (missing, newSViv (tex->smoothtile)); 2081 av_push (missing, newSViv (tex->smoothtile));
1717 } 2082 }
1718 } 2083 }
1719 } 2084 }
1720 } 2085 }
1721 else 2086 else
1722 cell->darkness = 0; 2087 CELL_CLEAR (cell);
1723 } 2088 }
1724} 2089}
1725 OUTPUT: 2090 OUTPUT:
1726 RETVAL 2091 RETVAL
1727 2092
1779} 2144}
1780 OUTPUT: 2145 OUTPUT:
1781 RETVAL 2146 RETVAL
1782 2147
1783void 2148void
1784draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2149draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1785 CODE: 2150 CODE:
1786{ 2151{
1787 int x, y, z; 2152 int x, y, z;
1788 2153
1789 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2154 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1790 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2155 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1791 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2156 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1792 smooth_key skey; 2157 smooth_key skey;
1793 2158 int pl_x, pl_y;
2159 maptex pl_tex;
1794 rc_t *rc = rc_alloc (); 2160 rc_t *rc = rc_alloc ();
2161 rc_t *rc_ov = rc_alloc ();
1795 rc_key_t key; 2162 rc_key_t key;
1796 rc_array_t *arr; 2163 rc_array_t *arr;
1797 2164
2165 pl_tex.name = 0;
2166
1798 // thats current max. sorry. 2167 // that's current max. sorry.
1799 if (sw > 255) sw = 255; 2168 if (sw > 255) sw = 255;
1800 if (sh > 255) sh = 255; 2169 if (sh > 255) sh = 255;
1801 2170
1802 // clear key, in case of extra padding 2171 // clear key, in case of extra padding
1803 memset (&skey, 0, sizeof (skey)); 2172 memset (&skey, 0, sizeof (skey));
1807 key.g = 255; 2176 key.g = 255;
1808 key.b = 255; 2177 key.b = 255;
1809 key.a = 255; 2178 key.a = 255;
1810 key.mode = GL_QUADS; 2179 key.mode = GL_QUADS;
1811 key.format = GL_T2F_V3F; 2180 key.format = GL_T2F_V3F;
1812 key.texname = -1;
1813 2181
1814 mx += self->x; 2182 mx += self->x;
1815 my += self->y; 2183 my += self->y;
1816 2184
1817 // first pass: determine smooth_max 2185 // first pass: determine smooth_max
1841 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2209 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1842 2210
1843 for (z = 0; z <= 2; z++) 2211 for (z = 0; z <= 2; z++)
1844 { 2212 {
1845 memset (smooth_level, 0, sizeof (smooth_level)); 2213 memset (smooth_level, 0, sizeof (smooth_level));
2214 key.texname = -1;
1846 2215
1847 for (y = 0; y < sh; y++) 2216 for (y = 0; y < sh; y++)
1848 if (0 <= y + my && y + my < self->rows) 2217 if (0 <= y + my && y + my < self->rows)
1849 { 2218 {
1850 maprow *row = self->row + (y + my); 2219 maprow *row = self->row + (y + my);
1860 maptex tex = self->tex [tile]; 2229 maptex tex = self->tex [tile];
1861 int px, py; 2230 int px, py;
1862 2231
1863 if (key.texname != tex.name) 2232 if (key.texname != tex.name)
1864 { 2233 {
2234 self->tex [tile].unused = 0;
2235
1865 if (!tex.name) 2236 if (!tex.name)
1866 tex = self->tex [2]; /* missing, replace by noface */ 2237 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1867 2238
1868 key.texname = tex.name; 2239 key.texname = tex.name;
1869 arr = rc_array (rc, &key); 2240 arr = rc_array (rc, &key);
1870 } 2241 }
1871 2242
1872 px = (x + 1) * T - tex.w; 2243 px = (x + 1) * T - tex.w;
1873 py = (y + 1) * T - tex.h; 2244 py = (y + 1) * T - tex.h;
2245
2246 if (expect_false (cell->player == player) && expect_false (z == 2))
2247 {
2248 pl_x = px;
2249 pl_y = py;
2250 pl_tex = tex;
2251 continue;
2252 }
1874 2253
1875 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2254 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1876 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2255 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1877 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2256 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1878 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2257 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1879
1880 if (cell->flags && z == 2)
1881 {
1882 // overlays such as the speech bubble, probably more to come
1883 if (cell->flags & 1)
1884 {
1885 maptex tex = self->tex [1];
1886 int px = x * T + T * 2 / 32;
1887 int py = y * T - T * 6 / 32;
1888
1889 if (tex.name)
1890 {
1891 if (key.texname != tex.name)
1892 {
1893 key.texname = tex.name;
1894 arr = rc_array (rc, &key);
1895 }
1896
1897 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1898 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1899 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1900 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1901 }
1902 }
1903 }
1904 2258
1905 // update smooth hash 2259 // update smooth hash
1906 if (tex.smoothtile) 2260 if (tex.smoothtile)
1907 { 2261 {
1908 skey.tile = tex.smoothtile; 2262 skey.tile = tex.smoothtile;
1937 // corners 2291 // corners
1938 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2292 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1939 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2293 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1940 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2294 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1941 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2295 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2296 }
2297 }
2298
2299 if (expect_false (z == 2) && expect_false (cell->flags))
2300 {
2301 // overlays such as the speech bubble, probably more to come
2302 if (cell->flags & 1)
2303 {
2304 rc_key_t key_ov = key;
2305 maptex tex = self->tex [TEXID_SPEECH];
2306 rc_array_t *arr;
2307 int px = x * T + T * 2 / 32;
2308 int py = y * T - T * 6 / 32;
2309
2310 key_ov.texname = tex.name;
2311 arr = rc_array (rc_ov, &key_ov);
2312
2313 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2314 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2315 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2316 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1942 } 2317 }
1943 } 2318 }
1944 } 2319 }
1945 } 2320 }
1946 2321
1986 { 2361 {
1987 // this time avoiding texture state changes 2362 // this time avoiding texture state changes
1988 // save gobs of state changes. 2363 // save gobs of state changes.
1989 if (key.texname != tex.name) 2364 if (key.texname != tex.name)
1990 { 2365 {
2366 self->tex [skey->tile].unused = 0;
2367
1991 glEnd (); 2368 glEnd ();
1992 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2369 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1993 glBegin (GL_QUADS); 2370 glBegin (GL_QUADS);
1994 } 2371 }
1995 2372
2024 } 2401 }
2025 2402
2026 hv_clear (smooth); 2403 hv_clear (smooth);
2027 } 2404 }
2028 2405
2406 if (pl_tex.name)
2407 {
2408 maptex tex = pl_tex;
2409 int px = pl_x + sdx;
2410 int py = pl_y + sdy;
2411
2412 key.texname = tex.name;
2413 arr = rc_array (rc, &key);
2414
2415 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2416 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2417 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2418 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2419
2420 rc_draw (rc);
2421 }
2422
2423 rc_draw (rc_ov);
2424 rc_clear (rc_ov);
2425
2029 glDisable (GL_BLEND); 2426 glDisable (GL_BLEND);
2030 rc_free (rc); 2427 rc_free (rc);
2428 rc_free (rc_ov);
2031 2429
2032 // top layer: overlays such as the health bar 2430 // top layer: overlays such as the health bar
2033 for (y = 0; y < sh; y++) 2431 for (y = 0; y < sh; y++)
2034 if (0 <= y + my && y + my < self->rows) 2432 if (0 <= y + my && y + my < self->rows)
2035 { 2433 {
2040 { 2438 {
2041 mapcell *cell = row->col + (x + mx - row->c0); 2439 mapcell *cell = row->col + (x + mx - row->c0);
2042 2440
2043 int px = x * T; 2441 int px = x * T;
2044 int py = y * T; 2442 int py = y * T;
2443
2444 if (expect_false (cell->player == player))
2445 {
2446 px += sdx;
2447 py += sdy;
2448 }
2045 2449
2046 if (cell->stat_hp) 2450 if (cell->stat_hp)
2047 { 2451 {
2048 int width = cell->stat_width * T; 2452 int width = cell->stat_width * T;
2049 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2453 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2060 } 2464 }
2061 } 2465 }
2062} 2466}
2063 2467
2064void 2468void
2065draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2469draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2066 CODE: 2470 CODE:
2067{ 2471{
2068 static float color[16][3] = { 2472 static float color[16][3] = {
2069 { 0.00F, 0.00F, 0.00F }, 2473 { 0.00f, 0.00f, 0.00f },
2070 { 1.00F, 1.00F, 1.00F }, 2474 { 1.00f, 1.00f, 1.00f },
2071 { 0.00F, 0.00F, 0.55F }, 2475 { 0.00f, 0.00f, 0.55f },
2072 { 1.00F, 0.00F, 0.00F }, 2476 { 1.00f, 0.00f, 0.00f },
2073 2477
2074 { 1.00F, 0.54F, 0.00F }, 2478 { 1.00f, 0.54f, 0.00f },
2075 { 0.11F, 0.56F, 1.00F }, 2479 { 0.11f, 0.56f, 1.00f },
2076 { 0.93F, 0.46F, 0.00F }, 2480 { 0.93f, 0.46f, 0.00f },
2077 { 0.18F, 0.54F, 0.34F }, 2481 { 0.18f, 0.54f, 0.34f },
2078 2482
2079 { 0.56F, 0.73F, 0.56F }, 2483 { 0.56f, 0.73f, 0.56f },
2080 { 0.80F, 0.80F, 0.80F }, 2484 { 0.80f, 0.80f, 0.80f },
2081 { 0.55F, 0.41F, 0.13F }, 2485 { 0.55f, 0.41f, 0.13f },
2082 { 0.99F, 0.77F, 0.26F }, 2486 { 0.99f, 0.77f, 0.26f },
2083 2487
2084 { 0.74F, 0.65F, 0.41F }, 2488 { 0.74f, 0.65f, 0.41f },
2085 2489
2086 { 0.00F, 1.00F, 1.00F }, 2490 { 0.00f, 1.00f, 1.00f },
2087 { 1.00F, 0.00F, 1.00F }, 2491 { 1.00f, 0.00f, 1.00f },
2088 { 1.00F, 1.00F, 0.00F }, 2492 { 1.00f, 1.00f, 0.00f },
2089 }; 2493 };
2090 2494
2091 int x, y; 2495 int x, y;
2092 2496
2093 glEnable (GL_TEXTURE_2D); 2497 glEnable (GL_TEXTURE_2D);
2498 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2499 * but the nvidia driver (185.18.14) mishandles alpha textures
2500 * and takes the colour from god knows where instead of using
2501 * Cp. MODULATE results in the same colour, but slightly different
2502 * alpha, but atcually gives us the correct colour with nvidia.
2503 */
2094 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2504 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2095 glEnable (GL_BLEND); 2505 glEnable (GL_BLEND);
2096 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2506 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2097 glBegin (GL_QUADS); 2507 glBegin (GL_QUADS);
2098 2508
2099 for (y = 0; y < h; y++) 2509 for (y = 0; y < h; y++)
2103 2513
2104 if (m) 2514 if (m)
2105 { 2515 {
2106 float *c = color [m & 15]; 2516 float *c = color [m & 15];
2107 2517
2108 float tx1 = m & 0x40 ? 0.5 : 0.; 2518 float tx1 = m & 0x40 ? 0.5f : 0.f;
2109 float tx2 = tx1 + 0.5; 2519 float tx2 = tx1 + 0.5f;
2110 2520
2111 glColor4f (c[0], c[1], c[2], 0.75); 2521 glColor4f (c[0], c[1], c[2], 1);
2112 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2522 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2113 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2523 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2114 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2524 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2115 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2525 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2116 } 2526 }
2124void 2534void
2125fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2535fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2126 PPCODE: 2536 PPCODE:
2127{ 2537{
2128 int x, y; 2538 int x, y;
2129 int sw1 = sw + 2; 2539 int sw1 = sw + 2;
2130 int sh1 = sh + 2; 2540 int sh1 = sh + 2;
2131 int sh3 = sh * 3; 2541 int sh3 = sh * 3;
2132 int sw34 = (sw * 3 + 3) & ~3; 2542 int sw3 = sw * 3;
2133 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2543 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2134 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2544 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2135 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2545 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2136 2546
2137 SvPOK_only (darkness3_sv); 2547 SvPOK_only (darkness3_sv);
2138 SvCUR_set (darkness3_sv, sw34 * sh3); 2548 SvCUR_set (darkness3_sv, sw3 * sh3);
2139 2549
2140 mx += self->x - 1; 2550 mx += self->x - 1;
2141 my += self->y - 1; 2551 my += self->y - 1;
2142
2143 memset (darkness1, 255, sw1 * sh1);
2144 2552
2145 for (y = 0; y < sh1; y++) 2553 for (y = 0; y < sh1; y++)
2146 if (0 <= y + my && y + my < self->rows) 2554 if (0 <= y + my && y + my < self->rows)
2147 { 2555 {
2148 maprow *row = self->row + (y + my); 2556 maprow *row = self->row + (y + my);
2151 if (row->c0 <= x + mx && x + mx < row->c1) 2559 if (row->c0 <= x + mx && x + mx < row->c1)
2152 { 2560 {
2153 mapcell *cell = row->col + (x + mx - row->c0); 2561 mapcell *cell = row->col + (x + mx - row->c0);
2154 2562
2155 darkness1 [y * sw1 + x] = cell->darkness 2563 darkness1 [y * sw1 + x] = cell->darkness
2156 ? 255 - (cell->darkness - 1) 2564 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2157 : 255 - FOW_DARKNESS; 2565 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2158 } 2566 }
2159 } 2567 }
2160 2568
2161 for (y = 0; y < sh; ++y) 2569 for (y = 0; y < sh; ++y)
2162 for (x = 0; x < sw; ++x) 2570 for (x = 0; x < sw; ++x)
2181 2589
2182 uint8_t r13 = (d13 + d23 + d12) / 3; 2590 uint8_t r13 = (d13 + d23 + d12) / 3;
2183 uint8_t r23 = d23; 2591 uint8_t r23 = d23;
2184 uint8_t r33 = (d23 + d33 + d32) / 3; 2592 uint8_t r33 = (d23 + d33 + d32) / 3;
2185 2593
2186 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2594 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2187 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2595 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2188 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2596 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2189 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2597 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2190 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2598 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2191 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2599 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2192 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2600 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2193 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2601 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2194 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2602 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2195 } 2603 }
2196 2604
2197 free (darkness1); 2605 free (darkness1);
2198 2606
2199 EXTEND (SP, 3); 2607 EXTEND (SP, 3);
2200 PUSHs (sv_2mortal (newSViv (sw34))); 2608 PUSHs (sv_2mortal (newSViv (sw3)));
2201 PUSHs (sv_2mortal (newSViv (sh3))); 2609 PUSHs (sv_2mortal (newSViv (sh3)));
2202 PUSHs (darkness3_sv); 2610 PUSHs (darkness3_sv);
2203} 2611}
2204 2612
2205SV * 2613SV *
2268 else 2676 else
2269 *data++ = 0; 2677 *data++ = 0;
2270 } 2678 }
2271 } 2679 }
2272 2680
2681 /* if size is w*h + 5 then no data has been found */
2682 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2683 {
2273 SvPOK_only (data_sv); 2684 SvPOK_only (data_sv);
2274 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2685 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2686 }
2687
2275 RETVAL = data_sv; 2688 RETVAL = data_sv;
2276} 2689}
2277 OUTPUT: 2690 OUTPUT:
2278 RETVAL 2691 RETVAL
2279 2692
2280void 2693void
2281set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2694set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2282 PPCODE: 2695 PPCODE:
2283{ 2696{
2284 int x, y, z; 2697 int x, y, z;
2285 int w, h; 2698 int w, h;
2286 int x1, y1; 2699 int x1, y1;
2700 STRLEN len;
2701 uint8_t *data, *end;
2702
2703 len = SvLEN (data_sv);
2704 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2705 data = SvPVbyte_nolen (data_sv);
2706 end = data + len + 8;
2707
2708 if (len < 5)
2709 XSRETURN_EMPTY;
2287 2710
2288 if (*data++ != 0) 2711 if (*data++ != 0)
2289 XSRETURN_EMPTY; /* version mismatch */ 2712 XSRETURN_EMPTY; /* version mismatch */
2290 2713
2291 w = *data++ << 8; w |= *data++; 2714 w = *data++ << 8; w |= *data++;
2306 { 2729 {
2307 maprow *row = map_get_row (self, y); 2730 maprow *row = map_get_row (self, y);
2308 2731
2309 for (x = x0; x < x1; x++) 2732 for (x = x0; x < x1; x++)
2310 { 2733 {
2734 uint8_t flags;
2735
2736 if (data + 7 >= end)
2737 XSRETURN_EMPTY;
2738
2311 uint8_t flags = *data++; 2739 flags = *data++;
2312 2740
2313 if (flags) 2741 if (flags)
2314 { 2742 {
2315 mapcell *cell = row_get_cell (row, x); 2743 mapcell *cell = row_get_cell (row, x);
2316 tileid tile[3] = { 0, 0, 0 }; 2744 tileid tile[3] = { 0, 0, 0 };
2319 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2747 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2320 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2748 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2321 2749
2322 if (cell->darkness == 0) 2750 if (cell->darkness == 0)
2323 { 2751 {
2324 cell->darkness = 0; 2752 /*cell->darkness = 0;*/
2753 EXTEND (SP, 3);
2325 2754
2326 for (z = 0; z <= 2; z++) 2755 for (z = 0; z <= 2; z++)
2327 { 2756 {
2328 tileid t = tile [z]; 2757 tileid t = tile [z];
2329 2758
2330 if (t >= self->texs || (t && !self->tex [t].name)) 2759 if (t >= self->texs || (t && !self->tex [t].name))
2331 { 2760 {
2332 XPUSHs (sv_2mortal (newSViv (t))); 2761 PUSHs (sv_2mortal (newSViv (t)));
2333 need_texid (self, t); 2762 need_texid (self, t);
2334 } 2763 }
2335 2764
2336 cell->tile [z] = t; 2765 cell->tile [z] = t;
2337 } 2766 }
2382 if (RETVAL < 0) 2811 if (RETVAL < 0)
2383 { 2812 {
2384 RETVAL = Mix_GroupOldest (-1); 2813 RETVAL = Mix_GroupOldest (-1);
2385 2814
2386 if (RETVAL < 0) 2815 if (RETVAL < 0)
2816 {
2817 // happens sometimes, maybe it just stopped playing(?)
2818 RETVAL = Mix_GroupAvailable (-1);
2819
2820 if (RETVAL < 0)
2387 XSRETURN_UNDEF; 2821 XSRETURN_UNDEF;
2388 2822 }
2823 else
2389 Mix_HaltChannel (RETVAL); 2824 Mix_HaltChannel (RETVAL);
2390 } 2825 }
2391 2826
2392 Mix_UnregisterAllEffects (RETVAL); 2827 Mix_UnregisterAllEffects (RETVAL);
2393 Mix_Volume (RETVAL, 128); 2828 Mix_Volume (RETVAL, 128);
2394} 2829}
2441void 2876void
2442set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2877set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2443 CODE: 2878 CODE:
2444{ 2879{
2445 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2880 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2446 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2881 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2447 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2882 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2448} 2883}
2449 2884
2450void 2885void
2451set_reverse_stereo (DC::Channel self, int flip) 2886set_reverse_stereo (DC::Channel self, int flip)
2453 Mix_SetReverseStereo (self, flip); 2888 Mix_SetReverseStereo (self, flip);
2454 2889
2455MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2890MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2456 2891
2457PROTOTYPES: DISABLE 2892PROTOTYPES: DISABLE
2893
2894void
2895decoders ()
2896 PPCODE:
2897#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2898 int i, num = Mix_GetNumChunkDecoders ();
2899 EXTEND (SP, num);
2900 for (i = 0; i < num; ++i)
2901 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2902#else
2903 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2904#endif
2458 2905
2459DC::MixChunk 2906DC::MixChunk
2460new (SV *class, DC::RW rwops) 2907new (SV *class, DC::RW rwops)
2461 CODE: 2908 CODE:
2462 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2909 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2495 OUTPUT: 2942 OUTPUT:
2496 RETVAL 2943 RETVAL
2497 2944
2498MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2945MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2499 2946
2947void
2948decoders ()
2949 PPCODE:
2950#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2951 int i, num = Mix_GetNumMusicDecoders ();
2952 EXTEND (SP, num);
2953 for (i = 0; i < num; ++i)
2954 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2955#else
2956 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2957#endif
2958
2500int 2959int
2501volume (int volume = -1) 2960volume (int volume = -1)
2502 PROTOTYPE: ;$ 2961 PROTOTYPE: ;$
2503 CODE: 2962 CODE:
2504 if (items > 0) 2963 if (items > 0)
2514 2973
2515void 2974void
2516halt () 2975halt ()
2517 CODE: 2976 CODE:
2518 Mix_HaltMusic (); 2977 Mix_HaltMusic ();
2978
2979int
2980playing ()
2981 CODE:
2982 RETVAL = Mix_PlayingMusic ();
2983 OUTPUT:
2984 RETVAL
2519 2985
2520DC::MixMusic 2986DC::MixMusic
2521new (SV *class, DC::RW rwops) 2987new (SV *class, DC::RW rwops)
2522 CODE: 2988 CODE:
2523 RETVAL = Mix_LoadMUS_RW (rwops); 2989 RETVAL = Mix_LoadMUS_RW (rwops);
2554 } *civ, const_iv[] = { 3020 } *civ, const_iv[] = {
2555# define const_iv(name) { # name, (IV)name } 3021# define const_iv(name) { # name, (IV)name }
2556 const_iv (GL_VENDOR), 3022 const_iv (GL_VENDOR),
2557 const_iv (GL_VERSION), 3023 const_iv (GL_VERSION),
2558 const_iv (GL_EXTENSIONS), 3024 const_iv (GL_EXTENSIONS),
3025 const_iv (GL_MAX_TEXTURE_UNITS),
2559 const_iv (GL_COLOR_MATERIAL), 3026 const_iv (GL_COLOR_MATERIAL),
2560 const_iv (GL_SMOOTH), 3027 const_iv (GL_SMOOTH),
2561 const_iv (GL_FLAT), 3028 const_iv (GL_FLAT),
2562 const_iv (GL_DITHER), 3029 const_iv (GL_DITHER),
2563 const_iv (GL_BLEND), 3030 const_iv (GL_BLEND),
2575 const_iv (GL_ZERO), 3042 const_iv (GL_ZERO),
2576 const_iv (GL_SRC_ALPHA), 3043 const_iv (GL_SRC_ALPHA),
2577 const_iv (GL_DST_ALPHA), 3044 const_iv (GL_DST_ALPHA),
2578 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3045 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2579 const_iv (GL_ONE_MINUS_DST_ALPHA), 3046 const_iv (GL_ONE_MINUS_DST_ALPHA),
3047 const_iv (GL_SRC_COLOR),
3048 const_iv (GL_DST_COLOR),
3049 const_iv (GL_ONE_MINUS_SRC_COLOR),
3050 const_iv (GL_ONE_MINUS_DST_COLOR),
2580 const_iv (GL_SRC_ALPHA_SATURATE), 3051 const_iv (GL_SRC_ALPHA_SATURATE),
2581 const_iv (GL_RGB), 3052 const_iv (GL_RGB),
2582 const_iv (GL_RGBA), 3053 const_iv (GL_RGBA),
2583 const_iv (GL_RGBA4), 3054 const_iv (GL_RGBA4),
2584 const_iv (GL_RGBA8), 3055 const_iv (GL_RGBA8),
2652 const_iv (GL_NICEST), 3123 const_iv (GL_NICEST),
2653 const_iv (GL_V2F), 3124 const_iv (GL_V2F),
2654 const_iv (GL_V3F), 3125 const_iv (GL_V3F),
2655 const_iv (GL_T2F_V3F), 3126 const_iv (GL_T2F_V3F),
2656 const_iv (GL_T2F_N3F_V3F), 3127 const_iv (GL_T2F_N3F_V3F),
3128 const_iv (GL_FUNC_ADD),
3129 const_iv (GL_FUNC_SUBTRACT),
3130 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2657# undef const_iv 3131# undef const_iv
2658 }; 3132 };
2659 3133
2660 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3134 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2661 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3135 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2668disable_GL_EXT_blend_func_separate () 3142disable_GL_EXT_blend_func_separate ()
2669 CODE: 3143 CODE:
2670 gl.BlendFuncSeparate = 0; 3144 gl.BlendFuncSeparate = 0;
2671 gl.BlendFuncSeparateEXT = 0; 3145 gl.BlendFuncSeparateEXT = 0;
2672 3146
3147void
3148apple_nvidia_bug (int enable)
3149
2673char * 3150char *
2674gl_vendor () 3151gl_vendor ()
2675 CODE: 3152 CODE:
2676 RETVAL = (char *)glGetString (GL_VENDOR); 3153 RETVAL = (char *)glGetString (GL_VENDOR);
2677 OUTPUT: 3154 OUTPUT:
2707 3184
2708int glGetError () 3185int glGetError ()
2709 3186
2710void glFinish () 3187void glFinish ()
2711 3188
3189void glFlush ()
3190
2712void glClear (int mask) 3191void glClear (int mask)
2713 3192
2714void glClearColor (float r, float g, float b, float a = 1.0) 3193void glClearColor (float r, float g, float b, float a = 1.0)
2715 PROTOTYPE: @ 3194 PROTOTYPE: @
2716 3195
2725void glBlendFunc (int sfactor, int dfactor) 3204void glBlendFunc (int sfactor, int dfactor)
2726 3205
2727void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3206void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2728 CODE: 3207 CODE:
2729 gl_BlendFuncSeparate (sa, da, saa, daa); 3208 gl_BlendFuncSeparate (sa, da, saa, daa);
3209
3210# void glBlendEquation (int se)
2730 3211
2731void glDepthMask (int flag) 3212void glDepthMask (int flag)
2732 3213
2733void glLogicOp (int opcode) 3214void glLogicOp (int opcode)
2734 3215
2769void glRotate (float angle, float x, float y, float z) 3250void glRotate (float angle, float x, float y, float z)
2770 CODE: 3251 CODE:
2771 glRotatef (angle, x, y, z); 3252 glRotatef (angle, x, y, z);
2772 3253
2773void glColor (float r, float g, float b, float a = 1.0) 3254void glColor (float r, float g, float b, float a = 1.0)
3255 PROTOTYPE: @
2774 ALIAS: 3256 ALIAS:
2775 glColor_premultiply = 1 3257 glColor_premultiply = 1
2776 CODE: 3258 CODE:
2777 if (ix) 3259 if (ix)
2778 { 3260 {
2883void glNewList (int list, int mode = GL_COMPILE) 3365void glNewList (int list, int mode = GL_COMPILE)
2884 3366
2885void glEndList () 3367void glEndList ()
2886 3368
2887void glCallList (int list) 3369void glCallList (int list)
3370
3371void c_init ()
3372 CODE:
3373 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3374 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2888 3375
2889MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3376MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2890 3377
2891PROTOTYPES: DISABLE 3378PROTOTYPES: DISABLE
2892 3379

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines