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.249 by root, Fri Dec 28 15:40:07 2007 UTC vs.
Revision 1.309 by root, Mon Dec 26 22:30:21 2011 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>
50 56
51#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)) 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)
52# define pango_layout_get_line_readonly pango_layout_get_line_readonly 62# define pango_layout_get_line_readonly pango_layout_get_line
53# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly 63# define pango_layout_get_lines_readonly pango_layout_get_lines
54# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly 64# 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 65# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
56#endif 66#endif
57 67
58#ifndef _WIN32 68#ifndef _WIN32
59# include <sys/types.h> 69# include <sys/types.h>
60# include <sys/socket.h> 70# include <sys/socket.h>
61# include <netinet/in.h> 71# include <netinet/in.h>
62# include <netinet/tcp.h> 72# include <netinet/tcp.h>
63# include <inttypes.h> 73# include <inttypes.h>
64#endif 74#endif
65 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
66#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
67 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 */
68#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
69 91
70#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
71#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
72 94
73#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
74 96
75#if 0 97/* mask out modifiers we are not interested in */
76# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77#else 99
78# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
79#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
80 123
81static AV *texture_av; 124static AV *texture_av;
82 125
83static struct 126static struct
84{ 127{
178 221
179static void 222static void
180layout_update_font (DC__Layout self) 223layout_update_font (DC__Layout self)
181{ 224{
182 /* use a random scale factor to account for unknown descenders, 0.8 works 225 /* use a random scale factor to account for unknown descenders, 0.8 works
183 * reasonably well with bitstream vera 226 * reasonably well with dejavu/bistream fonts
184 */ 227 */
185 PangoFontDescription *font = self->font ? self->font : default_font; 228 PangoFontDescription *font = self->font ? self->font : default_font;
186 229
187 pango_font_description_set_absolute_size (font, 230 pango_font_description_set_absolute_size (font,
188 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 231 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
216 int w, h; 259 int w, h;
217 float s, t; 260 float s, t;
218 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
219 tileid smoothtile; 262 tileid smoothtile;
220 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
221} maptex; 265} maptex;
222 266
223typedef struct { 267typedef struct {
224 uint32_t player; 268 uint32_t player;
225 tileid tile[3]; 269 tileid tile[3];
357 self->oy = 0; 401 self->oy = 0;
358 self->row = 0; 402 self->row = 0;
359 self->rows = 0; 403 self->rows = 0;
360} 404}
361 405
406#define CELL_CLEAR(cell) \
407 do { \
408 if ((cell)->player) \
409 (cell)->tile [2] = 0; \
410 (cell)->darkness = 0; \
411 (cell)->stat_hp = 0; \
412 (cell)->flags = 0; \
413 (cell)->player = 0; \
414 } while (0)
415
362static void 416static void
363map_blank (DC__Map self, int x0, int y0, int w, int h) 417map_blank (DC__Map self, int x0, int y0, int w, int h)
364{ 418{
365 int x, y; 419 int x, y;
366 maprow *row; 420 maprow *row;
380 if (x >= row->c1) 434 if (x >= row->c1)
381 break; 435 break;
382 436
383 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
384 438
385 cell->darkness = 0; 439 CELL_CLEAR (cell);
386 cell->stat_hp = 0;
387 cell->flags = 0;
388 cell->player = 0;
389 } 440 }
390 } 441 }
391} 442}
392 443
393typedef struct { 444typedef struct {
428 ev.code = 1; 479 ev.code = 1;
429 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
430 ev.data2 = 0; 481 ev.data2 = 0;
431 482
432 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
484}
485
486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
433} 490}
434 491
435static unsigned int 492static unsigned int
436minpot (unsigned int n) 493minpot (unsigned int n)
437{ 494{
504 if (!svp || !SvTRUE (*svp)) 561 if (!svp || !SvTRUE (*svp))
505 return 0; 562 return 0;
506 563
507 return 1; 564 return 1;
508} 565}
566
567/******************************************************************************/
568
569/* process keyboard modifiers */
570static int
571mod_munge (int mod)
572{
573 mod &= MOD_MASK;
574
575 if (mod & (KMOD_META | KMOD_ALT))
576 mod |= KMOD_LRAM;
577
578 return mod;
579}
580
581static void
582deliantra_main ()
583{
584 char *argv[] = { 0 };
585 call_argv ("::main", G_DISCARD | G_VOID, argv);
586}
587
588#ifdef __MACOSX__
589 /* to due surprising braindamage on the side of SDL design, we
590 * do some mind-boggling hack here: SDL requires a custom main()
591 * on OS X, so... we provide one and call the original main(), which,
592 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
593 * and which calls our main (== SDL_main) back.
594 */
595 extern C_LINKAGE int
596 main (int argc, char *argv[])
597 {
598 deliantra_main ();
599 }
600
601 #undef main
602
603 extern C_LINKAGE int main (int argc, char *argv[]);
604
605 static void
606 SDL_braino (void)
607 {
608 char *argv[] = { "deliantra client", 0 };
609 (main) (1, argv);
610 }
611#else
612 static void
613 SDL_braino (void)
614 {
615 deliantra_main ();
616 }
617#endif
509 618
510MODULE = Deliantra::Client PACKAGE = DC 619MODULE = Deliantra::Client PACKAGE = DC
511 620
512PROTOTYPES: ENABLE 621PROTOTYPES: ENABLE
513 622
542 const_iv (SDL_USEREVENT), 651 const_iv (SDL_USEREVENT),
543 652
544 const_iv (SDL_APPINPUTFOCUS), 653 const_iv (SDL_APPINPUTFOCUS),
545 const_iv (SDL_APPMOUSEFOCUS), 654 const_iv (SDL_APPMOUSEFOCUS),
546 const_iv (SDL_APPACTIVE), 655 const_iv (SDL_APPACTIVE),
656
657
658 const_iv (SDLK_UNKNOWN),
659 const_iv (SDLK_FIRST),
660 const_iv (SDLK_BACKSPACE),
661 const_iv (SDLK_TAB),
662 const_iv (SDLK_CLEAR),
663 const_iv (SDLK_RETURN),
664 const_iv (SDLK_PAUSE),
665 const_iv (SDLK_ESCAPE),
666 const_iv (SDLK_SPACE),
667 const_iv (SDLK_EXCLAIM),
668 const_iv (SDLK_QUOTEDBL),
669 const_iv (SDLK_HASH),
670 const_iv (SDLK_DOLLAR),
671 const_iv (SDLK_AMPERSAND),
672 const_iv (SDLK_QUOTE),
673 const_iv (SDLK_LEFTPAREN),
674 const_iv (SDLK_RIGHTPAREN),
675 const_iv (SDLK_ASTERISK),
676 const_iv (SDLK_PLUS),
677 const_iv (SDLK_COMMA),
678 const_iv (SDLK_MINUS),
679 const_iv (SDLK_PERIOD),
680 const_iv (SDLK_SLASH),
681 const_iv (SDLK_0),
682 const_iv (SDLK_1),
683 const_iv (SDLK_2),
684 const_iv (SDLK_3),
685 const_iv (SDLK_4),
686 const_iv (SDLK_5),
687 const_iv (SDLK_6),
688 const_iv (SDLK_7),
689 const_iv (SDLK_8),
690 const_iv (SDLK_9),
691 const_iv (SDLK_COLON),
692 const_iv (SDLK_SEMICOLON),
693 const_iv (SDLK_LESS),
694 const_iv (SDLK_EQUALS),
695 const_iv (SDLK_GREATER),
696 const_iv (SDLK_QUESTION),
697 const_iv (SDLK_AT),
698
699 const_iv (SDLK_LEFTBRACKET),
700 const_iv (SDLK_BACKSLASH),
701 const_iv (SDLK_RIGHTBRACKET),
702 const_iv (SDLK_CARET),
703 const_iv (SDLK_UNDERSCORE),
704 const_iv (SDLK_BACKQUOTE),
705 const_iv (SDLK_DELETE),
547 706
548 const_iv (SDLK_FIRST), 707 const_iv (SDLK_FIRST),
549 const_iv (SDLK_LAST), 708 const_iv (SDLK_LAST),
550 const_iv (SDLK_KP0), 709 const_iv (SDLK_KP0),
551 const_iv (SDLK_KP1), 710 const_iv (SDLK_KP1),
627 const_iv (KMOD_RMETA), 786 const_iv (KMOD_RMETA),
628 const_iv (KMOD_NUM), 787 const_iv (KMOD_NUM),
629 const_iv (KMOD_CAPS), 788 const_iv (KMOD_CAPS),
630 const_iv (KMOD_MODE), 789 const_iv (KMOD_MODE),
631 790
791 const_iv (KMOD_LRAM),
792
632 const_iv (MIX_DEFAULT_FORMAT), 793 const_iv (MIX_DEFAULT_FORMAT),
794
795 const_iv (SDL_INIT_TIMER),
796 const_iv (SDL_INIT_AUDIO),
797 const_iv (SDL_INIT_VIDEO),
798 const_iv (SDL_INIT_CDROM),
799 const_iv (SDL_INIT_JOYSTICK),
800 const_iv (SDL_INIT_EVERYTHING),
801 const_iv (SDL_INIT_NOPARACHUTE),
802 const_iv (SDL_INIT_EVENTTHREAD),
803
804 const_iv (SDL_GL_RED_SIZE),
805 const_iv (SDL_GL_GREEN_SIZE),
806 const_iv (SDL_GL_BLUE_SIZE),
807 const_iv (SDL_GL_ALPHA_SIZE),
808 const_iv (SDL_GL_DOUBLEBUFFER),
809 const_iv (SDL_GL_BUFFER_SIZE),
810 const_iv (SDL_GL_DEPTH_SIZE),
811 const_iv (SDL_GL_STENCIL_SIZE),
812 const_iv (SDL_GL_ACCUM_RED_SIZE),
813 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
814 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
815 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
816 const_iv (SDL_GL_STEREO),
817 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
818 const_iv (SDL_GL_MULTISAMPLESAMPLES),
819 const_iv (SDL_GL_ACCELERATED_VISUAL),
820 const_iv (SDL_GL_SWAP_CONTROL),
821
822 const_iv (FOW_DARKNESS)
633# undef const_iv 823# undef const_iv
634 }; 824 };
635 825
636 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 826 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
637 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
638 828
639 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
640 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
641} 831}
642 832
659 849
660IV minpot (UV n) 850IV minpot (UV n)
661 851
662IV popcount (UV n) 852IV popcount (UV n)
663 853
854NV distance (NV dx, NV dy)
855 CODE:
856 RETVAL = pow (dx * dx + dy * dy, 0.5);
857 OUTPUT:
858 RETVAL
859
664void 860void
665pango_init () 861pango_init ()
666 CODE: 862 CODE:
667{ 863{
668 opengl_fontmap = pango_opengl_font_map_new (); 864 opengl_fontmap = pango_opengl_font_map_new ();
669 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 865 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); 866 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
671#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2) 867 /*pango_context_set_font_description (opengl_context, default_font);*/
868#if PANGO_VERSION_CHECK (1, 15, 2)
672 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 869 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
673 pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR); 870 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
674#endif 871#endif
675} 872}
676 873
677char *
678SDL_GetError () 874char *SDL_GetError ()
679 875
680int 876void SDL_braino ()
681SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
682 877
683void 878int SDL_Init (U32 flags)
879
880int SDL_InitSubSystem (U32 flags)
881
882void SDL_QuitSubSystem (U32 flags)
883
684SDL_Quit () 884void SDL_Quit ()
885
886int SDL_GL_SetAttribute (int attr, int value)
887
888int SDL_GL_GetAttribute (int attr)
889 CODE:
890 if (SDL_GL_GetAttribute (attr, &RETVAL))
891 XSRETURN_UNDEF;
892 OUTPUT:
893 RETVAL
685 894
686void 895void
687SDL_ListModes (int rgb, int alpha) 896SDL_ListModes (int rgb, int alpha)
688 PPCODE: 897 PPCODE:
689{ 898{
701 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 910 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
702 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 911 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
703 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 912 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
704 913
705 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 914 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); 915 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
709#endif
710 916
711 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 917 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
712 918
713 if (m && m != (SDL_Rect **)-1) 919 if (m && m != (SDL_Rect **)-1)
714 while (*m) 920 while (*m)
715 { 921 {
716 if ((*m)->w >= 800 && (*m)->h >= 480) 922 if ((*m)->w >= 400 && (*m)->h >= 300)
717 { 923 {
718 AV *av = newAV (); 924 AV *av = newAV ();
719 av_push (av, newSViv ((*m)->w)); 925 av_push (av, newSViv ((*m)->w));
720 av_push (av, newSViv ((*m)->h)); 926 av_push (av, newSViv ((*m)->h));
721 av_push (av, newSViv (rgb)); 927 av_push (av, newSViv (rgb));
749 955
750 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
751#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 957#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
752#include "glfunc.h" 958#include "glfunc.h"
753#undef GL_FUNC 959#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
754 } 963 }
755} 964}
756 OUTPUT: 965 OUTPUT:
757 RETVAL 966 RETVAL
758 967
762char * 971char *
763SDL_GetKeyName (int sym) 972SDL_GetKeyName (int sym)
764 973
765int 974int
766SDL_GetAppState () 975SDL_GetAppState ()
976
977int
978SDL_GetModState ()
767 979
768void 980void
769poll_events () 981poll_events ()
770 PPCODE: 982 PPCODE:
771{ 983{
781 { 993 {
782 case SDL_KEYDOWN: 994 case SDL_KEYDOWN:
783 case SDL_KEYUP: 995 case SDL_KEYUP:
784 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 996 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
785 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 997 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
786 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 998 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 */ 999 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); 1000 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
789 break; 1001 break;
790 1002
791 case SDL_ACTIVEEVENT: 1003 case SDL_ACTIVEEVENT:
792 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1004 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
810 x = ev.motion.x; 1022 x = ev.motion.x;
811 y = ev.motion.y; 1023 y = ev.motion.y;
812 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1024 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
813 } 1025 }
814 1026
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1027 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
816 hv_store (hv, "state", 5, newSViv (state), 0); 1028 hv_store (hv, "state", 5, newSViv (state), 0);
817 hv_store (hv, "x", 1, newSViv (x), 0); 1029 hv_store (hv, "x", 1, newSViv (x), 0);
818 hv_store (hv, "y", 1, newSViv (y), 0); 1030 hv_store (hv, "y", 1, newSViv (y), 0);
819 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1031 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
820 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1032 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
821 } 1033 }
822 break; 1034 break;
823 1035
824 case SDL_MOUSEBUTTONDOWN: 1036 case SDL_MOUSEBUTTONDOWN:
825 case SDL_MOUSEBUTTONUP: 1037 case SDL_MOUSEBUTTONUP:
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1038 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
827 1039
828 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1040 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
829 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1041 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
830 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1042 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
831 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1043 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
839 } 1051 }
840 1052
841 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1053 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
842 } 1054 }
843} 1055}
1056
1057char *
1058SDL_AudioDriverName ()
1059 CODE:
1060{
1061 char buf [256];
1062 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1063 XSRETURN_UNDEF;
1064
1065 RETVAL = buf;
1066}
1067 OUTPUT:
1068 RETVAL
844 1069
845int 1070int
846Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1071Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
847 POSTCALL: 1072 POSTCALL:
848 Mix_HookMusicFinished (music_finished); 1073 Mix_HookMusicFinished (music_finished);
905 } 1130 }
906 } 1131 }
907#endif 1132#endif
908} 1133}
909 1134
910void 1135int
911add_font (char *file) 1136add_font (char *file)
912 CODE: 1137 CODE:
913 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1138 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1139 OUTPUT:
1140 RETVAL
1141
1142void
1143IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1144
1145void
1146Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_MP3 | MIX_INIT_OGG)
914 1147
915void 1148void
916load_image_inline (SV *image_) 1149load_image_inline (SV *image_)
917 ALIAS: 1150 ALIAS:
918 load_image_file = 1 1151 load_image_file = 1
1034#if DEBUG 1267#if DEBUG
1035 VALGRIND_DO_LEAK_CHECK; 1268 VALGRIND_DO_LEAK_CHECK;
1036#endif 1269#endif
1037} 1270}
1038 1271
1272int
1273SvREFCNT (SV *sv)
1274 CODE:
1275 RETVAL = SvREFCNT (sv);
1276 OUTPUT:
1277 RETVAL
1278
1039MODULE = Deliantra::Client PACKAGE = DC::Font 1279MODULE = Deliantra::Client PACKAGE = DC::Font
1040 1280
1041PROTOTYPES: DISABLE 1281PROTOTYPES: DISABLE
1042 1282
1043DC::Font 1283DC::Font
1312 1552
1313void 1553void
1314cursor_pos (DC::Layout self, int index) 1554cursor_pos (DC::Layout self, int index)
1315 PPCODE: 1555 PPCODE:
1316{ 1556{
1317 PangoRectangle strong_pos; 1557 PangoRectangle pos;
1318 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1558 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1319 1559
1320 EXTEND (SP, 3); 1560 EXTEND (SP, 3);
1321 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1561 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1322 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1562 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1323 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1563 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1324} 1564}
1325 1565
1326void 1566void
1327index_to_line_x (DC::Layout self, int index, int trailing = 0) 1567index_to_line_x (DC::Layout self, int index, int trailing = 0)
1328 PPCODE: 1568 PPCODE:
1329{ 1569{
1330 int line, x; 1570 int line, x;
1331 1571
1332 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1572 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1333#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1573#if !PANGO_VERSION_CHECK (1, 17, 3)
1334 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1574 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1335 --line; 1575 --line;
1336#endif 1576#endif
1337 EXTEND (SP, 2); 1577 EXTEND (SP, 2);
1338 PUSHs (sv_2mortal (newSViv (line))); 1578 PUSHs (sv_2mortal (newSViv (line)));
1472 if (ix) 1712 if (ix)
1473 { 1713 {
1474 glDisable (GL_ALPHA_TEST); 1714 glDisable (GL_ALPHA_TEST);
1475 glDisable (GL_BLEND); 1715 glDisable (GL_BLEND);
1476 } 1716 }
1717}
1718
1719void
1720draw_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)
1721 PROTOTYPE: @
1722 CODE:
1723{
1724 glEnable (GL_BLEND);
1725 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1726 glEnable (GL_TEXTURE_2D);
1727 glBindTexture (GL_TEXTURE_2D, name1);
1728
1729 glColor3f (intensity, intensity, intensity);
1730 glPushMatrix ();
1731 glScalef (1./3, 1./3, 1.);
1732
1733 if (blend > 0.f)
1734 {
1735 float dx3 = dx * -3.f / w;
1736 float dy3 = dy * -3.f / h;
1737 GLfloat env_color[4] = { 0., 0., 0., blend };
1738
1739 /* interpolate the two shadow textures */
1740 /* stage 0 == rgb(glcolor) + alpha(t0) */
1741 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1742
1743 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1744 gl.ActiveTexture (GL_TEXTURE1);
1745 glEnable (GL_TEXTURE_2D);
1746 glBindTexture (GL_TEXTURE_2D, name2);
1747 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1748
1749 /* rgb == rgb(glcolor) */
1750 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1751 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1752 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1753
1754 /* alpha = interpolate t0, t1 by env_alpha */
1755 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1756
1757 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1758 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1759 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1760
1761 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1762 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1763
1764 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1765 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1766
1767 glBegin (GL_QUADS);
1768 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1769 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1770 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1771 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1772 glEnd ();
1773
1774 glDisable (GL_TEXTURE_2D);
1775 gl.ActiveTexture (GL_TEXTURE0);
1776 }
1777 else
1778 {
1779 /* simple blending of one texture, also opengl <1.3 path */
1780 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1781
1782 glBegin (GL_QUADS);
1783 glTexCoord2f (0, 0); glVertex2f (0, 0);
1784 glTexCoord2f (0, t); glVertex2f (0, h);
1785 glTexCoord2f (s, t); glVertex2f (w, h);
1786 glTexCoord2f (s, 0); glVertex2f (w, 0);
1787 glEnd ();
1788 }
1789
1790 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1791 {
1792 int x, y;
1793 int dx3 = dx * 3;
1794 int dy3 = dy * 3;
1795
1796 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1797 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1798 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1799 glTranslatef (-1., -1., 0);
1800 glBegin (GL_QUADS);
1801
1802 for (y = 1; y < h; y += 3)
1803 {
1804 int y1 = y - dy3;
1805 int y1valid = y1 >= 0 && y1 < h;
1806
1807 for (x = 1; x < w; x += 3)
1808 {
1809 int x1 = x - dx3;
1810 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1811 uint8_t h2;
1812
1813 if (y1valid && x1 >= 0 && x1 < w)
1814 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1815 else
1816 h2 = 1; /* out of range == invisible */
1817
1818 if (h1 || h2)
1819 {
1820 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1821 glColor4f (1., 1., 1., alpha);
1822
1823 glTexCoord2f (0, 0.); glVertex2i (x , y );
1824 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1825 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1826 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1827 }
1828 }
1829 }
1830 }
1831
1832 glEnd ();
1833
1834 glPopMatrix ();
1835
1836 glDisable (GL_TEXTURE_2D);
1837 glDisable (GL_BLEND);
1477} 1838}
1478 1839
1479IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1840IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1480 CODE: 1841 CODE:
1481{ 1842{
1587 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1948 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1588 // use uglier nearest interpolation because linear suffers 1949 // use uglier nearest interpolation because linear suffers
1589 // from transparent color bleeding and ugly wrapping effects. 1950 // from transparent color bleeding and ugly wrapping effects.
1590 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1951 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1591} 1952}
1953
1954void
1955expire_textures (DC::Map self, int texid, int count)
1956 PPCODE:
1957 for (; texid < self->texs && count; ++texid, --count)
1958 {
1959 maptex *tex = self->tex + texid;
1960
1961 if (tex->name)
1962 {
1963 if (tex->unused)
1964 {
1965 tex->name = 0;
1966 tex->unused = 0;
1967 XPUSHs (sv_2mortal (newSViv (texid)));
1968 }
1969 else
1970 tex->unused = 1;
1971 }
1972 }
1592 1973
1593int 1974int
1594ox (DC::Map self) 1975ox (DC::Map self)
1595 ALIAS: 1976 ALIAS:
1596 oy = 1 1977 oy = 1
1674 uint8_t ext, cmd; 2055 uint8_t ext, cmd;
1675 2056
1676 do 2057 do
1677 { 2058 {
1678 ext = *data++; 2059 ext = *data++;
1679 cmd = ext & 0x3f; 2060 cmd = ext & 0x7f;
1680 2061
1681 if (cmd < 4) 2062 if (cmd < 4)
1682 cell->darkness = 255 - ext * 64 + 1; 2063 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1683 else if (cmd == 5) // health 2064 else if (cmd == 5) // health
1684 { 2065 {
1685 cell->stat_width = 1; 2066 cell->stat_width = 1;
1686 cell->stat_hp = *data++; 2067 cell->stat_hp = *data++;
1687 } 2068 }
1688 else if (cmd == 6) // monster width 2069 else if (cmd == 6) // monster width
1689 cell->stat_width = *data++ + 1; 2070 cell->stat_width = *data++ + 1;
1690 else if (cmd == 0x47) 2071 else if (cmd == 0x47)
1691 { 2072 {
1692 if (*data == 4) 2073 if (*data == 1) cell->player = data [1];
1693 ; // decode player count 2074 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2075 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2076 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1694 2077
1695 data += *data + 1; 2078 data += *data + 1;
1696 } 2079 }
1697 else if (cmd == 8) // cell flags 2080 else if (cmd == 8) // cell flags
1698 cell->flags = *data++; 2081 cell->flags = *data++;
1715 cell->tile [z] = self->face2tile [face]; 2098 cell->tile [z] = self->face2tile [face];
1716 2099
1717 if (cell->tile [z]) 2100 if (cell->tile [z])
1718 { 2101 {
1719 maptex *tex = self->tex + cell->tile [z]; 2102 maptex *tex = self->tex + cell->tile [z];
2103 tex->unused = 0;
1720 if (!tex->name) 2104 if (!tex->name)
1721 av_push (missing, newSViv (cell->tile [z])); 2105 av_push (missing, newSViv (cell->tile [z]));
1722 2106
1723 if (tex->smoothtile) 2107 if (tex->smoothtile)
1724 { 2108 {
1725 maptex *smooth = self->tex + tex->smoothtile; 2109 maptex *smooth = self->tex + tex->smoothtile;
2110 smooth->unused = 0;
1726 if (!smooth->name) 2111 if (!smooth->name)
1727 av_push (missing, newSViv (tex->smoothtile)); 2112 av_push (missing, newSViv (tex->smoothtile));
1728 } 2113 }
1729 } 2114 }
1730 } 2115 }
1731 } 2116 }
1732 else 2117 else
1733 cell->darkness = 0; 2118 CELL_CLEAR (cell);
1734 } 2119 }
1735} 2120}
1736 OUTPUT: 2121 OUTPUT:
1737 RETVAL 2122 RETVAL
1738 2123
1758 ? self->row + y 2143 ? self->row + y
1759 : 0; 2144 : 0;
1760 2145
1761 for (x = x0; x < x1; x++) 2146 for (x = x0; x < x1; x++)
1762 { 2147 {
1763 int r = 32, g = 32, b = 32, a = 192; 2148 unsigned int r = 32, g = 32, b = 32, a = 192;
1764 2149
1765 if (row && row->c0 <= x && x < row->c1) 2150 if (row && row->c0 <= x && x < row->c1)
1766 { 2151 {
1767 mapcell *cell = row->col + (x - row->c0); 2152 mapcell *cell = row->col + (x - row->c0);
1768 2153
1770 { 2155 {
1771 maptex tex = self->tex [cell->tile [z]]; 2156 maptex tex = self->tex [cell->tile [z]];
1772 int a0 = 255 - tex.a; 2157 int a0 = 255 - tex.a;
1773 int a1 = tex.a; 2158 int a1 = tex.a;
1774 2159
1775 r = (r * a0 + tex.r * a1) / 255; 2160 r = div255 (r * a0 + tex.r * a1);
1776 g = (g * a0 + tex.g * a1) / 255; 2161 g = div255 (g * a0 + tex.g * a1);
1777 b = (b * a0 + tex.b * a1) / 255; 2162 b = div255 (b * a0 + tex.b * a1);
1778 a = (a * a0 + tex.a * a1) / 255; 2163 a = div255 (a * a0 + tex.a * a1);
1779 } 2164 }
1780 } 2165 }
1781 2166
1782 *map++ = (r ) 2167 *map++ = (r )
1783 | (g << 8) 2168 | (g << 8)
1790} 2175}
1791 OUTPUT: 2176 OUTPUT:
1792 RETVAL 2177 RETVAL
1793 2178
1794void 2179void
1795draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2180draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1796 CODE: 2181 CODE:
1797{ 2182{
1798 int x, y, z; 2183 int x, y, z;
1799 2184
1800 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2185 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1801 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2186 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) 2187 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1803 smooth_key skey; 2188 smooth_key skey;
1804 2189 int pl_x, pl_y;
2190 maptex pl_tex;
1805 rc_t *rc = rc_alloc (); 2191 rc_t *rc = rc_alloc ();
2192 rc_t *rc_ov = rc_alloc ();
1806 rc_key_t key; 2193 rc_key_t key;
1807 rc_array_t *arr; 2194 rc_array_t *arr;
1808 2195
2196 pl_tex.name = 0;
2197
1809 // thats current max. sorry. 2198 // that's current max. sorry.
1810 if (sw > 255) sw = 255; 2199 if (sw > 255) sw = 255;
1811 if (sh > 255) sh = 255; 2200 if (sh > 255) sh = 255;
1812 2201
1813 // clear key, in case of extra padding 2202 // clear key, in case of extra padding
1814 memset (&skey, 0, sizeof (skey)); 2203 memset (&skey, 0, sizeof (skey));
1818 key.g = 255; 2207 key.g = 255;
1819 key.b = 255; 2208 key.b = 255;
1820 key.a = 255; 2209 key.a = 255;
1821 key.mode = GL_QUADS; 2210 key.mode = GL_QUADS;
1822 key.format = GL_T2F_V3F; 2211 key.format = GL_T2F_V3F;
1823 key.texname = -1;
1824 2212
1825 mx += self->x; 2213 mx += self->x;
1826 my += self->y; 2214 my += self->y;
1827 2215
1828 // first pass: determine smooth_max 2216 // first pass: determine smooth_max
1852 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2240 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1853 2241
1854 for (z = 0; z <= 2; z++) 2242 for (z = 0; z <= 2; z++)
1855 { 2243 {
1856 memset (smooth_level, 0, sizeof (smooth_level)); 2244 memset (smooth_level, 0, sizeof (smooth_level));
2245 key.texname = -1;
1857 2246
1858 for (y = 0; y < sh; y++) 2247 for (y = 0; y < sh; y++)
1859 if (0 <= y + my && y + my < self->rows) 2248 if (0 <= y + my && y + my < self->rows)
1860 { 2249 {
1861 maprow *row = self->row + (y + my); 2250 maprow *row = self->row + (y + my);
1871 maptex tex = self->tex [tile]; 2260 maptex tex = self->tex [tile];
1872 int px, py; 2261 int px, py;
1873 2262
1874 if (key.texname != tex.name) 2263 if (key.texname != tex.name)
1875 { 2264 {
2265 self->tex [tile].unused = 0;
2266
1876 if (!tex.name) 2267 if (!tex.name)
1877 tex = self->tex [2]; /* missing, replace by noface */ 2268 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1878 2269
1879 key.texname = tex.name; 2270 key.texname = tex.name;
1880 arr = rc_array (rc, &key); 2271 arr = rc_array (rc, &key);
1881 } 2272 }
1882 2273
1883 px = (x + 1) * T - tex.w; 2274 px = (x + 1) * Th - tex.w;
1884 py = (y + 1) * T - tex.h; 2275 py = (y + 1) * Tw - tex.h;
2276
2277 if (expect_false (cell->player == player) && expect_false (z == 2))
2278 {
2279 pl_x = px;
2280 pl_y = py;
2281 pl_tex = tex;
2282 continue;
2283 }
1885 2284
1886 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2285 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1887 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2286 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); 2287 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); 2288 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 2289
1916 // update smooth hash 2290 // update smooth hash
1917 if (tex.smoothtile) 2291 if (tex.smoothtile)
1918 { 2292 {
1919 skey.tile = tex.smoothtile; 2293 skey.tile = tex.smoothtile;
1948 // corners 2322 // corners
1949 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2323 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); 2324 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); 2325 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); 2326 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2327 }
2328 }
2329
2330 if (expect_false (z == 2) && expect_false (cell->flags))
2331 {
2332 // overlays such as the speech bubble, probably more to come
2333 if (cell->flags & 1)
2334 {
2335 rc_key_t key_ov = key;
2336 maptex tex = self->tex [TEXID_SPEECH];
2337 rc_array_t *arr;
2338 int px = x * Tw + Tw * 2 / 32;
2339 int py = y * Th - Th * 6 / 32;
2340
2341 key_ov.texname = tex.name;
2342 arr = rc_array (rc_ov, &key_ov);
2343
2344 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2345 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2346 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2347 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1953 } 2348 }
1954 } 2349 }
1955 } 2350 }
1956 } 2351 }
1957 2352
1984 if (!(bits & 0x1000) 2379 if (!(bits & 0x1000)
1985 && skey->level == level 2380 && skey->level == level
1986 && level > smooth_max [skey->x][skey->y]) 2381 && level > smooth_max [skey->x][skey->y])
1987 { 2382 {
1988 maptex tex = self->tex [skey->tile]; 2383 maptex tex = self->tex [skey->tile];
1989 int px = (((int)skey->x) - 1) * T; 2384 int px = (((int)skey->x) - 1) * Tw;
1990 int py = (((int)skey->y) - 1) * T; 2385 int py = (((int)skey->y) - 1) * Th;
1991 int border = bits & 15; 2386 int border = bits & 15;
1992 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2387 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1993 float dx = tex.s * .0625f; // 16 images/row 2388 float dx = tex.s * .0625f; // 16 images/row
1994 float dy = tex.t * .5f ; // 2 images/column 2389 float dy = tex.t * .5f ; // 2 images/column
1995 2390
1997 { 2392 {
1998 // this time avoiding texture state changes 2393 // this time avoiding texture state changes
1999 // save gobs of state changes. 2394 // save gobs of state changes.
2000 if (key.texname != tex.name) 2395 if (key.texname != tex.name)
2001 { 2396 {
2397 self->tex [skey->tile].unused = 0;
2398
2002 glEnd (); 2399 glEnd ();
2003 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2400 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2004 glBegin (GL_QUADS); 2401 glBegin (GL_QUADS);
2005 } 2402 }
2006 2403
2007 if (border) 2404 if (border)
2008 { 2405 {
2009 float ox = border * dx; 2406 float ox = border * dx;
2010 2407
2011 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2408 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2012 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2409 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2013 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2410 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2014 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2411 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2015 } 2412 }
2016 2413
2017 if (corner) 2414 if (corner)
2018 { 2415 {
2019 float ox = corner * dx; 2416 float ox = corner * dx;
2020 2417
2021 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2418 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2022 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2419 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2023 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2420 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2024 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2421 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2025 } 2422 }
2026 } 2423 }
2027 } 2424 }
2028 } 2425 }
2029 } 2426 }
2035 } 2432 }
2036 2433
2037 hv_clear (smooth); 2434 hv_clear (smooth);
2038 } 2435 }
2039 2436
2437 if (pl_tex.name)
2438 {
2439 maptex tex = pl_tex;
2440 int px = pl_x + sdx;
2441 int py = pl_y + sdy;
2442
2443 key.texname = tex.name;
2444 arr = rc_array (rc, &key);
2445
2446 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2447 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2448 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2449 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2450
2451 rc_draw (rc);
2452 }
2453
2454 rc_draw (rc_ov);
2455 rc_clear (rc_ov);
2456
2040 glDisable (GL_BLEND); 2457 glDisable (GL_BLEND);
2041 rc_free (rc); 2458 rc_free (rc);
2459 rc_free (rc_ov);
2042 2460
2043 // top layer: overlays such as the health bar 2461 // top layer: overlays such as the health bar
2044 for (y = 0; y < sh; y++) 2462 for (y = 0; y < sh; y++)
2045 if (0 <= y + my && y + my < self->rows) 2463 if (0 <= y + my && y + my < self->rows)
2046 { 2464 {
2049 for (x = 0; x < sw; x++) 2467 for (x = 0; x < sw; x++)
2050 if (row->c0 <= x + mx && x + mx < row->c1) 2468 if (row->c0 <= x + mx && x + mx < row->c1)
2051 { 2469 {
2052 mapcell *cell = row->col + (x + mx - row->c0); 2470 mapcell *cell = row->col + (x + mx - row->c0);
2053 2471
2054 int px = x * T; 2472 int px = x * Tw;
2055 int py = y * T; 2473 int py = y * Th;
2474
2475 if (expect_false (cell->player == player))
2476 {
2477 px += sdx;
2478 py += sdy;
2479 }
2056 2480
2057 if (cell->stat_hp) 2481 if (cell->stat_hp)
2058 { 2482 {
2059 int width = cell->stat_width * T; 2483 int width = cell->stat_width * Tw;
2060 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2484 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2061 2485
2062 glColor3ub (0, 0, 0); 2486 glColor3ub (0, 0, 0);
2063 glRectf (px + 1, py - thick - 2, 2487 glRectf (px + 1, py - thick - 2,
2064 px + width - 1, py); 2488 px + width - 1, py);
2065 2489
2071 } 2495 }
2072 } 2496 }
2073} 2497}
2074 2498
2075void 2499void
2076draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2500draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2077 CODE: 2501 CODE:
2078{ 2502{
2079 static float color[16][3] = { 2503 static float color[16][3] = {
2080 { 0.00F, 0.00F, 0.00F }, 2504 { 0.00f, 0.00f, 0.00f },
2081 { 1.00F, 1.00F, 1.00F }, 2505 { 1.00f, 1.00f, 1.00f },
2082 { 0.00F, 0.00F, 0.55F }, 2506 { 0.00f, 0.00f, 0.55f },
2083 { 1.00F, 0.00F, 0.00F }, 2507 { 1.00f, 0.00f, 0.00f },
2084 2508
2085 { 1.00F, 0.54F, 0.00F }, 2509 { 1.00f, 0.54f, 0.00f },
2086 { 0.11F, 0.56F, 1.00F }, 2510 { 0.11f, 0.56f, 1.00f },
2087 { 0.93F, 0.46F, 0.00F }, 2511 { 0.93f, 0.46f, 0.00f },
2088 { 0.18F, 0.54F, 0.34F }, 2512 { 0.18f, 0.54f, 0.34f },
2089 2513
2090 { 0.56F, 0.73F, 0.56F }, 2514 { 0.56f, 0.73f, 0.56f },
2091 { 0.80F, 0.80F, 0.80F }, 2515 { 0.80f, 0.80f, 0.80f },
2092 { 0.55F, 0.41F, 0.13F }, 2516 { 0.55f, 0.41f, 0.13f },
2093 { 0.99F, 0.77F, 0.26F }, 2517 { 0.99f, 0.77f, 0.26f },
2094 2518
2095 { 0.74F, 0.65F, 0.41F }, 2519 { 0.74f, 0.65f, 0.41f },
2096 2520
2097 { 0.00F, 1.00F, 1.00F }, 2521 { 0.00f, 1.00f, 1.00f },
2098 { 1.00F, 0.00F, 1.00F }, 2522 { 1.00f, 0.00f, 1.00f },
2099 { 1.00F, 1.00F, 0.00F }, 2523 { 1.00f, 1.00f, 0.00f },
2100 }; 2524 };
2101 2525
2102 int x, y; 2526 int x, y;
2103 2527
2104 glEnable (GL_TEXTURE_2D); 2528 glEnable (GL_TEXTURE_2D);
2529 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2530 * but the nvidia driver (185.18.14) mishandles alpha textures
2531 * and takes the colour from god knows where instead of using
2532 * Cp. MODULATE results in the same colour, but slightly different
2533 * alpha, but atcually gives us the correct colour with nvidia.
2534 */
2105 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2535 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2106 glEnable (GL_BLEND); 2536 glEnable (GL_BLEND);
2107 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2537 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2108 glBegin (GL_QUADS); 2538 glBegin (GL_QUADS);
2109 2539
2110 for (y = 0; y < h; y++) 2540 for (y = 0; y < h; y++)
2114 2544
2115 if (m) 2545 if (m)
2116 { 2546 {
2117 float *c = color [m & 15]; 2547 float *c = color [m & 15];
2118 2548
2119 float tx1 = m & 0x40 ? 0.5 : 0.; 2549 float tx1 = m & 0x40 ? 0.5f : 0.f;
2120 float tx2 = tx1 + 0.5; 2550 float tx2 = tx1 + 0.5f;
2121 2551
2122 glColor4f (c[0], c[1], c[2], 0.75); 2552 glColor4f (c[0], c[1], c[2], 1);
2123 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2553 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2124 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2554 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2125 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2555 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2126 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2556 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2127 } 2557 }
2135void 2565void
2136fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2566fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2137 PPCODE: 2567 PPCODE:
2138{ 2568{
2139 int x, y; 2569 int x, y;
2140 int sw1 = sw + 2; 2570 int sw1 = sw + 2;
2141 int sh1 = sh + 2; 2571 int sh1 = sh + 2;
2142 int sh3 = sh * 3; 2572 int sh3 = sh * 3;
2143 int sw34 = (sw * 3 + 3) & ~3; 2573 int sw3 = sw * 3;
2574 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2575 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2144 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2576 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2145 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2577 memset (darkness1, 0, sw1*sh1);
2146 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2147 2578
2148 SvPOK_only (darkness3_sv); 2579 SvPOK_only (darkness3_sv);
2149 SvCUR_set (darkness3_sv, sw34 * sh3); 2580 SvCUR_set (darkness3_sv, sw3 * sh3);
2150 2581
2151 mx += self->x - 1; 2582 mx += self->x - 1;
2152 my += self->y - 1; 2583 my += self->y - 1;
2153
2154 memset (darkness1, 255, sw1 * sh1);
2155 2584
2156 for (y = 0; y < sh1; y++) 2585 for (y = 0; y < sh1; y++)
2157 if (0 <= y + my && y + my < self->rows) 2586 if (0 <= y + my && y + my < self->rows)
2158 { 2587 {
2159 maprow *row = self->row + (y + my); 2588 maprow *row = self->row + (y + my);
2162 if (row->c0 <= x + mx && x + mx < row->c1) 2591 if (row->c0 <= x + mx && x + mx < row->c1)
2163 { 2592 {
2164 mapcell *cell = row->col + (x + mx - row->c0); 2593 mapcell *cell = row->col + (x + mx - row->c0);
2165 2594
2166 darkness1 [y * sw1 + x] = cell->darkness 2595 darkness1 [y * sw1 + x] = cell->darkness
2167 ? 255 - (cell->darkness - 1) 2596 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2168 : 255 - FOW_DARKNESS; 2597 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2169 } 2598 }
2170 } 2599 }
2171 2600
2172 for (y = 0; y < sh; ++y) 2601 for (y = 0; y < sh; ++y)
2173 for (x = 0; x < sw; ++x) 2602 for (x = 0; x < sw; ++x)
2192 2621
2193 uint8_t r13 = (d13 + d23 + d12) / 3; 2622 uint8_t r13 = (d13 + d23 + d12) / 3;
2194 uint8_t r23 = d23; 2623 uint8_t r23 = d23;
2195 uint8_t r33 = (d23 + d33 + d32) / 3; 2624 uint8_t r33 = (d23 + d33 + d32) / 3;
2196 2625
2197 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2626 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2198 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2627 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2199 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2628 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2200 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2629 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2201 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2630 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2202 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2631 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2203 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2632 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2204 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2633 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2205 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2634 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2206 } 2635 }
2207 2636
2208 free (darkness1); 2637 free (darkness1);
2209 2638
2210 EXTEND (SP, 3); 2639 EXTEND (SP, 3);
2211 PUSHs (sv_2mortal (newSViv (sw34))); 2640 PUSHs (sv_2mortal (newSViv (sw3)));
2212 PUSHs (sv_2mortal (newSViv (sh3))); 2641 PUSHs (sv_2mortal (newSViv (sh3)));
2213 PUSHs (darkness3_sv); 2642 PUSHs (darkness3_sv);
2214} 2643}
2215 2644
2216SV * 2645SV *
2279 else 2708 else
2280 *data++ = 0; 2709 *data++ = 0;
2281 } 2710 }
2282 } 2711 }
2283 2712
2713 /* if size is w*h + 5 then no data has been found */
2714 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2715 {
2284 SvPOK_only (data_sv); 2716 SvPOK_only (data_sv);
2285 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2717 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2718 }
2719
2286 RETVAL = data_sv; 2720 RETVAL = data_sv;
2287} 2721}
2288 OUTPUT: 2722 OUTPUT:
2289 RETVAL 2723 RETVAL
2290 2724
2291void 2725void
2292set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2726set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2293 PPCODE: 2727 PPCODE:
2294{ 2728{
2295 int x, y, z; 2729 int x, y, z;
2296 int w, h; 2730 int w, h;
2297 int x1, y1; 2731 int x1, y1;
2732 STRLEN len;
2733 uint8_t *data, *end;
2734
2735 len = SvLEN (data_sv);
2736 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2737 data = SvPVbyte_nolen (data_sv);
2738 end = data + len + 8;
2739
2740 if (len < 5)
2741 XSRETURN_EMPTY;
2298 2742
2299 if (*data++ != 0) 2743 if (*data++ != 0)
2300 XSRETURN_EMPTY; /* version mismatch */ 2744 XSRETURN_EMPTY; /* version mismatch */
2301 2745
2302 w = *data++ << 8; w |= *data++; 2746 w = *data++ << 8; w |= *data++;
2317 { 2761 {
2318 maprow *row = map_get_row (self, y); 2762 maprow *row = map_get_row (self, y);
2319 2763
2320 for (x = x0; x < x1; x++) 2764 for (x = x0; x < x1; x++)
2321 { 2765 {
2766 uint8_t flags;
2767
2768 if (data + 7 >= end)
2769 XSRETURN_EMPTY;
2770
2322 uint8_t flags = *data++; 2771 flags = *data++;
2323 2772
2324 if (flags) 2773 if (flags)
2325 { 2774 {
2326 mapcell *cell = row_get_cell (row, x); 2775 mapcell *cell = row_get_cell (row, x);
2327 tileid tile[3] = { 0, 0, 0 }; 2776 tileid tile[3] = { 0, 0, 0 };
2330 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2779 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2331 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2780 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2332 2781
2333 if (cell->darkness == 0) 2782 if (cell->darkness == 0)
2334 { 2783 {
2335 cell->darkness = 0; 2784 /*cell->darkness = 0;*/
2785 EXTEND (SP, 3);
2336 2786
2337 for (z = 0; z <= 2; z++) 2787 for (z = 0; z <= 2; z++)
2338 { 2788 {
2339 tileid t = tile [z]; 2789 tileid t = tile [z];
2340 2790
2341 if (t >= self->texs || (t && !self->tex [t].name)) 2791 if (t >= self->texs || (t && !self->tex [t].name))
2342 { 2792 {
2343 XPUSHs (sv_2mortal (newSViv (t))); 2793 PUSHs (sv_2mortal (newSViv (t)));
2344 need_texid (self, t); 2794 need_texid (self, t);
2345 } 2795 }
2346 2796
2347 cell->tile [z] = t; 2797 cell->tile [z] = t;
2348 } 2798 }
2393 if (RETVAL < 0) 2843 if (RETVAL < 0)
2394 { 2844 {
2395 RETVAL = Mix_GroupOldest (-1); 2845 RETVAL = Mix_GroupOldest (-1);
2396 2846
2397 if (RETVAL < 0) 2847 if (RETVAL < 0)
2848 {
2849 // happens sometimes, maybe it just stopped playing(?)
2850 RETVAL = Mix_GroupAvailable (-1);
2851
2852 if (RETVAL < 0)
2398 XSRETURN_UNDEF; 2853 XSRETURN_UNDEF;
2399 2854 }
2855 else
2400 Mix_HaltChannel (RETVAL); 2856 Mix_HaltChannel (RETVAL);
2401 } 2857 }
2402 2858
2403 Mix_UnregisterAllEffects (RETVAL); 2859 Mix_UnregisterAllEffects (RETVAL);
2404 Mix_Volume (RETVAL, 128); 2860 Mix_Volume (RETVAL, 128);
2405} 2861}
2452void 2908void
2453set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2909set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2454 CODE: 2910 CODE:
2455{ 2911{
2456 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2912 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2457 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2913 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2458 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2914 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2459} 2915}
2460 2916
2461void 2917void
2462set_reverse_stereo (DC::Channel self, int flip) 2918set_reverse_stereo (DC::Channel self, int flip)
2464 Mix_SetReverseStereo (self, flip); 2920 Mix_SetReverseStereo (self, flip);
2465 2921
2466MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2922MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2467 2923
2468PROTOTYPES: DISABLE 2924PROTOTYPES: DISABLE
2925
2926void
2927decoders ()
2928 PPCODE:
2929#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2930 int i, num = Mix_GetNumChunkDecoders ();
2931 EXTEND (SP, num);
2932 for (i = 0; i < num; ++i)
2933 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2934#else
2935 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2936#endif
2469 2937
2470DC::MixChunk 2938DC::MixChunk
2471new (SV *class, DC::RW rwops) 2939new (SV *class, DC::RW rwops)
2472 CODE: 2940 CODE:
2473 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2941 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2506 OUTPUT: 2974 OUTPUT:
2507 RETVAL 2975 RETVAL
2508 2976
2509MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2977MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2510 2978
2979void
2980decoders ()
2981 PPCODE:
2982#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2983 int i, num = Mix_GetNumMusicDecoders ();
2984 EXTEND (SP, num);
2985 for (i = 0; i < num; ++i)
2986 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2987#else
2988 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2989#endif
2990
2511int 2991int
2512volume (int volume = -1) 2992volume (int volume = -1)
2513 PROTOTYPE: ;$ 2993 PROTOTYPE: ;$
2514 CODE: 2994 CODE:
2515 if (items > 0) 2995 if (items > 0)
2525 3005
2526void 3006void
2527halt () 3007halt ()
2528 CODE: 3008 CODE:
2529 Mix_HaltMusic (); 3009 Mix_HaltMusic ();
3010
3011int
3012playing ()
3013 CODE:
3014 RETVAL = Mix_PlayingMusic ();
3015 OUTPUT:
3016 RETVAL
2530 3017
2531DC::MixMusic 3018DC::MixMusic
2532new (SV *class, DC::RW rwops) 3019new (SV *class, DC::RW rwops)
2533 CODE: 3020 CODE:
2534 RETVAL = Mix_LoadMUS_RW (rwops); 3021 RETVAL = Mix_LoadMUS_RW (rwops);
2565 } *civ, const_iv[] = { 3052 } *civ, const_iv[] = {
2566# define const_iv(name) { # name, (IV)name } 3053# define const_iv(name) { # name, (IV)name }
2567 const_iv (GL_VENDOR), 3054 const_iv (GL_VENDOR),
2568 const_iv (GL_VERSION), 3055 const_iv (GL_VERSION),
2569 const_iv (GL_EXTENSIONS), 3056 const_iv (GL_EXTENSIONS),
3057 const_iv (GL_MAX_TEXTURE_UNITS),
2570 const_iv (GL_COLOR_MATERIAL), 3058 const_iv (GL_COLOR_MATERIAL),
2571 const_iv (GL_SMOOTH), 3059 const_iv (GL_SMOOTH),
2572 const_iv (GL_FLAT), 3060 const_iv (GL_FLAT),
2573 const_iv (GL_DITHER), 3061 const_iv (GL_DITHER),
2574 const_iv (GL_BLEND), 3062 const_iv (GL_BLEND),
2586 const_iv (GL_ZERO), 3074 const_iv (GL_ZERO),
2587 const_iv (GL_SRC_ALPHA), 3075 const_iv (GL_SRC_ALPHA),
2588 const_iv (GL_DST_ALPHA), 3076 const_iv (GL_DST_ALPHA),
2589 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3077 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2590 const_iv (GL_ONE_MINUS_DST_ALPHA), 3078 const_iv (GL_ONE_MINUS_DST_ALPHA),
3079 const_iv (GL_SRC_COLOR),
3080 const_iv (GL_DST_COLOR),
3081 const_iv (GL_ONE_MINUS_SRC_COLOR),
3082 const_iv (GL_ONE_MINUS_DST_COLOR),
2591 const_iv (GL_SRC_ALPHA_SATURATE), 3083 const_iv (GL_SRC_ALPHA_SATURATE),
2592 const_iv (GL_RGB), 3084 const_iv (GL_RGB),
2593 const_iv (GL_RGBA), 3085 const_iv (GL_RGBA),
2594 const_iv (GL_RGBA4), 3086 const_iv (GL_RGBA4),
2595 const_iv (GL_RGBA8), 3087 const_iv (GL_RGBA8),
2663 const_iv (GL_NICEST), 3155 const_iv (GL_NICEST),
2664 const_iv (GL_V2F), 3156 const_iv (GL_V2F),
2665 const_iv (GL_V3F), 3157 const_iv (GL_V3F),
2666 const_iv (GL_T2F_V3F), 3158 const_iv (GL_T2F_V3F),
2667 const_iv (GL_T2F_N3F_V3F), 3159 const_iv (GL_T2F_N3F_V3F),
3160 const_iv (GL_FUNC_ADD),
3161 const_iv (GL_FUNC_SUBTRACT),
3162 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2668# undef const_iv 3163# undef const_iv
2669 }; 3164 };
2670 3165
2671 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3166 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2672 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3167 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2673 3168
2674 texture_av = newAV (); 3169 texture_av = newAV ();
2675 AvREAL_off (texture_av); 3170 AvREAL_off (texture_av);
2676} 3171}
2677 3172
2678void 3173void
2679disable_GL_EXT_blend_func_separate () 3174disable_GL_EXT_blend_func_separate ()
2680 CODE: 3175 CODE:
2681 gl.BlendFuncSeparate = 0; 3176 gl.BlendFuncSeparate = 0;
2682 gl.BlendFuncSeparateEXT = 0; 3177 gl.BlendFuncSeparateEXT = 0;
3178
3179void
3180apple_nvidia_bug (int enable)
2683 3181
2684char * 3182char *
2685gl_vendor () 3183gl_vendor ()
2686 CODE: 3184 CODE:
2687 RETVAL = (char *)glGetString (GL_VENDOR); 3185 RETVAL = (char *)glGetString (GL_VENDOR);
2718 3216
2719int glGetError () 3217int glGetError ()
2720 3218
2721void glFinish () 3219void glFinish ()
2722 3220
3221void glFlush ()
3222
2723void glClear (int mask) 3223void glClear (int mask)
2724 3224
2725void glClearColor (float r, float g, float b, float a = 1.0) 3225void glClearColor (float r, float g, float b, float a = 1.0)
2726 PROTOTYPE: @ 3226 PROTOTYPE: @
2727 3227
2736void glBlendFunc (int sfactor, int dfactor) 3236void glBlendFunc (int sfactor, int dfactor)
2737 3237
2738void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3238void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2739 CODE: 3239 CODE:
2740 gl_BlendFuncSeparate (sa, da, saa, daa); 3240 gl_BlendFuncSeparate (sa, da, saa, daa);
3241
3242# void glBlendEquation (int se)
2741 3243
2742void glDepthMask (int flag) 3244void glDepthMask (int flag)
2743 3245
2744void glLogicOp (int opcode) 3246void glLogicOp (int opcode)
2745 3247
2780void glRotate (float angle, float x, float y, float z) 3282void glRotate (float angle, float x, float y, float z)
2781 CODE: 3283 CODE:
2782 glRotatef (angle, x, y, z); 3284 glRotatef (angle, x, y, z);
2783 3285
2784void glColor (float r, float g, float b, float a = 1.0) 3286void glColor (float r, float g, float b, float a = 1.0)
3287 PROTOTYPE: @
2785 ALIAS: 3288 ALIAS:
2786 glColor_premultiply = 1 3289 glColor_premultiply = 1
2787 CODE: 3290 CODE:
2788 if (ix) 3291 if (ix)
2789 { 3292 {
2894void glNewList (int list, int mode = GL_COMPILE) 3397void glNewList (int list, int mode = GL_COMPILE)
2895 3398
2896void glEndList () 3399void glEndList ()
2897 3400
2898void glCallList (int list) 3401void glCallList (int list)
3402
3403void c_init ()
3404 CODE:
3405 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3406 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2899 3407
2900MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3408MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2901 3409
2902PROTOTYPES: DISABLE 3410PROTOTYPES: DISABLE
2903 3411

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines