ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.245 by root, Fri Dec 28 15:05:20 2007 UTC vs.
Revision 1.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>
56
57#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0
59#endif
60
61#if !PANGO_VERSION_CHECK (1, 15, 2)
62# define pango_layout_get_line_readonly pango_layout_get_line
63# define pango_layout_get_lines_readonly pango_layout_get_lines
64# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
65# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
66#endif
50 67
51#ifndef _WIN32 68#ifndef _WIN32
52# include <sys/types.h> 69# include <sys/types.h>
53# include <sys/socket.h> 70# include <sys/socket.h>
54# include <netinet/in.h> 71# include <netinet/in.h>
55# include <netinet/tcp.h> 72# include <netinet/tcp.h>
56# include <inttypes.h> 73# include <inttypes.h>
57#endif 74#endif
58 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
61#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
62 91
63#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
65 94
66#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
67 96
68#if 0 97/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 99
71# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
72#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
73 123
74static AV *texture_av; 124static AV *texture_av;
75 125
76static struct 126static struct
77{ 127{
134{ 184{
135 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
136 186
137 while (attrs) 187 while (attrs)
138 { 188 {
139 PangoAttribute *attr = attrs->data; 189 PangoAttribute *attr = (PangoAttribute *)attrs->data;
140 190
141 if (attr->klass->type == PANGO_ATTR_SHAPE) 191 if (attr->klass->type == PANGO_ATTR_SHAPE)
142 return 1; 192 return 1;
143 193
144 attrs = attrs->next; 194 attrs = attrs->next;
162static void 212static void
163substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
164{ 214{
165 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
166#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
167 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
168#endif 218#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 220}
171 221
172static void 222static void
173layout_update_font (DC__Layout self) 223layout_update_font (DC__Layout self)
174{ 224{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 225 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 226 * reasonably well with dejavu/bistream fonts
177 */ 227 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 228 PangoFontDescription *font = self->font ? self->font : default_font;
179 229
180 pango_font_description_set_absolute_size (font, 230 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 231 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
209 int w, h; 259 int w, h;
210 float s, t; 260 float s, t;
211 uint8_t r, g, b, a; 261 uint8_t r, g, b, a;
212 tileid smoothtile; 262 tileid smoothtile;
213 uint8_t smoothlevel; 263 uint8_t smoothlevel;
264 uint8_t unused; /* set to zero on use */
214} maptex; 265} maptex;
215 266
216typedef struct { 267typedef struct {
217 uint32_t player; 268 uint32_t player;
218 tileid tile[3]; 269 tileid tile[3];
350 self->oy = 0; 401 self->oy = 0;
351 self->row = 0; 402 self->row = 0;
352 self->rows = 0; 403 self->rows = 0;
353} 404}
354 405
406#define CELL_CLEAR(cell) \
407 do { \
408 if ((cell)->player) \
409 (cell)->tile [2] = 0; \
410 (cell)->darkness = 0; \
411 (cell)->stat_hp = 0; \
412 (cell)->flags = 0; \
413 (cell)->player = 0; \
414 } while (0)
415
355static void 416static void
356map_blank (DC__Map self, int x0, int y0, int w, int h) 417map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 418{
358 int x, y; 419 int x, y;
359 maprow *row; 420 maprow *row;
373 if (x >= row->c1) 434 if (x >= row->c1)
374 break; 435 break;
375 436
376 cell = row->col + x - row->c0; 437 cell = row->col + x - row->c0;
377 438
378 cell->darkness = 0; 439 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 440 }
383 } 441 }
384} 442}
385 443
386typedef struct { 444typedef struct {
421 ev.code = 1; 479 ev.code = 1;
422 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
423 ev.data2 = 0; 481 ev.data2 = 0;
424 482
425 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
484}
485
486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
426} 490}
427 491
428static unsigned int 492static unsigned int
429minpot (unsigned int n) 493minpot (unsigned int n)
430{ 494{
497 if (!svp || !SvTRUE (*svp)) 561 if (!svp || !SvTRUE (*svp))
498 return 0; 562 return 0;
499 563
500 return 1; 564 return 1;
501} 565}
566
567/******************************************************************************/
568
569/* process keyboard modifiers */
570static int
571mod_munge (int mod)
572{
573 mod &= MOD_MASK;
574
575 if (mod & (KMOD_META | KMOD_ALT))
576 mod |= KMOD_LRAM;
577
578 return mod;
579}
580
581static void
582deliantra_main (SV *real_main)
583{
584 dSP;
585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
588}
589
590#ifdef __MACOSX__
591 static SV *real_main;
592
593 /* to due surprising braindamage on the side of SDL design, we
594 * do some mind-boggling hack here: SDL requires a custom main()
595 * on OS X, so... we provide one and call the original main(), which,
596 * due to shared library magic, calls -lSDLmain's main, not perl's main,
597 * and which calls our main (== SDL_main) back.
598 */
599 extern C_LINKAGE int
600 main (int argc, char *argv[])
601 {
602 deliantra_main (real_main);
603 }
604
605 #undef main
606
607 extern C_LINKAGE int main (int argc, char *argv[]);
608
609 static void
610 SDL_main_hack (SV *real_main_)
611 {
612 real_main = real_main_;
613
614 char *argv[] = { "deliantra client", 0 };
615 (main) (1, argv);
616 }
617#else
618 static void
619 SDL_main_hack (SV *real_main)
620 {
621 deliantra_main (real_main);
622 }
623#endif
502 624
503MODULE = Deliantra::Client PACKAGE = DC 625MODULE = Deliantra::Client PACKAGE = DC
504 626
505PROTOTYPES: ENABLE 627PROTOTYPES: ENABLE
506 628
535 const_iv (SDL_USEREVENT), 657 const_iv (SDL_USEREVENT),
536 658
537 const_iv (SDL_APPINPUTFOCUS), 659 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 660 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 661 const_iv (SDL_APPACTIVE),
662
663
664 const_iv (SDLK_UNKNOWN),
665 const_iv (SDLK_FIRST),
666 const_iv (SDLK_BACKSPACE),
667 const_iv (SDLK_TAB),
668 const_iv (SDLK_CLEAR),
669 const_iv (SDLK_RETURN),
670 const_iv (SDLK_PAUSE),
671 const_iv (SDLK_ESCAPE),
672 const_iv (SDLK_SPACE),
673 const_iv (SDLK_EXCLAIM),
674 const_iv (SDLK_QUOTEDBL),
675 const_iv (SDLK_HASH),
676 const_iv (SDLK_DOLLAR),
677 const_iv (SDLK_AMPERSAND),
678 const_iv (SDLK_QUOTE),
679 const_iv (SDLK_LEFTPAREN),
680 const_iv (SDLK_RIGHTPAREN),
681 const_iv (SDLK_ASTERISK),
682 const_iv (SDLK_PLUS),
683 const_iv (SDLK_COMMA),
684 const_iv (SDLK_MINUS),
685 const_iv (SDLK_PERIOD),
686 const_iv (SDLK_SLASH),
687 const_iv (SDLK_0),
688 const_iv (SDLK_1),
689 const_iv (SDLK_2),
690 const_iv (SDLK_3),
691 const_iv (SDLK_4),
692 const_iv (SDLK_5),
693 const_iv (SDLK_6),
694 const_iv (SDLK_7),
695 const_iv (SDLK_8),
696 const_iv (SDLK_9),
697 const_iv (SDLK_COLON),
698 const_iv (SDLK_SEMICOLON),
699 const_iv (SDLK_LESS),
700 const_iv (SDLK_EQUALS),
701 const_iv (SDLK_GREATER),
702 const_iv (SDLK_QUESTION),
703 const_iv (SDLK_AT),
704
705 const_iv (SDLK_LEFTBRACKET),
706 const_iv (SDLK_BACKSLASH),
707 const_iv (SDLK_RIGHTBRACKET),
708 const_iv (SDLK_CARET),
709 const_iv (SDLK_UNDERSCORE),
710 const_iv (SDLK_BACKQUOTE),
711 const_iv (SDLK_DELETE),
540 712
541 const_iv (SDLK_FIRST), 713 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 714 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 715 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 716 const_iv (SDLK_KP1),
620 const_iv (KMOD_RMETA), 792 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 793 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 794 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 795 const_iv (KMOD_MODE),
624 796
797 const_iv (KMOD_LRAM),
798
625 const_iv (MIX_DEFAULT_FORMAT), 799 const_iv (MIX_DEFAULT_FORMAT),
800
801 const_iv (SDL_INIT_TIMER),
802 const_iv (SDL_INIT_AUDIO),
803 const_iv (SDL_INIT_VIDEO),
804 const_iv (SDL_INIT_CDROM),
805 const_iv (SDL_INIT_JOYSTICK),
806 const_iv (SDL_INIT_EVERYTHING),
807 const_iv (SDL_INIT_NOPARACHUTE),
808 const_iv (SDL_INIT_EVENTTHREAD),
809
810 const_iv (SDL_GL_RED_SIZE),
811 const_iv (SDL_GL_GREEN_SIZE),
812 const_iv (SDL_GL_BLUE_SIZE),
813 const_iv (SDL_GL_ALPHA_SIZE),
814 const_iv (SDL_GL_DOUBLEBUFFER),
815 const_iv (SDL_GL_BUFFER_SIZE),
816 const_iv (SDL_GL_DEPTH_SIZE),
817 const_iv (SDL_GL_STENCIL_SIZE),
818 const_iv (SDL_GL_ACCUM_RED_SIZE),
819 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
820 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
821 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
822 const_iv (SDL_GL_STEREO),
823 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
824 const_iv (SDL_GL_MULTISAMPLESAMPLES),
825 const_iv (SDL_GL_ACCELERATED_VISUAL),
826 const_iv (SDL_GL_SWAP_CONTROL),
827
828 const_iv (FOW_DARKNESS)
626# undef const_iv 829# undef const_iv
627 }; 830 };
628 831
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 832 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
631 834
632 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
633 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
634} 837}
635 838
651NV ceil (NV x) 854NV ceil (NV x)
652 855
653IV minpot (UV n) 856IV minpot (UV n)
654 857
655IV 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
656 865
657void 866void
658pango_init () 867pango_init ()
659 CODE: 868 CODE:
660{ 869{
661 opengl_fontmap = pango_opengl_font_map_new (); 870 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 871 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 872 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
873 /*pango_context_set_font_description (opengl_context, default_font);*/
874#if PANGO_VERSION_CHECK (1, 15, 2)
875 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
876 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
877#endif
664} 878}
665 879
666char *
667SDL_GetError () 880char *SDL_GetError ()
668 881
669int 882void SDL_main_hack (SV *real_main)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 883 PROTOTYPE: &
671 884
672void 885int SDL_Init (U32 flags)
886
887int SDL_InitSubSystem (U32 flags)
888
889void SDL_QuitSubSystem (U32 flags)
890
673SDL_Quit () 891void SDL_Quit ()
892
893int SDL_GL_SetAttribute (int attr, int value)
894 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
674 902
675void 903void
676SDL_ListModes (int rgb, int alpha) 904SDL_ListModes (int rgb, int alpha)
677 PPCODE: 905 PPCODE:
678{ 906{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 918 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 919 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 920 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 921
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 922 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 923 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 924
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 925 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 926
702 if (m && m != (SDL_Rect **)-1) 927 if (m && m != (SDL_Rect **)-1)
703 while (*m) 928 while (*m)
704 { 929 {
705 if ((*m)->w >= 800 && (*m)->h >= 480) 930 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 931 {
707 AV *av = newAV (); 932 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 933 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 934 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 935 av_push (av, newSViv (rgb));
733 ); 958 );
734 959
735 if (RETVAL) 960 if (RETVAL)
736 { 961 {
737 av_clear (texture_av); 962 av_clear (texture_av);
738
739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 963#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
741#include "glfunc.h" 964#include "glfunc.h"
742#undef GL_FUNC 965#undef GL_FUNC
966 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
967 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
743 } 968 }
744} 969}
745 OUTPUT: 970 OUTPUT:
746 RETVAL 971 RETVAL
972
973void
974SDL_WM_SetCaption (const char *title, const char *icon)
747 975
748void 976void
749SDL_GL_SwapBuffers () 977SDL_GL_SwapBuffers ()
750 978
751char * 979char *
752SDL_GetKeyName (int sym) 980SDL_GetKeyName (int sym)
981 C_ARGS: (SDLKey)sym
753 982
754int 983int
755SDL_GetAppState () 984SDL_GetAppState ()
756 985
986int
987SDL_GetModState ()
988
989int
990SDL_WaitEvent ()
991 C_ARGS: 0
992
757void 993void
994SDL_PumpEvents ()
995
996void
758poll_events () 997peep_events ()
759 PPCODE: 998 PPCODE:
760{ 999{
761 SDL_Event ev; 1000 SDL_Event ev;
762 1001
763 SDL_PumpEvents (); 1002 SDL_PumpEvents ();
770 { 1009 {
771 case SDL_KEYDOWN: 1010 case SDL_KEYDOWN:
772 case SDL_KEYUP: 1011 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1012 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1013 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 1014 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 1015 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1016 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 1017 break;
779 1018
780 case SDL_ACTIVEEVENT: 1019 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1020 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 1038 x = ev.motion.x;
800 y = ev.motion.y; 1039 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1040 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 1041 }
803 1042
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1043 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 1044 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1045 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1046 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1047 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1048 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1049 }
811 break; 1050 break;
812 1051
813 case SDL_MOUSEBUTTONDOWN: 1052 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1053 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1054 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1055
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1056 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1057 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1058 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1059 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
828 } 1067 }
829 1068
830 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))));
831 } 1070 }
832} 1071}
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
833 1085
834int 1086int
835Mix_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)
836 POSTCALL: 1088 POSTCALL:
837 Mix_HookMusicFinished (music_finished); 1089 Mix_HookMusicFinished (music_finished);
894 } 1146 }
895 } 1147 }
896#endif 1148#endif
897} 1149}
898 1150
899void 1151int
900add_font (char *file) 1152add_font (char *file)
901 CODE: 1153 CODE:
902 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)
903 1164
904void 1165void
905load_image_inline (SV *image_) 1166load_image_inline (SV *image_)
906 ALIAS: 1167 ALIAS:
907 load_image_file = 1 1168 load_image_file = 1
953 1214
954 SDL_LockSurface (surface2); 1215 SDL_LockSurface (surface2);
955 EXTEND (SP, 6); 1216 EXTEND (SP, 6);
956 PUSHs (sv_2mortal (newSViv (surface2->w))); 1217 PUSHs (sv_2mortal (newSViv (surface2->w)));
957 PUSHs (sv_2mortal (newSViv (surface2->h))); 1218 PUSHs (sv_2mortal (newSViv (surface2->h)));
958 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1219 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
959 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)));
960 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1221 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
961 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1222 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
962 SDL_UnlockSurface (surface2); 1223 SDL_UnlockSurface (surface2);
963 1224
1023#if DEBUG 1284#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1285 VALGRIND_DO_LEAK_CHECK;
1025#endif 1286#endif
1026} 1287}
1027 1288
1289int
1290SvREFCNT (SV *sv)
1291 CODE:
1292 RETVAL = SvREFCNT (sv);
1293 OUTPUT:
1294 RETVAL
1295
1028MODULE = Deliantra::Client PACKAGE = DC::Font 1296MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1297
1030PROTOTYPES: DISABLE 1298PROTOTYPES: DISABLE
1031 1299
1032DC::Font 1300DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1301new_from_file (SV *klass, char *path, int id = 0)
1034 CODE: 1302 CODE:
1035{ 1303{
1036 int count; 1304 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1305 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1038 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1306 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1067 PROTOTYPE: 1335 PROTOTYPE:
1068 CODE: 1336 CODE:
1069 tc_restore (); 1337 tc_restore ();
1070 1338
1071DC::Layout 1339DC::Layout
1072new (SV *class) 1340new (SV *klass)
1073 CODE: 1341 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1342 New (0, RETVAL, 1, struct cf_layout);
1075 1343
1076 RETVAL->pl = pango_layout_new (opengl_context); 1344 RETVAL->pl = pango_layout_new (opengl_context);
1077 RETVAL->r = 1.; 1345 RETVAL->r = 1.;
1165{ 1433{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1434 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1435
1168 do 1436 do
1169 { 1437 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1438 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1439
1172 if (run && shape_attr_p (run)) 1440 if (run && shape_attr_p (run))
1173 { 1441 {
1174 PangoRectangle extents; 1442 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1443 pango_layout_iter_get_run_extents (iter, 0, &extents);
1226 1494
1227void 1495void
1228set_height (DC::Layout self, int base_height) 1496set_height (DC::Layout self, int base_height)
1229 CODE: 1497 CODE:
1230 if (self->base_height != base_height) 1498 if (self->base_height != base_height)
1231 { 1499 {
1232 self->base_height = base_height; 1500 self->base_height = base_height;
1233 layout_update_font (self); 1501 layout_update_font (self);
1234 } 1502 }
1235 1503
1236void 1504void
1279int 1547int
1280descent (DC::Layout self) 1548descent (DC::Layout self)
1281 CODE: 1549 CODE:
1282{ 1550{
1283 PangoRectangle rect; 1551 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1552 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1553 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1554 RETVAL = PANGO_DESCENT (rect);
1287} 1555}
1288 OUTPUT: 1556 OUTPUT:
1289 RETVAL 1557 RETVAL
1301 1569
1302void 1570void
1303cursor_pos (DC::Layout self, int index) 1571cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1572 PPCODE:
1305{ 1573{
1306 PangoRectangle strong_pos; 1574 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1575 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1576
1309 EXTEND (SP, 3); 1577 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1578 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1579 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1580 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1581}
1314 1582
1315void 1583void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1584index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1585 PPCODE:
1318{ 1586{
1319 int line, x; 1587 int line, x;
1320 1588
1321 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);
1322
1323#if !PANGO_VERSION_CHECK (1, 17. 3) 1590#if !PANGO_VERSION_CHECK (1, 17, 3)
1324 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1591 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1325 --line; 1592 --line;
1326#endif 1593#endif
1327
1328 EXTEND (SP, 2); 1594 EXTEND (SP, 2);
1329 PUSHs (sv_2mortal (newSViv (line))); 1595 PUSHs (sv_2mortal (newSViv (line)));
1330 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1596 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1331} 1597}
1332 1598
1338 int index, trailing; 1604 int index, trailing;
1339 1605
1340 if (line < 0) 1606 if (line < 0)
1341 XSRETURN_EMPTY; 1607 XSRETURN_EMPTY;
1342 1608
1343 if (!(lp = pango_layout_get_line (self->pl, line))) 1609 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1344 XSRETURN_EMPTY; /* do better */ 1610 XSRETURN_EMPTY; /* do better */
1345 1611
1346 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1612 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1347 1613
1348 EXTEND (SP, 2); 1614 EXTEND (SP, 2);
1465 glDisable (GL_ALPHA_TEST); 1731 glDisable (GL_ALPHA_TEST);
1466 glDisable (GL_BLEND); 1732 glDisable (GL_BLEND);
1467 } 1733 }
1468} 1734}
1469 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
1470IV 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)
1471 CODE: 1858 CODE:
1472{ 1859{
1473 GLint width; 1860 GLint width;
1474 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);
1481MODULE = Deliantra::Client PACKAGE = DC::Map 1868MODULE = Deliantra::Client PACKAGE = DC::Map
1482 1869
1483PROTOTYPES: DISABLE 1870PROTOTYPES: DISABLE
1484 1871
1485DC::Map 1872DC::Map
1486new (SV *class) 1873new (SV *klass)
1487 CODE: 1874 CODE:
1488 New (0, RETVAL, 1, struct map); 1875 New (0, RETVAL, 1, struct map);
1489 RETVAL->x = 0; 1876 RETVAL->x = 0;
1490 RETVAL->y = 0; 1877 RETVAL->y = 0;
1491 RETVAL->w = 0; 1878 RETVAL->w = 0;
1578 //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);
1579 // use uglier nearest interpolation because linear suffers 1966 // use uglier nearest interpolation because linear suffers
1580 // from transparent color bleeding and ugly wrapping effects. 1967 // from transparent color bleeding and ugly wrapping effects.
1581 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1968 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1582} 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 }
1583 1990
1584int 1991int
1585ox (DC::Map self) 1992ox (DC::Map self)
1586 ALIAS: 1993 ALIAS:
1587 oy = 1 1994 oy = 1
1627 self->y += MAP_EXTEND_Y; 2034 self->y += MAP_EXTEND_Y;
1628 } 2035 }
1629} 2036}
1630 2037
1631SV * 2038SV *
1632map1a_update (DC::Map self, SV *data_, int extmap) 2039map1a_update (DC::Map self, SV *data_)
1633 CODE: 2040 CODE:
1634{ 2041{
1635 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2042 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1636 uint8_t *data_end = (uint8_t *)SvEND (data_); 2043 uint8_t *data_end = (uint8_t *)SvEND (data_);
1637 mapcell *cell; 2044 mapcell *cell;
1658 2065
1659 //TODO: don't trust server data to be in-range(!) 2066 //TODO: don't trust server data to be in-range(!)
1660 2067
1661 if (flags & 8) 2068 if (flags & 8)
1662 { 2069 {
2070 uint8_t ext, cmd;
2071
1663 if (extmap) 2072 do
1664 { 2073 {
1665 uint8_t ext, cmd; 2074 ext = *data++;
2075 cmd = ext & 0x7f;
1666 2076
1667 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
1668 { 2080 {
1669 ext = *data++;
1670 cmd = ext & 0x3f;
1671
1672 if (cmd < 4)
1673 cell->darkness = 255 - ext * 64 + 1;
1674 else if (cmd == 5) // health
1675 {
1676 cell->stat_width = 1; 2081 cell->stat_width = 1;
1677 cell->stat_hp = *data++; 2082 cell->stat_hp = *data++;
1678 }
1679 else if (cmd == 6) // monster width
1680 cell->stat_width = *data++ + 1;
1681 else if (cmd == 0x47)
1682 {
1683 if (*data == 4)
1684 ; // decode player count
1685
1686 data += *data + 1;
1687 }
1688 else if (cmd == 8) // cell flags
1689 cell->flags = *data++;
1690 else if (ext & 0x40) // unknown, multibyte => skip
1691 data += *data + 1;
1692 else
1693 data++;
1694 } 2083 }
1695 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++;
1696 } 2101 }
1697 else 2102 while (ext & 0x80);
1698 cell->darkness = *data++ + 1;
1699 } 2103 }
1700 2104
1701 for (z = 0; z <= 2; ++z) 2105 for (z = 0; z <= 2; ++z)
1702 if (flags & (4 >> z)) 2106 if (flags & (4 >> z))
1703 { 2107 {
1706 cell->tile [z] = self->face2tile [face]; 2110 cell->tile [z] = self->face2tile [face];
1707 2111
1708 if (cell->tile [z]) 2112 if (cell->tile [z])
1709 { 2113 {
1710 maptex *tex = self->tex + cell->tile [z]; 2114 maptex *tex = self->tex + cell->tile [z];
2115 tex->unused = 0;
1711 if (!tex->name) 2116 if (!tex->name)
1712 av_push (missing, newSViv (cell->tile [z])); 2117 av_push (missing, newSViv (cell->tile [z]));
1713 2118
1714 if (tex->smoothtile) 2119 if (tex->smoothtile)
1715 { 2120 {
1716 maptex *smooth = self->tex + tex->smoothtile; 2121 maptex *smooth = self->tex + tex->smoothtile;
2122 smooth->unused = 0;
1717 if (!smooth->name) 2123 if (!smooth->name)
1718 av_push (missing, newSViv (tex->smoothtile)); 2124 av_push (missing, newSViv (tex->smoothtile));
1719 } 2125 }
1720 } 2126 }
1721 } 2127 }
1722 } 2128 }
1723 else 2129 else
1724 cell->darkness = 0; 2130 CELL_CLEAR (cell);
1725 } 2131 }
1726} 2132}
1727 OUTPUT: 2133 OUTPUT:
1728 RETVAL 2134 RETVAL
1729 2135
1749 ? self->row + y 2155 ? self->row + y
1750 : 0; 2156 : 0;
1751 2157
1752 for (x = x0; x < x1; x++) 2158 for (x = x0; x < x1; x++)
1753 { 2159 {
1754 int r = 32, g = 32, b = 32, a = 192; 2160 unsigned int r = 32, g = 32, b = 32, a = 192;
1755 2161
1756 if (row && row->c0 <= x && x < row->c1) 2162 if (row && row->c0 <= x && x < row->c1)
1757 { 2163 {
1758 mapcell *cell = row->col + (x - row->c0); 2164 mapcell *cell = row->col + (x - row->c0);
1759 2165
1761 { 2167 {
1762 maptex tex = self->tex [cell->tile [z]]; 2168 maptex tex = self->tex [cell->tile [z]];
1763 int a0 = 255 - tex.a; 2169 int a0 = 255 - tex.a;
1764 int a1 = tex.a; 2170 int a1 = tex.a;
1765 2171
1766 r = (r * a0 + tex.r * a1) / 255; 2172 r = div255 (r * a0 + tex.r * a1);
1767 g = (g * a0 + tex.g * a1) / 255; 2173 g = div255 (g * a0 + tex.g * a1);
1768 b = (b * a0 + tex.b * a1) / 255; 2174 b = div255 (b * a0 + tex.b * a1);
1769 a = (a * a0 + tex.a * a1) / 255; 2175 a = div255 (a * a0 + tex.a * a1);
1770 } 2176 }
1771 } 2177 }
1772 2178
1773 *map++ = (r ) 2179 *map++ = (r )
1774 | (g << 8) 2180 | (g << 8)
1781} 2187}
1782 OUTPUT: 2188 OUTPUT:
1783 RETVAL 2189 RETVAL
1784 2190
1785void 2191void
1786draw (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)
1787 CODE: 2193 CODE:
1788{ 2194{
1789 int x, y, z; 2195 int x, y, z;
1790 2196
1791 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2197 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1792 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
1793 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)
1794 smooth_key skey; 2200 smooth_key skey;
1795 2201 int pl_x, pl_y;
2202 maptex pl_tex;
1796 rc_t *rc = rc_alloc (); 2203 rc_t *rc = rc_alloc ();
2204 rc_t *rc_ov = rc_alloc ();
1797 rc_key_t key; 2205 rc_key_t key;
1798 rc_array_t *arr; 2206 rc_array_t *arr;
1799 2207
2208 pl_tex.name = 0;
2209
1800 // thats current max. sorry. 2210 // that's current max. sorry.
1801 if (sw > 255) sw = 255; 2211 if (sw > 255) sw = 255;
1802 if (sh > 255) sh = 255; 2212 if (sh > 255) sh = 255;
1803 2213
1804 // clear key, in case of extra padding 2214 // clear key, in case of extra padding
1805 memset (&skey, 0, sizeof (skey)); 2215 memset (&skey, 0, sizeof (skey));
1809 key.g = 255; 2219 key.g = 255;
1810 key.b = 255; 2220 key.b = 255;
1811 key.a = 255; 2221 key.a = 255;
1812 key.mode = GL_QUADS; 2222 key.mode = GL_QUADS;
1813 key.format = GL_T2F_V3F; 2223 key.format = GL_T2F_V3F;
1814 key.texname = -1;
1815 2224
1816 mx += self->x; 2225 mx += self->x;
1817 my += self->y; 2226 my += self->y;
1818 2227
1819 // first pass: determine smooth_max 2228 // first pass: determine smooth_max
1843 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2252 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1844 2253
1845 for (z = 0; z <= 2; z++) 2254 for (z = 0; z <= 2; z++)
1846 { 2255 {
1847 memset (smooth_level, 0, sizeof (smooth_level)); 2256 memset (smooth_level, 0, sizeof (smooth_level));
2257 key.texname = -1;
1848 2258
1849 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
1850 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
1851 { 2261 {
1852 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
1862 maptex tex = self->tex [tile]; 2272 maptex tex = self->tex [tile];
1863 int px, py; 2273 int px, py;
1864 2274
1865 if (key.texname != tex.name) 2275 if (key.texname != tex.name)
1866 { 2276 {
2277 self->tex [tile].unused = 0;
2278
1867 if (!tex.name) 2279 if (!tex.name)
1868 tex = self->tex [2]; /* missing, replace by noface */ 2280 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1869 2281
1870 key.texname = tex.name; 2282 key.texname = tex.name;
1871 arr = rc_array (rc, &key); 2283 arr = rc_array (rc, &key);
1872 } 2284 }
1873 2285
1874 px = (x + 1) * T - tex.w; 2286 px = (x + 1) * Th - tex.w;
1875 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 }
1876 2296
1877 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2297 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1878 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);
1879 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);
1880 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);
1881
1882 if (cell->flags && z == 2)
1883 {
1884 // overlays such as the speech bubble, probably more to come
1885 if (cell->flags & 1)
1886 {
1887 maptex tex = self->tex [1];
1888 int px = x * T + T * 2 / 32;
1889 int py = y * T - T * 6 / 32;
1890
1891 if (tex.name)
1892 {
1893 if (key.texname != tex.name)
1894 {
1895 key.texname = tex.name;
1896 arr = rc_array (rc, &key);
1897 }
1898
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1901 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1902 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1903 }
1904 }
1905 }
1906 2301
1907 // update smooth hash 2302 // update smooth hash
1908 if (tex.smoothtile) 2303 if (tex.smoothtile)
1909 { 2304 {
1910 skey.tile = tex.smoothtile; 2305 skey.tile = tex.smoothtile;
1939 // corners 2334 // corners
1940 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);
1941 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);
1942 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);
1943 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);
1944 } 2360 }
1945 } 2361 }
1946 } 2362 }
1947 } 2363 }
1948 2364
1975 if (!(bits & 0x1000) 2391 if (!(bits & 0x1000)
1976 && skey->level == level 2392 && skey->level == level
1977 && level > smooth_max [skey->x][skey->y]) 2393 && level > smooth_max [skey->x][skey->y])
1978 { 2394 {
1979 maptex tex = self->tex [skey->tile]; 2395 maptex tex = self->tex [skey->tile];
1980 int px = (((int)skey->x) - 1) * T; 2396 int px = (((int)skey->x) - 1) * Tw;
1981 int py = (((int)skey->y) - 1) * T; 2397 int py = (((int)skey->y) - 1) * Th;
1982 int border = bits & 15; 2398 int border = bits & 15;
1983 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2399 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1984 float dx = tex.s * .0625f; // 16 images/row 2400 float dx = tex.s * .0625f; // 16 images/row
1985 float dy = tex.t * .5f ; // 2 images/column 2401 float dy = tex.t * .5f ; // 2 images/column
1986 2402
1988 { 2404 {
1989 // this time avoiding texture state changes 2405 // this time avoiding texture state changes
1990 // save gobs of state changes. 2406 // save gobs of state changes.
1991 if (key.texname != tex.name) 2407 if (key.texname != tex.name)
1992 { 2408 {
2409 self->tex [skey->tile].unused = 0;
2410
1993 glEnd (); 2411 glEnd ();
1994 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2412 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1995 glBegin (GL_QUADS); 2413 glBegin (GL_QUADS);
1996 } 2414 }
1997 2415
1998 if (border) 2416 if (border)
1999 { 2417 {
2000 float ox = border * dx; 2418 float ox = border * dx;
2001 2419
2002 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2420 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2003 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2421 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2004 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2422 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2005 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2423 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2006 } 2424 }
2007 2425
2008 if (corner) 2426 if (corner)
2009 { 2427 {
2010 float ox = corner * dx; 2428 float ox = corner * dx;
2011 2429
2012 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2013 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2014 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2015 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2016 } 2434 }
2017 } 2435 }
2018 } 2436 }
2019 } 2437 }
2020 } 2438 }
2026 } 2444 }
2027 2445
2028 hv_clear (smooth); 2446 hv_clear (smooth);
2029 } 2447 }
2030 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
2031 glDisable (GL_BLEND); 2469 glDisable (GL_BLEND);
2032 rc_free (rc); 2470 rc_free (rc);
2471 rc_free (rc_ov);
2033 2472
2034 // top layer: overlays such as the health bar 2473 // top layer: overlays such as the health bar
2035 for (y = 0; y < sh; y++) 2474 for (y = 0; y < sh; y++)
2036 if (0 <= y + my && y + my < self->rows) 2475 if (0 <= y + my && y + my < self->rows)
2037 { 2476 {
2040 for (x = 0; x < sw; x++) 2479 for (x = 0; x < sw; x++)
2041 if (row->c0 <= x + mx && x + mx < row->c1) 2480 if (row->c0 <= x + mx && x + mx < row->c1)
2042 { 2481 {
2043 mapcell *cell = row->col + (x + mx - row->c0); 2482 mapcell *cell = row->col + (x + mx - row->c0);
2044 2483
2045 int px = x * T; 2484 int px = x * Tw;
2046 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 }
2047 2492
2048 if (cell->stat_hp) 2493 if (cell->stat_hp)
2049 { 2494 {
2050 int width = cell->stat_width * T; 2495 int width = cell->stat_width * Tw;
2051 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2496 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2052 2497
2053 glColor3ub (0, 0, 0); 2498 glColor3ub (0, 0, 0);
2054 glRectf (px + 1, py - thick - 2, 2499 glRectf (px + 1, py - thick - 2,
2055 px + width - 1, py); 2500 px + width - 1, py);
2056 2501
2062 } 2507 }
2063 } 2508 }
2064} 2509}
2065 2510
2066void 2511void
2067draw_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)
2068 CODE: 2513 CODE:
2069{ 2514{
2070 static float color[16][3] = { 2515 static float color[16][3] = {
2071 { 0.00F, 0.00F, 0.00F }, 2516 { 0.00f, 0.00f, 0.00f },
2072 { 1.00F, 1.00F, 1.00F }, 2517 { 1.00f, 1.00f, 1.00f },
2073 { 0.00F, 0.00F, 0.55F }, 2518 { 0.00f, 0.00f, 0.55f },
2074 { 1.00F, 0.00F, 0.00F }, 2519 { 1.00f, 0.00f, 0.00f },
2075 2520
2076 { 1.00F, 0.54F, 0.00F }, 2521 { 1.00f, 0.54f, 0.00f },
2077 { 0.11F, 0.56F, 1.00F }, 2522 { 0.11f, 0.56f, 1.00f },
2078 { 0.93F, 0.46F, 0.00F }, 2523 { 0.93f, 0.46f, 0.00f },
2079 { 0.18F, 0.54F, 0.34F }, 2524 { 0.18f, 0.54f, 0.34f },
2080 2525
2081 { 0.56F, 0.73F, 0.56F }, 2526 { 0.56f, 0.73f, 0.56f },
2082 { 0.80F, 0.80F, 0.80F }, 2527 { 0.80f, 0.80f, 0.80f },
2083 { 0.55F, 0.41F, 0.13F }, 2528 { 0.55f, 0.41f, 0.13f },
2084 { 0.99F, 0.77F, 0.26F }, 2529 { 0.99f, 0.77f, 0.26f },
2085 2530
2086 { 0.74F, 0.65F, 0.41F }, 2531 { 0.74f, 0.65f, 0.41f },
2087 2532
2088 { 0.00F, 1.00F, 1.00F }, 2533 { 0.00f, 1.00f, 1.00f },
2089 { 1.00F, 0.00F, 1.00F }, 2534 { 1.00f, 0.00f, 1.00f },
2090 { 1.00F, 1.00F, 0.00F }, 2535 { 1.00f, 1.00f, 0.00f },
2091 }; 2536 };
2092 2537
2093 int x, y; 2538 int x, y;
2094 2539
2095 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 */
2096 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2547 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2097 glEnable (GL_BLEND); 2548 glEnable (GL_BLEND);
2098 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2549 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2099 glBegin (GL_QUADS); 2550 glBegin (GL_QUADS);
2100 2551
2101 for (y = 0; y < h; y++) 2552 for (y = 0; y < h; y++)
2105 2556
2106 if (m) 2557 if (m)
2107 { 2558 {
2108 float *c = color [m & 15]; 2559 float *c = color [m & 15];
2109 2560
2110 float tx1 = m & 0x40 ? 0.5 : 0.; 2561 float tx1 = m & 0x40 ? 0.5f : 0.f;
2111 float tx2 = tx1 + 0.5; 2562 float tx2 = tx1 + 0.5f;
2112 2563
2113 glColor4f (c[0], c[1], c[2], 0.75); 2564 glColor4f (c[0], c[1], c[2], 1);
2114 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2565 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2115 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2566 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2116 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2567 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2117 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2568 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2118 } 2569 }
2126void 2577void
2127fow_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)
2128 PPCODE: 2579 PPCODE:
2129{ 2580{
2130 int x, y; 2581 int x, y;
2131 int sw1 = sw + 2; 2582 int sw1 = sw + 2;
2132 int sh1 = sh + 2; 2583 int sh1 = sh + 2;
2133 int sh3 = sh * 3; 2584 int sh3 = sh * 3;
2134 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);
2135 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2588 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2136 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2589 memset (darkness1, 0, sw1*sh1);
2137 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2138 2590
2139 SvPOK_only (darkness3_sv); 2591 SvPOK_only (darkness3_sv);
2140 SvCUR_set (darkness3_sv, sw34 * sh3); 2592 SvCUR_set (darkness3_sv, sw3 * sh3);
2141 2593
2142 mx += self->x - 1; 2594 mx += self->x - 1;
2143 my += self->y - 1; 2595 my += self->y - 1;
2144
2145 memset (darkness1, 255, sw1 * sh1);
2146 2596
2147 for (y = 0; y < sh1; y++) 2597 for (y = 0; y < sh1; y++)
2148 if (0 <= y + my && y + my < self->rows) 2598 if (0 <= y + my && y + my < self->rows)
2149 { 2599 {
2150 maprow *row = self->row + (y + my); 2600 maprow *row = self->row + (y + my);
2153 if (row->c0 <= x + mx && x + mx < row->c1) 2603 if (row->c0 <= x + mx && x + mx < row->c1)
2154 { 2604 {
2155 mapcell *cell = row->col + (x + mx - row->c0); 2605 mapcell *cell = row->col + (x + mx - row->c0);
2156 2606
2157 darkness1 [y * sw1 + x] = cell->darkness 2607 darkness1 [y * sw1 + x] = cell->darkness
2158 ? 255 - (cell->darkness - 1) 2608 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2159 : 255 - FOW_DARKNESS; 2609 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2160 } 2610 }
2161 } 2611 }
2162 2612
2163 for (y = 0; y < sh; ++y) 2613 for (y = 0; y < sh; ++y)
2164 for (x = 0; x < sw; ++x) 2614 for (x = 0; x < sw; ++x)
2183 2633
2184 uint8_t r13 = (d13 + d23 + d12) / 3; 2634 uint8_t r13 = (d13 + d23 + d12) / 3;
2185 uint8_t r23 = d23; 2635 uint8_t r23 = d23;
2186 uint8_t r33 = (d23 + d33 + d32) / 3; 2636 uint8_t r33 = (d23 + d33 + d32) / 3;
2187 2637
2188 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2189 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2639 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2190 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2191 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2192 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 */
2193 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2194 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2195 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2645 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2196 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2197 } 2647 }
2198 2648
2199 free (darkness1); 2649 free (darkness1);
2200 2650
2201 EXTEND (SP, 3); 2651 EXTEND (SP, 3);
2202 PUSHs (sv_2mortal (newSViv (sw34))); 2652 PUSHs (sv_2mortal (newSViv (sw3)));
2203 PUSHs (sv_2mortal (newSViv (sh3))); 2653 PUSHs (sv_2mortal (newSViv (sh3)));
2204 PUSHs (darkness3_sv); 2654 PUSHs (darkness3_sv);
2205} 2655}
2206 2656
2207SV * 2657SV *
2270 else 2720 else
2271 *data++ = 0; 2721 *data++ = 0;
2272 } 2722 }
2273 } 2723 }
2274 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 {
2275 SvPOK_only (data_sv); 2728 SvPOK_only (data_sv);
2276 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2729 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2730 }
2731
2277 RETVAL = data_sv; 2732 RETVAL = data_sv;
2278} 2733}
2279 OUTPUT: 2734 OUTPUT:
2280 RETVAL 2735 RETVAL
2281 2736
2282void 2737void
2283set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2738set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2284 PPCODE: 2739 PPCODE:
2285{ 2740{
2286 int x, y, z; 2741 int x, y, z;
2287 int w, h; 2742 int w, h;
2288 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;
2289 2754
2290 if (*data++ != 0) 2755 if (*data++ != 0)
2291 XSRETURN_EMPTY; /* version mismatch */ 2756 XSRETURN_EMPTY; /* version mismatch */
2292 2757
2293 w = *data++ << 8; w |= *data++; 2758 w = *data++ << 8; w |= *data++;
2308 { 2773 {
2309 maprow *row = map_get_row (self, y); 2774 maprow *row = map_get_row (self, y);
2310 2775
2311 for (x = x0; x < x1; x++) 2776 for (x = x0; x < x1; x++)
2312 { 2777 {
2778 uint8_t flags;
2779
2780 if (data + 7 >= end)
2781 XSRETURN_EMPTY;
2782
2313 uint8_t flags = *data++; 2783 flags = *data++;
2314 2784
2315 if (flags) 2785 if (flags)
2316 { 2786 {
2317 mapcell *cell = row_get_cell (row, x); 2787 mapcell *cell = row_get_cell (row, x);
2318 tileid tile[3] = { 0, 0, 0 }; 2788 tileid tile[3] = { 0, 0, 0 };
2321 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2791 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2322 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2792 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2323 2793
2324 if (cell->darkness == 0) 2794 if (cell->darkness == 0)
2325 { 2795 {
2326 cell->darkness = 0; 2796 /*cell->darkness = 0;*/
2797 EXTEND (SP, 3);
2327 2798
2328 for (z = 0; z <= 2; z++) 2799 for (z = 0; z <= 2; z++)
2329 { 2800 {
2330 tileid t = tile [z]; 2801 tileid t = tile [z];
2331 2802
2332 if (t >= self->texs || (t && !self->tex [t].name)) 2803 if (t >= self->texs || (t && !self->tex [t].name))
2333 { 2804 {
2334 XPUSHs (sv_2mortal (newSViv (t))); 2805 PUSHs (sv_2mortal (newSViv (t)));
2335 need_texid (self, t); 2806 need_texid (self, t);
2336 } 2807 }
2337 2808
2338 cell->tile [z] = t; 2809 cell->tile [z] = t;
2339 } 2810 }
2344} 2815}
2345 2816
2346MODULE = Deliantra::Client PACKAGE = DC::RW 2817MODULE = Deliantra::Client PACKAGE = DC::RW
2347 2818
2348DC::RW 2819DC::RW
2349new (SV *class, SV *data_sv) 2820new (SV *klass, SV *data_sv)
2350 CODE: 2821 CODE:
2351{ 2822{
2352 STRLEN datalen; 2823 STRLEN datalen;
2353 char *data = SvPVbyte (data_sv, datalen); 2824 char *data = SvPVbyte (data_sv, datalen);
2354 2825
2356} 2827}
2357 OUTPUT: 2828 OUTPUT:
2358 RETVAL 2829 RETVAL
2359 2830
2360DC::RW 2831DC::RW
2361new_from_file (SV *class, const char *path, const char *mode = "rb") 2832new_from_file (SV *klass, const char *path, const char *mode = "rb")
2362 CODE: 2833 CODE:
2363 RETVAL = SDL_RWFromFile (path, mode); 2834 RETVAL = SDL_RWFromFile (path, mode);
2364 OUTPUT: 2835 OUTPUT:
2365 RETVAL 2836 RETVAL
2366 2837
2384 if (RETVAL < 0) 2855 if (RETVAL < 0)
2385 { 2856 {
2386 RETVAL = Mix_GroupOldest (-1); 2857 RETVAL = Mix_GroupOldest (-1);
2387 2858
2388 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)
2389 XSRETURN_UNDEF; 2865 XSRETURN_UNDEF;
2390 2866 }
2867 else
2391 Mix_HaltChannel (RETVAL); 2868 Mix_HaltChannel (RETVAL);
2392 } 2869 }
2393 2870
2394 Mix_UnregisterAllEffects (RETVAL); 2871 Mix_UnregisterAllEffects (RETVAL);
2395 Mix_Volume (RETVAL, 128); 2872 Mix_Volume (RETVAL, 128);
2396} 2873}
2443void 2920void
2444set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2921set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2445 CODE: 2922 CODE:
2446{ 2923{
2447 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));
2448 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;
2449 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2926 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2450} 2927}
2451 2928
2452void 2929void
2453set_reverse_stereo (DC::Channel self, int flip) 2930set_reverse_stereo (DC::Channel self, int flip)
2456 2933
2457MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2934MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2458 2935
2459PROTOTYPES: DISABLE 2936PROTOTYPES: DISABLE
2460 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
2461DC::MixChunk 2950DC::MixChunk
2462new (SV *class, DC::RW rwops) 2951new (SV *klass, DC::RW rwops)
2463 CODE: 2952 CODE:
2464 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2953 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2465 OUTPUT: 2954 OUTPUT:
2466 RETVAL 2955 RETVAL
2467 2956
2497 OUTPUT: 2986 OUTPUT:
2498 RETVAL 2987 RETVAL
2499 2988
2500MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2989MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2501 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
2502int 3003int
2503volume (int volume = -1) 3004volume (int volume = -1)
2504 PROTOTYPE: ;$ 3005 PROTOTYPE: ;$
2505 CODE: 3006 CODE:
2506 if (items > 0) 3007 if (items > 0)
2517void 3018void
2518halt () 3019halt ()
2519 CODE: 3020 CODE:
2520 Mix_HaltMusic (); 3021 Mix_HaltMusic ();
2521 3022
3023int
3024playing ()
3025 CODE:
3026 RETVAL = Mix_PlayingMusic ();
3027 OUTPUT:
3028 RETVAL
3029
2522DC::MixMusic 3030DC::MixMusic
2523new (SV *class, DC::RW rwops) 3031new (SV *klass, DC::RW rwops)
2524 CODE: 3032 CODE:
2525 RETVAL = Mix_LoadMUS_RW (rwops); 3033 RETVAL = Mix_LoadMUS_RW (rwops);
2526 OUTPUT: 3034 OUTPUT:
2527 RETVAL 3035 RETVAL
2528 3036
2556 } *civ, const_iv[] = { 3064 } *civ, const_iv[] = {
2557# define const_iv(name) { # name, (IV)name } 3065# define const_iv(name) { # name, (IV)name }
2558 const_iv (GL_VENDOR), 3066 const_iv (GL_VENDOR),
2559 const_iv (GL_VERSION), 3067 const_iv (GL_VERSION),
2560 const_iv (GL_EXTENSIONS), 3068 const_iv (GL_EXTENSIONS),
3069 const_iv (GL_MAX_TEXTURE_UNITS),
2561 const_iv (GL_COLOR_MATERIAL), 3070 const_iv (GL_COLOR_MATERIAL),
2562 const_iv (GL_SMOOTH), 3071 const_iv (GL_SMOOTH),
2563 const_iv (GL_FLAT), 3072 const_iv (GL_FLAT),
2564 const_iv (GL_DITHER), 3073 const_iv (GL_DITHER),
2565 const_iv (GL_BLEND), 3074 const_iv (GL_BLEND),
2577 const_iv (GL_ZERO), 3086 const_iv (GL_ZERO),
2578 const_iv (GL_SRC_ALPHA), 3087 const_iv (GL_SRC_ALPHA),
2579 const_iv (GL_DST_ALPHA), 3088 const_iv (GL_DST_ALPHA),
2580 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3089 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2581 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),
2582 const_iv (GL_SRC_ALPHA_SATURATE), 3095 const_iv (GL_SRC_ALPHA_SATURATE),
2583 const_iv (GL_RGB), 3096 const_iv (GL_RGB),
2584 const_iv (GL_RGBA), 3097 const_iv (GL_RGBA),
2585 const_iv (GL_RGBA4), 3098 const_iv (GL_RGBA4),
2586 const_iv (GL_RGBA8), 3099 const_iv (GL_RGBA8),
2654 const_iv (GL_NICEST), 3167 const_iv (GL_NICEST),
2655 const_iv (GL_V2F), 3168 const_iv (GL_V2F),
2656 const_iv (GL_V3F), 3169 const_iv (GL_V3F),
2657 const_iv (GL_T2F_V3F), 3170 const_iv (GL_T2F_V3F),
2658 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),
2659# undef const_iv 3175# undef const_iv
2660 }; 3176 };
2661 3177
2662 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--)
2663 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3179 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2664 3180
2665 texture_av = newAV (); 3181 texture_av = newAV ();
2666 AvREAL_off (texture_av); 3182 AvREAL_off (texture_av);
2667} 3183}
2668 3184
2670disable_GL_EXT_blend_func_separate () 3186disable_GL_EXT_blend_func_separate ()
2671 CODE: 3187 CODE:
2672 gl.BlendFuncSeparate = 0; 3188 gl.BlendFuncSeparate = 0;
2673 gl.BlendFuncSeparateEXT = 0; 3189 gl.BlendFuncSeparateEXT = 0;
2674 3190
2675char * 3191void
3192apple_nvidia_bug (int enable)
3193
3194const char *
2676gl_vendor () 3195gl_vendor ()
2677 CODE: 3196 CODE:
2678 RETVAL = (char *)glGetString (GL_VENDOR); 3197 RETVAL = (const char *)glGetString (GL_VENDOR);
2679 OUTPUT: 3198 OUTPUT:
2680 RETVAL 3199 RETVAL
2681 3200
2682char * 3201const char *
2683gl_version () 3202gl_version ()
2684 CODE: 3203 CODE:
2685 RETVAL = (char *)glGetString (GL_VERSION); 3204 RETVAL = (const char *)glGetString (GL_VERSION);
2686 OUTPUT: 3205 OUTPUT:
2687 RETVAL 3206 RETVAL
2688 3207
2689char * 3208const char *
2690gl_extensions () 3209gl_extensions ()
2691 CODE: 3210 CODE:
2692 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3211 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2693 OUTPUT: 3212 OUTPUT:
2694 RETVAL 3213 RETVAL
2695 3214
2696const char *glGetString (GLenum pname) 3215const char *glGetString (GLenum pname)
3216 CODE:
3217 RETVAL = (const char *)glGetString (pname);
3218 OUTPUT:
3219 RETVAL
2697 3220
2698GLint glGetInteger (GLenum pname) 3221GLint glGetInteger (GLenum pname)
2699 CODE: 3222 CODE:
2700 glGetIntegerv (pname, &RETVAL); 3223 glGetIntegerv (pname, &RETVAL);
2701 OUTPUT: 3224 OUTPUT:
2709 3232
2710int glGetError () 3233int glGetError ()
2711 3234
2712void glFinish () 3235void glFinish ()
2713 3236
3237void glFlush ()
3238
2714void glClear (int mask) 3239void glClear (int mask)
2715 3240
2716void glClearColor (float r, float g, float b, float a = 1.0) 3241void glClearColor (float r, float g, float b, float a = 1.0)
2717 PROTOTYPE: @ 3242 PROTOTYPE: @
2718 3243
2727void glBlendFunc (int sfactor, int dfactor) 3252void glBlendFunc (int sfactor, int dfactor)
2728 3253
2729void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3254void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2730 CODE: 3255 CODE:
2731 gl_BlendFuncSeparate (sa, da, saa, daa); 3256 gl_BlendFuncSeparate (sa, da, saa, daa);
3257
3258# void glBlendEquation (int se)
2732 3259
2733void glDepthMask (int flag) 3260void glDepthMask (int flag)
2734 3261
2735void glLogicOp (int opcode) 3262void glLogicOp (int opcode)
2736 3263
2771void glRotate (float angle, float x, float y, float z) 3298void glRotate (float angle, float x, float y, float z)
2772 CODE: 3299 CODE:
2773 glRotatef (angle, x, y, z); 3300 glRotatef (angle, x, y, z);
2774 3301
2775void 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: @
2776 ALIAS: 3304 ALIAS:
2777 glColor_premultiply = 1 3305 glColor_premultiply = 1
2778 CODE: 3306 CODE:
2779 if (ix) 3307 if (ix)
2780 { 3308 {
2885void glNewList (int list, int mode = GL_COMPILE) 3413void glNewList (int list, int mode = GL_COMPILE)
2886 3414
2887void glEndList () 3415void glEndList ()
2888 3416
2889void 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);
2890 3423
2891MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3424MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2892 3425
2893PROTOTYPES: DISABLE 3426PROTOTYPES: DISABLE
2894 3427

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines