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.253 by root, Fri Dec 28 20:59:14 2007 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 2018 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.h>
48 54
49#include <pango/pango.h> 55#include <pango/pango.h>
50 56
51#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)) 57#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0
59#endif
60
61#if !PANGO_VERSION_CHECK (1, 15, 2)
52# define pango_layout_get_line_readonly pango_layout_get_line_readonly 62# define pango_layout_get_line_readonly pango_layout_get_line
53# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly 63# define pango_layout_get_lines_readonly pango_layout_get_lines
54# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly 64# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
55# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly 65# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
56#endif 66#endif
57 67
58#ifndef _WIN32 68#ifndef _WIN32
59# include <sys/types.h> 69# include <sys/types.h>
60# include <sys/socket.h> 70# include <sys/socket.h>
61# include <netinet/in.h> 71# include <netinet/in.h>
62# include <netinet/tcp.h> 72# include <netinet/tcp.h>
63# include <inttypes.h> 73# include <inttypes.h>
64#endif 74#endif
65 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
66#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
67 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
68#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
69 91
70#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
71#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
72 94
73#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
74 96
75/* mask out modifiers we are not interested in */ 97/* mask out modifiers we are not interested in */
76#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77 99
78#if 0 100#define KMOD_LRAM 0x10000 // our extension
79# define PARACHUTE SDL_INIT_NOPARACHUTE 101
80#else 102#define TEXID_SPEECH 1
81# define PARACHUTE 0 103#define TEXID_NOFACE 2
82#endif 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}
83 123
84static AV *texture_av; 124static AV *texture_av;
85 125
86static struct 126static struct
87{ 127{
144{ 184{
145 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
146 186
147 while (attrs) 187 while (attrs)
148 { 188 {
149 PangoAttribute *attr = attrs->data; 189 PangoAttribute *attr = (PangoAttribute *)attrs->data;
150 190
151 if (attr->klass->type == PANGO_ATTR_SHAPE) 191 if (attr->klass->type == PANGO_ATTR_SHAPE)
152 return 1; 192 return 1;
153 193
154 attrs = attrs->next; 194 attrs = attrs->next;
172static void 212static void
173substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
174{ 214{
175 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
176#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
177 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
178#endif 218#endif
179 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
180} 220}
181 221
182static void 222static void
183layout_update_font (DC__Layout self) 223layout_update_font (DC__Layout self)
184{ 224{
185 /* 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
186 * reasonably well with bitstream vera 226 * reasonably well with dejavu/bistream fonts
187 */ 227 */
188 PangoFontDescription *font = self->font ? self->font : default_font; 228 PangoFontDescription *font = self->font ? self->font : default_font;
189 229
190 pango_font_description_set_absolute_size (font, 230 pango_font_description_set_absolute_size (font,
191 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 231 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
219 int w, h; 259 int w, h;
220 float s, t; 260 float s, t;
221 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
222 tileid smoothtile; 262 tileid smoothtile;
223 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
224} maptex; 265} maptex;
225 266
226typedef struct { 267typedef struct {
227 uint32_t player; 268 uint32_t player;
228 tileid tile[3]; 269 tileid tile[3];
360 self->oy = 0; 401 self->oy = 0;
361 self->row = 0; 402 self->row = 0;
362 self->rows = 0; 403 self->rows = 0;
363} 404}
364 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
365static void 416static void
366map_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)
367{ 418{
368 int x, y; 419 int x, y;
369 maprow *row; 420 maprow *row;
383 if (x >= row->c1) 434 if (x >= row->c1)
384 break; 435 break;
385 436
386 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
387 438
388 cell->darkness = 0; 439 CELL_CLEAR (cell);
389 cell->stat_hp = 0;
390 cell->flags = 0;
391 cell->player = 0;
392 } 440 }
393 } 441 }
394} 442}
395 443
396typedef struct { 444typedef struct {
431 ev.code = 1; 479 ev.code = 1;
432 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
433 ev.data2 = 0; 481 ev.data2 = 0;
434 482
435 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;
436} 490}
437 491
438static unsigned int 492static unsigned int
439minpot (unsigned int n) 493minpot (unsigned int n)
440{ 494{
507 if (!svp || !SvTRUE (*svp)) 561 if (!svp || !SvTRUE (*svp))
508 return 0; 562 return 0;
509 563
510 return 1; 564 return 1;
511} 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
512 624
513MODULE = Deliantra::Client PACKAGE = DC 625MODULE = Deliantra::Client PACKAGE = DC
514 626
515PROTOTYPES: ENABLE 627PROTOTYPES: ENABLE
516 628
545 const_iv (SDL_USEREVENT), 657 const_iv (SDL_USEREVENT),
546 658
547 const_iv (SDL_APPINPUTFOCUS), 659 const_iv (SDL_APPINPUTFOCUS),
548 const_iv (SDL_APPMOUSEFOCUS), 660 const_iv (SDL_APPMOUSEFOCUS),
549 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),
550 712
551 const_iv (SDLK_FIRST), 713 const_iv (SDLK_FIRST),
552 const_iv (SDLK_LAST), 714 const_iv (SDLK_LAST),
553 const_iv (SDLK_KP0), 715 const_iv (SDLK_KP0),
554 const_iv (SDLK_KP1), 716 const_iv (SDLK_KP1),
630 const_iv (KMOD_RMETA), 792 const_iv (KMOD_RMETA),
631 const_iv (KMOD_NUM), 793 const_iv (KMOD_NUM),
632 const_iv (KMOD_CAPS), 794 const_iv (KMOD_CAPS),
633 const_iv (KMOD_MODE), 795 const_iv (KMOD_MODE),
634 796
797 const_iv (KMOD_LRAM),
798
635 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)
636# undef const_iv 829# undef const_iv
637 }; 830 };
638 831
639 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--)
640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
641 834
642 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
643 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
644} 837}
645 838
661NV ceil (NV x) 854NV ceil (NV x)
662 855
663IV minpot (UV n) 856IV minpot (UV n)
664 857
665IV popcount (UV n) 858IV popcount (UV n)
859
860NV distance (NV dx, NV dy)
861 CODE:
862 RETVAL = pow (dx * dx + dy * dy, 0.5);
863 OUTPUT:
864 RETVAL
666 865
667void 866void
668pango_init () 867pango_init ()
669 CODE: 868 CODE:
670{ 869{
671 opengl_fontmap = pango_opengl_font_map_new (); 870 opengl_fontmap = pango_opengl_font_map_new ();
672 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);
673 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 872 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2) 873 /*pango_context_set_font_description (opengl_context, default_font);*/
874#if PANGO_VERSION_CHECK (1, 15, 2)
675 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 875 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 876 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
677#endif 877#endif
678} 878}
679 879
680char *
681SDL_GetError () 880char *SDL_GetError ()
682 881
683int 882void SDL_main_hack (SV *real_main)
684SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 883 PROTOTYPE: &
685 884
686void 885int SDL_Init (U32 flags)
886
887int SDL_InitSubSystem (U32 flags)
888
889void SDL_QuitSubSystem (U32 flags)
890
687SDL_Quit () 891void SDL_Quit ()
892
893int SDL_GL_SetAttribute (int attr, int value)
894 C_ARGS: (SDL_GLattr)attr, value
895
896int SDL_GL_GetAttribute (int attr)
897 CODE:
898 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
899 XSRETURN_UNDEF;
900 OUTPUT:
901 RETVAL
688 902
689void 903void
690SDL_ListModes (int rgb, int alpha) 904SDL_ListModes (int rgb, int alpha)
691 PPCODE: 905 PPCODE:
692{ 906{
704 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 918 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
705 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 919 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
706 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 920 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
707 921
708 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 922 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
709#if SDL_VERSION_ATLEAST(1,2,10)
710 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
711 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 923 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
712#endif
713 924
714 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 925 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
715 926
716 if (m && m != (SDL_Rect **)-1) 927 if (m && m != (SDL_Rect **)-1)
717 while (*m) 928 while (*m)
718 { 929 {
719 if ((*m)->w >= 800 && (*m)->h >= 480) 930 if ((*m)->w >= 400 && (*m)->h >= 300)
720 { 931 {
721 AV *av = newAV (); 932 AV *av = newAV ();
722 av_push (av, newSViv ((*m)->w)); 933 av_push (av, newSViv ((*m)->w));
723 av_push (av, newSViv ((*m)->h)); 934 av_push (av, newSViv ((*m)->h));
724 av_push (av, newSViv (rgb)); 935 av_push (av, newSViv (rgb));
747 ); 958 );
748 959
749 if (RETVAL) 960 if (RETVAL)
750 { 961 {
751 av_clear (texture_av); 962 av_clear (texture_av);
752
753 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
754#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 963#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
755#include "glfunc.h" 964#include "glfunc.h"
756#undef GL_FUNC 965#undef GL_FUNC
966 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
967 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
757 } 968 }
758} 969}
759 OUTPUT: 970 OUTPUT:
760 RETVAL 971 RETVAL
972
973void
974SDL_WM_SetCaption (const char *title, const char *icon)
761 975
762void 976void
763SDL_GL_SwapBuffers () 977SDL_GL_SwapBuffers ()
764 978
765char * 979char *
766SDL_GetKeyName (int sym) 980SDL_GetKeyName (int sym)
981 C_ARGS: (SDLKey)sym
767 982
768int 983int
769SDL_GetAppState () 984SDL_GetAppState ()
770 985
986int
987SDL_GetModState ()
988
989int
990SDL_WaitEvent ()
991 C_ARGS: 0
992
771void 993void
994SDL_PumpEvents ()
995
996void
772poll_events () 997peep_events ()
773 PPCODE: 998 PPCODE:
774{ 999{
775 SDL_Event ev; 1000 SDL_Event ev;
776 1001
777 SDL_PumpEvents (); 1002 SDL_PumpEvents ();
784 { 1009 {
785 case SDL_KEYDOWN: 1010 case SDL_KEYDOWN:
786 case SDL_KEYUP: 1011 case SDL_KEYUP:
787 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1012 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
788 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1013 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
789 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1014 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
790 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1015 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
791 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1016 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
792 break; 1017 break;
793 1018
794 case SDL_ACTIVEEVENT: 1019 case SDL_ACTIVEEVENT:
795 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1020 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
813 x = ev.motion.x; 1038 x = ev.motion.x;
814 y = ev.motion.y; 1039 y = ev.motion.y;
815 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1040 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
816 } 1041 }
817 1042
818 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1043 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
819 hv_store (hv, "state", 5, newSViv (state), 0); 1044 hv_store (hv, "state", 5, newSViv (state), 0);
820 hv_store (hv, "x", 1, newSViv (x), 0); 1045 hv_store (hv, "x", 1, newSViv (x), 0);
821 hv_store (hv, "y", 1, newSViv (y), 0); 1046 hv_store (hv, "y", 1, newSViv (y), 0);
822 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1047 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
823 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1048 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
843 1068
844 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1069 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
845 } 1070 }
846} 1071}
847 1072
1073char *
1074SDL_AudioDriverName ()
1075 CODE:
1076{
1077 char buf [256];
1078 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1079 XSRETURN_UNDEF;
1080
1081 RETVAL = buf;
1082}
1083 OUTPUT:
1084 RETVAL
1085
848int 1086int
849Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1087Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
850 POSTCALL: 1088 POSTCALL:
851 Mix_HookMusicFinished (music_finished); 1089 Mix_HookMusicFinished (music_finished);
852 Mix_ChannelFinished (channel_finished); 1090 Mix_ChannelFinished (channel_finished);
908 } 1146 }
909 } 1147 }
910#endif 1148#endif
911} 1149}
912 1150
913void 1151int
914add_font (char *file) 1152add_font (char *file)
915 CODE: 1153 CODE:
916 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1154 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1155 OUTPUT:
1156 RETVAL
1157
1158void
1159IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1160
1161# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1162void
1163Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
917 1164
918void 1165void
919load_image_inline (SV *image_) 1166load_image_inline (SV *image_)
920 ALIAS: 1167 ALIAS:
921 load_image_file = 1 1168 load_image_file = 1
967 1214
968 SDL_LockSurface (surface2); 1215 SDL_LockSurface (surface2);
969 EXTEND (SP, 6); 1216 EXTEND (SP, 6);
970 PUSHs (sv_2mortal (newSViv (surface2->w))); 1217 PUSHs (sv_2mortal (newSViv (surface2->w)));
971 PUSHs (sv_2mortal (newSViv (surface2->h))); 1218 PUSHs (sv_2mortal (newSViv (surface2->h)));
972 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1219 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
973 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1220 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
974 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1221 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
975 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1222 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
976 SDL_UnlockSurface (surface2); 1223 SDL_UnlockSurface (surface2);
977 1224
1037#if DEBUG 1284#if DEBUG
1038 VALGRIND_DO_LEAK_CHECK; 1285 VALGRIND_DO_LEAK_CHECK;
1039#endif 1286#endif
1040} 1287}
1041 1288
1289int
1290SvREFCNT (SV *sv)
1291 CODE:
1292 RETVAL = SvREFCNT (sv);
1293 OUTPUT:
1294 RETVAL
1295
1042MODULE = Deliantra::Client PACKAGE = DC::Font 1296MODULE = Deliantra::Client PACKAGE = DC::Font
1043 1297
1044PROTOTYPES: DISABLE 1298PROTOTYPES: DISABLE
1045 1299
1046DC::Font 1300DC::Font
1047new_from_file (SV *class, char *path, int id = 0) 1301new_from_file (SV *klass, char *path, int id = 0)
1048 CODE: 1302 CODE:
1049{ 1303{
1050 int count; 1304 int count;
1051 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1305 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1052 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1306 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1081 PROTOTYPE: 1335 PROTOTYPE:
1082 CODE: 1336 CODE:
1083 tc_restore (); 1337 tc_restore ();
1084 1338
1085DC::Layout 1339DC::Layout
1086new (SV *class) 1340new (SV *klass)
1087 CODE: 1341 CODE:
1088 New (0, RETVAL, 1, struct cf_layout); 1342 New (0, RETVAL, 1, struct cf_layout);
1089 1343
1090 RETVAL->pl = pango_layout_new (opengl_context); 1344 RETVAL->pl = pango_layout_new (opengl_context);
1091 RETVAL->r = 1.; 1345 RETVAL->r = 1.;
1240 1494
1241void 1495void
1242set_height (DC::Layout self, int base_height) 1496set_height (DC::Layout self, int base_height)
1243 CODE: 1497 CODE:
1244 if (self->base_height != base_height) 1498 if (self->base_height != base_height)
1245 { 1499 {
1246 self->base_height = base_height; 1500 self->base_height = base_height;
1247 layout_update_font (self); 1501 layout_update_font (self);
1248 } 1502 }
1249 1503
1250void 1504void
1331 PPCODE: 1585 PPCODE:
1332{ 1586{
1333 int line, x; 1587 int line, x;
1334 1588
1335 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1589 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1336#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1590#if !PANGO_VERSION_CHECK (1, 17, 3)
1337 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1591 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1338 --line; 1592 --line;
1339#endif 1593#endif
1340 EXTEND (SP, 2); 1594 EXTEND (SP, 2);
1341 PUSHs (sv_2mortal (newSViv (line))); 1595 PUSHs (sv_2mortal (newSViv (line)));
1477 glDisable (GL_ALPHA_TEST); 1731 glDisable (GL_ALPHA_TEST);
1478 glDisable (GL_BLEND); 1732 glDisable (GL_BLEND);
1479 } 1733 }
1480} 1734}
1481 1735
1736void
1737draw_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)
1738 PROTOTYPE: @
1739 CODE:
1740{
1741 glEnable (GL_BLEND);
1742 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1743 glEnable (GL_TEXTURE_2D);
1744 glBindTexture (GL_TEXTURE_2D, name1);
1745
1746 glColor3f (intensity, intensity, intensity);
1747 glPushMatrix ();
1748 glScalef (1./3, 1./3, 1.);
1749
1750 if (blend > 0.f)
1751 {
1752 float dx3 = dx * -3.f / w;
1753 float dy3 = dy * -3.f / h;
1754 GLfloat env_color[4] = { 0., 0., 0., blend };
1755
1756 /* interpolate the two shadow textures */
1757 /* stage 0 == rgb(glcolor) + alpha(t0) */
1758 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1759
1760 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1761 gl.ActiveTexture (GL_TEXTURE1);
1762 glEnable (GL_TEXTURE_2D);
1763 glBindTexture (GL_TEXTURE_2D, name2);
1764 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1765
1766 /* rgb == rgb(glcolor) */
1767 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1768 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1769 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1770
1771 /* alpha = interpolate t0, t1 by env_alpha */
1772 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1773
1774 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1775 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1776 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1777
1778 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1779 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1780
1781 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1782 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1783
1784 glBegin (GL_QUADS);
1785 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1786 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1787 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1788 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1789 glEnd ();
1790
1791 glDisable (GL_TEXTURE_2D);
1792 gl.ActiveTexture (GL_TEXTURE0);
1793 }
1794 else
1795 {
1796 /* simple blending of one texture, also opengl <1.3 path */
1797 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1798
1799 glBegin (GL_QUADS);
1800 glTexCoord2f (0, 0); glVertex2f (0, 0);
1801 glTexCoord2f (0, t); glVertex2f (0, h);
1802 glTexCoord2f (s, t); glVertex2f (w, h);
1803 glTexCoord2f (s, 0); glVertex2f (w, 0);
1804 glEnd ();
1805 }
1806
1807 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1808 {
1809 int x, y;
1810 int dx3 = dx * 3;
1811 int dy3 = dy * 3;
1812
1813 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1814 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1815 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1816 glTranslatef (-1., -1., 0);
1817 glBegin (GL_QUADS);
1818
1819 for (y = 1; y < h; y += 3)
1820 {
1821 int y1 = y - dy3;
1822 int y1valid = y1 >= 0 && y1 < h;
1823
1824 for (x = 1; x < w; x += 3)
1825 {
1826 int x1 = x - dx3;
1827 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1828 uint8_t h2;
1829
1830 if (y1valid && x1 >= 0 && x1 < w)
1831 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1832 else
1833 h2 = 1; /* out of range == invisible */
1834
1835 if (h1 || h2)
1836 {
1837 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1838 glColor4f (1., 1., 1., alpha);
1839
1840 glTexCoord2f (0, 0.); glVertex2i (x , y );
1841 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1842 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1843 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1844 }
1845 }
1846 }
1847 }
1848
1849 glEnd ();
1850
1851 glPopMatrix ();
1852
1853 glDisable (GL_TEXTURE_2D);
1854 glDisable (GL_BLEND);
1855}
1856
1482IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1857IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1483 CODE: 1858 CODE:
1484{ 1859{
1485 GLint width; 1860 GLint width;
1486 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1861 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1493MODULE = Deliantra::Client PACKAGE = DC::Map 1868MODULE = Deliantra::Client PACKAGE = DC::Map
1494 1869
1495PROTOTYPES: DISABLE 1870PROTOTYPES: DISABLE
1496 1871
1497DC::Map 1872DC::Map
1498new (SV *class) 1873new (SV *klass)
1499 CODE: 1874 CODE:
1500 New (0, RETVAL, 1, struct map); 1875 New (0, RETVAL, 1, struct map);
1501 RETVAL->x = 0; 1876 RETVAL->x = 0;
1502 RETVAL->y = 0; 1877 RETVAL->y = 0;
1503 RETVAL->w = 0; 1878 RETVAL->w = 0;
1590 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1965 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1591 // use uglier nearest interpolation because linear suffers 1966 // use uglier nearest interpolation because linear suffers
1592 // from transparent color bleeding and ugly wrapping effects. 1967 // from transparent color bleeding and ugly wrapping effects.
1593 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1968 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1594} 1969}
1970
1971void
1972expire_textures (DC::Map self, int texid, int count)
1973 PPCODE:
1974 for (; texid < self->texs && count; ++texid, --count)
1975 {
1976 maptex *tex = self->tex + texid;
1977
1978 if (tex->name)
1979 {
1980 if (tex->unused)
1981 {
1982 tex->name = 0;
1983 tex->unused = 0;
1984 XPUSHs (sv_2mortal (newSViv (texid)));
1985 }
1986 else
1987 tex->unused = 1;
1988 }
1989 }
1595 1990
1596int 1991int
1597ox (DC::Map self) 1992ox (DC::Map self)
1598 ALIAS: 1993 ALIAS:
1599 oy = 1 1994 oy = 1
1639 self->y += MAP_EXTEND_Y; 2034 self->y += MAP_EXTEND_Y;
1640 } 2035 }
1641} 2036}
1642 2037
1643SV * 2038SV *
1644map1a_update (DC::Map self, SV *data_, int extmap) 2039map1a_update (DC::Map self, SV *data_)
1645 CODE: 2040 CODE:
1646{ 2041{
1647 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2042 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1648 uint8_t *data_end = (uint8_t *)SvEND (data_); 2043 uint8_t *data_end = (uint8_t *)SvEND (data_);
1649 mapcell *cell; 2044 mapcell *cell;
1670 2065
1671 //TODO: don't trust server data to be in-range(!) 2066 //TODO: don't trust server data to be in-range(!)
1672 2067
1673 if (flags & 8) 2068 if (flags & 8)
1674 { 2069 {
2070 uint8_t ext, cmd;
2071
1675 if (extmap) 2072 do
1676 { 2073 {
1677 uint8_t ext, cmd; 2074 ext = *data++;
2075 cmd = ext & 0x7f;
1678 2076
1679 do 2077 if (cmd < 4)
2078 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2079 else if (cmd == 5) // health
1680 { 2080 {
1681 ext = *data++;
1682 cmd = ext & 0x3f;
1683
1684 if (cmd < 4)
1685 cell->darkness = 255 - ext * 64 + 1;
1686 else if (cmd == 5) // health
1687 {
1688 cell->stat_width = 1; 2081 cell->stat_width = 1;
1689 cell->stat_hp = *data++; 2082 cell->stat_hp = *data++;
1690 }
1691 else if (cmd == 6) // monster width
1692 cell->stat_width = *data++ + 1;
1693 else if (cmd == 0x47)
1694 {
1695 if (*data == 4)
1696 ; // decode player count
1697
1698 data += *data + 1;
1699 }
1700 else if (cmd == 8) // cell flags
1701 cell->flags = *data++;
1702 else if (ext & 0x40) // unknown, multibyte => skip
1703 data += *data + 1;
1704 else
1705 data++;
1706 } 2083 }
1707 while (ext & 0x80); 2084 else if (cmd == 6) // monster width
2085 cell->stat_width = *data++ + 1;
2086 else if (cmd == 0x47)
2087 {
2088 if (*data == 1) cell->player = data [1];
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);
2092
2093 data += *data + 1;
2094 }
2095 else if (cmd == 8) // cell flags
2096 cell->flags = *data++;
2097 else if (ext & 0x40) // unknown, multibyte => skip
2098 data += *data + 1;
2099 else
2100 data++;
1708 } 2101 }
1709 else 2102 while (ext & 0x80);
1710 cell->darkness = *data++ + 1;
1711 } 2103 }
1712 2104
1713 for (z = 0; z <= 2; ++z) 2105 for (z = 0; z <= 2; ++z)
1714 if (flags & (4 >> z)) 2106 if (flags & (4 >> z))
1715 { 2107 {
1718 cell->tile [z] = self->face2tile [face]; 2110 cell->tile [z] = self->face2tile [face];
1719 2111
1720 if (cell->tile [z]) 2112 if (cell->tile [z])
1721 { 2113 {
1722 maptex *tex = self->tex + cell->tile [z]; 2114 maptex *tex = self->tex + cell->tile [z];
2115 tex->unused = 0;
1723 if (!tex->name) 2116 if (!tex->name)
1724 av_push (missing, newSViv (cell->tile [z])); 2117 av_push (missing, newSViv (cell->tile [z]));
1725 2118
1726 if (tex->smoothtile) 2119 if (tex->smoothtile)
1727 { 2120 {
1728 maptex *smooth = self->tex + tex->smoothtile; 2121 maptex *smooth = self->tex + tex->smoothtile;
2122 smooth->unused = 0;
1729 if (!smooth->name) 2123 if (!smooth->name)
1730 av_push (missing, newSViv (tex->smoothtile)); 2124 av_push (missing, newSViv (tex->smoothtile));
1731 } 2125 }
1732 } 2126 }
1733 } 2127 }
1734 } 2128 }
1735 else 2129 else
1736 cell->darkness = 0; 2130 CELL_CLEAR (cell);
1737 } 2131 }
1738} 2132}
1739 OUTPUT: 2133 OUTPUT:
1740 RETVAL 2134 RETVAL
1741 2135
1761 ? self->row + y 2155 ? self->row + y
1762 : 0; 2156 : 0;
1763 2157
1764 for (x = x0; x < x1; x++) 2158 for (x = x0; x < x1; x++)
1765 { 2159 {
1766 int r = 32, g = 32, b = 32, a = 192; 2160 unsigned int r = 32, g = 32, b = 32, a = 192;
1767 2161
1768 if (row && row->c0 <= x && x < row->c1) 2162 if (row && row->c0 <= x && x < row->c1)
1769 { 2163 {
1770 mapcell *cell = row->col + (x - row->c0); 2164 mapcell *cell = row->col + (x - row->c0);
1771 2165
1773 { 2167 {
1774 maptex tex = self->tex [cell->tile [z]]; 2168 maptex tex = self->tex [cell->tile [z]];
1775 int a0 = 255 - tex.a; 2169 int a0 = 255 - tex.a;
1776 int a1 = tex.a; 2170 int a1 = tex.a;
1777 2171
1778 r = (r * a0 + tex.r * a1) / 255; 2172 r = div255 (r * a0 + tex.r * a1);
1779 g = (g * a0 + tex.g * a1) / 255; 2173 g = div255 (g * a0 + tex.g * a1);
1780 b = (b * a0 + tex.b * a1) / 255; 2174 b = div255 (b * a0 + tex.b * a1);
1781 a = (a * a0 + tex.a * a1) / 255; 2175 a = div255 (a * a0 + tex.a * a1);
1782 } 2176 }
1783 } 2177 }
1784 2178
1785 *map++ = (r ) 2179 *map++ = (r )
1786 | (g << 8) 2180 | (g << 8)
1793} 2187}
1794 OUTPUT: 2188 OUTPUT:
1795 RETVAL 2189 RETVAL
1796 2190
1797void 2191void
1798draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2192draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1799 CODE: 2193 CODE:
1800{ 2194{
1801 int x, y, z; 2195 int x, y, z;
1802 2196
1803 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2197 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1804 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2198 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1805 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2199 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1806 smooth_key skey; 2200 smooth_key skey;
1807 2201 int pl_x, pl_y;
2202 maptex pl_tex;
1808 rc_t *rc = rc_alloc (); 2203 rc_t *rc = rc_alloc ();
2204 rc_t *rc_ov = rc_alloc ();
1809 rc_key_t key; 2205 rc_key_t key;
1810 rc_array_t *arr; 2206 rc_array_t *arr;
1811 2207
2208 pl_tex.name = 0;
2209
1812 // thats current max. sorry. 2210 // that's current max. sorry.
1813 if (sw > 255) sw = 255; 2211 if (sw > 255) sw = 255;
1814 if (sh > 255) sh = 255; 2212 if (sh > 255) sh = 255;
1815 2213
1816 // clear key, in case of extra padding 2214 // clear key, in case of extra padding
1817 memset (&skey, 0, sizeof (skey)); 2215 memset (&skey, 0, sizeof (skey));
1821 key.g = 255; 2219 key.g = 255;
1822 key.b = 255; 2220 key.b = 255;
1823 key.a = 255; 2221 key.a = 255;
1824 key.mode = GL_QUADS; 2222 key.mode = GL_QUADS;
1825 key.format = GL_T2F_V3F; 2223 key.format = GL_T2F_V3F;
1826 key.texname = -1;
1827 2224
1828 mx += self->x; 2225 mx += self->x;
1829 my += self->y; 2226 my += self->y;
1830 2227
1831 // first pass: determine smooth_max 2228 // first pass: determine smooth_max
1855 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2252 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1856 2253
1857 for (z = 0; z <= 2; z++) 2254 for (z = 0; z <= 2; z++)
1858 { 2255 {
1859 memset (smooth_level, 0, sizeof (smooth_level)); 2256 memset (smooth_level, 0, sizeof (smooth_level));
2257 key.texname = -1;
1860 2258
1861 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
1862 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
1863 { 2261 {
1864 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
1874 maptex tex = self->tex [tile]; 2272 maptex tex = self->tex [tile];
1875 int px, py; 2273 int px, py;
1876 2274
1877 if (key.texname != tex.name) 2275 if (key.texname != tex.name)
1878 { 2276 {
2277 self->tex [tile].unused = 0;
2278
1879 if (!tex.name) 2279 if (!tex.name)
1880 tex = self->tex [2]; /* missing, replace by noface */ 2280 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1881 2281
1882 key.texname = tex.name; 2282 key.texname = tex.name;
1883 arr = rc_array (rc, &key); 2283 arr = rc_array (rc, &key);
1884 } 2284 }
1885 2285
1886 px = (x + 1) * T - tex.w; 2286 px = (x + 1) * Th - tex.w;
1887 py = (y + 1) * T - tex.h; 2287 py = (y + 1) * Tw - tex.h;
2288
2289 if (expect_false (cell->player == player) && expect_false (z == 2))
2290 {
2291 pl_x = px;
2292 pl_y = py;
2293 pl_tex = tex;
2294 continue;
2295 }
1888 2296
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2297 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2298 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1891 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2299 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1892 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2300 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1893
1894 if (cell->flags && z == 2)
1895 {
1896 // overlays such as the speech bubble, probably more to come
1897 if (cell->flags & 1)
1898 {
1899 maptex tex = self->tex [1];
1900 int px = x * T + T * 2 / 32;
1901 int py = y * T - T * 6 / 32;
1902
1903 if (tex.name)
1904 {
1905 if (key.texname != tex.name)
1906 {
1907 key.texname = tex.name;
1908 arr = rc_array (rc, &key);
1909 }
1910
1911 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1912 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1913 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1914 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1915 }
1916 }
1917 }
1918 2301
1919 // update smooth hash 2302 // update smooth hash
1920 if (tex.smoothtile) 2303 if (tex.smoothtile)
1921 { 2304 {
1922 skey.tile = tex.smoothtile; 2305 skey.tile = tex.smoothtile;
1951 // corners 2334 // corners
1952 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2335 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1953 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2336 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1954 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2337 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1955 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2338 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2339 }
2340 }
2341
2342 if (expect_false (z == 2) && expect_false (cell->flags))
2343 {
2344 // overlays such as the speech bubble, probably more to come
2345 if (cell->flags & 1)
2346 {
2347 rc_key_t key_ov = key;
2348 maptex tex = self->tex [TEXID_SPEECH];
2349 rc_array_t *arr;
2350 int px = x * Tw + Tw * 2 / 32;
2351 int py = y * Th - Th * 6 / 32;
2352
2353 key_ov.texname = tex.name;
2354 arr = rc_array (rc_ov, &key_ov);
2355
2356 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2357 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2358 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2359 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1956 } 2360 }
1957 } 2361 }
1958 } 2362 }
1959 } 2363 }
1960 2364
1987 if (!(bits & 0x1000) 2391 if (!(bits & 0x1000)
1988 && skey->level == level 2392 && skey->level == level
1989 && level > smooth_max [skey->x][skey->y]) 2393 && level > smooth_max [skey->x][skey->y])
1990 { 2394 {
1991 maptex tex = self->tex [skey->tile]; 2395 maptex tex = self->tex [skey->tile];
1992 int px = (((int)skey->x) - 1) * T; 2396 int px = (((int)skey->x) - 1) * Tw;
1993 int py = (((int)skey->y) - 1) * T; 2397 int py = (((int)skey->y) - 1) * Th;
1994 int border = bits & 15; 2398 int border = bits & 15;
1995 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2399 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1996 float dx = tex.s * .0625f; // 16 images/row 2400 float dx = tex.s * .0625f; // 16 images/row
1997 float dy = tex.t * .5f ; // 2 images/column 2401 float dy = tex.t * .5f ; // 2 images/column
1998 2402
2000 { 2404 {
2001 // this time avoiding texture state changes 2405 // this time avoiding texture state changes
2002 // save gobs of state changes. 2406 // save gobs of state changes.
2003 if (key.texname != tex.name) 2407 if (key.texname != tex.name)
2004 { 2408 {
2409 self->tex [skey->tile].unused = 0;
2410
2005 glEnd (); 2411 glEnd ();
2006 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2412 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2007 glBegin (GL_QUADS); 2413 glBegin (GL_QUADS);
2008 } 2414 }
2009 2415
2010 if (border) 2416 if (border)
2011 { 2417 {
2012 float ox = border * dx; 2418 float ox = border * dx;
2013 2419
2014 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2420 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2015 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2421 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2016 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2422 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2017 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2423 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2018 } 2424 }
2019 2425
2020 if (corner) 2426 if (corner)
2021 { 2427 {
2022 float ox = corner * dx; 2428 float ox = corner * dx;
2023 2429
2024 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2025 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2026 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2027 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2028 } 2434 }
2029 } 2435 }
2030 } 2436 }
2031 } 2437 }
2032 } 2438 }
2038 } 2444 }
2039 2445
2040 hv_clear (smooth); 2446 hv_clear (smooth);
2041 } 2447 }
2042 2448
2449 if (pl_tex.name)
2450 {
2451 maptex tex = pl_tex;
2452 int px = pl_x + sdx;
2453 int py = pl_y + sdy;
2454
2455 key.texname = tex.name;
2456 arr = rc_array (rc, &key);
2457
2458 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2459 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2460 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2461 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2462
2463 rc_draw (rc);
2464 }
2465
2466 rc_draw (rc_ov);
2467 rc_clear (rc_ov);
2468
2043 glDisable (GL_BLEND); 2469 glDisable (GL_BLEND);
2044 rc_free (rc); 2470 rc_free (rc);
2471 rc_free (rc_ov);
2045 2472
2046 // top layer: overlays such as the health bar 2473 // top layer: overlays such as the health bar
2047 for (y = 0; y < sh; y++) 2474 for (y = 0; y < sh; y++)
2048 if (0 <= y + my && y + my < self->rows) 2475 if (0 <= y + my && y + my < self->rows)
2049 { 2476 {
2052 for (x = 0; x < sw; x++) 2479 for (x = 0; x < sw; x++)
2053 if (row->c0 <= x + mx && x + mx < row->c1) 2480 if (row->c0 <= x + mx && x + mx < row->c1)
2054 { 2481 {
2055 mapcell *cell = row->col + (x + mx - row->c0); 2482 mapcell *cell = row->col + (x + mx - row->c0);
2056 2483
2057 int px = x * T; 2484 int px = x * Tw;
2058 int py = y * T; 2485 int py = y * Th;
2486
2487 if (expect_false (cell->player == player))
2488 {
2489 px += sdx;
2490 py += sdy;
2491 }
2059 2492
2060 if (cell->stat_hp) 2493 if (cell->stat_hp)
2061 { 2494 {
2062 int width = cell->stat_width * T; 2495 int width = cell->stat_width * Tw;
2063 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2496 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2064 2497
2065 glColor3ub (0, 0, 0); 2498 glColor3ub (0, 0, 0);
2066 glRectf (px + 1, py - thick - 2, 2499 glRectf (px + 1, py - thick - 2,
2067 px + width - 1, py); 2500 px + width - 1, py);
2068 2501
2074 } 2507 }
2075 } 2508 }
2076} 2509}
2077 2510
2078void 2511void
2079draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2512draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2080 CODE: 2513 CODE:
2081{ 2514{
2082 static float color[16][3] = { 2515 static float color[16][3] = {
2083 { 0.00F, 0.00F, 0.00F }, 2516 { 0.00f, 0.00f, 0.00f },
2084 { 1.00F, 1.00F, 1.00F }, 2517 { 1.00f, 1.00f, 1.00f },
2085 { 0.00F, 0.00F, 0.55F }, 2518 { 0.00f, 0.00f, 0.55f },
2086 { 1.00F, 0.00F, 0.00F }, 2519 { 1.00f, 0.00f, 0.00f },
2087 2520
2088 { 1.00F, 0.54F, 0.00F }, 2521 { 1.00f, 0.54f, 0.00f },
2089 { 0.11F, 0.56F, 1.00F }, 2522 { 0.11f, 0.56f, 1.00f },
2090 { 0.93F, 0.46F, 0.00F }, 2523 { 0.93f, 0.46f, 0.00f },
2091 { 0.18F, 0.54F, 0.34F }, 2524 { 0.18f, 0.54f, 0.34f },
2092 2525
2093 { 0.56F, 0.73F, 0.56F }, 2526 { 0.56f, 0.73f, 0.56f },
2094 { 0.80F, 0.80F, 0.80F }, 2527 { 0.80f, 0.80f, 0.80f },
2095 { 0.55F, 0.41F, 0.13F }, 2528 { 0.55f, 0.41f, 0.13f },
2096 { 0.99F, 0.77F, 0.26F }, 2529 { 0.99f, 0.77f, 0.26f },
2097 2530
2098 { 0.74F, 0.65F, 0.41F }, 2531 { 0.74f, 0.65f, 0.41f },
2099 2532
2100 { 0.00F, 1.00F, 1.00F }, 2533 { 0.00f, 1.00f, 1.00f },
2101 { 1.00F, 0.00F, 1.00F }, 2534 { 1.00f, 0.00f, 1.00f },
2102 { 1.00F, 1.00F, 0.00F }, 2535 { 1.00f, 1.00f, 0.00f },
2103 }; 2536 };
2104 2537
2105 int x, y; 2538 int x, y;
2106 2539
2107 glEnable (GL_TEXTURE_2D); 2540 glEnable (GL_TEXTURE_2D);
2541 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2542 * but the nvidia driver (185.18.14) mishandles alpha textures
2543 * and takes the colour from god knows where instead of using
2544 * Cp. MODULATE results in the same colour, but slightly different
2545 * alpha, but atcually gives us the correct colour with nvidia.
2546 */
2108 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2547 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2109 glEnable (GL_BLEND); 2548 glEnable (GL_BLEND);
2110 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2549 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2111 glBegin (GL_QUADS); 2550 glBegin (GL_QUADS);
2112 2551
2113 for (y = 0; y < h; y++) 2552 for (y = 0; y < h; y++)
2117 2556
2118 if (m) 2557 if (m)
2119 { 2558 {
2120 float *c = color [m & 15]; 2559 float *c = color [m & 15];
2121 2560
2122 float tx1 = m & 0x40 ? 0.5 : 0.; 2561 float tx1 = m & 0x40 ? 0.5f : 0.f;
2123 float tx2 = tx1 + 0.5; 2562 float tx2 = tx1 + 0.5f;
2124 2563
2125 glColor4f (c[0], c[1], c[2], 0.75); 2564 glColor4f (c[0], c[1], c[2], 1);
2126 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2565 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2127 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2566 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2128 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2567 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2129 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2568 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2130 } 2569 }
2138void 2577void
2139fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2578fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2140 PPCODE: 2579 PPCODE:
2141{ 2580{
2142 int x, y; 2581 int x, y;
2143 int sw1 = sw + 2; 2582 int sw1 = sw + 2;
2144 int sh1 = sh + 2; 2583 int sh1 = sh + 2;
2145 int sh3 = sh * 3; 2584 int sh3 = sh * 3;
2146 int sw34 = (sw * 3 + 3) & ~3; 2585 int sw3 = sw * 3;
2586 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2587 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2147 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2588 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2148 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2589 memset (darkness1, 0, sw1*sh1);
2149 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2150 2590
2151 SvPOK_only (darkness3_sv); 2591 SvPOK_only (darkness3_sv);
2152 SvCUR_set (darkness3_sv, sw34 * sh3); 2592 SvCUR_set (darkness3_sv, sw3 * sh3);
2153 2593
2154 mx += self->x - 1; 2594 mx += self->x - 1;
2155 my += self->y - 1; 2595 my += self->y - 1;
2156
2157 memset (darkness1, 255, sw1 * sh1);
2158 2596
2159 for (y = 0; y < sh1; y++) 2597 for (y = 0; y < sh1; y++)
2160 if (0 <= y + my && y + my < self->rows) 2598 if (0 <= y + my && y + my < self->rows)
2161 { 2599 {
2162 maprow *row = self->row + (y + my); 2600 maprow *row = self->row + (y + my);
2165 if (row->c0 <= x + mx && x + mx < row->c1) 2603 if (row->c0 <= x + mx && x + mx < row->c1)
2166 { 2604 {
2167 mapcell *cell = row->col + (x + mx - row->c0); 2605 mapcell *cell = row->col + (x + mx - row->c0);
2168 2606
2169 darkness1 [y * sw1 + x] = cell->darkness 2607 darkness1 [y * sw1 + x] = cell->darkness
2170 ? 255 - (cell->darkness - 1) 2608 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2171 : 255 - FOW_DARKNESS; 2609 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2172 } 2610 }
2173 } 2611 }
2174 2612
2175 for (y = 0; y < sh; ++y) 2613 for (y = 0; y < sh; ++y)
2176 for (x = 0; x < sw; ++x) 2614 for (x = 0; x < sw; ++x)
2195 2633
2196 uint8_t r13 = (d13 + d23 + d12) / 3; 2634 uint8_t r13 = (d13 + d23 + d12) / 3;
2197 uint8_t r23 = d23; 2635 uint8_t r23 = d23;
2198 uint8_t r33 = (d23 + d33 + d32) / 3; 2636 uint8_t r33 = (d23 + d33 + d32) / 3;
2199 2637
2200 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2201 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2202 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2203 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2204 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2642 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2205 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2206 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2207 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2208 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2209 } 2647 }
2210 2648
2211 free (darkness1); 2649 free (darkness1);
2212 2650
2213 EXTEND (SP, 3); 2651 EXTEND (SP, 3);
2214 PUSHs (sv_2mortal (newSViv (sw34))); 2652 PUSHs (sv_2mortal (newSViv (sw3)));
2215 PUSHs (sv_2mortal (newSViv (sh3))); 2653 PUSHs (sv_2mortal (newSViv (sh3)));
2216 PUSHs (darkness3_sv); 2654 PUSHs (darkness3_sv);
2217} 2655}
2218 2656
2219SV * 2657SV *
2282 else 2720 else
2283 *data++ = 0; 2721 *data++ = 0;
2284 } 2722 }
2285 } 2723 }
2286 2724
2725 /* if size is w*h + 5 then no data has been found */
2726 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2727 {
2287 SvPOK_only (data_sv); 2728 SvPOK_only (data_sv);
2288 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2729 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2730 }
2731
2289 RETVAL = data_sv; 2732 RETVAL = data_sv;
2290} 2733}
2291 OUTPUT: 2734 OUTPUT:
2292 RETVAL 2735 RETVAL
2293 2736
2294void 2737void
2295set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2738set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2296 PPCODE: 2739 PPCODE:
2297{ 2740{
2298 int x, y, z; 2741 int x, y, z;
2299 int w, h; 2742 int w, h;
2300 int x1, y1; 2743 int x1, y1;
2744 STRLEN len;
2745 uint8_t *data, *end;
2746
2747 len = SvLEN (data_sv);
2748 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2749 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2750 end = data + len + 8;
2751
2752 if (len < 5)
2753 XSRETURN_EMPTY;
2301 2754
2302 if (*data++ != 0) 2755 if (*data++ != 0)
2303 XSRETURN_EMPTY; /* version mismatch */ 2756 XSRETURN_EMPTY; /* version mismatch */
2304 2757
2305 w = *data++ << 8; w |= *data++; 2758 w = *data++ << 8; w |= *data++;
2320 { 2773 {
2321 maprow *row = map_get_row (self, y); 2774 maprow *row = map_get_row (self, y);
2322 2775
2323 for (x = x0; x < x1; x++) 2776 for (x = x0; x < x1; x++)
2324 { 2777 {
2778 uint8_t flags;
2779
2780 if (data + 7 >= end)
2781 XSRETURN_EMPTY;
2782
2325 uint8_t flags = *data++; 2783 flags = *data++;
2326 2784
2327 if (flags) 2785 if (flags)
2328 { 2786 {
2329 mapcell *cell = row_get_cell (row, x); 2787 mapcell *cell = row_get_cell (row, x);
2330 tileid tile[3] = { 0, 0, 0 }; 2788 tileid tile[3] = { 0, 0, 0 };
2333 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2791 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2334 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2792 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2335 2793
2336 if (cell->darkness == 0) 2794 if (cell->darkness == 0)
2337 { 2795 {
2338 cell->darkness = 0; 2796 /*cell->darkness = 0;*/
2797 EXTEND (SP, 3);
2339 2798
2340 for (z = 0; z <= 2; z++) 2799 for (z = 0; z <= 2; z++)
2341 { 2800 {
2342 tileid t = tile [z]; 2801 tileid t = tile [z];
2343 2802
2344 if (t >= self->texs || (t && !self->tex [t].name)) 2803 if (t >= self->texs || (t && !self->tex [t].name))
2345 { 2804 {
2346 XPUSHs (sv_2mortal (newSViv (t))); 2805 PUSHs (sv_2mortal (newSViv (t)));
2347 need_texid (self, t); 2806 need_texid (self, t);
2348 } 2807 }
2349 2808
2350 cell->tile [z] = t; 2809 cell->tile [z] = t;
2351 } 2810 }
2356} 2815}
2357 2816
2358MODULE = Deliantra::Client PACKAGE = DC::RW 2817MODULE = Deliantra::Client PACKAGE = DC::RW
2359 2818
2360DC::RW 2819DC::RW
2361new (SV *class, SV *data_sv) 2820new (SV *klass, SV *data_sv)
2362 CODE: 2821 CODE:
2363{ 2822{
2364 STRLEN datalen; 2823 STRLEN datalen;
2365 char *data = SvPVbyte (data_sv, datalen); 2824 char *data = SvPVbyte (data_sv, datalen);
2366 2825
2368} 2827}
2369 OUTPUT: 2828 OUTPUT:
2370 RETVAL 2829 RETVAL
2371 2830
2372DC::RW 2831DC::RW
2373new_from_file (SV *class, const char *path, const char *mode = "rb") 2832new_from_file (SV *klass, const char *path, const char *mode = "rb")
2374 CODE: 2833 CODE:
2375 RETVAL = SDL_RWFromFile (path, mode); 2834 RETVAL = SDL_RWFromFile (path, mode);
2376 OUTPUT: 2835 OUTPUT:
2377 RETVAL 2836 RETVAL
2378 2837
2396 if (RETVAL < 0) 2855 if (RETVAL < 0)
2397 { 2856 {
2398 RETVAL = Mix_GroupOldest (-1); 2857 RETVAL = Mix_GroupOldest (-1);
2399 2858
2400 if (RETVAL < 0) 2859 if (RETVAL < 0)
2860 {
2861 // happens sometimes, maybe it just stopped playing(?)
2862 RETVAL = Mix_GroupAvailable (-1);
2863
2864 if (RETVAL < 0)
2401 XSRETURN_UNDEF; 2865 XSRETURN_UNDEF;
2402 2866 }
2867 else
2403 Mix_HaltChannel (RETVAL); 2868 Mix_HaltChannel (RETVAL);
2404 } 2869 }
2405 2870
2406 Mix_UnregisterAllEffects (RETVAL); 2871 Mix_UnregisterAllEffects (RETVAL);
2407 Mix_Volume (RETVAL, 128); 2872 Mix_Volume (RETVAL, 128);
2408} 2873}
2455void 2920void
2456set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2921set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2457 CODE: 2922 CODE:
2458{ 2923{
2459 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2924 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2460 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2925 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2461 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2926 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2462} 2927}
2463 2928
2464void 2929void
2465set_reverse_stereo (DC::Channel self, int flip) 2930set_reverse_stereo (DC::Channel self, int flip)
2468 2933
2469MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2934MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2470 2935
2471PROTOTYPES: DISABLE 2936PROTOTYPES: DISABLE
2472 2937
2938void
2939decoders ()
2940 PPCODE:
2941#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2942 int i, num = Mix_GetNumChunkDecoders ();
2943 EXTEND (SP, num);
2944 for (i = 0; i < num; ++i)
2945 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2946#else
2947 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2948#endif
2949
2473DC::MixChunk 2950DC::MixChunk
2474new (SV *class, DC::RW rwops) 2951new (SV *klass, DC::RW rwops)
2475 CODE: 2952 CODE:
2476 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2953 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2477 OUTPUT: 2954 OUTPUT:
2478 RETVAL 2955 RETVAL
2479 2956
2509 OUTPUT: 2986 OUTPUT:
2510 RETVAL 2987 RETVAL
2511 2988
2512MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2989MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2513 2990
2991void
2992decoders ()
2993 PPCODE:
2994#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2995 int i, num = Mix_GetNumMusicDecoders ();
2996 EXTEND (SP, num);
2997 for (i = 0; i < num; ++i)
2998 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2999#else
3000 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3001#endif
3002
2514int 3003int
2515volume (int volume = -1) 3004volume (int volume = -1)
2516 PROTOTYPE: ;$ 3005 PROTOTYPE: ;$
2517 CODE: 3006 CODE:
2518 if (items > 0) 3007 if (items > 0)
2529void 3018void
2530halt () 3019halt ()
2531 CODE: 3020 CODE:
2532 Mix_HaltMusic (); 3021 Mix_HaltMusic ();
2533 3022
3023int
3024playing ()
3025 CODE:
3026 RETVAL = Mix_PlayingMusic ();
3027 OUTPUT:
3028 RETVAL
3029
2534DC::MixMusic 3030DC::MixMusic
2535new (SV *class, DC::RW rwops) 3031new (SV *klass, DC::RW rwops)
2536 CODE: 3032 CODE:
2537 RETVAL = Mix_LoadMUS_RW (rwops); 3033 RETVAL = Mix_LoadMUS_RW (rwops);
2538 OUTPUT: 3034 OUTPUT:
2539 RETVAL 3035 RETVAL
2540 3036
2568 } *civ, const_iv[] = { 3064 } *civ, const_iv[] = {
2569# define const_iv(name) { # name, (IV)name } 3065# define const_iv(name) { # name, (IV)name }
2570 const_iv (GL_VENDOR), 3066 const_iv (GL_VENDOR),
2571 const_iv (GL_VERSION), 3067 const_iv (GL_VERSION),
2572 const_iv (GL_EXTENSIONS), 3068 const_iv (GL_EXTENSIONS),
3069 const_iv (GL_MAX_TEXTURE_UNITS),
2573 const_iv (GL_COLOR_MATERIAL), 3070 const_iv (GL_COLOR_MATERIAL),
2574 const_iv (GL_SMOOTH), 3071 const_iv (GL_SMOOTH),
2575 const_iv (GL_FLAT), 3072 const_iv (GL_FLAT),
2576 const_iv (GL_DITHER), 3073 const_iv (GL_DITHER),
2577 const_iv (GL_BLEND), 3074 const_iv (GL_BLEND),
2589 const_iv (GL_ZERO), 3086 const_iv (GL_ZERO),
2590 const_iv (GL_SRC_ALPHA), 3087 const_iv (GL_SRC_ALPHA),
2591 const_iv (GL_DST_ALPHA), 3088 const_iv (GL_DST_ALPHA),
2592 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3089 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2593 const_iv (GL_ONE_MINUS_DST_ALPHA), 3090 const_iv (GL_ONE_MINUS_DST_ALPHA),
3091 const_iv (GL_SRC_COLOR),
3092 const_iv (GL_DST_COLOR),
3093 const_iv (GL_ONE_MINUS_SRC_COLOR),
3094 const_iv (GL_ONE_MINUS_DST_COLOR),
2594 const_iv (GL_SRC_ALPHA_SATURATE), 3095 const_iv (GL_SRC_ALPHA_SATURATE),
2595 const_iv (GL_RGB), 3096 const_iv (GL_RGB),
2596 const_iv (GL_RGBA), 3097 const_iv (GL_RGBA),
2597 const_iv (GL_RGBA4), 3098 const_iv (GL_RGBA4),
2598 const_iv (GL_RGBA8), 3099 const_iv (GL_RGBA8),
2666 const_iv (GL_NICEST), 3167 const_iv (GL_NICEST),
2667 const_iv (GL_V2F), 3168 const_iv (GL_V2F),
2668 const_iv (GL_V3F), 3169 const_iv (GL_V3F),
2669 const_iv (GL_T2F_V3F), 3170 const_iv (GL_T2F_V3F),
2670 const_iv (GL_T2F_N3F_V3F), 3171 const_iv (GL_T2F_N3F_V3F),
3172 const_iv (GL_FUNC_ADD),
3173 const_iv (GL_FUNC_SUBTRACT),
3174 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2671# undef const_iv 3175# undef const_iv
2672 }; 3176 };
2673 3177
2674 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3178 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2675 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3179 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2676 3180
2677 texture_av = newAV (); 3181 texture_av = newAV ();
2678 AvREAL_off (texture_av); 3182 AvREAL_off (texture_av);
2679} 3183}
2680 3184
2682disable_GL_EXT_blend_func_separate () 3186disable_GL_EXT_blend_func_separate ()
2683 CODE: 3187 CODE:
2684 gl.BlendFuncSeparate = 0; 3188 gl.BlendFuncSeparate = 0;
2685 gl.BlendFuncSeparateEXT = 0; 3189 gl.BlendFuncSeparateEXT = 0;
2686 3190
2687char * 3191void
3192apple_nvidia_bug (int enable)
3193
3194const char *
2688gl_vendor () 3195gl_vendor ()
2689 CODE: 3196 CODE:
2690 RETVAL = (char *)glGetString (GL_VENDOR); 3197 RETVAL = (const char *)glGetString (GL_VENDOR);
2691 OUTPUT: 3198 OUTPUT:
2692 RETVAL 3199 RETVAL
2693 3200
2694char * 3201const char *
2695gl_version () 3202gl_version ()
2696 CODE: 3203 CODE:
2697 RETVAL = (char *)glGetString (GL_VERSION); 3204 RETVAL = (const char *)glGetString (GL_VERSION);
2698 OUTPUT: 3205 OUTPUT:
2699 RETVAL 3206 RETVAL
2700 3207
2701char * 3208const char *
2702gl_extensions () 3209gl_extensions ()
2703 CODE: 3210 CODE:
2704 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3211 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2705 OUTPUT: 3212 OUTPUT:
2706 RETVAL 3213 RETVAL
2707 3214
2708const char *glGetString (GLenum pname) 3215const char *glGetString (GLenum pname)
3216 CODE:
3217 RETVAL = (const char *)glGetString (pname);
3218 OUTPUT:
3219 RETVAL
2709 3220
2710GLint glGetInteger (GLenum pname) 3221GLint glGetInteger (GLenum pname)
2711 CODE: 3222 CODE:
2712 glGetIntegerv (pname, &RETVAL); 3223 glGetIntegerv (pname, &RETVAL);
2713 OUTPUT: 3224 OUTPUT:
2721 3232
2722int glGetError () 3233int glGetError ()
2723 3234
2724void glFinish () 3235void glFinish ()
2725 3236
3237void glFlush ()
3238
2726void glClear (int mask) 3239void glClear (int mask)
2727 3240
2728void glClearColor (float r, float g, float b, float a = 1.0) 3241void glClearColor (float r, float g, float b, float a = 1.0)
2729 PROTOTYPE: @ 3242 PROTOTYPE: @
2730 3243
2739void glBlendFunc (int sfactor, int dfactor) 3252void glBlendFunc (int sfactor, int dfactor)
2740 3253
2741void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3254void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2742 CODE: 3255 CODE:
2743 gl_BlendFuncSeparate (sa, da, saa, daa); 3256 gl_BlendFuncSeparate (sa, da, saa, daa);
3257
3258# void glBlendEquation (int se)
2744 3259
2745void glDepthMask (int flag) 3260void glDepthMask (int flag)
2746 3261
2747void glLogicOp (int opcode) 3262void glLogicOp (int opcode)
2748 3263
2783void glRotate (float angle, float x, float y, float z) 3298void glRotate (float angle, float x, float y, float z)
2784 CODE: 3299 CODE:
2785 glRotatef (angle, x, y, z); 3300 glRotatef (angle, x, y, z);
2786 3301
2787void glColor (float r, float g, float b, float a = 1.0) 3302void glColor (float r, float g, float b, float a = 1.0)
3303 PROTOTYPE: @
2788 ALIAS: 3304 ALIAS:
2789 glColor_premultiply = 1 3305 glColor_premultiply = 1
2790 CODE: 3306 CODE:
2791 if (ix) 3307 if (ix)
2792 { 3308 {
2897void glNewList (int list, int mode = GL_COMPILE) 3413void glNewList (int list, int mode = GL_COMPILE)
2898 3414
2899void glEndList () 3415void glEndList ()
2900 3416
2901void glCallList (int list) 3417void glCallList (int list)
3418
3419void c_init ()
3420 CODE:
3421 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3422 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2902 3423
2903MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3424MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2904 3425
2905PROTOTYPES: DISABLE 3426PROTOTYPES: DISABLE
2906 3427

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines