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.241 by root, Wed Dec 26 20:46:39 2007 UTC vs.
Revision 1.297 by root, Tue Dec 22 00:08:11 2009 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);
46#endif
47
44#define PANGO_ENABLE_BACKEND 48#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 49#define G_DISABLE_CAST_CHECKS
46 50
47#include <glib/gmacros.h> 51#include <glib/gmacros.h>
48 52
49#include <pango/pango.h> 53#include <pango/pango.h>
54
55#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0
57#endif
58
59#if !PANGO_VERSION_CHECK (1, 15, 2)
60# define pango_layout_get_line_readonly pango_layout_get_line
61# define pango_layout_get_lines_readonly pango_layout_get_lines
62# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
63# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
64#endif
50 65
51#ifndef _WIN32 66#ifndef _WIN32
52# include <sys/types.h> 67# include <sys/types.h>
53# include <sys/socket.h> 68# include <sys/socket.h>
54# include <netinet/in.h> 69# include <netinet/in.h>
55# include <netinet/tcp.h> 70# include <netinet/tcp.h>
56# include <inttypes.h> 71# include <inttypes.h>
57#endif 72#endif
58 73
74#if __GNUC__ >= 4
75# define expect(expr,value) __builtin_expect ((expr),(value))
76#else
77# define expect(expr,value) (expr)
78#endif
79
80#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1)
82
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 84
85/* this is used as fow flag as well, so has to have a different value */
86/* then anything that is computed by incoming darkness */
61#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
62 89
63#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
65 92
66#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
67 94
68#if 0 95/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 97
71# define PARACHUTE 0 98#define KMOD_LRAM 0x10000 // our extension
72#endif 99
100#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2
73 102
74static AV *texture_av; 103static AV *texture_av;
75 104
76static struct 105static struct
77{ 106{
120 149
121#include "pango-font.c" 150#include "pango-font.c"
122#include "pango-fontmap.c" 151#include "pango-fontmap.c"
123#include "pango-render.c" 152#include "pango-render.c"
124 153
125typedef IV dc__Channel; 154typedef IV DC__Channel;
126typedef SDL_RWops *dc__RW; 155typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *dc__MixChunk; 156typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *dc__MixMusic; 157typedef Mix_Music *DC__MixMusic;
129 158
130typedef PangoFontDescription *dc__Font; 159typedef PangoFontDescription *DC__Font;
131 160
132static int 161static int
133shape_attr_p (PangoLayoutRun *run) 162shape_attr_p (PangoLayoutRun *run)
134{ 163{
135 GSList *attrs = run->item->analysis.extra_attrs; 164 GSList *attrs = run->item->analysis.extra_attrs;
149 178
150typedef struct cf_layout { 179typedef struct cf_layout {
151 PangoLayout *pl; 180 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 181 float r, g, b, a; // default color for rgba mode
153 int base_height; 182 int base_height;
154 dc__Font font; 183 DC__Font font;
155 rc_t *rc; 184 rc_t *rc;
156} *dc__Layout; 185} *DC__Layout;
157 186
158static dc__Font default_font; 187static DC__Font default_font;
159static PangoContext *opengl_context; 188static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 189static PangoFontMap *opengl_fontmap;
161 190
162static void 191static void
163substitute_func (FcPattern *pattern, gpointer data) 192substitute_func (FcPattern *pattern, gpointer data)
168#endif 197#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 198 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 199}
171 200
172static void 201static void
173layout_update_font (dc__Layout self) 202layout_update_font (DC__Layout self)
174{ 203{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 204 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 205 * reasonably well with dejavu/bistream fonts
177 */ 206 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 207 PangoFontDescription *font = self->font ? self->font : default_font;
179 208
180 pango_font_description_set_absolute_size (font, 209 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 210 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 211
183 pango_layout_set_font_description (self->pl, font); 212 pango_layout_set_font_description (self->pl, font);
184} 213}
185 214
186static void 215static void
187layout_get_pixel_size (dc__Layout self, int *w, int *h) 216layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 217{
189 PangoRectangle rect; 218 PangoRectangle rect;
190 219
191 // get_pixel_* wrongly rounds down 220 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 221 pango_layout_get_extents (self->pl, 0, &rect);
209 int w, h; 238 int w, h;
210 float s, t; 239 float s, t;
211 uint8_t r, g, b, a; 240 uint8_t r, g, b, a;
212 tileid smoothtile; 241 tileid smoothtile;
213 uint8_t smoothlevel; 242 uint8_t smoothlevel;
243 uint8_t unused; /* set to zero on use */
214} maptex; 244} maptex;
215 245
216typedef struct { 246typedef struct {
217 uint32_t player; 247 uint32_t player;
218 tileid tile[3]; 248 tileid tile[3];
231 int faces; tileid *face2tile; // [faceid] 261 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 262 int texs; maptex *tex; // [tileid]
233 263
234 int32_t rows; 264 int32_t rows;
235 maprow *row; 265 maprow *row;
236} *dc__Map; 266} *DC__Map;
237 267
238static char * 268static char *
239prepend (char *ptr, int sze, int inc) 269prepend (char *ptr, int sze, int inc)
240{ 270{
241 char *p; 271 char *p;
279 self->texs *= 2; 309 self->texs *= 2;
280 } 310 }
281} 311}
282 312
283static maprow * 313static maprow *
284map_get_row (dc__Map self, int y) 314map_get_row (DC__Map self, int y)
285{ 315{
286 if (0 > y) 316 if (0 > y)
287 { 317 {
288 int extend = - y + MAP_EXTEND_Y; 318 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 319 Prepend (maprow, self->row, self->rows, extend);
327 357
328 return row->col + (x - row->c0); 358 return row->col + (x - row->c0);
329} 359}
330 360
331static mapcell * 361static mapcell *
332map_get_cell (dc__Map self, int x, int y) 362map_get_cell (DC__Map self, int x, int y)
333{ 363{
334 return row_get_cell (map_get_row (self, y), x); 364 return row_get_cell (map_get_row (self, y), x);
335} 365}
336 366
337static void 367static void
338map_clear (dc__Map self) 368map_clear (DC__Map self)
339{ 369{
340 int r; 370 int r;
341 371
342 for (r = 0; r < self->rows; r++) 372 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 373 Safefree (self->row[r].col);
350 self->oy = 0; 380 self->oy = 0;
351 self->row = 0; 381 self->row = 0;
352 self->rows = 0; 382 self->rows = 0;
353} 383}
354 384
385#define CELL_CLEAR(cell) \
386 do { \
387 if ((cell)->player) \
388 (cell)->tile [2] = 0; \
389 (cell)->darkness = 0; \
390 (cell)->stat_hp = 0; \
391 (cell)->flags = 0; \
392 (cell)->player = 0; \
393 } while (0)
394
355static void 395static void
356map_blank (dc__Map self, int x0, int y0, int w, int h) 396map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 397{
358 int x, y; 398 int x, y;
359 maprow *row; 399 maprow *row;
360 mapcell *cell; 400 mapcell *cell;
361 401
373 if (x >= row->c1) 413 if (x >= row->c1)
374 break; 414 break;
375 415
376 cell = row->col + x - row->c0; 416 cell = row->col + x - row->c0;
377 417
378 cell->darkness = 0; 418 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 419 }
383 } 420 }
384} 421}
385 422
386typedef struct { 423typedef struct {
498 return 0; 535 return 0;
499 536
500 return 1; 537 return 1;
501} 538}
502 539
540/******************************************************************************/
541
542/* process keyboard modifiers */
543static int
544mod_munge (int mod)
545{
546 mod &= MOD_MASK;
547
548 if (mod & (KMOD_META | KMOD_ALT))
549 mod |= KMOD_LRAM;
550
551 return mod;
552}
553
554static void
555deliantra_main ()
556{
557 char *argv[] = { 0 };
558 call_argv ("::main", G_DISCARD | G_VOID, argv);
559}
560
561#ifdef __MACOSX__
562 /* to due surprising braindamage on the side of SDL design, we
563 * do some mind-boggling hack here: SDL requires a custom main()
564 * on OS X, so... we provide one and call the original main(), which,
565 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
566 * and which calls our main (== SDL_main) back.
567 */
568 extern C_LINKAGE int
569 main (int argc, char *argv[])
570 {
571 deliantra_main ();
572 }
573
574 #undef main
575
576 extern C_LINKAGE int main (int argc, char *argv[]);
577
578 static void
579 SDL_braino (void)
580 {
581 char *argv[] = { "deliantra client", 0 };
582 (main) (1, argv);
583 }
584#else
585 static void
586 SDL_braino (void)
587 {
588 deliantra_main ();
589 }
590#endif
591
503MODULE = Deliantra::Client PACKAGE = dc 592MODULE = Deliantra::Client PACKAGE = DC
504 593
505PROTOTYPES: ENABLE 594PROTOTYPES: ENABLE
506 595
507BOOT: 596BOOT:
508{ 597{
509 HV *stash = gv_stashpv ("dc", 1); 598 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 599 static const struct {
511 const char *name; 600 const char *name;
512 IV iv; 601 IV iv;
513 } *civ, const_iv[] = { 602 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 603# define const_iv(name) { # name, (IV)name }
535 const_iv (SDL_USEREVENT), 624 const_iv (SDL_USEREVENT),
536 625
537 const_iv (SDL_APPINPUTFOCUS), 626 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 627 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 628 const_iv (SDL_APPACTIVE),
629
630
631 const_iv (SDLK_UNKNOWN),
632 const_iv (SDLK_FIRST),
633 const_iv (SDLK_BACKSPACE),
634 const_iv (SDLK_TAB),
635 const_iv (SDLK_CLEAR),
636 const_iv (SDLK_RETURN),
637 const_iv (SDLK_PAUSE),
638 const_iv (SDLK_ESCAPE),
639 const_iv (SDLK_SPACE),
640 const_iv (SDLK_EXCLAIM),
641 const_iv (SDLK_QUOTEDBL),
642 const_iv (SDLK_HASH),
643 const_iv (SDLK_DOLLAR),
644 const_iv (SDLK_AMPERSAND),
645 const_iv (SDLK_QUOTE),
646 const_iv (SDLK_LEFTPAREN),
647 const_iv (SDLK_RIGHTPAREN),
648 const_iv (SDLK_ASTERISK),
649 const_iv (SDLK_PLUS),
650 const_iv (SDLK_COMMA),
651 const_iv (SDLK_MINUS),
652 const_iv (SDLK_PERIOD),
653 const_iv (SDLK_SLASH),
654 const_iv (SDLK_0),
655 const_iv (SDLK_1),
656 const_iv (SDLK_2),
657 const_iv (SDLK_3),
658 const_iv (SDLK_4),
659 const_iv (SDLK_5),
660 const_iv (SDLK_6),
661 const_iv (SDLK_7),
662 const_iv (SDLK_8),
663 const_iv (SDLK_9),
664 const_iv (SDLK_COLON),
665 const_iv (SDLK_SEMICOLON),
666 const_iv (SDLK_LESS),
667 const_iv (SDLK_EQUALS),
668 const_iv (SDLK_GREATER),
669 const_iv (SDLK_QUESTION),
670 const_iv (SDLK_AT),
671
672 const_iv (SDLK_LEFTBRACKET),
673 const_iv (SDLK_BACKSLASH),
674 const_iv (SDLK_RIGHTBRACKET),
675 const_iv (SDLK_CARET),
676 const_iv (SDLK_UNDERSCORE),
677 const_iv (SDLK_BACKQUOTE),
678 const_iv (SDLK_DELETE),
540 679
541 const_iv (SDLK_FIRST), 680 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 681 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 682 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 683 const_iv (SDLK_KP1),
620 const_iv (KMOD_RMETA), 759 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 760 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 761 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 762 const_iv (KMOD_MODE),
624 763
764 const_iv (KMOD_LRAM),
765
625 const_iv (MIX_DEFAULT_FORMAT), 766 const_iv (MIX_DEFAULT_FORMAT),
767
768 const_iv (SDL_INIT_TIMER),
769 const_iv (SDL_INIT_AUDIO),
770 const_iv (SDL_INIT_VIDEO),
771 const_iv (SDL_INIT_CDROM),
772 const_iv (SDL_INIT_JOYSTICK),
773 const_iv (SDL_INIT_EVERYTHING),
774 const_iv (SDL_INIT_NOPARACHUTE),
775 const_iv (SDL_INIT_EVENTTHREAD),
776
777 const_iv (SDL_GL_RED_SIZE),
778 const_iv (SDL_GL_GREEN_SIZE),
779 const_iv (SDL_GL_BLUE_SIZE),
780 const_iv (SDL_GL_ALPHA_SIZE),
781 const_iv (SDL_GL_DOUBLEBUFFER),
782 const_iv (SDL_GL_BUFFER_SIZE),
783 const_iv (SDL_GL_DEPTH_SIZE),
784 const_iv (SDL_GL_STENCIL_SIZE),
785 const_iv (SDL_GL_ACCUM_RED_SIZE),
786 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
787 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
788 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
789 const_iv (SDL_GL_STEREO),
790 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
791 const_iv (SDL_GL_MULTISAMPLESAMPLES),
792 const_iv (SDL_GL_ACCELERATED_VISUAL),
793 const_iv (SDL_GL_SWAP_CONTROL),
794
795 const_iv (FOW_DARKNESS)
626# undef const_iv 796# undef const_iv
627 }; 797 };
628 798
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 799 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 800 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
652 822
653IV minpot (UV n) 823IV minpot (UV n)
654 824
655IV popcount (UV n) 825IV popcount (UV n)
656 826
827NV distance (NV dx, NV dy)
828 CODE:
829 RETVAL = pow (dx * dx + dy * dy, 0.5);
830 OUTPUT:
831 RETVAL
832
657void 833void
658pango_init () 834pango_init ()
659 CODE: 835 CODE:
660{ 836{
661 opengl_fontmap = pango_opengl_font_map_new (); 837 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 838 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); 839 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
840 /*pango_context_set_font_description (opengl_context, default_font);*/
841#if PANGO_VERSION_CHECK (1, 15, 2)
842 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
843 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
844#endif
664} 845}
665 846
666char *
667SDL_GetError () 847char *SDL_GetError ()
668 848
669int 849void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 850
672void 851int SDL_Init (U32 flags)
852
853int SDL_InitSubSystem (U32 flags)
854
855void SDL_QuitSubSystem (U32 flags)
856
673SDL_Quit () 857void SDL_Quit ()
858
859int SDL_GL_SetAttribute (int attr, int value)
860
861int SDL_GL_GetAttribute (int attr)
862 CODE:
863 if (SDL_GL_GetAttribute (attr, &RETVAL))
864 XSRETURN_UNDEF;
865 OUTPUT:
866 RETVAL
674 867
675void 868void
676SDL_ListModes (int rgb, int alpha) 869SDL_ListModes (int rgb, int alpha)
677 PPCODE: 870 PPCODE:
678{ 871{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 883 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 886
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 887 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); 888 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 889
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 890 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 891
702 if (m && m != (SDL_Rect **)-1) 892 if (m && m != (SDL_Rect **)-1)
703 while (*m) 893 while (*m)
704 { 894 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 895 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 896 {
707 AV *av = newAV (); 897 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 898 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 899 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 900 av_push (av, newSViv (rgb));
752SDL_GetKeyName (int sym) 942SDL_GetKeyName (int sym)
753 943
754int 944int
755SDL_GetAppState () 945SDL_GetAppState ()
756 946
947int
948SDL_GetModState ()
949
757void 950void
758poll_events () 951poll_events ()
759 PPCODE: 952 PPCODE:
760{ 953{
761 SDL_Event ev; 954 SDL_Event ev;
770 { 963 {
771 case SDL_KEYDOWN: 964 case SDL_KEYDOWN:
772 case SDL_KEYUP: 965 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 966 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 967 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 968 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 */ 969 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); 970 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 971 break;
779 972
780 case SDL_ACTIVEEVENT: 973 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 974 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 992 x = ev.motion.x;
800 y = ev.motion.y; 993 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 994 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 995 }
803 996
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 997 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 998 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 999 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1000 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1001 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1002 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1003 }
811 break; 1004 break;
812 1005
813 case SDL_MOUSEBUTTONDOWN: 1006 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1007 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1008 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1009
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1010 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1011 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1012 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1013 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1018 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1019 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 1020 break;
828 } 1021 }
829 1022
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("dc::UI::Event", 1)))); 1023 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 1024 }
832} 1025}
833 1026
834int 1027int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1028Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
894 } 1087 }
895 } 1088 }
896#endif 1089#endif
897} 1090}
898 1091
899void 1092int
900add_font (char *file) 1093add_font (char *file)
901 CODE: 1094 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1095 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1096 OUTPUT:
1097 RETVAL
903 1098
904void 1099void
905load_image_inline (SV *image_) 1100load_image_inline (SV *image_)
906 ALIAS: 1101 ALIAS:
907 load_image_file = 1 1102 load_image_file = 1
1023#if DEBUG 1218#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1219 VALGRIND_DO_LEAK_CHECK;
1025#endif 1220#endif
1026} 1221}
1027 1222
1223int
1224SvREFCNT (SV *sv)
1225 CODE:
1226 RETVAL = SvREFCNT (sv);
1227 OUTPUT:
1228 RETVAL
1229
1028MODULE = Deliantra::Client PACKAGE = dc::Font 1230MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1231
1030PROTOTYPES: DISABLE 1232PROTOTYPES: DISABLE
1031 1233
1032dc::Font 1234DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1235new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1236 CODE:
1035{ 1237{
1036 int count; 1238 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1239 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1242}
1041 OUTPUT: 1243 OUTPUT:
1042 RETVAL 1244 RETVAL
1043 1245
1044void 1246void
1045DESTROY (dc::Font self) 1247DESTROY (DC::Font self)
1046 CODE: 1248 CODE:
1047 pango_font_description_free (self); 1249 pango_font_description_free (self);
1048 1250
1049void 1251void
1050make_default (dc::Font self) 1252make_default (DC::Font self)
1051 PROTOTYPE: $ 1253 PROTOTYPE: $
1052 CODE: 1254 CODE:
1053 default_font = self; 1255 default_font = self;
1054 1256
1055MODULE = Deliantra::Client PACKAGE = dc::Layout 1257MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1258
1057PROTOTYPES: DISABLE 1259PROTOTYPES: DISABLE
1058 1260
1059void 1261void
1060glyph_cache_backup () 1262glyph_cache_backup ()
1066glyph_cache_restore () 1268glyph_cache_restore ()
1067 PROTOTYPE: 1269 PROTOTYPE:
1068 CODE: 1270 CODE:
1069 tc_restore (); 1271 tc_restore ();
1070 1272
1071dc::Layout 1273DC::Layout
1072new (SV *class) 1274new (SV *class)
1073 CODE: 1275 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1276 New (0, RETVAL, 1, struct cf_layout);
1075 1277
1076 RETVAL->pl = pango_layout_new (opengl_context); 1278 RETVAL->pl = pango_layout_new (opengl_context);
1086 layout_update_font (RETVAL); 1288 layout_update_font (RETVAL);
1087 OUTPUT: 1289 OUTPUT:
1088 RETVAL 1290 RETVAL
1089 1291
1090void 1292void
1091DESTROY (dc::Layout self) 1293DESTROY (DC::Layout self)
1092 CODE: 1294 CODE:
1093 g_object_unref (self->pl); 1295 g_object_unref (self->pl);
1094 rc_free (self->rc); 1296 rc_free (self->rc);
1095 Safefree (self); 1297 Safefree (self);
1096 1298
1097void 1299void
1098set_text (dc::Layout self, SV *text_) 1300set_text (DC::Layout self, SV *text_)
1099 CODE: 1301 CODE:
1100{ 1302{
1101 STRLEN textlen; 1303 STRLEN textlen;
1102 char *text = SvPVutf8 (text_, textlen); 1304 char *text = SvPVutf8 (text_, textlen);
1103 1305
1104 pango_layout_set_text (self->pl, text, textlen); 1306 pango_layout_set_text (self->pl, text, textlen);
1105} 1307}
1106 1308
1107void 1309void
1108set_markup (dc::Layout self, SV *text_) 1310set_markup (DC::Layout self, SV *text_)
1109 CODE: 1311 CODE:
1110{ 1312{
1111 STRLEN textlen; 1313 STRLEN textlen;
1112 char *text = SvPVutf8 (text_, textlen); 1314 char *text = SvPVutf8 (text_, textlen);
1113 1315
1114 pango_layout_set_markup (self->pl, text, textlen); 1316 pango_layout_set_markup (self->pl, text, textlen);
1115} 1317}
1116 1318
1117void 1319void
1118set_shapes (dc::Layout self, ...) 1320set_shapes (DC::Layout self, ...)
1119 CODE: 1321 CODE:
1120{ 1322{
1121 PangoAttrList *attrs = 0; 1323 PangoAttrList *attrs = 0;
1122 const char *text = pango_layout_get_text (self->pl); 1324 const char *text = pango_layout_get_text (self->pl);
1123 const char *pos = text; 1325 const char *pos = text;
1158 if (attrs) 1360 if (attrs)
1159 pango_layout_set_attributes (self->pl, attrs); 1361 pango_layout_set_attributes (self->pl, attrs);
1160} 1362}
1161 1363
1162void 1364void
1163get_shapes (dc::Layout self) 1365get_shapes (DC::Layout self)
1164 PPCODE: 1366 PPCODE:
1165{ 1367{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1368 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1369
1168 do 1370 do
1169 { 1371 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1372 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1373
1172 if (run && shape_attr_p (run)) 1374 if (run && shape_attr_p (run))
1173 { 1375 {
1174 PangoRectangle extents; 1376 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1377 pango_layout_iter_get_run_extents (iter, 0, &extents);
1183 1385
1184 pango_layout_iter_free (iter); 1386 pango_layout_iter_free (iter);
1185} 1387}
1186 1388
1187int 1389int
1188has_wrapped (dc::Layout self) 1390has_wrapped (DC::Layout self)
1189 CODE: 1391 CODE:
1190{ 1392{
1191 int lines = 1; 1393 int lines = 1;
1192 const char *text = pango_layout_get_text (self->pl); 1394 const char *text = pango_layout_get_text (self->pl);
1193 1395
1198} 1400}
1199 OUTPUT: 1401 OUTPUT:
1200 RETVAL 1402 RETVAL
1201 1403
1202SV * 1404SV *
1203get_text (dc::Layout self) 1405get_text (DC::Layout self)
1204 CODE: 1406 CODE:
1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1407 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206 sv_utf8_decode (RETVAL); 1408 sv_utf8_decode (RETVAL);
1207 OUTPUT: 1409 OUTPUT:
1208 RETVAL 1410 RETVAL
1209 1411
1210void 1412void
1211set_foreground (dc::Layout self, float r, float g, float b, float a = 1.) 1413set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1212 CODE: 1414 CODE:
1213 self->r = r; 1415 self->r = r;
1214 self->g = g; 1416 self->g = g;
1215 self->b = b; 1417 self->b = b;
1216 self->a = a; 1418 self->a = a;
1217 1419
1218void 1420void
1219set_font (dc::Layout self, dc::Font font = 0) 1421set_font (DC::Layout self, DC::Font font = 0)
1220 CODE: 1422 CODE:
1221 if (self->font != font) 1423 if (self->font != font)
1222 { 1424 {
1223 self->font = font; 1425 self->font = font;
1224 layout_update_font (self); 1426 layout_update_font (self);
1225 } 1427 }
1226 1428
1227void 1429void
1228set_height (dc::Layout self, int base_height) 1430set_height (DC::Layout self, int base_height)
1229 CODE: 1431 CODE:
1230 if (self->base_height != base_height) 1432 if (self->base_height != base_height)
1231 { 1433 {
1232 self->base_height = base_height; 1434 self->base_height = base_height;
1233 layout_update_font (self); 1435 layout_update_font (self);
1234 } 1436 }
1235 1437
1236void 1438void
1237set_width (dc::Layout self, int max_width = -1) 1439set_width (DC::Layout self, int max_width = -1)
1238 CODE: 1440 CODE:
1239 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1441 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1240 1442
1241void 1443void
1242set_indent (dc::Layout self, int indent) 1444set_indent (DC::Layout self, int indent)
1243 CODE: 1445 CODE:
1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1446 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245 1447
1246void 1448void
1247set_spacing (dc::Layout self, int spacing) 1449set_spacing (DC::Layout self, int spacing)
1248 CODE: 1450 CODE:
1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1451 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250 1452
1251void 1453void
1252set_ellipsise (dc::Layout self, int ellipsise) 1454set_ellipsise (DC::Layout self, int ellipsise)
1253 CODE: 1455 CODE:
1254 pango_layout_set_ellipsize (self->pl, 1456 pango_layout_set_ellipsize (self->pl,
1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1457 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1458 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1459 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258 : PANGO_ELLIPSIZE_NONE 1460 : PANGO_ELLIPSIZE_NONE
1259 ); 1461 );
1260 1462
1261void 1463void
1262set_single_paragraph_mode (dc::Layout self, int spm) 1464set_single_paragraph_mode (DC::Layout self, int spm)
1263 CODE: 1465 CODE:
1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1466 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265 1467
1266void 1468void
1267size (dc::Layout self) 1469size (DC::Layout self)
1268 PPCODE: 1470 PPCODE:
1269{ 1471{
1270 int w, h; 1472 int w, h;
1271 1473
1272 layout_get_pixel_size (self, &w, &h); 1474 layout_get_pixel_size (self, &w, &h);
1275 PUSHs (sv_2mortal (newSViv (w))); 1477 PUSHs (sv_2mortal (newSViv (w)));
1276 PUSHs (sv_2mortal (newSViv (h))); 1478 PUSHs (sv_2mortal (newSViv (h)));
1277} 1479}
1278 1480
1279int 1481int
1280descent (dc::Layout self) 1482descent (DC::Layout self)
1281 CODE: 1483 CODE:
1282{ 1484{
1283 PangoRectangle rect; 1485 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1486 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1487 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1488 RETVAL = PANGO_DESCENT (rect);
1287} 1489}
1288 OUTPUT: 1490 OUTPUT:
1289 RETVAL 1491 RETVAL
1290 1492
1291int 1493int
1292xy_to_index (dc::Layout self, int x, int y) 1494xy_to_index (DC::Layout self, int x, int y)
1293 CODE: 1495 CODE:
1294{ 1496{
1295 int index, trailing; 1497 int index, trailing;
1296 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1498 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1297 RETVAL = index + trailing; 1499 RETVAL = index + trailing;
1298} 1500}
1299 OUTPUT: 1501 OUTPUT:
1300 RETVAL 1502 RETVAL
1301 1503
1302void 1504void
1303cursor_pos (dc::Layout self, int index) 1505cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1506 PPCODE:
1305{ 1507{
1306 PangoRectangle strong_pos; 1508 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1509 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1510
1309 EXTEND (SP, 3); 1511 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1512 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1513 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1514 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1515}
1314 1516
1315void 1517void
1316index_to_line_x (dc::Layout self, int index, int trailing = 0) 1518index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1519 PPCODE:
1318{ 1520{
1319 int line, x; 1521 int line, x;
1320 1522
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1523 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1524#if !PANGO_VERSION_CHECK (1, 17, 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1525 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1526 --line;
1527#endif
1324 EXTEND (SP, 2); 1528 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1529 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1530 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1531}
1328 1532
1329void 1533void
1330line_x_to_index (dc::Layout self, int line, int x) 1534line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1535 PPCODE:
1332{ 1536{
1333 PangoLayoutLine *lp; 1537 PangoLayoutLine *lp;
1334 int index, trailing; 1538 int index, trailing;
1335 1539
1336 if (line < 0) 1540 if (line < 0)
1337 XSRETURN_EMPTY; 1541 XSRETURN_EMPTY;
1338 1542
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1543 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1544 XSRETURN_EMPTY; /* do better */
1341 1545
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1546 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1547
1344 EXTEND (SP, 2); 1548 EXTEND (SP, 2);
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1554 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1555 }
1352} 1556}
1353 1557
1354void 1558void
1355render (dc::Layout self, float x, float y, int flags = 0) 1559render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1560 CODE:
1357 rc_clear (self->rc); 1561 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1562 pango_opengl_render_layout_subpixel (
1359 self->pl, 1563 self->pl,
1360 self->rc, 1564 self->rc,
1365 // we assume that context_change actually clears/frees stuff 1569 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1570 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1571 pango_layout_context_changed (self->pl);
1368 1572
1369void 1573void
1370draw (dc::Layout self) 1574draw (DC::Layout self)
1371 CODE: 1575 CODE:
1372{ 1576{
1373 glEnable (GL_TEXTURE_2D); 1577 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1578 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1579 glEnable (GL_BLEND);
1383 glDisable (GL_ALPHA_TEST); 1587 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1588 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1589 glDisable (GL_TEXTURE_2D);
1386} 1590}
1387 1591
1388MODULE = Deliantra::Client PACKAGE = dc::Texture 1592MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1593
1390PROTOTYPES: ENABLE 1594PROTOTYPES: ENABLE
1391 1595
1392void 1596void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1597pad (SV *data_, int ow, int oh, int nw, int nh)
1461 glDisable (GL_ALPHA_TEST); 1665 glDisable (GL_ALPHA_TEST);
1462 glDisable (GL_BLEND); 1666 glDisable (GL_BLEND);
1463 } 1667 }
1464} 1668}
1465 1669
1670void
1671draw_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)
1672 PROTOTYPE: @
1673 CODE:
1674{
1675 glEnable (GL_TEXTURE_2D);
1676 glEnable (GL_BLEND);
1677 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1678 glBindTexture (GL_TEXTURE_2D, name1);
1679
1680 glColor3f (intensity, intensity, intensity);
1681 glPushMatrix ();
1682 glScalef (1./3, 1./3, 1.);
1683
1684 if (blend > 0.f)
1685 {
1686 float dx3 = dx * -3.f / w;
1687 float dy3 = dy * -3.f / h;
1688 GLfloat env_color[4] = { 0., 0., 0., blend };
1689
1690 /* interpolate the two shadow textures */
1691 /* stage 0 == rgb(glcolor) + alpha(t0) */
1692 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1693
1694 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1695 gl.ActiveTexture (GL_TEXTURE1);
1696 glEnable (GL_TEXTURE_2D);
1697 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699
1700 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704
1705 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707
1708 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1709 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1710 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1711
1712 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1713 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714
1715 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717
1718 glBegin (GL_QUADS);
1719 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1720 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1721 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1722 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1723 glEnd ();
1724
1725 glDisable (GL_TEXTURE_2D);
1726 gl.ActiveTexture (GL_TEXTURE0);
1727 }
1728 else
1729 {
1730 /* simple blending of one texture, also opengl <1.3 path */
1731 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1732
1733 glBegin (GL_QUADS);
1734 glTexCoord2f (0, 0); glVertex2f (0, 0);
1735 glTexCoord2f (0, t); glVertex2f (0, h);
1736 glTexCoord2f (s, t); glVertex2f (w, h);
1737 glTexCoord2f (s, 0); glVertex2f (w, 0);
1738 glEnd ();
1739 }
1740
1741 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1742 {
1743 int x, y;
1744 int dx3 = dx * 3;
1745 int dy3 = dy * 3;
1746
1747 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1748 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1749 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1750 glTranslatef (-1., -1., 0);
1751 glBegin (GL_QUADS);
1752
1753 for (y = 1; y < h; y += 3)
1754 {
1755 int y1 = y - dy3;
1756 int y1valid = y1 >= 0 && y1 < h;
1757
1758 for (x = 1; x < w; x += 3)
1759 {
1760 int x1 = x - dx3;
1761 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1762 uint8_t h2;
1763
1764 if (y1valid && x1 >= 0 && x1 < w)
1765 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1766 else
1767 h2 = 1; /* out of range == invisible */
1768
1769 if (h1 || h2)
1770 {
1771 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1772 glColor4f (1., 1., 1., alpha);
1773
1774 glTexCoord2f (0, 0.); glVertex2i (x , y );
1775 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1776 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1777 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1778 }
1779 }
1780 }
1781 }
1782
1783 glEnd ();
1784
1785 glPopMatrix ();
1786
1787 glDisable (GL_TEXTURE_2D);
1788 glDisable (GL_BLEND);
1789}
1790
1466IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1791IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1467 CODE: 1792 CODE:
1468{ 1793{
1469 GLint width; 1794 GLint width;
1470 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1795 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1472 RETVAL = width > 0; 1797 RETVAL = width > 0;
1473} 1798}
1474 OUTPUT: 1799 OUTPUT:
1475 RETVAL 1800 RETVAL
1476 1801
1477MODULE = Deliantra::Client PACKAGE = dc::Map 1802MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1803
1479PROTOTYPES: DISABLE 1804PROTOTYPES: DISABLE
1480 1805
1481dc::Map 1806DC::Map
1482new (SV *class) 1807new (SV *class)
1483 CODE: 1808 CODE:
1484 New (0, RETVAL, 1, struct map); 1809 New (0, RETVAL, 1, struct map);
1485 RETVAL->x = 0; 1810 RETVAL->x = 0;
1486 RETVAL->y = 0; 1811 RETVAL->y = 0;
1494 RETVAL->row = 0; 1819 RETVAL->row = 0;
1495 OUTPUT: 1820 OUTPUT:
1496 RETVAL 1821 RETVAL
1497 1822
1498void 1823void
1499DESTROY (dc::Map self) 1824DESTROY (DC::Map self)
1500 CODE: 1825 CODE:
1501{ 1826{
1502 map_clear (self); 1827 map_clear (self);
1503 Safefree (self->face2tile); 1828 Safefree (self->face2tile);
1504 Safefree (self->tex); 1829 Safefree (self->tex);
1505 Safefree (self); 1830 Safefree (self);
1506} 1831}
1507 1832
1508void 1833void
1509resize (dc::Map self, int map_width, int map_height) 1834resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1835 CODE:
1511 self->w = map_width; 1836 self->w = map_width;
1512 self->h = map_height; 1837 self->h = map_height;
1513 1838
1514void 1839void
1515clear (dc::Map self) 1840clear (DC::Map self)
1516 CODE: 1841 CODE:
1517 map_clear (self); 1842 map_clear (self);
1518 1843
1519void 1844void
1520set_tileid (dc::Map self, int face, int tile) 1845set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1846 CODE:
1522{ 1847{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1848 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1849 need_texid (self, tile);
1525} 1850}
1526 1851
1527void 1852void
1528set_smooth (dc::Map self, int face, int smooth, int level) 1853set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1854 CODE:
1530{ 1855{
1531 tileid texid; 1856 tileid texid;
1532 maptex *tex; 1857 maptex *tex;
1533 1858
1546 tex->smoothtile = self->face2tile [smooth]; 1871 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1872 tex->smoothlevel = level;
1548} 1873}
1549 1874
1550void 1875void
1551set_texture (dc::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1876set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1552 CODE: 1877 CODE:
1553{ 1878{
1554 need_texid (self, texid); 1879 need_texid (self, texid);
1555 1880
1556 { 1881 {
1575 // use uglier nearest interpolation because linear suffers 1900 // use uglier nearest interpolation because linear suffers
1576 // from transparent color bleeding and ugly wrapping effects. 1901 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1902 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1903}
1579 1904
1905void
1906expire_textures (DC::Map self, int texid, int count)
1907 PPCODE:
1908 for (; texid < self->texs && count; ++texid, --count)
1909 {
1910 maptex *tex = self->tex + texid;
1911
1912 if (tex->name)
1913 {
1914 if (tex->unused)
1915 {
1916 tex->name = 0;
1917 tex->unused = 0;
1918 XPUSHs (sv_2mortal (newSViv (texid)));
1919 }
1920 else
1921 tex->unused = 1;
1922 }
1923 }
1924
1580int 1925int
1581ox (dc::Map self) 1926ox (DC::Map self)
1582 ALIAS: 1927 ALIAS:
1583 oy = 1 1928 oy = 1
1584 x = 2 1929 x = 2
1585 y = 3 1930 y = 3
1586 w = 4 1931 w = 4
1597 } 1942 }
1598 OUTPUT: 1943 OUTPUT:
1599 RETVAL 1944 RETVAL
1600 1945
1601void 1946void
1602scroll (dc::Map self, int dx, int dy) 1947scroll (DC::Map self, int dx, int dy)
1603 CODE: 1948 CODE:
1604{ 1949{
1605 if (dx > 0) 1950 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 1951 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 1952 else if (dx < 0)
1623 self->y += MAP_EXTEND_Y; 1968 self->y += MAP_EXTEND_Y;
1624 } 1969 }
1625} 1970}
1626 1971
1627SV * 1972SV *
1628map1a_update (dc::Map self, SV *data_, int extmap) 1973map1a_update (DC::Map self, SV *data_, int extmap)
1629 CODE: 1974 CODE:
1630{ 1975{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1976 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 1977 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 1978 mapcell *cell;
1661 uint8_t ext, cmd; 2006 uint8_t ext, cmd;
1662 2007
1663 do 2008 do
1664 { 2009 {
1665 ext = *data++; 2010 ext = *data++;
1666 cmd = ext & 0x3f; 2011 cmd = ext & 0x7f;
1667 2012
1668 if (cmd < 4) 2013 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 2014 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1670 else if (cmd == 5) // health 2015 else if (cmd == 5) // health
1671 { 2016 {
1672 cell->stat_width = 1; 2017 cell->stat_width = 1;
1673 cell->stat_hp = *data++; 2018 cell->stat_hp = *data++;
1674 } 2019 }
1675 else if (cmd == 6) // monster width 2020 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 2021 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 2022 else if (cmd == 0x47)
1678 { 2023 {
1679 if (*data == 4) 2024 if (*data == 1) cell->player = data [1];
1680 ; // decode player count 2025 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2026 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2027 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1681 2028
1682 data += *data + 1; 2029 data += *data + 1;
1683 } 2030 }
1684 else if (cmd == 8) // cell flags 2031 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 2032 cell->flags = *data++;
1702 cell->tile [z] = self->face2tile [face]; 2049 cell->tile [z] = self->face2tile [face];
1703 2050
1704 if (cell->tile [z]) 2051 if (cell->tile [z])
1705 { 2052 {
1706 maptex *tex = self->tex + cell->tile [z]; 2053 maptex *tex = self->tex + cell->tile [z];
2054 tex->unused = 0;
1707 if (!tex->name) 2055 if (!tex->name)
1708 av_push (missing, newSViv (cell->tile [z])); 2056 av_push (missing, newSViv (cell->tile [z]));
1709 2057
1710 if (tex->smoothtile) 2058 if (tex->smoothtile)
1711 { 2059 {
1712 maptex *smooth = self->tex + tex->smoothtile; 2060 maptex *smooth = self->tex + tex->smoothtile;
2061 smooth->unused = 0;
1713 if (!smooth->name) 2062 if (!smooth->name)
1714 av_push (missing, newSViv (tex->smoothtile)); 2063 av_push (missing, newSViv (tex->smoothtile));
1715 } 2064 }
1716 } 2065 }
1717 } 2066 }
1718 } 2067 }
1719 else 2068 else
1720 cell->darkness = 0; 2069 CELL_CLEAR (cell);
1721 } 2070 }
1722} 2071}
1723 OUTPUT: 2072 OUTPUT:
1724 RETVAL 2073 RETVAL
1725 2074
1726SV * 2075SV *
1727mapmap (dc::Map self, int x0, int y0, int w, int h) 2076mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 2077 CODE:
1729{ 2078{
1730 int x1, x; 2079 int x1, x;
1731 int y1, y; 2080 int y1, y;
1732 int z; 2081 int z;
1777} 2126}
1778 OUTPUT: 2127 OUTPUT:
1779 RETVAL 2128 RETVAL
1780 2129
1781void 2130void
1782draw (dc::Map self, int mx, int my, int sw, int sh, int T) 2131draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1783 CODE: 2132 CODE:
1784{ 2133{
1785 int x, y, z; 2134 int x, y, z;
1786 2135
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2136 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2137 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1789 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2138 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790 smooth_key skey; 2139 smooth_key skey;
1791 2140 int pl_x, pl_y;
2141 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 2142 rc_t *rc = rc_alloc ();
2143 rc_t *rc_ov = rc_alloc ();
1793 rc_key_t key; 2144 rc_key_t key;
1794 rc_array_t *arr; 2145 rc_array_t *arr;
1795 2146
2147 pl_tex.name = 0;
2148
1796 // thats current max. sorry. 2149 // that's current max. sorry.
1797 if (sw > 255) sw = 255; 2150 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 2151 if (sh > 255) sh = 255;
1799 2152
1800 // clear key, in case of extra padding 2153 // clear key, in case of extra padding
1801 memset (&skey, 0, sizeof (skey)); 2154 memset (&skey, 0, sizeof (skey));
1805 key.g = 255; 2158 key.g = 255;
1806 key.b = 255; 2159 key.b = 255;
1807 key.a = 255; 2160 key.a = 255;
1808 key.mode = GL_QUADS; 2161 key.mode = GL_QUADS;
1809 key.format = GL_T2F_V3F; 2162 key.format = GL_T2F_V3F;
1810 key.texname = -1;
1811 2163
1812 mx += self->x; 2164 mx += self->x;
1813 my += self->y; 2165 my += self->y;
1814 2166
1815 // first pass: determine smooth_max 2167 // first pass: determine smooth_max
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2191 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1840 2192
1841 for (z = 0; z <= 2; z++) 2193 for (z = 0; z <= 2; z++)
1842 { 2194 {
1843 memset (smooth_level, 0, sizeof (smooth_level)); 2195 memset (smooth_level, 0, sizeof (smooth_level));
2196 key.texname = -1;
1844 2197
1845 for (y = 0; y < sh; y++) 2198 for (y = 0; y < sh; y++)
1846 if (0 <= y + my && y + my < self->rows) 2199 if (0 <= y + my && y + my < self->rows)
1847 { 2200 {
1848 maprow *row = self->row + (y + my); 2201 maprow *row = self->row + (y + my);
1858 maptex tex = self->tex [tile]; 2211 maptex tex = self->tex [tile];
1859 int px, py; 2212 int px, py;
1860 2213
1861 if (key.texname != tex.name) 2214 if (key.texname != tex.name)
1862 { 2215 {
2216 self->tex [tile].unused = 0;
2217
1863 if (!tex.name) 2218 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 2219 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1865 2220
1866 key.texname = tex.name; 2221 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 2222 arr = rc_array (rc, &key);
1868 } 2223 }
1869 2224
1870 px = (x + 1) * T - tex.w; 2225 px = (x + 1) * T - tex.w;
1871 py = (y + 1) * T - tex.h; 2226 py = (y + 1) * T - tex.h;
2227
2228 if (expect_false (cell->player == player) && expect_false (z == 2))
2229 {
2230 pl_x = px;
2231 pl_y = py;
2232 pl_tex = tex;
2233 continue;
2234 }
1872 2235
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2236 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2237 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1875 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2238 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1876 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2239 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877
1878 if (cell->flags && z == 2)
1879 {
1880 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1)
1882 {
1883 maptex tex = self->tex [1];
1884 int px = x * T + T * 2 / 32;
1885 int py = y * T - T * 6 / 32;
1886
1887 if (tex.name)
1888 {
1889 if (key.texname != tex.name)
1890 {
1891 key.texname = tex.name;
1892 arr = rc_array (rc, &key);
1893 }
1894
1895 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1896 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1897 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1898 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1899 }
1900 }
1901 }
1902 2240
1903 // update smooth hash 2241 // update smooth hash
1904 if (tex.smoothtile) 2242 if (tex.smoothtile)
1905 { 2243 {
1906 skey.tile = tex.smoothtile; 2244 skey.tile = tex.smoothtile;
1935 // corners 2273 // corners
1936 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2274 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1937 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2275 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1938 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2276 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1939 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2277 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2278 }
2279 }
2280
2281 if (expect_false (z == 2) && expect_false (cell->flags))
2282 {
2283 // overlays such as the speech bubble, probably more to come
2284 if (cell->flags & 1)
2285 {
2286 rc_key_t key_ov = key;
2287 maptex tex = self->tex [TEXID_SPEECH];
2288 rc_array_t *arr;
2289 int px = x * T + T * 2 / 32;
2290 int py = y * T - T * 6 / 32;
2291
2292 key_ov.texname = tex.name;
2293 arr = rc_array (rc_ov, &key_ov);
2294
2295 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2296 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2297 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2298 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1940 } 2299 }
1941 } 2300 }
1942 } 2301 }
1943 } 2302 }
1944 2303
1984 { 2343 {
1985 // this time avoiding texture state changes 2344 // this time avoiding texture state changes
1986 // save gobs of state changes. 2345 // save gobs of state changes.
1987 if (key.texname != tex.name) 2346 if (key.texname != tex.name)
1988 { 2347 {
2348 self->tex [skey->tile].unused = 0;
2349
1989 glEnd (); 2350 glEnd ();
1990 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2351 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1991 glBegin (GL_QUADS); 2352 glBegin (GL_QUADS);
1992 } 2353 }
1993 2354
2022 } 2383 }
2023 2384
2024 hv_clear (smooth); 2385 hv_clear (smooth);
2025 } 2386 }
2026 2387
2388 if (pl_tex.name)
2389 {
2390 maptex tex = pl_tex;
2391 int px = pl_x + sdx;
2392 int py = pl_y + sdy;
2393
2394 key.texname = tex.name;
2395 arr = rc_array (rc, &key);
2396
2397 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2398 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2399 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2400 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2401
2402 rc_draw (rc);
2403 }
2404
2405 rc_draw (rc_ov);
2406 rc_clear (rc_ov);
2407
2027 glDisable (GL_BLEND); 2408 glDisable (GL_BLEND);
2028 rc_free (rc); 2409 rc_free (rc);
2410 rc_free (rc_ov);
2029 2411
2030 // top layer: overlays such as the health bar 2412 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2413 for (y = 0; y < sh; y++)
2032 if (0 <= y + my && y + my < self->rows) 2414 if (0 <= y + my && y + my < self->rows)
2033 { 2415 {
2038 { 2420 {
2039 mapcell *cell = row->col + (x + mx - row->c0); 2421 mapcell *cell = row->col + (x + mx - row->c0);
2040 2422
2041 int px = x * T; 2423 int px = x * T;
2042 int py = y * T; 2424 int py = y * T;
2425
2426 if (expect_false (cell->player == player))
2427 {
2428 px += sdx;
2429 py += sdy;
2430 }
2043 2431
2044 if (cell->stat_hp) 2432 if (cell->stat_hp)
2045 { 2433 {
2046 int width = cell->stat_width * T; 2434 int width = cell->stat_width * T;
2047 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2435 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2058 } 2446 }
2059 } 2447 }
2060} 2448}
2061 2449
2062void 2450void
2063draw_magicmap (dc::Map self, int dx, int dy, int w, int h, unsigned char *data) 2451draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2064 CODE: 2452 CODE:
2065{ 2453{
2066 static float color[16][3] = { 2454 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2455 { 0.00f, 0.00f, 0.00f },
2068 { 1.00F, 1.00F, 1.00F }, 2456 { 1.00f, 1.00f, 1.00f },
2069 { 0.00F, 0.00F, 0.55F }, 2457 { 0.00f, 0.00f, 0.55f },
2070 { 1.00F, 0.00F, 0.00F }, 2458 { 1.00f, 0.00f, 0.00f },
2071 2459
2072 { 1.00F, 0.54F, 0.00F }, 2460 { 1.00f, 0.54f, 0.00f },
2073 { 0.11F, 0.56F, 1.00F }, 2461 { 0.11f, 0.56f, 1.00f },
2074 { 0.93F, 0.46F, 0.00F }, 2462 { 0.93f, 0.46f, 0.00f },
2075 { 0.18F, 0.54F, 0.34F }, 2463 { 0.18f, 0.54f, 0.34f },
2076 2464
2077 { 0.56F, 0.73F, 0.56F }, 2465 { 0.56f, 0.73f, 0.56f },
2078 { 0.80F, 0.80F, 0.80F }, 2466 { 0.80f, 0.80f, 0.80f },
2079 { 0.55F, 0.41F, 0.13F }, 2467 { 0.55f, 0.41f, 0.13f },
2080 { 0.99F, 0.77F, 0.26F }, 2468 { 0.99f, 0.77f, 0.26f },
2081 2469
2082 { 0.74F, 0.65F, 0.41F }, 2470 { 0.74f, 0.65f, 0.41f },
2083 2471
2084 { 0.00F, 1.00F, 1.00F }, 2472 { 0.00f, 1.00f, 1.00f },
2085 { 1.00F, 0.00F, 1.00F }, 2473 { 1.00f, 0.00f, 1.00f },
2086 { 1.00F, 1.00F, 0.00F }, 2474 { 1.00f, 1.00f, 0.00f },
2087 }; 2475 };
2088 2476
2089 int x, y; 2477 int x, y;
2090 2478
2091 glEnable (GL_TEXTURE_2D); 2479 glEnable (GL_TEXTURE_2D);
2480 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2481 * but the nvidia driver (185.18.14) mishandles alpha textures
2482 * and takes the colour from god knows where instead of using
2483 * Cp. MODULATE results in the same colour, but slightly different
2484 * alpha, but atcually gives us the correct colour with nvidia.
2485 */
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2486 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2093 glEnable (GL_BLEND); 2487 glEnable (GL_BLEND);
2094 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2488 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2095 glBegin (GL_QUADS); 2489 glBegin (GL_QUADS);
2096 2490
2097 for (y = 0; y < h; y++) 2491 for (y = 0; y < h; y++)
2101 2495
2102 if (m) 2496 if (m)
2103 { 2497 {
2104 float *c = color [m & 15]; 2498 float *c = color [m & 15];
2105 2499
2106 float tx1 = m & 0x40 ? 0.5 : 0.; 2500 float tx1 = m & 0x40 ? 0.5f : 0.f;
2107 float tx2 = tx1 + 0.5; 2501 float tx2 = tx1 + 0.5f;
2108 2502
2109 glColor4f (c[0], c[1], c[2], 0.75); 2503 glColor4f (c[0], c[1], c[2], 1);
2110 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2504 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2111 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2505 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2112 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2506 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2113 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2507 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2114 } 2508 }
2118 glDisable (GL_BLEND); 2512 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2513 glDisable (GL_TEXTURE_2D);
2120} 2514}
2121 2515
2122void 2516void
2123fow_texture (dc::Map self, int mx, int my, int sw, int sh) 2517fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124 PPCODE: 2518 PPCODE:
2125{ 2519{
2126 int x, y; 2520 int x, y;
2127 int sw1 = sw + 2; 2521 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2522 int sh1 = sh + 2;
2129 int sh3 = sh * 3; 2523 int sh3 = sh * 3;
2130 int sw34 = (sw * 3 + 3) & ~3; 2524 int sw3 = sw * 3;
2131 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2525 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2132 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2526 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2133 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2527 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2134 2528
2135 SvPOK_only (darkness3_sv); 2529 SvPOK_only (darkness3_sv);
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2530 SvCUR_set (darkness3_sv, sw3 * sh3);
2137 2531
2138 mx += self->x - 1; 2532 mx += self->x - 1;
2139 my += self->y - 1; 2533 my += self->y - 1;
2140
2141 memset (darkness1, 255, sw1 * sh1);
2142 2534
2143 for (y = 0; y < sh1; y++) 2535 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2536 if (0 <= y + my && y + my < self->rows)
2145 { 2537 {
2146 maprow *row = self->row + (y + my); 2538 maprow *row = self->row + (y + my);
2149 if (row->c0 <= x + mx && x + mx < row->c1) 2541 if (row->c0 <= x + mx && x + mx < row->c1)
2150 { 2542 {
2151 mapcell *cell = row->col + (x + mx - row->c0); 2543 mapcell *cell = row->col + (x + mx - row->c0);
2152 2544
2153 darkness1 [y * sw1 + x] = cell->darkness 2545 darkness1 [y * sw1 + x] = cell->darkness
2154 ? 255 - (cell->darkness - 1) 2546 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2155 : 255 - FOW_DARKNESS; 2547 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2156 } 2548 }
2157 } 2549 }
2158 2550
2159 for (y = 0; y < sh; ++y) 2551 for (y = 0; y < sh; ++y)
2160 for (x = 0; x < sw; ++x) 2552 for (x = 0; x < sw; ++x)
2179 2571
2180 uint8_t r13 = (d13 + d23 + d12) / 3; 2572 uint8_t r13 = (d13 + d23 + d12) / 3;
2181 uint8_t r23 = d23; 2573 uint8_t r23 = d23;
2182 uint8_t r33 = (d23 + d33 + d32) / 3; 2574 uint8_t r33 = (d23 + d33 + d32) / 3;
2183 2575
2184 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2576 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2185 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2577 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2186 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2578 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2187 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2579 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2188 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2580 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2189 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2581 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2190 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2582 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2191 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2583 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2192 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2584 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2193 } 2585 }
2194 2586
2195 free (darkness1); 2587 free (darkness1);
2196 2588
2197 EXTEND (SP, 3); 2589 EXTEND (SP, 3);
2198 PUSHs (sv_2mortal (newSViv (sw34))); 2590 PUSHs (sv_2mortal (newSViv (sw3)));
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2591 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2592 PUSHs (darkness3_sv);
2201} 2593}
2202 2594
2203SV * 2595SV *
2204get_rect (dc::Map self, int x0, int y0, int w, int h) 2596get_rect (DC::Map self, int x0, int y0, int w, int h)
2205 CODE: 2597 CODE:
2206{ 2598{
2207 int x, y, x1, y1; 2599 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2600 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2601 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2266 else 2658 else
2267 *data++ = 0; 2659 *data++ = 0;
2268 } 2660 }
2269 } 2661 }
2270 2662
2663 /* if size is w*h + 5 then no data has been found */
2664 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2665 {
2271 SvPOK_only (data_sv); 2666 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2667 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2668 }
2669
2273 RETVAL = data_sv; 2670 RETVAL = data_sv;
2274} 2671}
2275 OUTPUT: 2672 OUTPUT:
2276 RETVAL 2673 RETVAL
2277 2674
2278void 2675void
2279set_rect (dc::Map self, int x0, int y0, uint8_t *data) 2676set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2677 PPCODE:
2281{ 2678{
2282 int x, y, z; 2679 int x, y, z;
2283 int w, h; 2680 int w, h;
2284 int x1, y1; 2681 int x1, y1;
2682 STRLEN len;
2683 uint8_t *data, *end;
2684
2685 len = SvLEN (data_sv);
2686 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2687 data = SvPVbyte_nolen (data_sv);
2688 end = data + len + 8;
2689
2690 if (len < 5)
2691 XSRETURN_EMPTY;
2285 2692
2286 if (*data++ != 0) 2693 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2694 XSRETURN_EMPTY; /* version mismatch */
2288 2695
2289 w = *data++ << 8; w |= *data++; 2696 w = *data++ << 8; w |= *data++;
2304 { 2711 {
2305 maprow *row = map_get_row (self, y); 2712 maprow *row = map_get_row (self, y);
2306 2713
2307 for (x = x0; x < x1; x++) 2714 for (x = x0; x < x1; x++)
2308 { 2715 {
2716 uint8_t flags;
2717
2718 if (data + 7 >= end)
2719 XSRETURN_EMPTY;
2720
2309 uint8_t flags = *data++; 2721 flags = *data++;
2310 2722
2311 if (flags) 2723 if (flags)
2312 { 2724 {
2313 mapcell *cell = row_get_cell (row, x); 2725 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2726 tileid tile[3] = { 0, 0, 0 };
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2729 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2730 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2731
2320 if (cell->darkness == 0) 2732 if (cell->darkness == 0)
2321 { 2733 {
2322 cell->darkness = 0; 2734 /*cell->darkness = 0;*/
2735 EXTEND (SP, 3);
2323 2736
2324 for (z = 0; z <= 2; z++) 2737 for (z = 0; z <= 2; z++)
2325 { 2738 {
2326 tileid t = tile [z]; 2739 tileid t = tile [z];
2327 2740
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2741 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2742 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2743 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2744 need_texid (self, t);
2332 } 2745 }
2333 2746
2334 cell->tile [z] = t; 2747 cell->tile [z] = t;
2335 } 2748 }
2337 } 2750 }
2338 } 2751 }
2339 } 2752 }
2340} 2753}
2341 2754
2342MODULE = Deliantra::Client PACKAGE = dc::RW 2755MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2756
2344dc::RW 2757DC::RW
2345new (SV *class, SV *data_sv) 2758new (SV *class, SV *data_sv)
2346 CODE: 2759 CODE:
2347{ 2760{
2348 STRLEN datalen; 2761 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2762 char *data = SvPVbyte (data_sv, datalen);
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2764 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2765}
2353 OUTPUT: 2766 OUTPUT:
2354 RETVAL 2767 RETVAL
2355 2768
2356dc::RW 2769DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2770new_from_file (SV *class, const char *path, const char *mode = "rb")
2358 CODE: 2771 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2772 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2773 OUTPUT:
2361 RETVAL 2774 RETVAL
2362 2775
2363# fails on win32: 2776# fails on win32:
2364# dc.xs(2268) : error C2059: syntax error : '(' 2777# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2778#void
2366#close (dc::RW self) 2779#close (DC::RW self)
2367# CODE: 2780# CODE:
2368# (self->(close)) (self); 2781# (self->(close)) (self);
2369 2782
2370MODULE = Deliantra::Client PACKAGE = dc::Channel 2783MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2784
2372PROTOTYPES: DISABLE 2785PROTOTYPES: DISABLE
2373 2786
2374dc::Channel 2787DC::Channel
2375find () 2788find ()
2376 CODE: 2789 CODE:
2377{ 2790{
2378 RETVAL = Mix_GroupAvailable (-1); 2791 RETVAL = Mix_GroupAvailable (-1);
2379 2792
2392} 2805}
2393 OUTPUT: 2806 OUTPUT:
2394 RETVAL 2807 RETVAL
2395 2808
2396void 2809void
2397halt (dc::Channel self) 2810halt (DC::Channel self)
2398 CODE: 2811 CODE:
2399 Mix_HaltChannel (self); 2812 Mix_HaltChannel (self);
2400 2813
2401void 2814void
2402expire (dc::Channel self, int ticks = -1) 2815expire (DC::Channel self, int ticks = -1)
2403 CODE: 2816 CODE:
2404 Mix_ExpireChannel (self, ticks); 2817 Mix_ExpireChannel (self, ticks);
2405 2818
2406void 2819void
2407fade_out (dc::Channel self, int ticks = -1) 2820fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2821 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2822 Mix_FadeOutChannel (self, ticks);
2410 2823
2411int 2824int
2412volume (dc::Channel self, int volume) 2825volume (DC::Channel self, int volume)
2413 CODE: 2826 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2827 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2828 OUTPUT:
2416 RETVAL 2829 RETVAL
2417 2830
2418void 2831void
2419unregister_all_effects (dc::Channel self) 2832unregister_all_effects (DC::Channel self)
2420 CODE: 2833 CODE:
2421 Mix_UnregisterAllEffects (self); 2834 Mix_UnregisterAllEffects (self);
2422 2835
2423void 2836void
2424set_panning (dc::Channel self, int left, int right) 2837set_panning (DC::Channel self, int left, int right)
2425 CODE: 2838 CODE:
2426 left = CLAMP (left , 0, 255); 2839 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2840 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2841 Mix_SetPanning (self, left, right);
2429 2842
2430void 2843void
2431set_distance (dc::Channel self, int distance) 2844set_distance (DC::Channel self, int distance)
2432 CODE: 2845 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2846 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2847
2435void 2848void
2436set_position (dc::Channel self, int angle, int distance) 2849set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2850 CODE:
2438 2851
2439void 2852void
2440set_position_r (dc::Channel self, int dx, int dy, int maxdistance) 2853set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2854 CODE:
2442{ 2855{
2443 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2856 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2444 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2857 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2858 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2859}
2447 2860
2448void 2861void
2449set_reverse_stereo (dc::Channel self, int flip) 2862set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2863 CODE:
2451 Mix_SetReverseStereo (self, flip); 2864 Mix_SetReverseStereo (self, flip);
2452 2865
2453MODULE = Deliantra::Client PACKAGE = dc::MixChunk 2866MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2867
2455PROTOTYPES: DISABLE 2868PROTOTYPES: DISABLE
2456 2869
2457dc::MixChunk 2870DC::MixChunk
2458new (SV *class, dc::RW rwops) 2871new (SV *class, DC::RW rwops)
2459 CODE: 2872 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2873 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2874 OUTPUT:
2462 RETVAL 2875 RETVAL
2463 2876
2464void 2877void
2465DESTROY (dc::MixChunk self) 2878DESTROY (DC::MixChunk self)
2466 CODE: 2879 CODE:
2467 Mix_FreeChunk (self); 2880 Mix_FreeChunk (self);
2468 2881
2469int 2882int
2470volume (dc::MixChunk self, int volume = -1) 2883volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2884 CODE:
2472 if (items > 1) 2885 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2886 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2887 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2888 OUTPUT:
2476 RETVAL 2889 RETVAL
2477 2890
2478dc::Channel 2891DC::Channel
2479play (dc::MixChunk self, dc::Channel channel = -1, int loops = 0, int ticks = -1) 2892play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480 CODE: 2893 CODE:
2481{ 2894{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2895 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 2896
2484 if (RETVAL < 0) 2897 if (RETVAL < 0)
2491 } 2904 }
2492} 2905}
2493 OUTPUT: 2906 OUTPUT:
2494 RETVAL 2907 RETVAL
2495 2908
2496MODULE = Deliantra::Client PACKAGE = dc::MixMusic 2909MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497 2910
2498int 2911int
2499volume (int volume = -1) 2912volume (int volume = -1)
2500 PROTOTYPE: ;$ 2913 PROTOTYPE: ;$
2501 CODE: 2914 CODE:
2513void 2926void
2514halt () 2927halt ()
2515 CODE: 2928 CODE:
2516 Mix_HaltMusic (); 2929 Mix_HaltMusic ();
2517 2930
2518dc::MixMusic 2931DC::MixMusic
2519new (SV *class, dc::RW rwops) 2932new (SV *class, DC::RW rwops)
2520 CODE: 2933 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 2934 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 2935 OUTPUT:
2523 RETVAL 2936 RETVAL
2524 2937
2525void 2938void
2526DESTROY (dc::MixMusic self) 2939DESTROY (DC::MixMusic self)
2527 CODE: 2940 CODE:
2528 Mix_FreeMusic (self); 2941 Mix_FreeMusic (self);
2529 2942
2530int 2943int
2531play (dc::MixMusic self, int loops = -1) 2944play (DC::MixMusic self, int loops = -1)
2532 CODE: 2945 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 2946 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 2947 OUTPUT:
2535 RETVAL 2948 RETVAL
2536 2949
2537void 2950void
2538fade_in_pos (dc::MixMusic self, int loops, int ms, double position) 2951fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 2952 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 2953 Mix_FadeInMusicPos (self, loops, ms, position);
2541 2954
2542MODULE = Deliantra::Client PACKAGE = dc::OpenGL 2955MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 2956
2544PROTOTYPES: ENABLE 2957PROTOTYPES: ENABLE
2545 2958
2546BOOT: 2959BOOT:
2547{ 2960{
2548 HV *stash = gv_stashpv ("dc::OpenGL", 1); 2961 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 2962 static const struct {
2550 const char *name; 2963 const char *name;
2551 IV iv; 2964 IV iv;
2552 } *civ, const_iv[] = { 2965 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 2966# define const_iv(name) { # name, (IV)name }
2554 const_iv (GL_VENDOR), 2967 const_iv (GL_VENDOR),
2555 const_iv (GL_VERSION), 2968 const_iv (GL_VERSION),
2556 const_iv (GL_EXTENSIONS), 2969 const_iv (GL_EXTENSIONS),
2970 const_iv (GL_MAX_TEXTURE_UNITS),
2557 const_iv (GL_COLOR_MATERIAL), 2971 const_iv (GL_COLOR_MATERIAL),
2558 const_iv (GL_SMOOTH), 2972 const_iv (GL_SMOOTH),
2559 const_iv (GL_FLAT), 2973 const_iv (GL_FLAT),
2560 const_iv (GL_DITHER), 2974 const_iv (GL_DITHER),
2561 const_iv (GL_BLEND), 2975 const_iv (GL_BLEND),
2573 const_iv (GL_ZERO), 2987 const_iv (GL_ZERO),
2574 const_iv (GL_SRC_ALPHA), 2988 const_iv (GL_SRC_ALPHA),
2575 const_iv (GL_DST_ALPHA), 2989 const_iv (GL_DST_ALPHA),
2576 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2990 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2577 const_iv (GL_ONE_MINUS_DST_ALPHA), 2991 const_iv (GL_ONE_MINUS_DST_ALPHA),
2992 const_iv (GL_SRC_COLOR),
2993 const_iv (GL_DST_COLOR),
2994 const_iv (GL_ONE_MINUS_SRC_COLOR),
2995 const_iv (GL_ONE_MINUS_DST_COLOR),
2578 const_iv (GL_SRC_ALPHA_SATURATE), 2996 const_iv (GL_SRC_ALPHA_SATURATE),
2579 const_iv (GL_RGB), 2997 const_iv (GL_RGB),
2580 const_iv (GL_RGBA), 2998 const_iv (GL_RGBA),
2581 const_iv (GL_RGBA4), 2999 const_iv (GL_RGBA4),
2582 const_iv (GL_RGBA8), 3000 const_iv (GL_RGBA8),
2650 const_iv (GL_NICEST), 3068 const_iv (GL_NICEST),
2651 const_iv (GL_V2F), 3069 const_iv (GL_V2F),
2652 const_iv (GL_V3F), 3070 const_iv (GL_V3F),
2653 const_iv (GL_T2F_V3F), 3071 const_iv (GL_T2F_V3F),
2654 const_iv (GL_T2F_N3F_V3F), 3072 const_iv (GL_T2F_N3F_V3F),
3073 const_iv (GL_FUNC_ADD),
3074 const_iv (GL_FUNC_SUBTRACT),
3075 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2655# undef const_iv 3076# undef const_iv
2656 }; 3077 };
2657 3078
2658 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3079 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2659 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3080 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2666disable_GL_EXT_blend_func_separate () 3087disable_GL_EXT_blend_func_separate ()
2667 CODE: 3088 CODE:
2668 gl.BlendFuncSeparate = 0; 3089 gl.BlendFuncSeparate = 0;
2669 gl.BlendFuncSeparateEXT = 0; 3090 gl.BlendFuncSeparateEXT = 0;
2670 3091
3092void
3093apple_nvidia_bug (int enable)
3094
2671char * 3095char *
2672gl_vendor () 3096gl_vendor ()
2673 CODE: 3097 CODE:
2674 RETVAL = (char *)glGetString (GL_VENDOR); 3098 RETVAL = (char *)glGetString (GL_VENDOR);
2675 OUTPUT: 3099 OUTPUT:
2724 3148
2725void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3149void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2726 CODE: 3150 CODE:
2727 gl_BlendFuncSeparate (sa, da, saa, daa); 3151 gl_BlendFuncSeparate (sa, da, saa, daa);
2728 3152
3153# void glBlendEquation (int se)
3154
2729void glDepthMask (int flag) 3155void glDepthMask (int flag)
2730 3156
2731void glLogicOp (int opcode) 3157void glLogicOp (int opcode)
2732 3158
2733void glColorMask (int red, int green, int blue, int alpha) 3159void glColorMask (int red, int green, int blue, int alpha)
2767void glRotate (float angle, float x, float y, float z) 3193void glRotate (float angle, float x, float y, float z)
2768 CODE: 3194 CODE:
2769 glRotatef (angle, x, y, z); 3195 glRotatef (angle, x, y, z);
2770 3196
2771void glColor (float r, float g, float b, float a = 1.0) 3197void glColor (float r, float g, float b, float a = 1.0)
3198 PROTOTYPE: @
2772 ALIAS: 3199 ALIAS:
2773 glColor_premultiply = 1 3200 glColor_premultiply = 1
2774 CODE: 3201 CODE:
2775 if (ix) 3202 if (ix)
2776 { 3203 {
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3273void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 3274 CODE:
2848 if (gl.SeparableFilter2D) 3275 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3276 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3277
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3278void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 3279
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3280void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 3281
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3282void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3283
2882 3309
2883void glEndList () 3310void glEndList ()
2884 3311
2885void glCallList (int list) 3312void glCallList (int list)
2886 3313
3314void c_init ()
3315 CODE:
3316 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3317 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3318
2887MODULE = Deliantra::Client PACKAGE = dc::UI::Base 3319MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 3320
2889PROTOTYPES: DISABLE 3321PROTOTYPES: DISABLE
2890 3322
2891void 3323void
2892find_widget (SV *self, NV x, NV y) 3324find_widget (SV *self, NV x, NV y)
2896 XPUSHs (self); 3328 XPUSHs (self);
2897} 3329}
2898 3330
2899BOOT: 3331BOOT:
2900{ 3332{
2901 hover_gv = gv_fetchpv ("dc::UI::HOVER", 1, SVt_NV); 3333 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 3334
2903 draw_x_gv = gv_fetchpv ("dc::UI::Base::draw_x", 1, SVt_NV); 3335 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2904 draw_y_gv = gv_fetchpv ("dc::UI::Base::draw_y", 1, SVt_NV); 3336 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2905 draw_w_gv = gv_fetchpv ("dc::UI::Base::draw_w", 1, SVt_NV); 3337 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2906 draw_h_gv = gv_fetchpv ("dc::UI::Base::draw_h", 1, SVt_NV); 3338 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907} 3339}
2908 3340
2909void 3341void
2910draw (SV *self) 3342draw (SV *self)
2911 CODE: 3343 CODE:
2918 SV *draw_w_sv = GvSV (draw_w_gv); 3350 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 3351 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 3352 double draw_x, draw_y;
2921 3353
2922 if (!SvROK (self)) 3354 if (!SvROK (self))
2923 croak ("dc::Base::draw: %s not a reference", SvPV_nolen (self)); 3355 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 3356
2925 hv = (HV *)SvRV (self); 3357 hv = (HV *)SvRV (self);
2926 3358
2927 if (SvTYPE (hv) != SVt_PVHV) 3359 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("dc::Base::draw: %s not a hashref", SvPV_nolen (self)); 3360 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 3361
2930 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3362 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2931 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3363 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932 3364
2933 if (!h || !w) 3365 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines