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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines