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.246 by root, Fri Dec 28 15:06:02 2007 UTC vs.
Revision 1.314 by root, Wed Jan 18 15:31:51 2012 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 (SV *real_main)
583{
584 dSP;
585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
588}
589
590#ifdef __MACOSX__
591 static SV *real_main;
592
593 /* to due surprising braindamage on the side of SDL design, we
594 * do some mind-boggling hack here: SDL requires a custom main()
595 * on OS X, so... we provide one and call the original main(), which,
596 * due to shared library magic, calls -lSDLmain's main, not perl's main,
597 * and which calls our main (== SDL_main) back.
598 */
599 extern C_LINKAGE int
600 main (int argc, char *argv[])
601 {
602 deliantra_main (real_main);
603 }
604
605 #undef main
606
607 extern C_LINKAGE int main (int argc, char *argv[]);
608
609 static void
610 SDL_main_hack (SV *real_main_)
611 {
612 real_main = real_main;
613
614 char *argv[] = { "deliantra client", 0 };
615 (main) (1, argv);
616 }
617#else
618 static void
619 SDL_main_hack (SV *real_main)
620 {
621 deliantra_main (real_main);
622 }
623#endif
502 624
503MODULE = Deliantra::Client PACKAGE = DC 625MODULE = Deliantra::Client PACKAGE = DC
504 626
505PROTOTYPES: ENABLE 627PROTOTYPES: ENABLE
506 628
535 const_iv (SDL_USEREVENT), 657 const_iv (SDL_USEREVENT),
536 658
537 const_iv (SDL_APPINPUTFOCUS), 659 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 660 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 661 const_iv (SDL_APPACTIVE),
662
663
664 const_iv (SDLK_UNKNOWN),
665 const_iv (SDLK_FIRST),
666 const_iv (SDLK_BACKSPACE),
667 const_iv (SDLK_TAB),
668 const_iv (SDLK_CLEAR),
669 const_iv (SDLK_RETURN),
670 const_iv (SDLK_PAUSE),
671 const_iv (SDLK_ESCAPE),
672 const_iv (SDLK_SPACE),
673 const_iv (SDLK_EXCLAIM),
674 const_iv (SDLK_QUOTEDBL),
675 const_iv (SDLK_HASH),
676 const_iv (SDLK_DOLLAR),
677 const_iv (SDLK_AMPERSAND),
678 const_iv (SDLK_QUOTE),
679 const_iv (SDLK_LEFTPAREN),
680 const_iv (SDLK_RIGHTPAREN),
681 const_iv (SDLK_ASTERISK),
682 const_iv (SDLK_PLUS),
683 const_iv (SDLK_COMMA),
684 const_iv (SDLK_MINUS),
685 const_iv (SDLK_PERIOD),
686 const_iv (SDLK_SLASH),
687 const_iv (SDLK_0),
688 const_iv (SDLK_1),
689 const_iv (SDLK_2),
690 const_iv (SDLK_3),
691 const_iv (SDLK_4),
692 const_iv (SDLK_5),
693 const_iv (SDLK_6),
694 const_iv (SDLK_7),
695 const_iv (SDLK_8),
696 const_iv (SDLK_9),
697 const_iv (SDLK_COLON),
698 const_iv (SDLK_SEMICOLON),
699 const_iv (SDLK_LESS),
700 const_iv (SDLK_EQUALS),
701 const_iv (SDLK_GREATER),
702 const_iv (SDLK_QUESTION),
703 const_iv (SDLK_AT),
704
705 const_iv (SDLK_LEFTBRACKET),
706 const_iv (SDLK_BACKSLASH),
707 const_iv (SDLK_RIGHTBRACKET),
708 const_iv (SDLK_CARET),
709 const_iv (SDLK_UNDERSCORE),
710 const_iv (SDLK_BACKQUOTE),
711 const_iv (SDLK_DELETE),
540 712
541 const_iv (SDLK_FIRST), 713 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 714 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 715 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 716 const_iv (SDLK_KP1),
620 const_iv (KMOD_RMETA), 792 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 793 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 794 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 795 const_iv (KMOD_MODE),
624 796
797 const_iv (KMOD_LRAM),
798
625 const_iv (MIX_DEFAULT_FORMAT), 799 const_iv (MIX_DEFAULT_FORMAT),
800
801 const_iv (SDL_INIT_TIMER),
802 const_iv (SDL_INIT_AUDIO),
803 const_iv (SDL_INIT_VIDEO),
804 const_iv (SDL_INIT_CDROM),
805 const_iv (SDL_INIT_JOYSTICK),
806 const_iv (SDL_INIT_EVERYTHING),
807 const_iv (SDL_INIT_NOPARACHUTE),
808 const_iv (SDL_INIT_EVENTTHREAD),
809
810 const_iv (SDL_GL_RED_SIZE),
811 const_iv (SDL_GL_GREEN_SIZE),
812 const_iv (SDL_GL_BLUE_SIZE),
813 const_iv (SDL_GL_ALPHA_SIZE),
814 const_iv (SDL_GL_DOUBLEBUFFER),
815 const_iv (SDL_GL_BUFFER_SIZE),
816 const_iv (SDL_GL_DEPTH_SIZE),
817 const_iv (SDL_GL_STENCIL_SIZE),
818 const_iv (SDL_GL_ACCUM_RED_SIZE),
819 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
820 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
821 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
822 const_iv (SDL_GL_STEREO),
823 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
824 const_iv (SDL_GL_MULTISAMPLESAMPLES),
825 const_iv (SDL_GL_ACCELERATED_VISUAL),
826 const_iv (SDL_GL_SWAP_CONTROL),
827
828 const_iv (FOW_DARKNESS)
626# undef const_iv 829# undef const_iv
627 }; 830 };
628 831
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 832 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
631 834
632 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
633 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
634} 837}
635 838
652 855
653IV minpot (UV n) 856IV minpot (UV n)
654 857
655IV popcount (UV n) 858IV popcount (UV n)
656 859
860NV distance (NV dx, NV dy)
861 CODE:
862 RETVAL = pow (dx * dx + dy * dy, 0.5);
863 OUTPUT:
864 RETVAL
865
657void 866void
658pango_init () 867pango_init ()
659 CODE: 868 CODE:
660{ 869{
661 opengl_fontmap = pango_opengl_font_map_new (); 870 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 871 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); 872 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
873 /*pango_context_set_font_description (opengl_context, default_font);*/
874#if PANGO_VERSION_CHECK (1, 15, 2)
875 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
876 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
877#endif
664} 878}
665 879
666char *
667SDL_GetError () 880char *SDL_GetError ()
668 881
669int 882void SDL_main_hack (SV *real_main)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 883 PROTOTYPE: &
671 884
672void 885int SDL_Init (U32 flags)
886
887int SDL_InitSubSystem (U32 flags)
888
889void SDL_QuitSubSystem (U32 flags)
890
673SDL_Quit () 891void SDL_Quit ()
892
893int SDL_GL_SetAttribute (int attr, int value)
894
895int SDL_GL_GetAttribute (int attr)
896 CODE:
897 if (SDL_GL_GetAttribute (attr, &RETVAL))
898 XSRETURN_UNDEF;
899 OUTPUT:
900 RETVAL
674 901
675void 902void
676SDL_ListModes (int rgb, int alpha) 903SDL_ListModes (int rgb, int alpha)
677 PPCODE: 904 PPCODE:
678{ 905{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 917 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 918 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 919 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 920
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 921 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); 922 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 923
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 924 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 925
702 if (m && m != (SDL_Rect **)-1) 926 if (m && m != (SDL_Rect **)-1)
703 while (*m) 927 while (*m)
704 { 928 {
705 if ((*m)->w >= 800 && (*m)->h >= 480) 929 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 930 {
707 AV *av = newAV (); 931 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 932 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 933 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 934 av_push (av, newSViv (rgb));
733 ); 957 );
734 958
735 if (RETVAL) 959 if (RETVAL)
736 { 960 {
737 av_clear (texture_av); 961 av_clear (texture_av);
738
739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 962#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
741#include "glfunc.h" 963#include "glfunc.h"
742#undef GL_FUNC 964#undef GL_FUNC
965 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
966 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
743 } 967 }
744} 968}
745 OUTPUT: 969 OUTPUT:
746 RETVAL 970 RETVAL
747 971
748void 972void
973SDL_WM_SetCaption (const char *title, const char *icon)
974
975void
749SDL_GL_SwapBuffers () 976SDL_GL_SwapBuffers ()
750 977
751char * 978char *
752SDL_GetKeyName (int sym) 979SDL_GetKeyName (int sym)
753 980
754int 981int
755SDL_GetAppState () 982SDL_GetAppState ()
756 983
984int
985SDL_GetModState ()
986
987int
988SDL_WaitEvent ()
989 C_ARGS: 0
990
757void 991void
992SDL_PumpEvents ()
993
994void
758poll_events () 995peep_events ()
759 PPCODE: 996 PPCODE:
760{ 997{
761 SDL_Event ev; 998 SDL_Event ev;
762 999
763 SDL_PumpEvents (); 1000 SDL_PumpEvents ();
770 { 1007 {
771 case SDL_KEYDOWN: 1008 case SDL_KEYDOWN:
772 case SDL_KEYUP: 1009 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1011 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1012 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 */ 1013 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); 1014 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 1015 break;
779 1016
780 case SDL_ACTIVEEVENT: 1017 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1018 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 1036 x = ev.motion.x;
800 y = ev.motion.y; 1037 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1038 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 1039 }
803 1040
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1041 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1042 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1043 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1044 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1045 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1046 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1047 }
811 break; 1048 break;
812 1049
813 case SDL_MOUSEBUTTONDOWN: 1050 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1051 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1052 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1053
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1054 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1055 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1056 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1057 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
828 } 1065 }
829 1066
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1067 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 1068 }
832} 1069}
1070
1071char *
1072SDL_AudioDriverName ()
1073 CODE:
1074{
1075 char buf [256];
1076 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1077 XSRETURN_UNDEF;
1078
1079 RETVAL = buf;
1080}
1081 OUTPUT:
1082 RETVAL
833 1083
834int 1084int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1085Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
836 POSTCALL: 1086 POSTCALL:
837 Mix_HookMusicFinished (music_finished); 1087 Mix_HookMusicFinished (music_finished);
894 } 1144 }
895 } 1145 }
896#endif 1146#endif
897} 1147}
898 1148
899void 1149int
900add_font (char *file) 1150add_font (char *file)
901 CODE: 1151 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1152 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1153 OUTPUT:
1154 RETVAL
1155
1156void
1157IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1158
1159# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1160void
1161Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
903 1162
904void 1163void
905load_image_inline (SV *image_) 1164load_image_inline (SV *image_)
906 ALIAS: 1165 ALIAS:
907 load_image_file = 1 1166 load_image_file = 1
1023#if DEBUG 1282#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1283 VALGRIND_DO_LEAK_CHECK;
1025#endif 1284#endif
1026} 1285}
1027 1286
1287int
1288SvREFCNT (SV *sv)
1289 CODE:
1290 RETVAL = SvREFCNT (sv);
1291 OUTPUT:
1292 RETVAL
1293
1028MODULE = Deliantra::Client PACKAGE = DC::Font 1294MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1295
1030PROTOTYPES: DISABLE 1296PROTOTYPES: DISABLE
1031 1297
1032DC::Font 1298DC::Font
1165{ 1431{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1432 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1433
1168 do 1434 do
1169 { 1435 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1436 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1437
1172 if (run && shape_attr_p (run)) 1438 if (run && shape_attr_p (run))
1173 { 1439 {
1174 PangoRectangle extents; 1440 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1441 pango_layout_iter_get_run_extents (iter, 0, &extents);
1279int 1545int
1280descent (DC::Layout self) 1546descent (DC::Layout self)
1281 CODE: 1547 CODE:
1282{ 1548{
1283 PangoRectangle rect; 1549 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1550 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1551 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1552 RETVAL = PANGO_DESCENT (rect);
1287} 1553}
1288 OUTPUT: 1554 OUTPUT:
1289 RETVAL 1555 RETVAL
1301 1567
1302void 1568void
1303cursor_pos (DC::Layout self, int index) 1569cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1570 PPCODE:
1305{ 1571{
1306 PangoRectangle strong_pos; 1572 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1573 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1574
1309 EXTEND (SP, 3); 1575 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1576 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1577 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1578 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1579}
1314 1580
1315void 1581void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1582index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1583 PPCODE:
1318{ 1584{
1319 int line, x; 1585 int line, x;
1320 1586
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1587 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1322#if !PANGO_VERSION_CHECK (1, 17. 3) 1588#if !PANGO_VERSION_CHECK (1, 17, 3)
1323 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1589 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1324 --line; 1590 --line;
1325#endif 1591#endif
1326 EXTEND (SP, 2); 1592 EXTEND (SP, 2);
1327 PUSHs (sv_2mortal (newSViv (line))); 1593 PUSHs (sv_2mortal (newSViv (line)));
1336 int index, trailing; 1602 int index, trailing;
1337 1603
1338 if (line < 0) 1604 if (line < 0)
1339 XSRETURN_EMPTY; 1605 XSRETURN_EMPTY;
1340 1606
1341 if (!(lp = pango_layout_get_line (self->pl, line))) 1607 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1342 XSRETURN_EMPTY; /* do better */ 1608 XSRETURN_EMPTY; /* do better */
1343 1609
1344 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1610 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1345 1611
1346 EXTEND (SP, 2); 1612 EXTEND (SP, 2);
1461 if (ix) 1727 if (ix)
1462 { 1728 {
1463 glDisable (GL_ALPHA_TEST); 1729 glDisable (GL_ALPHA_TEST);
1464 glDisable (GL_BLEND); 1730 glDisable (GL_BLEND);
1465 } 1731 }
1732}
1733
1734void
1735draw_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)
1736 PROTOTYPE: @
1737 CODE:
1738{
1739 glEnable (GL_BLEND);
1740 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1741 glEnable (GL_TEXTURE_2D);
1742 glBindTexture (GL_TEXTURE_2D, name1);
1743
1744 glColor3f (intensity, intensity, intensity);
1745 glPushMatrix ();
1746 glScalef (1./3, 1./3, 1.);
1747
1748 if (blend > 0.f)
1749 {
1750 float dx3 = dx * -3.f / w;
1751 float dy3 = dy * -3.f / h;
1752 GLfloat env_color[4] = { 0., 0., 0., blend };
1753
1754 /* interpolate the two shadow textures */
1755 /* stage 0 == rgb(glcolor) + alpha(t0) */
1756 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1757
1758 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1759 gl.ActiveTexture (GL_TEXTURE1);
1760 glEnable (GL_TEXTURE_2D);
1761 glBindTexture (GL_TEXTURE_2D, name2);
1762 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1763
1764 /* rgb == rgb(glcolor) */
1765 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1766 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1767 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1768
1769 /* alpha = interpolate t0, t1 by env_alpha */
1770 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1771
1772 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1773 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1774 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1775
1776 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1777 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1778
1779 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1780 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1781
1782 glBegin (GL_QUADS);
1783 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1784 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1785 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1786 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1787 glEnd ();
1788
1789 glDisable (GL_TEXTURE_2D);
1790 gl.ActiveTexture (GL_TEXTURE0);
1791 }
1792 else
1793 {
1794 /* simple blending of one texture, also opengl <1.3 path */
1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1796
1797 glBegin (GL_QUADS);
1798 glTexCoord2f (0, 0); glVertex2f (0, 0);
1799 glTexCoord2f (0, t); glVertex2f (0, h);
1800 glTexCoord2f (s, t); glVertex2f (w, h);
1801 glTexCoord2f (s, 0); glVertex2f (w, 0);
1802 glEnd ();
1803 }
1804
1805 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1806 {
1807 int x, y;
1808 int dx3 = dx * 3;
1809 int dy3 = dy * 3;
1810
1811 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1812 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1813 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1814 glTranslatef (-1., -1., 0);
1815 glBegin (GL_QUADS);
1816
1817 for (y = 1; y < h; y += 3)
1818 {
1819 int y1 = y - dy3;
1820 int y1valid = y1 >= 0 && y1 < h;
1821
1822 for (x = 1; x < w; x += 3)
1823 {
1824 int x1 = x - dx3;
1825 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1826 uint8_t h2;
1827
1828 if (y1valid && x1 >= 0 && x1 < w)
1829 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1830 else
1831 h2 = 1; /* out of range == invisible */
1832
1833 if (h1 || h2)
1834 {
1835 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1836 glColor4f (1., 1., 1., alpha);
1837
1838 glTexCoord2f (0, 0.); glVertex2i (x , y );
1839 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1840 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1841 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1842 }
1843 }
1844 }
1845 }
1846
1847 glEnd ();
1848
1849 glPopMatrix ();
1850
1851 glDisable (GL_TEXTURE_2D);
1852 glDisable (GL_BLEND);
1466} 1853}
1467 1854
1468IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1855IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1469 CODE: 1856 CODE:
1470{ 1857{
1576 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1963 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1577 // use uglier nearest interpolation because linear suffers 1964 // use uglier nearest interpolation because linear suffers
1578 // from transparent color bleeding and ugly wrapping effects. 1965 // from transparent color bleeding and ugly wrapping effects.
1579 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1966 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1580} 1967}
1968
1969void
1970expire_textures (DC::Map self, int texid, int count)
1971 PPCODE:
1972 for (; texid < self->texs && count; ++texid, --count)
1973 {
1974 maptex *tex = self->tex + texid;
1975
1976 if (tex->name)
1977 {
1978 if (tex->unused)
1979 {
1980 tex->name = 0;
1981 tex->unused = 0;
1982 XPUSHs (sv_2mortal (newSViv (texid)));
1983 }
1984 else
1985 tex->unused = 1;
1986 }
1987 }
1581 1988
1582int 1989int
1583ox (DC::Map self) 1990ox (DC::Map self)
1584 ALIAS: 1991 ALIAS:
1585 oy = 1 1992 oy = 1
1663 uint8_t ext, cmd; 2070 uint8_t ext, cmd;
1664 2071
1665 do 2072 do
1666 { 2073 {
1667 ext = *data++; 2074 ext = *data++;
1668 cmd = ext & 0x3f; 2075 cmd = ext & 0x7f;
1669 2076
1670 if (cmd < 4) 2077 if (cmd < 4)
1671 cell->darkness = 255 - ext * 64 + 1; 2078 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1672 else if (cmd == 5) // health 2079 else if (cmd == 5) // health
1673 { 2080 {
1674 cell->stat_width = 1; 2081 cell->stat_width = 1;
1675 cell->stat_hp = *data++; 2082 cell->stat_hp = *data++;
1676 } 2083 }
1677 else if (cmd == 6) // monster width 2084 else if (cmd == 6) // monster width
1678 cell->stat_width = *data++ + 1; 2085 cell->stat_width = *data++ + 1;
1679 else if (cmd == 0x47) 2086 else if (cmd == 0x47)
1680 { 2087 {
1681 if (*data == 4) 2088 if (*data == 1) cell->player = data [1];
1682 ; // decode player count 2089 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2090 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2091 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1683 2092
1684 data += *data + 1; 2093 data += *data + 1;
1685 } 2094 }
1686 else if (cmd == 8) // cell flags 2095 else if (cmd == 8) // cell flags
1687 cell->flags = *data++; 2096 cell->flags = *data++;
1704 cell->tile [z] = self->face2tile [face]; 2113 cell->tile [z] = self->face2tile [face];
1705 2114
1706 if (cell->tile [z]) 2115 if (cell->tile [z])
1707 { 2116 {
1708 maptex *tex = self->tex + cell->tile [z]; 2117 maptex *tex = self->tex + cell->tile [z];
2118 tex->unused = 0;
1709 if (!tex->name) 2119 if (!tex->name)
1710 av_push (missing, newSViv (cell->tile [z])); 2120 av_push (missing, newSViv (cell->tile [z]));
1711 2121
1712 if (tex->smoothtile) 2122 if (tex->smoothtile)
1713 { 2123 {
1714 maptex *smooth = self->tex + tex->smoothtile; 2124 maptex *smooth = self->tex + tex->smoothtile;
2125 smooth->unused = 0;
1715 if (!smooth->name) 2126 if (!smooth->name)
1716 av_push (missing, newSViv (tex->smoothtile)); 2127 av_push (missing, newSViv (tex->smoothtile));
1717 } 2128 }
1718 } 2129 }
1719 } 2130 }
1720 } 2131 }
1721 else 2132 else
1722 cell->darkness = 0; 2133 CELL_CLEAR (cell);
1723 } 2134 }
1724} 2135}
1725 OUTPUT: 2136 OUTPUT:
1726 RETVAL 2137 RETVAL
1727 2138
1747 ? self->row + y 2158 ? self->row + y
1748 : 0; 2159 : 0;
1749 2160
1750 for (x = x0; x < x1; x++) 2161 for (x = x0; x < x1; x++)
1751 { 2162 {
1752 int r = 32, g = 32, b = 32, a = 192; 2163 unsigned int r = 32, g = 32, b = 32, a = 192;
1753 2164
1754 if (row && row->c0 <= x && x < row->c1) 2165 if (row && row->c0 <= x && x < row->c1)
1755 { 2166 {
1756 mapcell *cell = row->col + (x - row->c0); 2167 mapcell *cell = row->col + (x - row->c0);
1757 2168
1759 { 2170 {
1760 maptex tex = self->tex [cell->tile [z]]; 2171 maptex tex = self->tex [cell->tile [z]];
1761 int a0 = 255 - tex.a; 2172 int a0 = 255 - tex.a;
1762 int a1 = tex.a; 2173 int a1 = tex.a;
1763 2174
1764 r = (r * a0 + tex.r * a1) / 255; 2175 r = div255 (r * a0 + tex.r * a1);
1765 g = (g * a0 + tex.g * a1) / 255; 2176 g = div255 (g * a0 + tex.g * a1);
1766 b = (b * a0 + tex.b * a1) / 255; 2177 b = div255 (b * a0 + tex.b * a1);
1767 a = (a * a0 + tex.a * a1) / 255; 2178 a = div255 (a * a0 + tex.a * a1);
1768 } 2179 }
1769 } 2180 }
1770 2181
1771 *map++ = (r ) 2182 *map++ = (r )
1772 | (g << 8) 2183 | (g << 8)
1779} 2190}
1780 OUTPUT: 2191 OUTPUT:
1781 RETVAL 2192 RETVAL
1782 2193
1783void 2194void
1784draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2195draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1785 CODE: 2196 CODE:
1786{ 2197{
1787 int x, y, z; 2198 int x, y, z;
1788 2199
1789 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2200 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1790 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2201 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1791 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2202 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1792 smooth_key skey; 2203 smooth_key skey;
1793 2204 int pl_x, pl_y;
2205 maptex pl_tex;
1794 rc_t *rc = rc_alloc (); 2206 rc_t *rc = rc_alloc ();
2207 rc_t *rc_ov = rc_alloc ();
1795 rc_key_t key; 2208 rc_key_t key;
1796 rc_array_t *arr; 2209 rc_array_t *arr;
1797 2210
2211 pl_tex.name = 0;
2212
1798 // thats current max. sorry. 2213 // that's current max. sorry.
1799 if (sw > 255) sw = 255; 2214 if (sw > 255) sw = 255;
1800 if (sh > 255) sh = 255; 2215 if (sh > 255) sh = 255;
1801 2216
1802 // clear key, in case of extra padding 2217 // clear key, in case of extra padding
1803 memset (&skey, 0, sizeof (skey)); 2218 memset (&skey, 0, sizeof (skey));
1807 key.g = 255; 2222 key.g = 255;
1808 key.b = 255; 2223 key.b = 255;
1809 key.a = 255; 2224 key.a = 255;
1810 key.mode = GL_QUADS; 2225 key.mode = GL_QUADS;
1811 key.format = GL_T2F_V3F; 2226 key.format = GL_T2F_V3F;
1812 key.texname = -1;
1813 2227
1814 mx += self->x; 2228 mx += self->x;
1815 my += self->y; 2229 my += self->y;
1816 2230
1817 // first pass: determine smooth_max 2231 // first pass: determine smooth_max
1841 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2255 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1842 2256
1843 for (z = 0; z <= 2; z++) 2257 for (z = 0; z <= 2; z++)
1844 { 2258 {
1845 memset (smooth_level, 0, sizeof (smooth_level)); 2259 memset (smooth_level, 0, sizeof (smooth_level));
2260 key.texname = -1;
1846 2261
1847 for (y = 0; y < sh; y++) 2262 for (y = 0; y < sh; y++)
1848 if (0 <= y + my && y + my < self->rows) 2263 if (0 <= y + my && y + my < self->rows)
1849 { 2264 {
1850 maprow *row = self->row + (y + my); 2265 maprow *row = self->row + (y + my);
1860 maptex tex = self->tex [tile]; 2275 maptex tex = self->tex [tile];
1861 int px, py; 2276 int px, py;
1862 2277
1863 if (key.texname != tex.name) 2278 if (key.texname != tex.name)
1864 { 2279 {
2280 self->tex [tile].unused = 0;
2281
1865 if (!tex.name) 2282 if (!tex.name)
1866 tex = self->tex [2]; /* missing, replace by noface */ 2283 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1867 2284
1868 key.texname = tex.name; 2285 key.texname = tex.name;
1869 arr = rc_array (rc, &key); 2286 arr = rc_array (rc, &key);
1870 } 2287 }
1871 2288
1872 px = (x + 1) * T - tex.w; 2289 px = (x + 1) * Th - tex.w;
1873 py = (y + 1) * T - tex.h; 2290 py = (y + 1) * Tw - tex.h;
2291
2292 if (expect_false (cell->player == player) && expect_false (z == 2))
2293 {
2294 pl_x = px;
2295 pl_y = py;
2296 pl_tex = tex;
2297 continue;
2298 }
1874 2299
1875 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2300 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1876 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2301 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1877 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2302 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1878 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2303 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1879
1880 if (cell->flags && z == 2)
1881 {
1882 // overlays such as the speech bubble, probably more to come
1883 if (cell->flags & 1)
1884 {
1885 maptex tex = self->tex [1];
1886 int px = x * T + T * 2 / 32;
1887 int py = y * T - T * 6 / 32;
1888
1889 if (tex.name)
1890 {
1891 if (key.texname != tex.name)
1892 {
1893 key.texname = tex.name;
1894 arr = rc_array (rc, &key);
1895 }
1896
1897 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1898 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1899 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1900 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1901 }
1902 }
1903 }
1904 2304
1905 // update smooth hash 2305 // update smooth hash
1906 if (tex.smoothtile) 2306 if (tex.smoothtile)
1907 { 2307 {
1908 skey.tile = tex.smoothtile; 2308 skey.tile = tex.smoothtile;
1937 // corners 2337 // corners
1938 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2338 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1939 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2339 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1940 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2340 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1941 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2341 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2342 }
2343 }
2344
2345 if (expect_false (z == 2) && expect_false (cell->flags))
2346 {
2347 // overlays such as the speech bubble, probably more to come
2348 if (cell->flags & 1)
2349 {
2350 rc_key_t key_ov = key;
2351 maptex tex = self->tex [TEXID_SPEECH];
2352 rc_array_t *arr;
2353 int px = x * Tw + Tw * 2 / 32;
2354 int py = y * Th - Th * 6 / 32;
2355
2356 key_ov.texname = tex.name;
2357 arr = rc_array (rc_ov, &key_ov);
2358
2359 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2360 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2361 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2362 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1942 } 2363 }
1943 } 2364 }
1944 } 2365 }
1945 } 2366 }
1946 2367
1973 if (!(bits & 0x1000) 2394 if (!(bits & 0x1000)
1974 && skey->level == level 2395 && skey->level == level
1975 && level > smooth_max [skey->x][skey->y]) 2396 && level > smooth_max [skey->x][skey->y])
1976 { 2397 {
1977 maptex tex = self->tex [skey->tile]; 2398 maptex tex = self->tex [skey->tile];
1978 int px = (((int)skey->x) - 1) * T; 2399 int px = (((int)skey->x) - 1) * Tw;
1979 int py = (((int)skey->y) - 1) * T; 2400 int py = (((int)skey->y) - 1) * Th;
1980 int border = bits & 15; 2401 int border = bits & 15;
1981 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2402 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1982 float dx = tex.s * .0625f; // 16 images/row 2403 float dx = tex.s * .0625f; // 16 images/row
1983 float dy = tex.t * .5f ; // 2 images/column 2404 float dy = tex.t * .5f ; // 2 images/column
1984 2405
1986 { 2407 {
1987 // this time avoiding texture state changes 2408 // this time avoiding texture state changes
1988 // save gobs of state changes. 2409 // save gobs of state changes.
1989 if (key.texname != tex.name) 2410 if (key.texname != tex.name)
1990 { 2411 {
2412 self->tex [skey->tile].unused = 0;
2413
1991 glEnd (); 2414 glEnd ();
1992 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2415 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1993 glBegin (GL_QUADS); 2416 glBegin (GL_QUADS);
1994 } 2417 }
1995 2418
1996 if (border) 2419 if (border)
1997 { 2420 {
1998 float ox = border * dx; 2421 float ox = border * dx;
1999 2422
2000 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2423 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2001 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2424 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2002 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2425 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2003 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2426 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2004 } 2427 }
2005 2428
2006 if (corner) 2429 if (corner)
2007 { 2430 {
2008 float ox = corner * dx; 2431 float ox = corner * dx;
2009 2432
2010 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2011 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2434 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2012 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2435 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2013 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2436 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2014 } 2437 }
2015 } 2438 }
2016 } 2439 }
2017 } 2440 }
2018 } 2441 }
2024 } 2447 }
2025 2448
2026 hv_clear (smooth); 2449 hv_clear (smooth);
2027 } 2450 }
2028 2451
2452 if (pl_tex.name)
2453 {
2454 maptex tex = pl_tex;
2455 int px = pl_x + sdx;
2456 int py = pl_y + sdy;
2457
2458 key.texname = tex.name;
2459 arr = rc_array (rc, &key);
2460
2461 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2462 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2463 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2464 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2465
2466 rc_draw (rc);
2467 }
2468
2469 rc_draw (rc_ov);
2470 rc_clear (rc_ov);
2471
2029 glDisable (GL_BLEND); 2472 glDisable (GL_BLEND);
2030 rc_free (rc); 2473 rc_free (rc);
2474 rc_free (rc_ov);
2031 2475
2032 // top layer: overlays such as the health bar 2476 // top layer: overlays such as the health bar
2033 for (y = 0; y < sh; y++) 2477 for (y = 0; y < sh; y++)
2034 if (0 <= y + my && y + my < self->rows) 2478 if (0 <= y + my && y + my < self->rows)
2035 { 2479 {
2038 for (x = 0; x < sw; x++) 2482 for (x = 0; x < sw; x++)
2039 if (row->c0 <= x + mx && x + mx < row->c1) 2483 if (row->c0 <= x + mx && x + mx < row->c1)
2040 { 2484 {
2041 mapcell *cell = row->col + (x + mx - row->c0); 2485 mapcell *cell = row->col + (x + mx - row->c0);
2042 2486
2043 int px = x * T; 2487 int px = x * Tw;
2044 int py = y * T; 2488 int py = y * Th;
2489
2490 if (expect_false (cell->player == player))
2491 {
2492 px += sdx;
2493 py += sdy;
2494 }
2045 2495
2046 if (cell->stat_hp) 2496 if (cell->stat_hp)
2047 { 2497 {
2048 int width = cell->stat_width * T; 2498 int width = cell->stat_width * Tw;
2049 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2499 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2050 2500
2051 glColor3ub (0, 0, 0); 2501 glColor3ub (0, 0, 0);
2052 glRectf (px + 1, py - thick - 2, 2502 glRectf (px + 1, py - thick - 2,
2053 px + width - 1, py); 2503 px + width - 1, py);
2054 2504
2060 } 2510 }
2061 } 2511 }
2062} 2512}
2063 2513
2064void 2514void
2065draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2515draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2066 CODE: 2516 CODE:
2067{ 2517{
2068 static float color[16][3] = { 2518 static float color[16][3] = {
2069 { 0.00F, 0.00F, 0.00F }, 2519 { 0.00f, 0.00f, 0.00f },
2070 { 1.00F, 1.00F, 1.00F }, 2520 { 1.00f, 1.00f, 1.00f },
2071 { 0.00F, 0.00F, 0.55F }, 2521 { 0.00f, 0.00f, 0.55f },
2072 { 1.00F, 0.00F, 0.00F }, 2522 { 1.00f, 0.00f, 0.00f },
2073 2523
2074 { 1.00F, 0.54F, 0.00F }, 2524 { 1.00f, 0.54f, 0.00f },
2075 { 0.11F, 0.56F, 1.00F }, 2525 { 0.11f, 0.56f, 1.00f },
2076 { 0.93F, 0.46F, 0.00F }, 2526 { 0.93f, 0.46f, 0.00f },
2077 { 0.18F, 0.54F, 0.34F }, 2527 { 0.18f, 0.54f, 0.34f },
2078 2528
2079 { 0.56F, 0.73F, 0.56F }, 2529 { 0.56f, 0.73f, 0.56f },
2080 { 0.80F, 0.80F, 0.80F }, 2530 { 0.80f, 0.80f, 0.80f },
2081 { 0.55F, 0.41F, 0.13F }, 2531 { 0.55f, 0.41f, 0.13f },
2082 { 0.99F, 0.77F, 0.26F }, 2532 { 0.99f, 0.77f, 0.26f },
2083 2533
2084 { 0.74F, 0.65F, 0.41F }, 2534 { 0.74f, 0.65f, 0.41f },
2085 2535
2086 { 0.00F, 1.00F, 1.00F }, 2536 { 0.00f, 1.00f, 1.00f },
2087 { 1.00F, 0.00F, 1.00F }, 2537 { 1.00f, 0.00f, 1.00f },
2088 { 1.00F, 1.00F, 0.00F }, 2538 { 1.00f, 1.00f, 0.00f },
2089 }; 2539 };
2090 2540
2091 int x, y; 2541 int x, y;
2092 2542
2093 glEnable (GL_TEXTURE_2D); 2543 glEnable (GL_TEXTURE_2D);
2544 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2545 * but the nvidia driver (185.18.14) mishandles alpha textures
2546 * and takes the colour from god knows where instead of using
2547 * Cp. MODULATE results in the same colour, but slightly different
2548 * alpha, but atcually gives us the correct colour with nvidia.
2549 */
2094 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2550 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2095 glEnable (GL_BLEND); 2551 glEnable (GL_BLEND);
2096 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2552 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2097 glBegin (GL_QUADS); 2553 glBegin (GL_QUADS);
2098 2554
2099 for (y = 0; y < h; y++) 2555 for (y = 0; y < h; y++)
2103 2559
2104 if (m) 2560 if (m)
2105 { 2561 {
2106 float *c = color [m & 15]; 2562 float *c = color [m & 15];
2107 2563
2108 float tx1 = m & 0x40 ? 0.5 : 0.; 2564 float tx1 = m & 0x40 ? 0.5f : 0.f;
2109 float tx2 = tx1 + 0.5; 2565 float tx2 = tx1 + 0.5f;
2110 2566
2111 glColor4f (c[0], c[1], c[2], 0.75); 2567 glColor4f (c[0], c[1], c[2], 1);
2112 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2568 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2113 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2569 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2114 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2570 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2115 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2571 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2116 } 2572 }
2124void 2580void
2125fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2581fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2126 PPCODE: 2582 PPCODE:
2127{ 2583{
2128 int x, y; 2584 int x, y;
2129 int sw1 = sw + 2; 2585 int sw1 = sw + 2;
2130 int sh1 = sh + 2; 2586 int sh1 = sh + 2;
2131 int sh3 = sh * 3; 2587 int sh3 = sh * 3;
2132 int sw34 = (sw * 3 + 3) & ~3; 2588 int sw3 = sw * 3;
2589 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2590 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2133 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2591 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2134 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2592 memset (darkness1, 0, sw1*sh1);
2135 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2136 2593
2137 SvPOK_only (darkness3_sv); 2594 SvPOK_only (darkness3_sv);
2138 SvCUR_set (darkness3_sv, sw34 * sh3); 2595 SvCUR_set (darkness3_sv, sw3 * sh3);
2139 2596
2140 mx += self->x - 1; 2597 mx += self->x - 1;
2141 my += self->y - 1; 2598 my += self->y - 1;
2142
2143 memset (darkness1, 255, sw1 * sh1);
2144 2599
2145 for (y = 0; y < sh1; y++) 2600 for (y = 0; y < sh1; y++)
2146 if (0 <= y + my && y + my < self->rows) 2601 if (0 <= y + my && y + my < self->rows)
2147 { 2602 {
2148 maprow *row = self->row + (y + my); 2603 maprow *row = self->row + (y + my);
2151 if (row->c0 <= x + mx && x + mx < row->c1) 2606 if (row->c0 <= x + mx && x + mx < row->c1)
2152 { 2607 {
2153 mapcell *cell = row->col + (x + mx - row->c0); 2608 mapcell *cell = row->col + (x + mx - row->c0);
2154 2609
2155 darkness1 [y * sw1 + x] = cell->darkness 2610 darkness1 [y * sw1 + x] = cell->darkness
2156 ? 255 - (cell->darkness - 1) 2611 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2157 : 255 - FOW_DARKNESS; 2612 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2158 } 2613 }
2159 } 2614 }
2160 2615
2161 for (y = 0; y < sh; ++y) 2616 for (y = 0; y < sh; ++y)
2162 for (x = 0; x < sw; ++x) 2617 for (x = 0; x < sw; ++x)
2181 2636
2182 uint8_t r13 = (d13 + d23 + d12) / 3; 2637 uint8_t r13 = (d13 + d23 + d12) / 3;
2183 uint8_t r23 = d23; 2638 uint8_t r23 = d23;
2184 uint8_t r33 = (d23 + d33 + d32) / 3; 2639 uint8_t r33 = (d23 + d33 + d32) / 3;
2185 2640
2186 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2187 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2188 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2643 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2189 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2190 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2645 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2191 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2646 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2192 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2193 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2194 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2649 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2195 } 2650 }
2196 2651
2197 free (darkness1); 2652 free (darkness1);
2198 2653
2199 EXTEND (SP, 3); 2654 EXTEND (SP, 3);
2200 PUSHs (sv_2mortal (newSViv (sw34))); 2655 PUSHs (sv_2mortal (newSViv (sw3)));
2201 PUSHs (sv_2mortal (newSViv (sh3))); 2656 PUSHs (sv_2mortal (newSViv (sh3)));
2202 PUSHs (darkness3_sv); 2657 PUSHs (darkness3_sv);
2203} 2658}
2204 2659
2205SV * 2660SV *
2268 else 2723 else
2269 *data++ = 0; 2724 *data++ = 0;
2270 } 2725 }
2271 } 2726 }
2272 2727
2728 /* if size is w*h + 5 then no data has been found */
2729 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2730 {
2273 SvPOK_only (data_sv); 2731 SvPOK_only (data_sv);
2274 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2732 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2733 }
2734
2275 RETVAL = data_sv; 2735 RETVAL = data_sv;
2276} 2736}
2277 OUTPUT: 2737 OUTPUT:
2278 RETVAL 2738 RETVAL
2279 2739
2280void 2740void
2281set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2741set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2282 PPCODE: 2742 PPCODE:
2283{ 2743{
2284 int x, y, z; 2744 int x, y, z;
2285 int w, h; 2745 int w, h;
2286 int x1, y1; 2746 int x1, y1;
2747 STRLEN len;
2748 uint8_t *data, *end;
2749
2750 len = SvLEN (data_sv);
2751 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2752 data = SvPVbyte_nolen (data_sv);
2753 end = data + len + 8;
2754
2755 if (len < 5)
2756 XSRETURN_EMPTY;
2287 2757
2288 if (*data++ != 0) 2758 if (*data++ != 0)
2289 XSRETURN_EMPTY; /* version mismatch */ 2759 XSRETURN_EMPTY; /* version mismatch */
2290 2760
2291 w = *data++ << 8; w |= *data++; 2761 w = *data++ << 8; w |= *data++;
2306 { 2776 {
2307 maprow *row = map_get_row (self, y); 2777 maprow *row = map_get_row (self, y);
2308 2778
2309 for (x = x0; x < x1; x++) 2779 for (x = x0; x < x1; x++)
2310 { 2780 {
2781 uint8_t flags;
2782
2783 if (data + 7 >= end)
2784 XSRETURN_EMPTY;
2785
2311 uint8_t flags = *data++; 2786 flags = *data++;
2312 2787
2313 if (flags) 2788 if (flags)
2314 { 2789 {
2315 mapcell *cell = row_get_cell (row, x); 2790 mapcell *cell = row_get_cell (row, x);
2316 tileid tile[3] = { 0, 0, 0 }; 2791 tileid tile[3] = { 0, 0, 0 };
2319 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2794 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2320 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2795 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2321 2796
2322 if (cell->darkness == 0) 2797 if (cell->darkness == 0)
2323 { 2798 {
2324 cell->darkness = 0; 2799 /*cell->darkness = 0;*/
2800 EXTEND (SP, 3);
2325 2801
2326 for (z = 0; z <= 2; z++) 2802 for (z = 0; z <= 2; z++)
2327 { 2803 {
2328 tileid t = tile [z]; 2804 tileid t = tile [z];
2329 2805
2330 if (t >= self->texs || (t && !self->tex [t].name)) 2806 if (t >= self->texs || (t && !self->tex [t].name))
2331 { 2807 {
2332 XPUSHs (sv_2mortal (newSViv (t))); 2808 PUSHs (sv_2mortal (newSViv (t)));
2333 need_texid (self, t); 2809 need_texid (self, t);
2334 } 2810 }
2335 2811
2336 cell->tile [z] = t; 2812 cell->tile [z] = t;
2337 } 2813 }
2382 if (RETVAL < 0) 2858 if (RETVAL < 0)
2383 { 2859 {
2384 RETVAL = Mix_GroupOldest (-1); 2860 RETVAL = Mix_GroupOldest (-1);
2385 2861
2386 if (RETVAL < 0) 2862 if (RETVAL < 0)
2863 {
2864 // happens sometimes, maybe it just stopped playing(?)
2865 RETVAL = Mix_GroupAvailable (-1);
2866
2867 if (RETVAL < 0)
2387 XSRETURN_UNDEF; 2868 XSRETURN_UNDEF;
2388 2869 }
2870 else
2389 Mix_HaltChannel (RETVAL); 2871 Mix_HaltChannel (RETVAL);
2390 } 2872 }
2391 2873
2392 Mix_UnregisterAllEffects (RETVAL); 2874 Mix_UnregisterAllEffects (RETVAL);
2393 Mix_Volume (RETVAL, 128); 2875 Mix_Volume (RETVAL, 128);
2394} 2876}
2441void 2923void
2442set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2924set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2443 CODE: 2925 CODE:
2444{ 2926{
2445 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2927 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2446 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2928 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2447 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2929 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2448} 2930}
2449 2931
2450void 2932void
2451set_reverse_stereo (DC::Channel self, int flip) 2933set_reverse_stereo (DC::Channel self, int flip)
2453 Mix_SetReverseStereo (self, flip); 2935 Mix_SetReverseStereo (self, flip);
2454 2936
2455MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2937MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2456 2938
2457PROTOTYPES: DISABLE 2939PROTOTYPES: DISABLE
2940
2941void
2942decoders ()
2943 PPCODE:
2944#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2945 int i, num = Mix_GetNumChunkDecoders ();
2946 EXTEND (SP, num);
2947 for (i = 0; i < num; ++i)
2948 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2949#else
2950 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2951#endif
2458 2952
2459DC::MixChunk 2953DC::MixChunk
2460new (SV *class, DC::RW rwops) 2954new (SV *class, DC::RW rwops)
2461 CODE: 2955 CODE:
2462 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2956 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2495 OUTPUT: 2989 OUTPUT:
2496 RETVAL 2990 RETVAL
2497 2991
2498MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2992MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2499 2993
2994void
2995decoders ()
2996 PPCODE:
2997#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2998 int i, num = Mix_GetNumMusicDecoders ();
2999 EXTEND (SP, num);
3000 for (i = 0; i < num; ++i)
3001 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3002#else
3003 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3004#endif
3005
2500int 3006int
2501volume (int volume = -1) 3007volume (int volume = -1)
2502 PROTOTYPE: ;$ 3008 PROTOTYPE: ;$
2503 CODE: 3009 CODE:
2504 if (items > 0) 3010 if (items > 0)
2514 3020
2515void 3021void
2516halt () 3022halt ()
2517 CODE: 3023 CODE:
2518 Mix_HaltMusic (); 3024 Mix_HaltMusic ();
3025
3026int
3027playing ()
3028 CODE:
3029 RETVAL = Mix_PlayingMusic ();
3030 OUTPUT:
3031 RETVAL
2519 3032
2520DC::MixMusic 3033DC::MixMusic
2521new (SV *class, DC::RW rwops) 3034new (SV *class, DC::RW rwops)
2522 CODE: 3035 CODE:
2523 RETVAL = Mix_LoadMUS_RW (rwops); 3036 RETVAL = Mix_LoadMUS_RW (rwops);
2554 } *civ, const_iv[] = { 3067 } *civ, const_iv[] = {
2555# define const_iv(name) { # name, (IV)name } 3068# define const_iv(name) { # name, (IV)name }
2556 const_iv (GL_VENDOR), 3069 const_iv (GL_VENDOR),
2557 const_iv (GL_VERSION), 3070 const_iv (GL_VERSION),
2558 const_iv (GL_EXTENSIONS), 3071 const_iv (GL_EXTENSIONS),
3072 const_iv (GL_MAX_TEXTURE_UNITS),
2559 const_iv (GL_COLOR_MATERIAL), 3073 const_iv (GL_COLOR_MATERIAL),
2560 const_iv (GL_SMOOTH), 3074 const_iv (GL_SMOOTH),
2561 const_iv (GL_FLAT), 3075 const_iv (GL_FLAT),
2562 const_iv (GL_DITHER), 3076 const_iv (GL_DITHER),
2563 const_iv (GL_BLEND), 3077 const_iv (GL_BLEND),
2575 const_iv (GL_ZERO), 3089 const_iv (GL_ZERO),
2576 const_iv (GL_SRC_ALPHA), 3090 const_iv (GL_SRC_ALPHA),
2577 const_iv (GL_DST_ALPHA), 3091 const_iv (GL_DST_ALPHA),
2578 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3092 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2579 const_iv (GL_ONE_MINUS_DST_ALPHA), 3093 const_iv (GL_ONE_MINUS_DST_ALPHA),
3094 const_iv (GL_SRC_COLOR),
3095 const_iv (GL_DST_COLOR),
3096 const_iv (GL_ONE_MINUS_SRC_COLOR),
3097 const_iv (GL_ONE_MINUS_DST_COLOR),
2580 const_iv (GL_SRC_ALPHA_SATURATE), 3098 const_iv (GL_SRC_ALPHA_SATURATE),
2581 const_iv (GL_RGB), 3099 const_iv (GL_RGB),
2582 const_iv (GL_RGBA), 3100 const_iv (GL_RGBA),
2583 const_iv (GL_RGBA4), 3101 const_iv (GL_RGBA4),
2584 const_iv (GL_RGBA8), 3102 const_iv (GL_RGBA8),
2652 const_iv (GL_NICEST), 3170 const_iv (GL_NICEST),
2653 const_iv (GL_V2F), 3171 const_iv (GL_V2F),
2654 const_iv (GL_V3F), 3172 const_iv (GL_V3F),
2655 const_iv (GL_T2F_V3F), 3173 const_iv (GL_T2F_V3F),
2656 const_iv (GL_T2F_N3F_V3F), 3174 const_iv (GL_T2F_N3F_V3F),
3175 const_iv (GL_FUNC_ADD),
3176 const_iv (GL_FUNC_SUBTRACT),
3177 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2657# undef const_iv 3178# undef const_iv
2658 }; 3179 };
2659 3180
2660 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3181 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2661 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3182 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2662 3183
2663 texture_av = newAV (); 3184 texture_av = newAV ();
2664 AvREAL_off (texture_av); 3185 AvREAL_off (texture_av);
2665} 3186}
2666 3187
2667void 3188void
2668disable_GL_EXT_blend_func_separate () 3189disable_GL_EXT_blend_func_separate ()
2669 CODE: 3190 CODE:
2670 gl.BlendFuncSeparate = 0; 3191 gl.BlendFuncSeparate = 0;
2671 gl.BlendFuncSeparateEXT = 0; 3192 gl.BlendFuncSeparateEXT = 0;
3193
3194void
3195apple_nvidia_bug (int enable)
2672 3196
2673char * 3197char *
2674gl_vendor () 3198gl_vendor ()
2675 CODE: 3199 CODE:
2676 RETVAL = (char *)glGetString (GL_VENDOR); 3200 RETVAL = (char *)glGetString (GL_VENDOR);
2707 3231
2708int glGetError () 3232int glGetError ()
2709 3233
2710void glFinish () 3234void glFinish ()
2711 3235
3236void glFlush ()
3237
2712void glClear (int mask) 3238void glClear (int mask)
2713 3239
2714void glClearColor (float r, float g, float b, float a = 1.0) 3240void glClearColor (float r, float g, float b, float a = 1.0)
2715 PROTOTYPE: @ 3241 PROTOTYPE: @
2716 3242
2725void glBlendFunc (int sfactor, int dfactor) 3251void glBlendFunc (int sfactor, int dfactor)
2726 3252
2727void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3253void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2728 CODE: 3254 CODE:
2729 gl_BlendFuncSeparate (sa, da, saa, daa); 3255 gl_BlendFuncSeparate (sa, da, saa, daa);
3256
3257# void glBlendEquation (int se)
2730 3258
2731void glDepthMask (int flag) 3259void glDepthMask (int flag)
2732 3260
2733void glLogicOp (int opcode) 3261void glLogicOp (int opcode)
2734 3262
2769void glRotate (float angle, float x, float y, float z) 3297void glRotate (float angle, float x, float y, float z)
2770 CODE: 3298 CODE:
2771 glRotatef (angle, x, y, z); 3299 glRotatef (angle, x, y, z);
2772 3300
2773void glColor (float r, float g, float b, float a = 1.0) 3301void glColor (float r, float g, float b, float a = 1.0)
3302 PROTOTYPE: @
2774 ALIAS: 3303 ALIAS:
2775 glColor_premultiply = 1 3304 glColor_premultiply = 1
2776 CODE: 3305 CODE:
2777 if (ix) 3306 if (ix)
2778 { 3307 {
2883void glNewList (int list, int mode = GL_COMPILE) 3412void glNewList (int list, int mode = GL_COMPILE)
2884 3413
2885void glEndList () 3414void glEndList ()
2886 3415
2887void glCallList (int list) 3416void glCallList (int list)
3417
3418void c_init ()
3419 CODE:
3420 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3421 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2888 3422
2889MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3423MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2890 3424
2891PROTOTYPES: DISABLE 3425PROTOTYPES: DISABLE
2892 3426

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines