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.245 by root, Fri Dec 28 15:05:20 2007 UTC vs.
Revision 1.306 by root, Thu Oct 14 00:02:39 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
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}
73 123
74static AV *texture_av; 124static AV *texture_av;
75 125
76static struct 126static struct
77{ 127{
171 221
172static void 222static void
173layout_update_font (DC__Layout self) 223layout_update_font (DC__Layout self)
174{ 224{
175 /* 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
176 * reasonably well with bitstream vera 226 * reasonably well with dejavu/bistream fonts
177 */ 227 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 228 PangoFontDescription *font = self->font ? self->font : default_font;
179 229
180 pango_font_description_set_absolute_size (font, 230 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 231 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
209 int w, h; 259 int w, h;
210 float s, t; 260 float s, t;
211 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
212 tileid smoothtile; 262 tileid smoothtile;
213 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
214} maptex; 265} maptex;
215 266
216typedef struct { 267typedef struct {
217 uint32_t player; 268 uint32_t player;
218 tileid tile[3]; 269 tileid tile[3];
350 self->oy = 0; 401 self->oy = 0;
351 self->row = 0; 402 self->row = 0;
352 self->rows = 0; 403 self->rows = 0;
353} 404}
354 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
355static void 416static void
356map_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)
357{ 418{
358 int x, y; 419 int x, y;
359 maprow *row; 420 maprow *row;
373 if (x >= row->c1) 434 if (x >= row->c1)
374 break; 435 break;
375 436
376 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
377 438
378 cell->darkness = 0; 439 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 440 }
383 } 441 }
384} 442}
385 443
386typedef struct { 444typedef struct {
421 ev.code = 1; 479 ev.code = 1;
422 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
423 ev.data2 = 0; 481 ev.data2 = 0;
424 482
425 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;
426} 490}
427 491
428static unsigned int 492static unsigned int
429minpot (unsigned int n) 493minpot (unsigned int n)
430{ 494{
497 if (!svp || !SvTRUE (*svp)) 561 if (!svp || !SvTRUE (*svp))
498 return 0; 562 return 0;
499 563
500 return 1; 564 return 1;
501} 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
502 618
503MODULE = Deliantra::Client PACKAGE = DC 619MODULE = Deliantra::Client PACKAGE = DC
504 620
505PROTOTYPES: ENABLE 621PROTOTYPES: ENABLE
506 622
535 const_iv (SDL_USEREVENT), 651 const_iv (SDL_USEREVENT),
536 652
537 const_iv (SDL_APPINPUTFOCUS), 653 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 654 const_iv (SDL_APPMOUSEFOCUS),
539 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),
540 706
541 const_iv (SDLK_FIRST), 707 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 708 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 709 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 710 const_iv (SDLK_KP1),
620 const_iv (KMOD_RMETA), 786 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 787 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 788 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 789 const_iv (KMOD_MODE),
624 790
791 const_iv (KMOD_LRAM),
792
625 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)
626# undef const_iv 823# undef const_iv
627 }; 824 };
628 825
629 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; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
652 849
653IV minpot (UV n) 850IV minpot (UV n)
654 851
655IV popcount (UV n) 852IV popcount (UV n)
656 853
854NV distance (NV dx, NV dy)
855 CODE:
856 RETVAL = pow (dx * dx + dy * dy, 0.5);
857 OUTPUT:
858 RETVAL
859
657void 860void
658pango_init () 861pango_init ()
659 CODE: 862 CODE:
660{ 863{
661 opengl_fontmap = pango_opengl_font_map_new (); 864 opengl_fontmap = pango_opengl_font_map_new ();
662 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);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 866 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
867 /*pango_context_set_font_description (opengl_context, default_font);*/
868#if PANGO_VERSION_CHECK (1, 15, 2)
869 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
870 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
871#endif
664} 872}
665 873
666char *
667SDL_GetError () 874char *SDL_GetError ()
668 875
669int 876void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 877
672void 878int SDL_Init (U32 flags)
879
880int SDL_InitSubSystem (U32 flags)
881
882void SDL_QuitSubSystem (U32 flags)
883
673SDL_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
674 894
675void 895void
676SDL_ListModes (int rgb, int alpha) 896SDL_ListModes (int rgb, int alpha)
677 PPCODE: 897 PPCODE:
678{ 898{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 910 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 911 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 912 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 913
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 914 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); 915 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 916
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 917 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 918
702 if (m && m != (SDL_Rect **)-1) 919 if (m && m != (SDL_Rect **)-1)
703 while (*m) 920 while (*m)
704 { 921 {
705 if ((*m)->w >= 800 && (*m)->h >= 480) 922 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 923 {
707 AV *av = newAV (); 924 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 925 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 926 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 927 av_push (av, newSViv (rgb));
738 955
739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
740#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);
741#include "glfunc.h" 958#include "glfunc.h"
742#undef GL_FUNC 959#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
743 } 963 }
744} 964}
745 OUTPUT: 965 OUTPUT:
746 RETVAL 966 RETVAL
747 967
751char * 971char *
752SDL_GetKeyName (int sym) 972SDL_GetKeyName (int sym)
753 973
754int 974int
755SDL_GetAppState () 975SDL_GetAppState ()
976
977int
978SDL_GetModState ()
756 979
757void 980void
758poll_events () 981poll_events ()
759 PPCODE: 982 PPCODE:
760{ 983{
770 { 993 {
771 case SDL_KEYDOWN: 994 case SDL_KEYDOWN:
772 case SDL_KEYUP: 995 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 996 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 997 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 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);
776 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 */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1000 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 1001 break;
779 1002
780 case SDL_ACTIVEEVENT: 1003 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1004 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 1022 x = ev.motion.x;
800 y = ev.motion.y; 1023 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1024 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 1025 }
803 1026
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1027 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1028 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1029 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1030 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1031 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1032 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1033 }
811 break; 1034 break;
812 1035
813 case SDL_MOUSEBUTTONDOWN: 1036 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1037 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1038 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1039
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1040 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1041 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1042 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1043 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
828 } 1051 }
829 1052
830 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))));
831 } 1054 }
832} 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
833 1069
834int 1070int
835Mix_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)
836 POSTCALL: 1072 POSTCALL:
837 Mix_HookMusicFinished (music_finished); 1073 Mix_HookMusicFinished (music_finished);
894 } 1130 }
895 } 1131 }
896#endif 1132#endif
897} 1133}
898 1134
899void 1135int
900add_font (char *file) 1136add_font (char *file)
901 CODE: 1137 CODE:
902 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)
903 1144
904void 1145void
905load_image_inline (SV *image_) 1146load_image_inline (SV *image_)
906 ALIAS: 1147 ALIAS:
907 load_image_file = 1 1148 load_image_file = 1
1023#if DEBUG 1264#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1265 VALGRIND_DO_LEAK_CHECK;
1025#endif 1266#endif
1026} 1267}
1027 1268
1269int
1270SvREFCNT (SV *sv)
1271 CODE:
1272 RETVAL = SvREFCNT (sv);
1273 OUTPUT:
1274 RETVAL
1275
1028MODULE = Deliantra::Client PACKAGE = DC::Font 1276MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1277
1030PROTOTYPES: DISABLE 1278PROTOTYPES: DISABLE
1031 1279
1032DC::Font 1280DC::Font
1165{ 1413{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1414 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1415
1168 do 1416 do
1169 { 1417 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1418 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1419
1172 if (run && shape_attr_p (run)) 1420 if (run && shape_attr_p (run))
1173 { 1421 {
1174 PangoRectangle extents; 1422 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1423 pango_layout_iter_get_run_extents (iter, 0, &extents);
1279int 1527int
1280descent (DC::Layout self) 1528descent (DC::Layout self)
1281 CODE: 1529 CODE:
1282{ 1530{
1283 PangoRectangle rect; 1531 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1532 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1533 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1534 RETVAL = PANGO_DESCENT (rect);
1287} 1535}
1288 OUTPUT: 1536 OUTPUT:
1289 RETVAL 1537 RETVAL
1301 1549
1302void 1550void
1303cursor_pos (DC::Layout self, int index) 1551cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1552 PPCODE:
1305{ 1553{
1306 PangoRectangle strong_pos; 1554 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1555 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1556
1309 EXTEND (SP, 3); 1557 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1558 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1559 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1560 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1561}
1314 1562
1315void 1563void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1564index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1565 PPCODE:
1318{ 1566{
1319 int line, x; 1567 int line, x;
1320 1568
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1569 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1322
1323#if !PANGO_VERSION_CHECK (1, 17. 3) 1570#if !PANGO_VERSION_CHECK (1, 17, 3)
1324 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1571 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1325 --line; 1572 --line;
1326#endif 1573#endif
1327
1328 EXTEND (SP, 2); 1574 EXTEND (SP, 2);
1329 PUSHs (sv_2mortal (newSViv (line))); 1575 PUSHs (sv_2mortal (newSViv (line)));
1330 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1576 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1331} 1577}
1332 1578
1338 int index, trailing; 1584 int index, trailing;
1339 1585
1340 if (line < 0) 1586 if (line < 0)
1341 XSRETURN_EMPTY; 1587 XSRETURN_EMPTY;
1342 1588
1343 if (!(lp = pango_layout_get_line (self->pl, line))) 1589 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1344 XSRETURN_EMPTY; /* do better */ 1590 XSRETURN_EMPTY; /* do better */
1345 1591
1346 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1592 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1347 1593
1348 EXTEND (SP, 2); 1594 EXTEND (SP, 2);
1463 if (ix) 1709 if (ix)
1464 { 1710 {
1465 glDisable (GL_ALPHA_TEST); 1711 glDisable (GL_ALPHA_TEST);
1466 glDisable (GL_BLEND); 1712 glDisable (GL_BLEND);
1467 } 1713 }
1714}
1715
1716void
1717draw_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)
1718 PROTOTYPE: @
1719 CODE:
1720{
1721 glEnable (GL_BLEND);
1722 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1723 glEnable (GL_TEXTURE_2D);
1724 glBindTexture (GL_TEXTURE_2D, name1);
1725
1726 glColor3f (intensity, intensity, intensity);
1727 glPushMatrix ();
1728 glScalef (1./3, 1./3, 1.);
1729
1730 if (blend > 0.f)
1731 {
1732 float dx3 = dx * -3.f / w;
1733 float dy3 = dy * -3.f / h;
1734 GLfloat env_color[4] = { 0., 0., 0., blend };
1735
1736 /* interpolate the two shadow textures */
1737 /* stage 0 == rgb(glcolor) + alpha(t0) */
1738 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1739
1740 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1741 gl.ActiveTexture (GL_TEXTURE1);
1742 glEnable (GL_TEXTURE_2D);
1743 glBindTexture (GL_TEXTURE_2D, name2);
1744 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1745
1746 /* rgb == rgb(glcolor) */
1747 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1748 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1749 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1750
1751 /* alpha = interpolate t0, t1 by env_alpha */
1752 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1753
1754 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1755 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1756 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1757
1758 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1759 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1760
1761 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1762 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1763
1764 glBegin (GL_QUADS);
1765 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1766 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1767 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1768 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1769 glEnd ();
1770
1771 glDisable (GL_TEXTURE_2D);
1772 gl.ActiveTexture (GL_TEXTURE0);
1773 }
1774 else
1775 {
1776 /* simple blending of one texture, also opengl <1.3 path */
1777 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1778
1779 glBegin (GL_QUADS);
1780 glTexCoord2f (0, 0); glVertex2f (0, 0);
1781 glTexCoord2f (0, t); glVertex2f (0, h);
1782 glTexCoord2f (s, t); glVertex2f (w, h);
1783 glTexCoord2f (s, 0); glVertex2f (w, 0);
1784 glEnd ();
1785 }
1786
1787 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1788 {
1789 int x, y;
1790 int dx3 = dx * 3;
1791 int dy3 = dy * 3;
1792
1793 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1794 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1795 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1796 glTranslatef (-1., -1., 0);
1797 glBegin (GL_QUADS);
1798
1799 for (y = 1; y < h; y += 3)
1800 {
1801 int y1 = y - dy3;
1802 int y1valid = y1 >= 0 && y1 < h;
1803
1804 for (x = 1; x < w; x += 3)
1805 {
1806 int x1 = x - dx3;
1807 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1808 uint8_t h2;
1809
1810 if (y1valid && x1 >= 0 && x1 < w)
1811 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1812 else
1813 h2 = 1; /* out of range == invisible */
1814
1815 if (h1 || h2)
1816 {
1817 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1818 glColor4f (1., 1., 1., alpha);
1819
1820 glTexCoord2f (0, 0.); glVertex2i (x , y );
1821 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1822 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1823 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1824 }
1825 }
1826 }
1827 }
1828
1829 glEnd ();
1830
1831 glPopMatrix ();
1832
1833 glDisable (GL_TEXTURE_2D);
1834 glDisable (GL_BLEND);
1468} 1835}
1469 1836
1470IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1837IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1471 CODE: 1838 CODE:
1472{ 1839{
1578 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1945 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1579 // use uglier nearest interpolation because linear suffers 1946 // use uglier nearest interpolation because linear suffers
1580 // from transparent color bleeding and ugly wrapping effects. 1947 // from transparent color bleeding and ugly wrapping effects.
1581 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1948 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1582} 1949}
1950
1951void
1952expire_textures (DC::Map self, int texid, int count)
1953 PPCODE:
1954 for (; texid < self->texs && count; ++texid, --count)
1955 {
1956 maptex *tex = self->tex + texid;
1957
1958 if (tex->name)
1959 {
1960 if (tex->unused)
1961 {
1962 tex->name = 0;
1963 tex->unused = 0;
1964 XPUSHs (sv_2mortal (newSViv (texid)));
1965 }
1966 else
1967 tex->unused = 1;
1968 }
1969 }
1583 1970
1584int 1971int
1585ox (DC::Map self) 1972ox (DC::Map self)
1586 ALIAS: 1973 ALIAS:
1587 oy = 1 1974 oy = 1
1665 uint8_t ext, cmd; 2052 uint8_t ext, cmd;
1666 2053
1667 do 2054 do
1668 { 2055 {
1669 ext = *data++; 2056 ext = *data++;
1670 cmd = ext & 0x3f; 2057 cmd = ext & 0x7f;
1671 2058
1672 if (cmd < 4) 2059 if (cmd < 4)
1673 cell->darkness = 255 - ext * 64 + 1; 2060 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1674 else if (cmd == 5) // health 2061 else if (cmd == 5) // health
1675 { 2062 {
1676 cell->stat_width = 1; 2063 cell->stat_width = 1;
1677 cell->stat_hp = *data++; 2064 cell->stat_hp = *data++;
1678 } 2065 }
1679 else if (cmd == 6) // monster width 2066 else if (cmd == 6) // monster width
1680 cell->stat_width = *data++ + 1; 2067 cell->stat_width = *data++ + 1;
1681 else if (cmd == 0x47) 2068 else if (cmd == 0x47)
1682 { 2069 {
1683 if (*data == 4) 2070 if (*data == 1) cell->player = data [1];
1684 ; // decode player count 2071 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2072 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2073 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1685 2074
1686 data += *data + 1; 2075 data += *data + 1;
1687 } 2076 }
1688 else if (cmd == 8) // cell flags 2077 else if (cmd == 8) // cell flags
1689 cell->flags = *data++; 2078 cell->flags = *data++;
1706 cell->tile [z] = self->face2tile [face]; 2095 cell->tile [z] = self->face2tile [face];
1707 2096
1708 if (cell->tile [z]) 2097 if (cell->tile [z])
1709 { 2098 {
1710 maptex *tex = self->tex + cell->tile [z]; 2099 maptex *tex = self->tex + cell->tile [z];
2100 tex->unused = 0;
1711 if (!tex->name) 2101 if (!tex->name)
1712 av_push (missing, newSViv (cell->tile [z])); 2102 av_push (missing, newSViv (cell->tile [z]));
1713 2103
1714 if (tex->smoothtile) 2104 if (tex->smoothtile)
1715 { 2105 {
1716 maptex *smooth = self->tex + tex->smoothtile; 2106 maptex *smooth = self->tex + tex->smoothtile;
2107 smooth->unused = 0;
1717 if (!smooth->name) 2108 if (!smooth->name)
1718 av_push (missing, newSViv (tex->smoothtile)); 2109 av_push (missing, newSViv (tex->smoothtile));
1719 } 2110 }
1720 } 2111 }
1721 } 2112 }
1722 } 2113 }
1723 else 2114 else
1724 cell->darkness = 0; 2115 CELL_CLEAR (cell);
1725 } 2116 }
1726} 2117}
1727 OUTPUT: 2118 OUTPUT:
1728 RETVAL 2119 RETVAL
1729 2120
1749 ? self->row + y 2140 ? self->row + y
1750 : 0; 2141 : 0;
1751 2142
1752 for (x = x0; x < x1; x++) 2143 for (x = x0; x < x1; x++)
1753 { 2144 {
1754 int r = 32, g = 32, b = 32, a = 192; 2145 unsigned int r = 32, g = 32, b = 32, a = 192;
1755 2146
1756 if (row && row->c0 <= x && x < row->c1) 2147 if (row && row->c0 <= x && x < row->c1)
1757 { 2148 {
1758 mapcell *cell = row->col + (x - row->c0); 2149 mapcell *cell = row->col + (x - row->c0);
1759 2150
1761 { 2152 {
1762 maptex tex = self->tex [cell->tile [z]]; 2153 maptex tex = self->tex [cell->tile [z]];
1763 int a0 = 255 - tex.a; 2154 int a0 = 255 - tex.a;
1764 int a1 = tex.a; 2155 int a1 = tex.a;
1765 2156
1766 r = (r * a0 + tex.r * a1) / 255; 2157 r = div255 (r * a0 + tex.r * a1);
1767 g = (g * a0 + tex.g * a1) / 255; 2158 g = div255 (g * a0 + tex.g * a1);
1768 b = (b * a0 + tex.b * a1) / 255; 2159 b = div255 (b * a0 + tex.b * a1);
1769 a = (a * a0 + tex.a * a1) / 255; 2160 a = div255 (a * a0 + tex.a * a1);
1770 } 2161 }
1771 } 2162 }
1772 2163
1773 *map++ = (r ) 2164 *map++ = (r )
1774 | (g << 8) 2165 | (g << 8)
1781} 2172}
1782 OUTPUT: 2173 OUTPUT:
1783 RETVAL 2174 RETVAL
1784 2175
1785void 2176void
1786draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2177draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1787 CODE: 2178 CODE:
1788{ 2179{
1789 int x, y, z; 2180 int x, y, z;
1790 2181
1791 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2182 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1792 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2183 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1793 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2184 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1794 smooth_key skey; 2185 smooth_key skey;
1795 2186 int pl_x, pl_y;
2187 maptex pl_tex;
1796 rc_t *rc = rc_alloc (); 2188 rc_t *rc = rc_alloc ();
2189 rc_t *rc_ov = rc_alloc ();
1797 rc_key_t key; 2190 rc_key_t key;
1798 rc_array_t *arr; 2191 rc_array_t *arr;
1799 2192
2193 pl_tex.name = 0;
2194
1800 // thats current max. sorry. 2195 // that's current max. sorry.
1801 if (sw > 255) sw = 255; 2196 if (sw > 255) sw = 255;
1802 if (sh > 255) sh = 255; 2197 if (sh > 255) sh = 255;
1803 2198
1804 // clear key, in case of extra padding 2199 // clear key, in case of extra padding
1805 memset (&skey, 0, sizeof (skey)); 2200 memset (&skey, 0, sizeof (skey));
1809 key.g = 255; 2204 key.g = 255;
1810 key.b = 255; 2205 key.b = 255;
1811 key.a = 255; 2206 key.a = 255;
1812 key.mode = GL_QUADS; 2207 key.mode = GL_QUADS;
1813 key.format = GL_T2F_V3F; 2208 key.format = GL_T2F_V3F;
1814 key.texname = -1;
1815 2209
1816 mx += self->x; 2210 mx += self->x;
1817 my += self->y; 2211 my += self->y;
1818 2212
1819 // first pass: determine smooth_max 2213 // first pass: determine smooth_max
1843 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2237 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1844 2238
1845 for (z = 0; z <= 2; z++) 2239 for (z = 0; z <= 2; z++)
1846 { 2240 {
1847 memset (smooth_level, 0, sizeof (smooth_level)); 2241 memset (smooth_level, 0, sizeof (smooth_level));
2242 key.texname = -1;
1848 2243
1849 for (y = 0; y < sh; y++) 2244 for (y = 0; y < sh; y++)
1850 if (0 <= y + my && y + my < self->rows) 2245 if (0 <= y + my && y + my < self->rows)
1851 { 2246 {
1852 maprow *row = self->row + (y + my); 2247 maprow *row = self->row + (y + my);
1862 maptex tex = self->tex [tile]; 2257 maptex tex = self->tex [tile];
1863 int px, py; 2258 int px, py;
1864 2259
1865 if (key.texname != tex.name) 2260 if (key.texname != tex.name)
1866 { 2261 {
2262 self->tex [tile].unused = 0;
2263
1867 if (!tex.name) 2264 if (!tex.name)
1868 tex = self->tex [2]; /* missing, replace by noface */ 2265 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1869 2266
1870 key.texname = tex.name; 2267 key.texname = tex.name;
1871 arr = rc_array (rc, &key); 2268 arr = rc_array (rc, &key);
1872 } 2269 }
1873 2270
1874 px = (x + 1) * T - tex.w; 2271 px = (x + 1) * Th - tex.w;
1875 py = (y + 1) * T - tex.h; 2272 py = (y + 1) * Tw - tex.h;
2273
2274 if (expect_false (cell->player == player) && expect_false (z == 2))
2275 {
2276 pl_x = px;
2277 pl_y = py;
2278 pl_tex = tex;
2279 continue;
2280 }
1876 2281
1877 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2282 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1878 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2283 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1879 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2284 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1880 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2285 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1881
1882 if (cell->flags && z == 2)
1883 {
1884 // overlays such as the speech bubble, probably more to come
1885 if (cell->flags & 1)
1886 {
1887 maptex tex = self->tex [1];
1888 int px = x * T + T * 2 / 32;
1889 int py = y * T - T * 6 / 32;
1890
1891 if (tex.name)
1892 {
1893 if (key.texname != tex.name)
1894 {
1895 key.texname = tex.name;
1896 arr = rc_array (rc, &key);
1897 }
1898
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1901 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1902 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1903 }
1904 }
1905 }
1906 2286
1907 // update smooth hash 2287 // update smooth hash
1908 if (tex.smoothtile) 2288 if (tex.smoothtile)
1909 { 2289 {
1910 skey.tile = tex.smoothtile; 2290 skey.tile = tex.smoothtile;
1939 // corners 2319 // corners
1940 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2320 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1941 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2321 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1942 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2322 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1943 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2323 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2324 }
2325 }
2326
2327 if (expect_false (z == 2) && expect_false (cell->flags))
2328 {
2329 // overlays such as the speech bubble, probably more to come
2330 if (cell->flags & 1)
2331 {
2332 rc_key_t key_ov = key;
2333 maptex tex = self->tex [TEXID_SPEECH];
2334 rc_array_t *arr;
2335 int px = x * Tw + Tw * 2 / 32;
2336 int py = y * Th - Th * 6 / 32;
2337
2338 key_ov.texname = tex.name;
2339 arr = rc_array (rc_ov, &key_ov);
2340
2341 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2342 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2343 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2344 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1944 } 2345 }
1945 } 2346 }
1946 } 2347 }
1947 } 2348 }
1948 2349
1975 if (!(bits & 0x1000) 2376 if (!(bits & 0x1000)
1976 && skey->level == level 2377 && skey->level == level
1977 && level > smooth_max [skey->x][skey->y]) 2378 && level > smooth_max [skey->x][skey->y])
1978 { 2379 {
1979 maptex tex = self->tex [skey->tile]; 2380 maptex tex = self->tex [skey->tile];
1980 int px = (((int)skey->x) - 1) * T; 2381 int px = (((int)skey->x) - 1) * Tw;
1981 int py = (((int)skey->y) - 1) * T; 2382 int py = (((int)skey->y) - 1) * Th;
1982 int border = bits & 15; 2383 int border = bits & 15;
1983 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2384 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1984 float dx = tex.s * .0625f; // 16 images/row 2385 float dx = tex.s * .0625f; // 16 images/row
1985 float dy = tex.t * .5f ; // 2 images/column 2386 float dy = tex.t * .5f ; // 2 images/column
1986 2387
1988 { 2389 {
1989 // this time avoiding texture state changes 2390 // this time avoiding texture state changes
1990 // save gobs of state changes. 2391 // save gobs of state changes.
1991 if (key.texname != tex.name) 2392 if (key.texname != tex.name)
1992 { 2393 {
2394 self->tex [skey->tile].unused = 0;
2395
1993 glEnd (); 2396 glEnd ();
1994 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2397 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1995 glBegin (GL_QUADS); 2398 glBegin (GL_QUADS);
1996 } 2399 }
1997 2400
1998 if (border) 2401 if (border)
1999 { 2402 {
2000 float ox = border * dx; 2403 float ox = border * dx;
2001 2404
2002 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2405 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2003 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2406 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2004 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2407 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2005 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2408 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2006 } 2409 }
2007 2410
2008 if (corner) 2411 if (corner)
2009 { 2412 {
2010 float ox = corner * dx; 2413 float ox = corner * dx;
2011 2414
2012 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2013 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2014 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2015 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2016 } 2419 }
2017 } 2420 }
2018 } 2421 }
2019 } 2422 }
2020 } 2423 }
2026 } 2429 }
2027 2430
2028 hv_clear (smooth); 2431 hv_clear (smooth);
2029 } 2432 }
2030 2433
2434 if (pl_tex.name)
2435 {
2436 maptex tex = pl_tex;
2437 int px = pl_x + sdx;
2438 int py = pl_y + sdy;
2439
2440 key.texname = tex.name;
2441 arr = rc_array (rc, &key);
2442
2443 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2444 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2445 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2446 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2447
2448 rc_draw (rc);
2449 }
2450
2451 rc_draw (rc_ov);
2452 rc_clear (rc_ov);
2453
2031 glDisable (GL_BLEND); 2454 glDisable (GL_BLEND);
2032 rc_free (rc); 2455 rc_free (rc);
2456 rc_free (rc_ov);
2033 2457
2034 // top layer: overlays such as the health bar 2458 // top layer: overlays such as the health bar
2035 for (y = 0; y < sh; y++) 2459 for (y = 0; y < sh; y++)
2036 if (0 <= y + my && y + my < self->rows) 2460 if (0 <= y + my && y + my < self->rows)
2037 { 2461 {
2040 for (x = 0; x < sw; x++) 2464 for (x = 0; x < sw; x++)
2041 if (row->c0 <= x + mx && x + mx < row->c1) 2465 if (row->c0 <= x + mx && x + mx < row->c1)
2042 { 2466 {
2043 mapcell *cell = row->col + (x + mx - row->c0); 2467 mapcell *cell = row->col + (x + mx - row->c0);
2044 2468
2045 int px = x * T; 2469 int px = x * Tw;
2046 int py = y * T; 2470 int py = y * Th;
2471
2472 if (expect_false (cell->player == player))
2473 {
2474 px += sdx;
2475 py += sdy;
2476 }
2047 2477
2048 if (cell->stat_hp) 2478 if (cell->stat_hp)
2049 { 2479 {
2050 int width = cell->stat_width * T; 2480 int width = cell->stat_width * Tw;
2051 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2481 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2052 2482
2053 glColor3ub (0, 0, 0); 2483 glColor3ub (0, 0, 0);
2054 glRectf (px + 1, py - thick - 2, 2484 glRectf (px + 1, py - thick - 2,
2055 px + width - 1, py); 2485 px + width - 1, py);
2056 2486
2062 } 2492 }
2063 } 2493 }
2064} 2494}
2065 2495
2066void 2496void
2067draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2497draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2068 CODE: 2498 CODE:
2069{ 2499{
2070 static float color[16][3] = { 2500 static float color[16][3] = {
2071 { 0.00F, 0.00F, 0.00F }, 2501 { 0.00f, 0.00f, 0.00f },
2072 { 1.00F, 1.00F, 1.00F }, 2502 { 1.00f, 1.00f, 1.00f },
2073 { 0.00F, 0.00F, 0.55F }, 2503 { 0.00f, 0.00f, 0.55f },
2074 { 1.00F, 0.00F, 0.00F }, 2504 { 1.00f, 0.00f, 0.00f },
2075 2505
2076 { 1.00F, 0.54F, 0.00F }, 2506 { 1.00f, 0.54f, 0.00f },
2077 { 0.11F, 0.56F, 1.00F }, 2507 { 0.11f, 0.56f, 1.00f },
2078 { 0.93F, 0.46F, 0.00F }, 2508 { 0.93f, 0.46f, 0.00f },
2079 { 0.18F, 0.54F, 0.34F }, 2509 { 0.18f, 0.54f, 0.34f },
2080 2510
2081 { 0.56F, 0.73F, 0.56F }, 2511 { 0.56f, 0.73f, 0.56f },
2082 { 0.80F, 0.80F, 0.80F }, 2512 { 0.80f, 0.80f, 0.80f },
2083 { 0.55F, 0.41F, 0.13F }, 2513 { 0.55f, 0.41f, 0.13f },
2084 { 0.99F, 0.77F, 0.26F }, 2514 { 0.99f, 0.77f, 0.26f },
2085 2515
2086 { 0.74F, 0.65F, 0.41F }, 2516 { 0.74f, 0.65f, 0.41f },
2087 2517
2088 { 0.00F, 1.00F, 1.00F }, 2518 { 0.00f, 1.00f, 1.00f },
2089 { 1.00F, 0.00F, 1.00F }, 2519 { 1.00f, 0.00f, 1.00f },
2090 { 1.00F, 1.00F, 0.00F }, 2520 { 1.00f, 1.00f, 0.00f },
2091 }; 2521 };
2092 2522
2093 int x, y; 2523 int x, y;
2094 2524
2095 glEnable (GL_TEXTURE_2D); 2525 glEnable (GL_TEXTURE_2D);
2526 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2527 * but the nvidia driver (185.18.14) mishandles alpha textures
2528 * and takes the colour from god knows where instead of using
2529 * Cp. MODULATE results in the same colour, but slightly different
2530 * alpha, but atcually gives us the correct colour with nvidia.
2531 */
2096 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2532 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2097 glEnable (GL_BLEND); 2533 glEnable (GL_BLEND);
2098 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2534 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2099 glBegin (GL_QUADS); 2535 glBegin (GL_QUADS);
2100 2536
2101 for (y = 0; y < h; y++) 2537 for (y = 0; y < h; y++)
2105 2541
2106 if (m) 2542 if (m)
2107 { 2543 {
2108 float *c = color [m & 15]; 2544 float *c = color [m & 15];
2109 2545
2110 float tx1 = m & 0x40 ? 0.5 : 0.; 2546 float tx1 = m & 0x40 ? 0.5f : 0.f;
2111 float tx2 = tx1 + 0.5; 2547 float tx2 = tx1 + 0.5f;
2112 2548
2113 glColor4f (c[0], c[1], c[2], 0.75); 2549 glColor4f (c[0], c[1], c[2], 1);
2114 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2550 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2115 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2551 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2116 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2552 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2117 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2553 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2118 } 2554 }
2126void 2562void
2127fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2563fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2128 PPCODE: 2564 PPCODE:
2129{ 2565{
2130 int x, y; 2566 int x, y;
2131 int sw1 = sw + 2; 2567 int sw1 = sw + 2;
2132 int sh1 = sh + 2; 2568 int sh1 = sh + 2;
2133 int sh3 = sh * 3; 2569 int sh3 = sh * 3;
2134 int sw34 = (sw * 3 + 3) & ~3; 2570 int sw3 = sw * 3;
2135 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2571 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2136 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2572 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2137 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2573 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2138 2574
2139 SvPOK_only (darkness3_sv); 2575 SvPOK_only (darkness3_sv);
2140 SvCUR_set (darkness3_sv, sw34 * sh3); 2576 SvCUR_set (darkness3_sv, sw3 * sh3);
2141 2577
2142 mx += self->x - 1; 2578 mx += self->x - 1;
2143 my += self->y - 1; 2579 my += self->y - 1;
2144
2145 memset (darkness1, 255, sw1 * sh1);
2146 2580
2147 for (y = 0; y < sh1; y++) 2581 for (y = 0; y < sh1; y++)
2148 if (0 <= y + my && y + my < self->rows) 2582 if (0 <= y + my && y + my < self->rows)
2149 { 2583 {
2150 maprow *row = self->row + (y + my); 2584 maprow *row = self->row + (y + my);
2153 if (row->c0 <= x + mx && x + mx < row->c1) 2587 if (row->c0 <= x + mx && x + mx < row->c1)
2154 { 2588 {
2155 mapcell *cell = row->col + (x + mx - row->c0); 2589 mapcell *cell = row->col + (x + mx - row->c0);
2156 2590
2157 darkness1 [y * sw1 + x] = cell->darkness 2591 darkness1 [y * sw1 + x] = cell->darkness
2158 ? 255 - (cell->darkness - 1) 2592 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2159 : 255 - FOW_DARKNESS; 2593 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2160 } 2594 }
2161 } 2595 }
2162 2596
2163 for (y = 0; y < sh; ++y) 2597 for (y = 0; y < sh; ++y)
2164 for (x = 0; x < sw; ++x) 2598 for (x = 0; x < sw; ++x)
2183 2617
2184 uint8_t r13 = (d13 + d23 + d12) / 3; 2618 uint8_t r13 = (d13 + d23 + d12) / 3;
2185 uint8_t r23 = d23; 2619 uint8_t r23 = d23;
2186 uint8_t r33 = (d23 + d33 + d32) / 3; 2620 uint8_t r33 = (d23 + d33 + d32) / 3;
2187 2621
2188 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2622 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2189 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2623 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2190 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2624 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2191 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2625 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2192 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2626 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2193 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2627 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2194 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2628 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2195 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2629 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2196 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2630 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2197 } 2631 }
2198 2632
2199 free (darkness1); 2633 free (darkness1);
2200 2634
2201 EXTEND (SP, 3); 2635 EXTEND (SP, 3);
2202 PUSHs (sv_2mortal (newSViv (sw34))); 2636 PUSHs (sv_2mortal (newSViv (sw3)));
2203 PUSHs (sv_2mortal (newSViv (sh3))); 2637 PUSHs (sv_2mortal (newSViv (sh3)));
2204 PUSHs (darkness3_sv); 2638 PUSHs (darkness3_sv);
2205} 2639}
2206 2640
2207SV * 2641SV *
2270 else 2704 else
2271 *data++ = 0; 2705 *data++ = 0;
2272 } 2706 }
2273 } 2707 }
2274 2708
2709 /* if size is w*h + 5 then no data has been found */
2710 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2711 {
2275 SvPOK_only (data_sv); 2712 SvPOK_only (data_sv);
2276 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2713 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2714 }
2715
2277 RETVAL = data_sv; 2716 RETVAL = data_sv;
2278} 2717}
2279 OUTPUT: 2718 OUTPUT:
2280 RETVAL 2719 RETVAL
2281 2720
2282void 2721void
2283set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2722set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2284 PPCODE: 2723 PPCODE:
2285{ 2724{
2286 int x, y, z; 2725 int x, y, z;
2287 int w, h; 2726 int w, h;
2288 int x1, y1; 2727 int x1, y1;
2728 STRLEN len;
2729 uint8_t *data, *end;
2730
2731 len = SvLEN (data_sv);
2732 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2733 data = SvPVbyte_nolen (data_sv);
2734 end = data + len + 8;
2735
2736 if (len < 5)
2737 XSRETURN_EMPTY;
2289 2738
2290 if (*data++ != 0) 2739 if (*data++ != 0)
2291 XSRETURN_EMPTY; /* version mismatch */ 2740 XSRETURN_EMPTY; /* version mismatch */
2292 2741
2293 w = *data++ << 8; w |= *data++; 2742 w = *data++ << 8; w |= *data++;
2308 { 2757 {
2309 maprow *row = map_get_row (self, y); 2758 maprow *row = map_get_row (self, y);
2310 2759
2311 for (x = x0; x < x1; x++) 2760 for (x = x0; x < x1; x++)
2312 { 2761 {
2762 uint8_t flags;
2763
2764 if (data + 7 >= end)
2765 XSRETURN_EMPTY;
2766
2313 uint8_t flags = *data++; 2767 flags = *data++;
2314 2768
2315 if (flags) 2769 if (flags)
2316 { 2770 {
2317 mapcell *cell = row_get_cell (row, x); 2771 mapcell *cell = row_get_cell (row, x);
2318 tileid tile[3] = { 0, 0, 0 }; 2772 tileid tile[3] = { 0, 0, 0 };
2321 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2775 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2322 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2776 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2323 2777
2324 if (cell->darkness == 0) 2778 if (cell->darkness == 0)
2325 { 2779 {
2326 cell->darkness = 0; 2780 /*cell->darkness = 0;*/
2781 EXTEND (SP, 3);
2327 2782
2328 for (z = 0; z <= 2; z++) 2783 for (z = 0; z <= 2; z++)
2329 { 2784 {
2330 tileid t = tile [z]; 2785 tileid t = tile [z];
2331 2786
2332 if (t >= self->texs || (t && !self->tex [t].name)) 2787 if (t >= self->texs || (t && !self->tex [t].name))
2333 { 2788 {
2334 XPUSHs (sv_2mortal (newSViv (t))); 2789 PUSHs (sv_2mortal (newSViv (t)));
2335 need_texid (self, t); 2790 need_texid (self, t);
2336 } 2791 }
2337 2792
2338 cell->tile [z] = t; 2793 cell->tile [z] = t;
2339 } 2794 }
2384 if (RETVAL < 0) 2839 if (RETVAL < 0)
2385 { 2840 {
2386 RETVAL = Mix_GroupOldest (-1); 2841 RETVAL = Mix_GroupOldest (-1);
2387 2842
2388 if (RETVAL < 0) 2843 if (RETVAL < 0)
2844 {
2845 // happens sometimes, maybe it just stopped playing(?)
2846 RETVAL = Mix_GroupAvailable (-1);
2847
2848 if (RETVAL < 0)
2389 XSRETURN_UNDEF; 2849 XSRETURN_UNDEF;
2390 2850 }
2851 else
2391 Mix_HaltChannel (RETVAL); 2852 Mix_HaltChannel (RETVAL);
2392 } 2853 }
2393 2854
2394 Mix_UnregisterAllEffects (RETVAL); 2855 Mix_UnregisterAllEffects (RETVAL);
2395 Mix_Volume (RETVAL, 128); 2856 Mix_Volume (RETVAL, 128);
2396} 2857}
2443void 2904void
2444set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2905set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2445 CODE: 2906 CODE:
2446{ 2907{
2447 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2908 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2448 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2909 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2449 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2910 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2450} 2911}
2451 2912
2452void 2913void
2453set_reverse_stereo (DC::Channel self, int flip) 2914set_reverse_stereo (DC::Channel self, int flip)
2455 Mix_SetReverseStereo (self, flip); 2916 Mix_SetReverseStereo (self, flip);
2456 2917
2457MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2918MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2458 2919
2459PROTOTYPES: DISABLE 2920PROTOTYPES: DISABLE
2921
2922void
2923decoders ()
2924 PPCODE:
2925#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2926 int i, num = Mix_GetNumChunkDecoders ();
2927 EXTEND (SP, num);
2928 for (i = 0; i < num; ++i)
2929 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2930#else
2931 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2932#endif
2460 2933
2461DC::MixChunk 2934DC::MixChunk
2462new (SV *class, DC::RW rwops) 2935new (SV *class, DC::RW rwops)
2463 CODE: 2936 CODE:
2464 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2937 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2497 OUTPUT: 2970 OUTPUT:
2498 RETVAL 2971 RETVAL
2499 2972
2500MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2973MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2501 2974
2975void
2976decoders ()
2977 PPCODE:
2978#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2979 int i, num = Mix_GetNumMusicDecoders ();
2980 EXTEND (SP, num);
2981 for (i = 0; i < num; ++i)
2982 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2983#else
2984 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2985#endif
2986
2502int 2987int
2503volume (int volume = -1) 2988volume (int volume = -1)
2504 PROTOTYPE: ;$ 2989 PROTOTYPE: ;$
2505 CODE: 2990 CODE:
2506 if (items > 0) 2991 if (items > 0)
2516 3001
2517void 3002void
2518halt () 3003halt ()
2519 CODE: 3004 CODE:
2520 Mix_HaltMusic (); 3005 Mix_HaltMusic ();
3006
3007int
3008playing ()
3009 CODE:
3010 RETVAL = Mix_PlayingMusic ();
3011 OUTPUT:
3012 RETVAL
2521 3013
2522DC::MixMusic 3014DC::MixMusic
2523new (SV *class, DC::RW rwops) 3015new (SV *class, DC::RW rwops)
2524 CODE: 3016 CODE:
2525 RETVAL = Mix_LoadMUS_RW (rwops); 3017 RETVAL = Mix_LoadMUS_RW (rwops);
2556 } *civ, const_iv[] = { 3048 } *civ, const_iv[] = {
2557# define const_iv(name) { # name, (IV)name } 3049# define const_iv(name) { # name, (IV)name }
2558 const_iv (GL_VENDOR), 3050 const_iv (GL_VENDOR),
2559 const_iv (GL_VERSION), 3051 const_iv (GL_VERSION),
2560 const_iv (GL_EXTENSIONS), 3052 const_iv (GL_EXTENSIONS),
3053 const_iv (GL_MAX_TEXTURE_UNITS),
2561 const_iv (GL_COLOR_MATERIAL), 3054 const_iv (GL_COLOR_MATERIAL),
2562 const_iv (GL_SMOOTH), 3055 const_iv (GL_SMOOTH),
2563 const_iv (GL_FLAT), 3056 const_iv (GL_FLAT),
2564 const_iv (GL_DITHER), 3057 const_iv (GL_DITHER),
2565 const_iv (GL_BLEND), 3058 const_iv (GL_BLEND),
2577 const_iv (GL_ZERO), 3070 const_iv (GL_ZERO),
2578 const_iv (GL_SRC_ALPHA), 3071 const_iv (GL_SRC_ALPHA),
2579 const_iv (GL_DST_ALPHA), 3072 const_iv (GL_DST_ALPHA),
2580 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3073 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2581 const_iv (GL_ONE_MINUS_DST_ALPHA), 3074 const_iv (GL_ONE_MINUS_DST_ALPHA),
3075 const_iv (GL_SRC_COLOR),
3076 const_iv (GL_DST_COLOR),
3077 const_iv (GL_ONE_MINUS_SRC_COLOR),
3078 const_iv (GL_ONE_MINUS_DST_COLOR),
2582 const_iv (GL_SRC_ALPHA_SATURATE), 3079 const_iv (GL_SRC_ALPHA_SATURATE),
2583 const_iv (GL_RGB), 3080 const_iv (GL_RGB),
2584 const_iv (GL_RGBA), 3081 const_iv (GL_RGBA),
2585 const_iv (GL_RGBA4), 3082 const_iv (GL_RGBA4),
2586 const_iv (GL_RGBA8), 3083 const_iv (GL_RGBA8),
2654 const_iv (GL_NICEST), 3151 const_iv (GL_NICEST),
2655 const_iv (GL_V2F), 3152 const_iv (GL_V2F),
2656 const_iv (GL_V3F), 3153 const_iv (GL_V3F),
2657 const_iv (GL_T2F_V3F), 3154 const_iv (GL_T2F_V3F),
2658 const_iv (GL_T2F_N3F_V3F), 3155 const_iv (GL_T2F_N3F_V3F),
3156 const_iv (GL_FUNC_ADD),
3157 const_iv (GL_FUNC_SUBTRACT),
3158 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2659# undef const_iv 3159# undef const_iv
2660 }; 3160 };
2661 3161
2662 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3162 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2663 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3163 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2670disable_GL_EXT_blend_func_separate () 3170disable_GL_EXT_blend_func_separate ()
2671 CODE: 3171 CODE:
2672 gl.BlendFuncSeparate = 0; 3172 gl.BlendFuncSeparate = 0;
2673 gl.BlendFuncSeparateEXT = 0; 3173 gl.BlendFuncSeparateEXT = 0;
2674 3174
3175void
3176apple_nvidia_bug (int enable)
3177
2675char * 3178char *
2676gl_vendor () 3179gl_vendor ()
2677 CODE: 3180 CODE:
2678 RETVAL = (char *)glGetString (GL_VENDOR); 3181 RETVAL = (char *)glGetString (GL_VENDOR);
2679 OUTPUT: 3182 OUTPUT:
2709 3212
2710int glGetError () 3213int glGetError ()
2711 3214
2712void glFinish () 3215void glFinish ()
2713 3216
3217void glFlush ()
3218
2714void glClear (int mask) 3219void glClear (int mask)
2715 3220
2716void glClearColor (float r, float g, float b, float a = 1.0) 3221void glClearColor (float r, float g, float b, float a = 1.0)
2717 PROTOTYPE: @ 3222 PROTOTYPE: @
2718 3223
2727void glBlendFunc (int sfactor, int dfactor) 3232void glBlendFunc (int sfactor, int dfactor)
2728 3233
2729void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3234void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2730 CODE: 3235 CODE:
2731 gl_BlendFuncSeparate (sa, da, saa, daa); 3236 gl_BlendFuncSeparate (sa, da, saa, daa);
3237
3238# void glBlendEquation (int se)
2732 3239
2733void glDepthMask (int flag) 3240void glDepthMask (int flag)
2734 3241
2735void glLogicOp (int opcode) 3242void glLogicOp (int opcode)
2736 3243
2771void glRotate (float angle, float x, float y, float z) 3278void glRotate (float angle, float x, float y, float z)
2772 CODE: 3279 CODE:
2773 glRotatef (angle, x, y, z); 3280 glRotatef (angle, x, y, z);
2774 3281
2775void glColor (float r, float g, float b, float a = 1.0) 3282void glColor (float r, float g, float b, float a = 1.0)
3283 PROTOTYPE: @
2776 ALIAS: 3284 ALIAS:
2777 glColor_premultiply = 1 3285 glColor_premultiply = 1
2778 CODE: 3286 CODE:
2779 if (ix) 3287 if (ix)
2780 { 3288 {
2885void glNewList (int list, int mode = GL_COMPILE) 3393void glNewList (int list, int mode = GL_COMPILE)
2886 3394
2887void glEndList () 3395void glEndList ()
2888 3396
2889void glCallList (int list) 3397void glCallList (int list)
3398
3399void c_init ()
3400 CODE:
3401 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3402 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2890 3403
2891MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3404MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2892 3405
2893PROTOTYPES: DISABLE 3406PROTOTYPES: DISABLE
2894 3407

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines