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.234 by root, Mon Aug 27 02:52:54 2007 UTC vs.
Revision 1.275 by root, Thu Aug 28 00:53:53 2008 UTC

39#include <SDL_endian.h> 39#include <SDL_endian.h>
40#include <SDL_image.h> 40#include <SDL_image.h>
41#include <SDL_mixer.h> 41#include <SDL_mixer.h>
42#include <SDL_opengl.h> 42#include <SDL_opengl.h>
43 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
44#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
46 51
47#include <glib/gmacros.h> 52#include <glib/gmacros.h>
48 53
49#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
50 66
51#ifndef _WIN32 67#ifndef _WIN32
52# include <sys/types.h> 68# include <sys/types.h>
53# include <sys/socket.h> 69# include <sys/socket.h>
54# include <netinet/in.h> 70# include <netinet/in.h>
55# include <netinet/tcp.h> 71# include <netinet/tcp.h>
56# include <inttypes.h> 72# include <inttypes.h>
57#endif 73#endif
58 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 85
61#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
62 87
63#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
65 90
66#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
67 92
68#if 0 93/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else
71# define PARACHUTE 0
72#endif
73 95
74static AV *texture_av; 96static AV *texture_av;
75 97
76static struct 98static struct
77{ 99{
120 142
121#include "pango-font.c" 143#include "pango-font.c"
122#include "pango-fontmap.c" 144#include "pango-fontmap.c"
123#include "pango-render.c" 145#include "pango-render.c"
124 146
125typedef IV CFPlus__Channel; 147typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 148typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 149typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 150typedef Mix_Music *DC__MixMusic;
129 151
130typedef PangoFontDescription *CFPlus__Font; 152typedef PangoFontDescription *DC__Font;
131 153
132static int 154static int
133shape_attr_p (PangoLayoutRun *run) 155shape_attr_p (PangoLayoutRun *run)
134{ 156{
135 GSList *attrs = run->item->analysis.extra_attrs; 157 GSList *attrs = run->item->analysis.extra_attrs;
149 171
150typedef struct cf_layout { 172typedef struct cf_layout {
151 PangoLayout *pl; 173 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 174 float r, g, b, a; // default color for rgba mode
153 int base_height; 175 int base_height;
154 CFPlus__Font font; 176 DC__Font font;
155 rc_t *rc; 177 rc_t *rc;
156} *CFPlus__Layout; 178} *DC__Layout;
157 179
158static CFPlus__Font default_font; 180static DC__Font default_font;
159static PangoContext *opengl_context; 181static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 182static PangoFontMap *opengl_fontmap;
161 183
162static void 184static void
163substitute_func (FcPattern *pattern, gpointer data) 185substitute_func (FcPattern *pattern, gpointer data)
168#endif 190#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 191 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 192}
171 193
172static void 194static void
173layout_update_font (CFPlus__Layout self) 195layout_update_font (DC__Layout self)
174{ 196{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 197 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 198 * reasonably well with dejavu/bistream fonts
177 */ 199 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 200 PangoFontDescription *font = self->font ? self->font : default_font;
179 201
180 pango_font_description_set_absolute_size (font, 202 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 203 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 204
183 pango_layout_set_font_description (self->pl, font); 205 pango_layout_set_font_description (self->pl, font);
184} 206}
185 207
186static void 208static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 209layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 210{
189 PangoRectangle rect; 211 PangoRectangle rect;
190 212
191 // get_pixel_* wrongly rounds down 213 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 214 pango_layout_get_extents (self->pl, 0, &rect);
231 int faces; tileid *face2tile; // [faceid] 253 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 254 int texs; maptex *tex; // [tileid]
233 255
234 int32_t rows; 256 int32_t rows;
235 maprow *row; 257 maprow *row;
236} *CFPlus__Map; 258} *DC__Map;
237 259
238static char * 260static char *
239prepend (char *ptr, int sze, int inc) 261prepend (char *ptr, int sze, int inc)
240{ 262{
241 char *p; 263 char *p;
279 self->texs *= 2; 301 self->texs *= 2;
280 } 302 }
281} 303}
282 304
283static maprow * 305static maprow *
284map_get_row (CFPlus__Map self, int y) 306map_get_row (DC__Map self, int y)
285{ 307{
286 if (0 > y) 308 if (0 > y)
287 { 309 {
288 int extend = - y + MAP_EXTEND_Y; 310 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 311 Prepend (maprow, self->row, self->rows, extend);
327 349
328 return row->col + (x - row->c0); 350 return row->col + (x - row->c0);
329} 351}
330 352
331static mapcell * 353static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 354map_get_cell (DC__Map self, int x, int y)
333{ 355{
334 return row_get_cell (map_get_row (self, y), x); 356 return row_get_cell (map_get_row (self, y), x);
335} 357}
336 358
337static void 359static void
338map_clear (CFPlus__Map self) 360map_clear (DC__Map self)
339{ 361{
340 int r; 362 int r;
341 363
342 for (r = 0; r < self->rows; r++) 364 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 365 Safefree (self->row[r].col);
350 self->oy = 0; 372 self->oy = 0;
351 self->row = 0; 373 self->row = 0;
352 self->rows = 0; 374 self->rows = 0;
353} 375}
354 376
377#define CELL_CLEAR(cell) \
378 do { \
379 if ((cell)->player) \
380 (cell)->tile [2] = 0; \
381 (cell)->darkness = 0; \
382 (cell)->stat_hp = 0; \
383 (cell)->flags = 0; \
384 (cell)->player = 0; \
385 } while (0)
386
355static void 387static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 388map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 389{
358 int x, y; 390 int x, y;
359 maprow *row; 391 maprow *row;
360 mapcell *cell; 392 mapcell *cell;
361 393
373 if (x >= row->c1) 405 if (x >= row->c1)
374 break; 406 break;
375 407
376 cell = row->col + x - row->c0; 408 cell = row->col + x - row->c0;
377 409
378 cell->darkness = 0; 410 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 411 }
383 } 412 }
384} 413}
385 414
386typedef struct { 415typedef struct {
440 n |= n >> 16; 469 n |= n >> 16;
441 470
442 return n + 1; 471 return n + 1;
443} 472}
444 473
474static unsigned int
475popcount (unsigned int n)
476{
477 n -= (n >> 1) & 0x55555555U;
478 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
479 n = ((n >> 4) + n) & 0x0f0f0f0fU;
480 n *= 0x01010101U;
481
482 return n >> 24;
483}
484
445/* SDL should provide this, really. */ 485/* SDL should provide this, really. */
446#define SDLK_MODIFIER_MIN 300 486#define SDLK_MODIFIER_MIN 300
447#define SDLK_MODIFIER_MAX 314 487#define SDLK_MODIFIER_MAX 314
448 488
449/******************************************************************************/ 489/******************************************************************************/
487 return 0; 527 return 0;
488 528
489 return 1; 529 return 1;
490} 530}
491 531
492MODULE = CFPlus PACKAGE = CFPlus 532static void
533deliantra_main ()
534{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537}
538
539#ifdef __MACOSX__
540 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back.
545 */
546 extern C_LINKAGE int
547 main (int argc, char *argv[])
548 {
549 deliantra_main ();
550 }
551
552 #undef main
553
554 extern C_LINKAGE int main (int argc, char *argv[]);
555
556 static void
557 SDL_braino (void)
558 {
559 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv);
561 }
562#else
563 static void
564 SDL_braino (void)
565 {
566 deliantra_main ();
567 }
568#endif
569
570MODULE = Deliantra::Client PACKAGE = DC
493 571
494PROTOTYPES: ENABLE 572PROTOTYPES: ENABLE
495 573
496BOOT: 574BOOT:
497{ 575{
498 HV *stash = gv_stashpv ("CFPlus", 1); 576 HV *stash = gv_stashpv ("DC", 1);
499 static const struct { 577 static const struct {
500 const char *name; 578 const char *name;
501 IV iv; 579 IV iv;
502 } *civ, const_iv[] = { 580 } *civ, const_iv[] = {
503# define const_iv(name) { # name, (IV)name } 581# define const_iv(name) { # name, (IV)name }
525 603
526 const_iv (SDL_APPINPUTFOCUS), 604 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS), 605 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE), 606 const_iv (SDL_APPACTIVE),
529 607
608
609 const_iv (SDLK_UNKNOWN),
610 const_iv (SDLK_FIRST),
611 const_iv (SDLK_BACKSPACE),
612 const_iv (SDLK_TAB),
613 const_iv (SDLK_CLEAR),
614 const_iv (SDLK_RETURN),
615 const_iv (SDLK_PAUSE),
616 const_iv (SDLK_ESCAPE),
617 const_iv (SDLK_SPACE),
618 const_iv (SDLK_EXCLAIM),
619 const_iv (SDLK_QUOTEDBL),
620 const_iv (SDLK_HASH),
621 const_iv (SDLK_DOLLAR),
622 const_iv (SDLK_AMPERSAND),
623 const_iv (SDLK_QUOTE),
624 const_iv (SDLK_LEFTPAREN),
625 const_iv (SDLK_RIGHTPAREN),
626 const_iv (SDLK_ASTERISK),
627 const_iv (SDLK_PLUS),
628 const_iv (SDLK_COMMA),
629 const_iv (SDLK_MINUS),
630 const_iv (SDLK_PERIOD),
631 const_iv (SDLK_SLASH),
632 const_iv (SDLK_0),
633 const_iv (SDLK_1),
634 const_iv (SDLK_2),
635 const_iv (SDLK_3),
636 const_iv (SDLK_4),
637 const_iv (SDLK_5),
638 const_iv (SDLK_6),
639 const_iv (SDLK_7),
640 const_iv (SDLK_8),
641 const_iv (SDLK_9),
642 const_iv (SDLK_COLON),
643 const_iv (SDLK_SEMICOLON),
644 const_iv (SDLK_LESS),
645 const_iv (SDLK_EQUALS),
646 const_iv (SDLK_GREATER),
647 const_iv (SDLK_QUESTION),
648 const_iv (SDLK_AT),
649
650 const_iv (SDLK_LEFTBRACKET),
651 const_iv (SDLK_BACKSLASH),
652 const_iv (SDLK_RIGHTBRACKET),
653 const_iv (SDLK_CARET),
654 const_iv (SDLK_UNDERSCORE),
655 const_iv (SDLK_BACKQUOTE),
656 const_iv (SDLK_DELETE),
657
658 const_iv (SDLK_FIRST),
659 const_iv (SDLK_LAST),
530 const_iv (SDLK_KP0), 660 const_iv (SDLK_KP0),
531 const_iv (SDLK_KP1), 661 const_iv (SDLK_KP1),
532 const_iv (SDLK_KP2), 662 const_iv (SDLK_KP2),
533 const_iv (SDLK_KP3), 663 const_iv (SDLK_KP3),
534 const_iv (SDLK_KP4), 664 const_iv (SDLK_KP4),
606 const_iv (KMOD_LMETA), 736 const_iv (KMOD_LMETA),
607 const_iv (KMOD_RMETA), 737 const_iv (KMOD_RMETA),
608 const_iv (KMOD_NUM), 738 const_iv (KMOD_NUM),
609 const_iv (KMOD_CAPS), 739 const_iv (KMOD_CAPS),
610 const_iv (KMOD_MODE), 740 const_iv (KMOD_MODE),
741
742 const_iv (MIX_DEFAULT_FORMAT),
743
744 const_iv (SDL_INIT_TIMER),
745 const_iv (SDL_INIT_AUDIO),
746 const_iv (SDL_INIT_VIDEO),
747 const_iv (SDL_INIT_CDROM),
748 const_iv (SDL_INIT_JOYSTICK),
749 const_iv (SDL_INIT_EVERYTHING),
750 const_iv (SDL_INIT_NOPARACHUTE),
751 const_iv (SDL_INIT_EVENTTHREAD),
752
753 const_iv (SDL_GL_RED_SIZE),
754 const_iv (SDL_GL_GREEN_SIZE),
755 const_iv (SDL_GL_BLUE_SIZE),
756 const_iv (SDL_GL_ALPHA_SIZE),
757 const_iv (SDL_GL_DOUBLEBUFFER),
758 const_iv (SDL_GL_BUFFER_SIZE),
759 const_iv (SDL_GL_DEPTH_SIZE),
760 const_iv (SDL_GL_STENCIL_SIZE),
761 const_iv (SDL_GL_ACCUM_RED_SIZE),
762 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
763 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
764 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
765 const_iv (SDL_GL_STEREO),
766 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
767 const_iv (SDL_GL_MULTISAMPLESAMPLES),
768 const_iv (SDL_GL_ACCELERATED_VISUAL),
769 const_iv (SDL_GL_SWAP_CONTROL),
770
771 const_iv (FOW_DARKNESS)
611# undef const_iv 772# undef const_iv
612 }; 773 };
613 774
614 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 775 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
633 794
634NV floor (NV x) 795NV floor (NV x)
635 796
636NV ceil (NV x) 797NV ceil (NV x)
637 798
799IV minpot (UV n)
800
801IV popcount (UV n)
802
638void 803void
639pango_init () 804pango_init ()
640 CODE: 805 CODE:
641{ 806{
642 opengl_fontmap = pango_opengl_font_map_new (); 807 opengl_fontmap = pango_opengl_font_map_new ();
643 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 808 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
644 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 809 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
810 /*pango_context_set_font_description (opengl_context, default_font);*/
811#if PANGO_VERSION_CHECK (1, 15, 2)
812 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
813 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
814#endif
645} 815}
646 816
647char *
648SDL_GetError () 817char *SDL_GetError ()
649 818
650int 819void SDL_braino ()
651SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
652 820
653void 821int SDL_Init (U32 flags)
822
823int SDL_InitSubSystem (U32 flags)
824
825void SDL_QuitSubSystem (U32 flags)
826
654SDL_Quit () 827void SDL_Quit ()
828
829int SDL_GL_SetAttribute (int attr, int value)
830
831int SDL_GL_GetAttribute (int attr)
832 CODE:
833 if (SDL_GL_GetAttribute (attr, &RETVAL))
834 XSRETURN_UNDEF;
835 OUTPUT:
836 RETVAL
655 837
656void 838void
657SDL_ListModes (int rgb, int alpha) 839SDL_ListModes (int rgb, int alpha)
658 PPCODE: 840 PPCODE:
659{ 841{
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 853 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 854 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 855 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674 856
675 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 857 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
676#if SDL_VERSION_ATLEAST(1,2,10)
677 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
678 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 858 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679#endif
680 859
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 860 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 861
683 if (m && m != (SDL_Rect **)-1) 862 if (m && m != (SDL_Rect **)-1)
684 while (*m) 863 while (*m)
685 { 864 {
686 if ((*m)->w >= 640 && (*m)->h >= 480) 865 if ((*m)->w >= 400 && (*m)->h >= 300)
687 { 866 {
688 AV *av = newAV (); 867 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 868 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 869 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 870 av_push (av, newSViv (rgb));
715 894
716 if (RETVAL) 895 if (RETVAL)
717 { 896 {
718 av_clear (texture_av); 897 av_clear (texture_av);
719 898
720 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 899 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 900#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
722#include "glfunc.h" 901#include "glfunc.h"
723#undef GL_FUNC 902#undef GL_FUNC
724 } 903 }
725} 904}
732char * 911char *
733SDL_GetKeyName (int sym) 912SDL_GetKeyName (int sym)
734 913
735int 914int
736SDL_GetAppState () 915SDL_GetAppState ()
916
917int
918SDL_GetModState ()
737 919
738void 920void
739poll_events () 921poll_events ()
740 PPCODE: 922 PPCODE:
741{ 923{
751 { 933 {
752 case SDL_KEYDOWN: 934 case SDL_KEYDOWN:
753 case SDL_KEYUP: 935 case SDL_KEYUP:
754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 938 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
757 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 939 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
758 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 940 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759 break; 941 break;
760 942
761 case SDL_ACTIVEEVENT: 943 case SDL_ACTIVEEVENT:
762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
780 x = ev.motion.x; 962 x = ev.motion.x;
781 y = ev.motion.y; 963 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 } 965 }
784 966
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 hv_store (hv, "state", 5, newSViv (state), 0); 968 hv_store (hv, "state", 5, newSViv (state), 0);
787 hv_store (hv, "x", 1, newSViv (x), 0); 969 hv_store (hv, "x", 1, newSViv (x), 0);
788 hv_store (hv, "y", 1, newSViv (y), 0); 970 hv_store (hv, "y", 1, newSViv (y), 0);
789 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 971 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 972 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 } 973 }
792 break; 974 break;
793 975
794 case SDL_MOUSEBUTTONDOWN: 976 case SDL_MOUSEBUTTONDOWN:
795 case SDL_MOUSEBUTTONUP: 977 case SDL_MOUSEBUTTONUP:
796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 978 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797 979
798 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 980 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 981 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 982 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 983 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 988 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 989 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 990 break;
809 } 991 }
810 992
811 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 993 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
812 } 994 }
813} 995}
814 996
815int 997int
816Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 998Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817 POSTCALL: 999 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 1000 Mix_HookMusicFinished (music_finished);
819 Mix_ChannelFinished (channel_finished); 1001 Mix_ChannelFinished (channel_finished);
1002
1003void
1004Mix_QuerySpec ()
1005 PPCODE:
1006{
1007 int freq, channels;
1008 Uint16 format;
1009
1010 if (Mix_QuerySpec (&freq, &format, &channels))
1011 {
1012 EXTEND (SP, 3);
1013 PUSHs (sv_2mortal (newSViv (freq)));
1014 PUSHs (sv_2mortal (newSViv (format)));
1015 PUSHs (sv_2mortal (newSViv (channels)));
1016 }
1017}
820 1018
821void 1019void
822Mix_CloseAudio () 1020Mix_CloseAudio ()
823 1021
824int 1022int
859 } 1057 }
860 } 1058 }
861#endif 1059#endif
862} 1060}
863 1061
864void 1062int
865add_font (char *file) 1063add_font (char *file)
866 CODE: 1064 CODE:
867 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1065 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1066 OUTPUT:
1067 RETVAL
868 1068
869void 1069void
870load_image_inline (SV *image_) 1070load_image_inline (SV *image_)
871 ALIAS: 1071 ALIAS:
872 load_image_file = 1 1072 load_image_file = 1
958void 1158void
959error (char *message) 1159error (char *message)
960 CODE: 1160 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1161 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1162#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1163 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1164#endif
965 1165
966void 1166void
967fatal (char *message) 1167fatal (char *message)
968 CODE: 1168 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1169 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1170#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1171 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1172#endif
973 _exit (1); 1173 _exit (1);
974 1174
975void 1175void
976_exit (int retval = 0) 1176_exit (int retval = 0)
988#if DEBUG 1188#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1189 VALGRIND_DO_LEAK_CHECK;
990#endif 1190#endif
991} 1191}
992 1192
993MODULE = CFPlus PACKAGE = CFPlus::Font 1193MODULE = Deliantra::Client PACKAGE = DC::Font
994 1194
995PROTOTYPES: DISABLE 1195PROTOTYPES: DISABLE
996 1196
997CFPlus::Font 1197DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1198new_from_file (SV *class, char *path, int id = 0)
999 CODE: 1199 CODE:
1000{ 1200{
1001 int count; 1201 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1202 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1005} 1205}
1006 OUTPUT: 1206 OUTPUT:
1007 RETVAL 1207 RETVAL
1008 1208
1009void 1209void
1010DESTROY (CFPlus::Font self) 1210DESTROY (DC::Font self)
1011 CODE: 1211 CODE:
1012 pango_font_description_free (self); 1212 pango_font_description_free (self);
1013 1213
1014void 1214void
1015make_default (CFPlus::Font self) 1215make_default (DC::Font self)
1016 PROTOTYPE: $ 1216 PROTOTYPE: $
1017 CODE: 1217 CODE:
1018 default_font = self; 1218 default_font = self;
1019 1219
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1220MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1221
1022PROTOTYPES: DISABLE 1222PROTOTYPES: DISABLE
1023 1223
1024void 1224void
1025reset_glyph_cache () 1225glyph_cache_backup ()
1026 PROTOTYPE: 1226 PROTOTYPE:
1027 CODE: 1227 CODE:
1228 tc_backup ();
1229
1230void
1231glyph_cache_restore ()
1232 PROTOTYPE:
1233 CODE:
1028 tc_clear (); 1234 tc_restore ();
1029 1235
1030CFPlus::Layout 1236DC::Layout
1031new (SV *class) 1237new (SV *class)
1032 CODE: 1238 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1239 New (0, RETVAL, 1, struct cf_layout);
1034 1240
1035 RETVAL->pl = pango_layout_new (opengl_context); 1241 RETVAL->pl = pango_layout_new (opengl_context);
1045 layout_update_font (RETVAL); 1251 layout_update_font (RETVAL);
1046 OUTPUT: 1252 OUTPUT:
1047 RETVAL 1253 RETVAL
1048 1254
1049void 1255void
1050DESTROY (CFPlus::Layout self) 1256DESTROY (DC::Layout self)
1051 CODE: 1257 CODE:
1052 g_object_unref (self->pl); 1258 g_object_unref (self->pl);
1053 rc_free (self->rc); 1259 rc_free (self->rc);
1054 Safefree (self); 1260 Safefree (self);
1055 1261
1056void 1262void
1057set_text (CFPlus::Layout self, SV *text_) 1263set_text (DC::Layout self, SV *text_)
1058 CODE: 1264 CODE:
1059{ 1265{
1060 STRLEN textlen; 1266 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1267 char *text = SvPVutf8 (text_, textlen);
1062 1268
1063 pango_layout_set_text (self->pl, text, textlen); 1269 pango_layout_set_text (self->pl, text, textlen);
1064} 1270}
1065 1271
1066void 1272void
1067set_markup (CFPlus::Layout self, SV *text_) 1273set_markup (DC::Layout self, SV *text_)
1068 CODE: 1274 CODE:
1069{ 1275{
1070 STRLEN textlen; 1276 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1277 char *text = SvPVutf8 (text_, textlen);
1072 1278
1073 pango_layout_set_markup (self->pl, text, textlen); 1279 pango_layout_set_markup (self->pl, text, textlen);
1074} 1280}
1075 1281
1076void 1282void
1077set_shapes (CFPlus::Layout self, ...) 1283set_shapes (DC::Layout self, ...)
1078 CODE: 1284 CODE:
1079{ 1285{
1080 PangoAttrList *attrs = 0; 1286 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1287 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1288 const char *pos = text;
1117 if (attrs) 1323 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1324 pango_layout_set_attributes (self->pl, attrs);
1119} 1325}
1120 1326
1121void 1327void
1122get_shapes (CFPlus::Layout self) 1328get_shapes (DC::Layout self)
1123 PPCODE: 1329 PPCODE:
1124{ 1330{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1331 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1332
1127 do 1333 do
1128 { 1334 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1335 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1336
1131 if (run && shape_attr_p (run)) 1337 if (run && shape_attr_p (run))
1132 { 1338 {
1133 PangoRectangle extents; 1339 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1340 pango_layout_iter_get_run_extents (iter, 0, &extents);
1142 1348
1143 pango_layout_iter_free (iter); 1349 pango_layout_iter_free (iter);
1144} 1350}
1145 1351
1146int 1352int
1147has_wrapped (CFPlus::Layout self) 1353has_wrapped (DC::Layout self)
1148 CODE: 1354 CODE:
1149{ 1355{
1150 int lines = 1; 1356 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1357 const char *text = pango_layout_get_text (self->pl);
1152 1358
1157} 1363}
1158 OUTPUT: 1364 OUTPUT:
1159 RETVAL 1365 RETVAL
1160 1366
1161SV * 1367SV *
1162get_text (CFPlus::Layout self) 1368get_text (DC::Layout self)
1163 CODE: 1369 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1370 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1371 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1372 OUTPUT:
1167 RETVAL 1373 RETVAL
1168 1374
1169void 1375void
1170set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1376set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1171 CODE: 1377 CODE:
1172 self->r = r; 1378 self->r = r;
1173 self->g = g; 1379 self->g = g;
1174 self->b = b; 1380 self->b = b;
1175 self->a = a; 1381 self->a = a;
1176 1382
1177void 1383void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1384set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1385 CODE:
1180 if (self->font != font) 1386 if (self->font != font)
1181 { 1387 {
1182 self->font = font; 1388 self->font = font;
1183 layout_update_font (self); 1389 layout_update_font (self);
1184 } 1390 }
1185 1391
1186void 1392void
1187set_height (CFPlus::Layout self, int base_height) 1393set_height (DC::Layout self, int base_height)
1188 CODE: 1394 CODE:
1189 if (self->base_height != base_height) 1395 if (self->base_height != base_height)
1190 { 1396 {
1191 self->base_height = base_height; 1397 self->base_height = base_height;
1192 layout_update_font (self); 1398 layout_update_font (self);
1193 } 1399 }
1194 1400
1195void 1401void
1196set_width (CFPlus::Layout self, int max_width = -1) 1402set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1403 CODE:
1198 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1404 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1199 1405
1200void 1406void
1201set_indent (CFPlus::Layout self, int indent) 1407set_indent (DC::Layout self, int indent)
1202 CODE: 1408 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1409 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1410
1205void 1411void
1206set_spacing (CFPlus::Layout self, int spacing) 1412set_spacing (DC::Layout self, int spacing)
1207 CODE: 1413 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1414 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1415
1210void 1416void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1417set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1418 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1419 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1420 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1421 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1422 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1423 : PANGO_ELLIPSIZE_NONE
1218 ); 1424 );
1219 1425
1220void 1426void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1427set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1428 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1429 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1430
1225void 1431void
1226size (CFPlus::Layout self) 1432size (DC::Layout self)
1227 PPCODE: 1433 PPCODE:
1228{ 1434{
1229 int w, h; 1435 int w, h;
1230 1436
1231 layout_get_pixel_size (self, &w, &h); 1437 layout_get_pixel_size (self, &w, &h);
1234 PUSHs (sv_2mortal (newSViv (w))); 1440 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1441 PUSHs (sv_2mortal (newSViv (h)));
1236} 1442}
1237 1443
1238int 1444int
1239descent (CFPlus::Layout self) 1445descent (DC::Layout self)
1240 CODE: 1446 CODE:
1241{ 1447{
1242 PangoRectangle rect; 1448 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1449 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1450 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1451 RETVAL = PANGO_DESCENT (rect);
1246} 1452}
1247 OUTPUT: 1453 OUTPUT:
1248 RETVAL 1454 RETVAL
1249 1455
1250int 1456int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1457xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1458 CODE:
1253{ 1459{
1254 int index, trailing; 1460 int index, trailing;
1255 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1461 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1256 RETVAL = index + trailing; 1462 RETVAL = index + trailing;
1257} 1463}
1258 OUTPUT: 1464 OUTPUT:
1259 RETVAL 1465 RETVAL
1260 1466
1261void 1467void
1262cursor_pos (CFPlus::Layout self, int index) 1468cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1469 PPCODE:
1264{ 1470{
1265 PangoRectangle strong_pos; 1471 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1472 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1473
1268 EXTEND (SP, 3); 1474 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1475 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1476 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1477 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1478}
1273 1479
1274void 1480void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1481index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1482 PPCODE:
1277{ 1483{
1278 int line, x; 1484 int line, x;
1279 1485
1280 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1486 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1487#if !PANGO_VERSION_CHECK (1, 17, 3)
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1488 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1489 --line;
1490#endif
1283 EXTEND (SP, 2); 1491 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1492 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1494}
1287 1495
1288void 1496void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1497line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1498 PPCODE:
1291{ 1499{
1292 PangoLayoutLine *lp; 1500 PangoLayoutLine *lp;
1293 int index, trailing; 1501 int index, trailing;
1294 1502
1295 if (line < 0) 1503 if (line < 0)
1296 XSRETURN_EMPTY; 1504 XSRETURN_EMPTY;
1297 1505
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1506 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1507 XSRETURN_EMPTY; /* do better */
1300 1508
1301 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1509 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1302 1510
1303 EXTEND (SP, 2); 1511 EXTEND (SP, 2);
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1517 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1518 }
1311} 1519}
1312 1520
1313void 1521void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1522render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1523 CODE:
1316 rc_clear (self->rc); 1524 rc_clear (self->rc);
1317 pango_opengl_render_layout_subpixel ( 1525 pango_opengl_render_layout_subpixel (
1318 self->pl, 1526 self->pl,
1319 self->rc, 1527 self->rc,
1324 // we assume that context_change actually clears/frees stuff 1532 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1533 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1534 pango_layout_context_changed (self->pl);
1327 1535
1328void 1536void
1329draw (CFPlus::Layout self) 1537draw (DC::Layout self)
1330 CODE: 1538 CODE:
1331{ 1539{
1332 glEnable (GL_TEXTURE_2D); 1540 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1541 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1542 glEnable (GL_BLEND);
1342 glDisable (GL_ALPHA_TEST); 1550 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1551 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1552 glDisable (GL_TEXTURE_2D);
1345} 1553}
1346 1554
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1555MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1556
1349PROTOTYPES: ENABLE 1557PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1558
1353void 1559void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1560pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1561 CODE:
1356{ 1562{
1433 RETVAL = width > 0; 1639 RETVAL = width > 0;
1434} 1640}
1435 OUTPUT: 1641 OUTPUT:
1436 RETVAL 1642 RETVAL
1437 1643
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1644MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1645
1440PROTOTYPES: DISABLE 1646PROTOTYPES: DISABLE
1441 1647
1442CFPlus::Map 1648DC::Map
1443new (SV *class) 1649new (SV *class)
1444 CODE: 1650 CODE:
1445 New (0, RETVAL, 1, struct map); 1651 New (0, RETVAL, 1, struct map);
1446 RETVAL->x = 0; 1652 RETVAL->x = 0;
1447 RETVAL->y = 0; 1653 RETVAL->y = 0;
1455 RETVAL->row = 0; 1661 RETVAL->row = 0;
1456 OUTPUT: 1662 OUTPUT:
1457 RETVAL 1663 RETVAL
1458 1664
1459void 1665void
1460DESTROY (CFPlus::Map self) 1666DESTROY (DC::Map self)
1461 CODE: 1667 CODE:
1462{ 1668{
1463 map_clear (self); 1669 map_clear (self);
1464 Safefree (self->face2tile); 1670 Safefree (self->face2tile);
1465 Safefree (self->tex); 1671 Safefree (self->tex);
1466 Safefree (self); 1672 Safefree (self);
1467} 1673}
1468 1674
1469void 1675void
1470resize (CFPlus::Map self, int map_width, int map_height) 1676resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1677 CODE:
1472 self->w = map_width; 1678 self->w = map_width;
1473 self->h = map_height; 1679 self->h = map_height;
1474 1680
1475void 1681void
1476clear (CFPlus::Map self) 1682clear (DC::Map self)
1477 CODE: 1683 CODE:
1478 map_clear (self); 1684 map_clear (self);
1479 1685
1480void 1686void
1481set_tileid (CFPlus::Map self, int face, int tile) 1687set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1688 CODE:
1483{ 1689{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1690 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1691 need_texid (self, tile);
1486} 1692}
1487 1693
1488void 1694void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1695set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1696 CODE:
1491{ 1697{
1492 tileid texid; 1698 tileid texid;
1493 maptex *tex; 1699 maptex *tex;
1494 1700
1507 tex->smoothtile = self->face2tile [smooth]; 1713 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1714 tex->smoothlevel = level;
1509} 1715}
1510 1716
1511void 1717void
1512set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1718set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1513 CODE: 1719 CODE:
1514{ 1720{
1515 need_texid (self, texid); 1721 need_texid (self, texid);
1516 1722
1517 { 1723 {
1537 // from transparent color bleeding and ugly wrapping effects. 1743 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1745}
1540 1746
1541int 1747int
1542ox (CFPlus::Map self) 1748ox (DC::Map self)
1543 ALIAS: 1749 ALIAS:
1544 oy = 1 1750 oy = 1
1545 x = 2 1751 x = 2
1546 y = 3 1752 y = 3
1547 w = 4 1753 w = 4
1558 } 1764 }
1559 OUTPUT: 1765 OUTPUT:
1560 RETVAL 1766 RETVAL
1561 1767
1562void 1768void
1563scroll (CFPlus::Map self, int dx, int dy) 1769scroll (DC::Map self, int dx, int dy)
1564 CODE: 1770 CODE:
1565{ 1771{
1566 if (dx > 0) 1772 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 1773 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 1774 else if (dx < 0)
1584 self->y += MAP_EXTEND_Y; 1790 self->y += MAP_EXTEND_Y;
1585 } 1791 }
1586} 1792}
1587 1793
1588SV * 1794SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 1795map1a_update (DC::Map self, SV *data_, int extmap)
1590 CODE: 1796 CODE:
1591{ 1797{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1798 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 1799 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 1800 mapcell *cell;
1622 uint8_t ext, cmd; 1828 uint8_t ext, cmd;
1623 1829
1624 do 1830 do
1625 { 1831 {
1626 ext = *data++; 1832 ext = *data++;
1627 cmd = ext & 0x3f; 1833 cmd = ext & 0x7f;
1628 1834
1629 if (cmd < 4) 1835 if (cmd < 4)
1630 cell->darkness = 255 - ext * 64 + 1; 1836 cell->darkness = 255 - ext * 64 + 1;
1631 else if (cmd == 5) // health 1837 else if (cmd == 5) // health
1632 { 1838 {
1635 } 1841 }
1636 else if (cmd == 6) // monster width 1842 else if (cmd == 6) // monster width
1637 cell->stat_width = *data++ + 1; 1843 cell->stat_width = *data++ + 1;
1638 else if (cmd == 0x47) 1844 else if (cmd == 0x47)
1639 { 1845 {
1640 if (*data == 4) 1846 if (*data == 1) cell->player = data [1];
1641 ; // decode player count 1847 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1848 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1849 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1642 1850
1643 data += *data + 1; 1851 data += *data + 1;
1644 } 1852 }
1645 else if (cmd == 8) // cell flags 1853 else if (cmd == 8) // cell flags
1646 cell->flags = *data++; 1854 cell->flags = *data++;
1676 } 1884 }
1677 } 1885 }
1678 } 1886 }
1679 } 1887 }
1680 else 1888 else
1681 cell->darkness = 0; 1889 CELL_CLEAR (cell);
1682 } 1890 }
1683} 1891}
1684 OUTPUT: 1892 OUTPUT:
1685 RETVAL 1893 RETVAL
1686 1894
1687SV * 1895SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1896mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 1897 CODE:
1690{ 1898{
1691 int x1, x; 1899 int x1, x;
1692 int y1, y; 1900 int y1, y;
1693 int z; 1901 int z;
1738} 1946}
1739 OUTPUT: 1947 OUTPUT:
1740 RETVAL 1948 RETVAL
1741 1949
1742void 1950void
1743draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1951draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1744 CODE: 1952 CODE:
1745{ 1953{
1746 int x, y, z; 1954 int x, y, z;
1747 1955
1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1956 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1957 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1750 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1958 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751 smooth_key skey; 1959 smooth_key skey;
1752 1960 int pl_x, pl_y;
1961 maptex pl_tex;
1753 rc_t *rc = rc_alloc (); 1962 rc_t *rc = rc_alloc ();
1754 rc_key_t key; 1963 rc_key_t key;
1755 rc_array_t *arr; 1964 rc_array_t *arr;
1965
1966 pl_tex.name = 0;
1756 1967
1757 // thats current max. sorry. 1968 // thats current max. sorry.
1758 if (sw > 255) sw = 255; 1969 if (sw > 255) sw = 255;
1759 if (sh > 255) sh = 255; 1970 if (sh > 255) sh = 255;
1760 1971
1815 tileid tile = cell->tile [z]; 2026 tileid tile = cell->tile [z];
1816 2027
1817 if (tile) 2028 if (tile)
1818 { 2029 {
1819 maptex tex = self->tex [tile]; 2030 maptex tex = self->tex [tile];
1820 int px, py; 2031 int px = (x + 1) * T - tex.w;
2032 int py = (y + 1) * T - tex.h;
1821 2033
1822 if (key.texname != tex.name) 2034 if (key.texname != tex.name)
1823 { 2035 {
1824 if (!tex.name) 2036 if (!tex.name)
1825 tex = self->tex [2]; /* missing, replace by noface */ 2037 tex = self->tex [2]; /* missing, replace by noface */
1826 2038
1827 key.texname = tex.name; 2039 key.texname = tex.name;
1828 arr = rc_array (rc, &key); 2040 arr = rc_array (rc, &key);
1829 } 2041 }
1830 2042
1831 px = (x + 1) * T - tex.w; 2043 if (expect_false (cell->player == player) && expect_false (z == 2))
1832 py = (y + 1) * T - tex.h; 2044 {
2045 pl_x = px;
2046 pl_y = py;
2047 pl_tex = tex;
2048 continue;
2049 }
1833 2050
1834 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1835 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2052 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1836 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2053 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1837 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2054 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1838 2055
1839 if (cell->flags && z == 2) 2056 if (expect_false (cell->flags) && expect_false (z == 2))
1840 { 2057 {
1841 // overlays such as the speech bubble, probably more to come 2058 // overlays such as the speech bubble, probably more to come
1842 if (cell->flags & 1) 2059 if (cell->flags & 1)
1843 { 2060 {
1844 maptex tex = self->tex [1]; 2061 maptex tex = self->tex [1];
1983 } 2200 }
1984 2201
1985 hv_clear (smooth); 2202 hv_clear (smooth);
1986 } 2203 }
1987 2204
2205 if (pl_tex.name)
2206 {
2207 maptex tex = pl_tex;
2208 int px = pl_x + sdx;
2209 int py = pl_y + sdy;
2210
2211 key.texname = tex.name;
2212 arr = rc_array (rc, &key);
2213
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2218
2219 rc_draw (rc);
2220 }
2221
1988 glDisable (GL_BLEND); 2222 glDisable (GL_BLEND);
1989 rc_free (rc); 2223 rc_free (rc);
1990 2224
1991 // top layer: overlays such as the health bar 2225 // top layer: overlays such as the health bar
1992 for (y = 0; y < sh; y++) 2226 for (y = 0; y < sh; y++)
2019 } 2253 }
2020 } 2254 }
2021} 2255}
2022 2256
2023void 2257void
2024draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2258draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2025 CODE: 2259 CODE:
2026{ 2260{
2027 static float color[16][3] = { 2261 static float color[16][3] = {
2028 { 0.00F, 0.00F, 0.00F }, 2262 { 0.00F, 0.00F, 0.00F },
2029 { 1.00F, 1.00F, 1.00F }, 2263 { 1.00F, 1.00F, 1.00F },
2079 glDisable (GL_BLEND); 2313 glDisable (GL_BLEND);
2080 glDisable (GL_TEXTURE_2D); 2314 glDisable (GL_TEXTURE_2D);
2081} 2315}
2082 2316
2083void 2317void
2084fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2318fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2085 PPCODE: 2319 PPCODE:
2086{ 2320{
2087 int x, y; 2321 int x, y;
2088 int sw1 = sw + 2; 2322 int sw1 = sw + 2;
2089 int sh1 = sh + 2; 2323 int sh1 = sh + 2;
2097 SvCUR_set (darkness3_sv, sw34 * sh3); 2331 SvCUR_set (darkness3_sv, sw34 * sh3);
2098 2332
2099 mx += self->x - 1; 2333 mx += self->x - 1;
2100 my += self->y - 1; 2334 my += self->y - 1;
2101 2335
2102 memset (darkness1, 255, sw1 * sh1); 2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2103 2337
2104 for (y = 0; y < sh1; y++) 2338 for (y = 0; y < sh1; y++)
2105 if (0 <= y + my && y + my < self->rows) 2339 if (0 <= y + my && y + my < self->rows)
2106 { 2340 {
2107 maprow *row = self->row + (y + my); 2341 maprow *row = self->row + (y + my);
2160 PUSHs (sv_2mortal (newSViv (sh3))); 2394 PUSHs (sv_2mortal (newSViv (sh3)));
2161 PUSHs (darkness3_sv); 2395 PUSHs (darkness3_sv);
2162} 2396}
2163 2397
2164SV * 2398SV *
2165get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2399get_rect (DC::Map self, int x0, int y0, int w, int h)
2166 CODE: 2400 CODE:
2167{ 2401{
2168 int x, y, x1, y1; 2402 int x, y, x1, y1;
2169 SV *data_sv = newSV (w * h * 7 + 5); 2403 SV *data_sv = newSV (w * h * 7 + 5);
2170 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2404 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2227 else 2461 else
2228 *data++ = 0; 2462 *data++ = 0;
2229 } 2463 }
2230 } 2464 }
2231 2465
2466 /* if size is w*h + 5 then no data has been found */
2467 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2468 {
2232 SvPOK_only (data_sv); 2469 SvPOK_only (data_sv);
2233 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2470 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2471 }
2472
2234 RETVAL = data_sv; 2473 RETVAL = data_sv;
2235} 2474}
2236 OUTPUT: 2475 OUTPUT:
2237 RETVAL 2476 RETVAL
2238 2477
2239void 2478void
2240set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2479set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2241 PPCODE: 2480 PPCODE:
2242{ 2481{
2243 int x, y, z; 2482 int x, y, z;
2244 int w, h; 2483 int w, h;
2245 int x1, y1; 2484 int x1, y1;
2485 STRLEN len;
2486 uint8_t *data, *end;
2487
2488 len = SvLEN (data_sv);
2489 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2490 data = SvPVbyte_nolen (data_sv);
2491 end = data + len + 8;
2492
2493 if (len < 5)
2494 XSRETURN_EMPTY;
2246 2495
2247 if (*data++ != 0) 2496 if (*data++ != 0)
2248 XSRETURN_EMPTY; /* version mismatch */ 2497 XSRETURN_EMPTY; /* version mismatch */
2249 2498
2250 w = *data++ << 8; w |= *data++; 2499 w = *data++ << 8; w |= *data++;
2265 { 2514 {
2266 maprow *row = map_get_row (self, y); 2515 maprow *row = map_get_row (self, y);
2267 2516
2268 for (x = x0; x < x1; x++) 2517 for (x = x0; x < x1; x++)
2269 { 2518 {
2519 uint8_t flags;
2520
2521 if (data + 7 >= end)
2522 XSRETURN_EMPTY;
2523
2270 uint8_t flags = *data++; 2524 flags = *data++;
2271 2525
2272 if (flags) 2526 if (flags)
2273 { 2527 {
2274 mapcell *cell = row_get_cell (row, x); 2528 mapcell *cell = row_get_cell (row, x);
2275 tileid tile[3] = { 0, 0, 0 }; 2529 tileid tile[3] = { 0, 0, 0 };
2278 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2532 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2279 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2533 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2280 2534
2281 if (cell->darkness == 0) 2535 if (cell->darkness == 0)
2282 { 2536 {
2283 cell->darkness = 0; 2537 /*cell->darkness = 0;*/
2538 EXTEND (SP, 3);
2284 2539
2285 for (z = 0; z <= 2; z++) 2540 for (z = 0; z <= 2; z++)
2286 { 2541 {
2287 tileid t = tile [z]; 2542 tileid t = tile [z];
2288 2543
2289 if (t >= self->texs || (t && !self->tex [t].name)) 2544 if (t >= self->texs || (t && !self->tex [t].name))
2290 { 2545 {
2291 XPUSHs (sv_2mortal (newSViv (t))); 2546 PUSHs (sv_2mortal (newSViv (t)));
2292 need_texid (self, t); 2547 need_texid (self, t);
2293 } 2548 }
2294 2549
2295 cell->tile [z] = t; 2550 cell->tile [z] = t;
2296 } 2551 }
2298 } 2553 }
2299 } 2554 }
2300 } 2555 }
2301} 2556}
2302 2557
2303MODULE = CFPlus PACKAGE = CFPlus::RW 2558MODULE = Deliantra::Client PACKAGE = DC::RW
2304 2559
2305CFPlus::RW 2560DC::RW
2306new (SV *class, SV *data_sv) 2561new (SV *class, SV *data_sv)
2307 CODE: 2562 CODE:
2308{ 2563{
2309 STRLEN datalen; 2564 STRLEN datalen;
2310 char *data = SvPVbyte (data_sv, datalen); 2565 char *data = SvPVbyte (data_sv, datalen);
2312 RETVAL = SDL_RWFromConstMem (data, datalen); 2567 RETVAL = SDL_RWFromConstMem (data, datalen);
2313} 2568}
2314 OUTPUT: 2569 OUTPUT:
2315 RETVAL 2570 RETVAL
2316 2571
2317CFPlus::RW 2572DC::RW
2318new_from_file (SV *class, const char *path, const char *mode = "rb") 2573new_from_file (SV *class, const char *path, const char *mode = "rb")
2319 CODE: 2574 CODE:
2320 RETVAL = SDL_RWFromFile (path, mode); 2575 RETVAL = SDL_RWFromFile (path, mode);
2321 OUTPUT: 2576 OUTPUT:
2322 RETVAL 2577 RETVAL
2323 2578
2324# fails on win32: 2579# fails on win32:
2325# CFPlus.xs(2268) : error C2059: syntax error : '(' 2580# dc.xs(2268) : error C2059: syntax error : '('
2326#void 2581#void
2327#close (CFPlus::RW self) 2582#close (DC::RW self)
2328# CODE: 2583# CODE:
2329# (self->(close)) (self); 2584# (self->(close)) (self);
2330 2585
2331MODULE = CFPlus PACKAGE = CFPlus::Channel 2586MODULE = Deliantra::Client PACKAGE = DC::Channel
2332 2587
2333PROTOTYPES: DISABLE 2588PROTOTYPES: DISABLE
2334 2589
2335CFPlus::Channel 2590DC::Channel
2336find () 2591find ()
2337 CODE: 2592 CODE:
2338{ 2593{
2339 RETVAL = Mix_GroupAvailable (-1); 2594 RETVAL = Mix_GroupAvailable (-1);
2340 2595
2353} 2608}
2354 OUTPUT: 2609 OUTPUT:
2355 RETVAL 2610 RETVAL
2356 2611
2357void 2612void
2358halt (CFPlus::Channel self) 2613halt (DC::Channel self)
2359 CODE: 2614 CODE:
2360 Mix_HaltChannel (self); 2615 Mix_HaltChannel (self);
2361 2616
2362void 2617void
2363expire (CFPlus::Channel self, int ticks = -1) 2618expire (DC::Channel self, int ticks = -1)
2364 CODE: 2619 CODE:
2365 Mix_ExpireChannel (self, ticks); 2620 Mix_ExpireChannel (self, ticks);
2366 2621
2367void 2622void
2368fade_out (CFPlus::Channel self, int ticks = -1) 2623fade_out (DC::Channel self, int ticks = -1)
2369 CODE: 2624 CODE:
2370 Mix_FadeOutChannel (self, ticks); 2625 Mix_FadeOutChannel (self, ticks);
2371 2626
2372int 2627int
2373volume (CFPlus::Channel self, int volume) 2628volume (DC::Channel self, int volume)
2374 CODE: 2629 CODE:
2375 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2630 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2376 OUTPUT: 2631 OUTPUT:
2377 RETVAL 2632 RETVAL
2378 2633
2379void 2634void
2380unregister_all_effects (CFPlus::Channel self) 2635unregister_all_effects (DC::Channel self)
2381 CODE: 2636 CODE:
2382 Mix_UnregisterAllEffects (self); 2637 Mix_UnregisterAllEffects (self);
2383 2638
2384void 2639void
2385set_panning (CFPlus::Channel self, int left, int right) 2640set_panning (DC::Channel self, int left, int right)
2386 CODE: 2641 CODE:
2387 left = CLAMP (left , 0, 255); 2642 left = CLAMP (left , 0, 255);
2388 right = CLAMP (right, 0, 255); 2643 right = CLAMP (right, 0, 255);
2389 Mix_SetPanning (self, left, right); 2644 Mix_SetPanning (self, left, right);
2390 2645
2391void 2646void
2392set_distance (CFPlus::Channel self, int distance) 2647set_distance (DC::Channel self, int distance)
2393 CODE: 2648 CODE:
2394 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2649 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2395 2650
2396void 2651void
2397set_position (CFPlus::Channel self, int angle, int distance) 2652set_position (DC::Channel self, int angle, int distance)
2398 CODE: 2653 CODE:
2399 2654
2400void 2655void
2401set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2656set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2402 CODE: 2657 CODE:
2403{ 2658{
2404 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2659 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2405 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2660 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2406 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2661 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2407} 2662}
2408 2663
2409void 2664void
2410set_reverse_stereo (CFPlus::Channel self, int flip) 2665set_reverse_stereo (DC::Channel self, int flip)
2411 CODE: 2666 CODE:
2412 Mix_SetReverseStereo (self, flip); 2667 Mix_SetReverseStereo (self, flip);
2413 2668
2414MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2669MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2415 2670
2416PROTOTYPES: DISABLE 2671PROTOTYPES: DISABLE
2417 2672
2418CFPlus::MixChunk 2673DC::MixChunk
2419new (SV *class, CFPlus::RW rwops) 2674new (SV *class, DC::RW rwops)
2420 CODE: 2675 CODE:
2421 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2676 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2422 OUTPUT: 2677 OUTPUT:
2423 RETVAL 2678 RETVAL
2424 2679
2425void 2680void
2426DESTROY (CFPlus::MixChunk self) 2681DESTROY (DC::MixChunk self)
2427 CODE: 2682 CODE:
2428 Mix_FreeChunk (self); 2683 Mix_FreeChunk (self);
2429 2684
2430int 2685int
2431volume (CFPlus::MixChunk self, int volume = -1) 2686volume (DC::MixChunk self, int volume = -1)
2432 CODE: 2687 CODE:
2433 if (items > 1) 2688 if (items > 1)
2434 volume = CLAMP (volume, 0, 128); 2689 volume = CLAMP (volume, 0, 128);
2435 RETVAL = Mix_VolumeChunk (self, volume); 2690 RETVAL = Mix_VolumeChunk (self, volume);
2436 OUTPUT: 2691 OUTPUT:
2437 RETVAL 2692 RETVAL
2438 2693
2439CFPlus::Channel 2694DC::Channel
2440play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2695play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2441 CODE: 2696 CODE:
2442{ 2697{
2443 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2698 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2444 2699
2445 if (RETVAL < 0) 2700 if (RETVAL < 0)
2452 } 2707 }
2453} 2708}
2454 OUTPUT: 2709 OUTPUT:
2455 RETVAL 2710 RETVAL
2456 2711
2457MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2712MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2458 2713
2459int 2714int
2460volume (int volume = -1) 2715volume (int volume = -1)
2461 PROTOTYPE: ;$ 2716 PROTOTYPE: ;$
2462 CODE: 2717 CODE:
2474void 2729void
2475halt () 2730halt ()
2476 CODE: 2731 CODE:
2477 Mix_HaltMusic (); 2732 Mix_HaltMusic ();
2478 2733
2479CFPlus::MixMusic 2734DC::MixMusic
2480new (SV *class, CFPlus::RW rwops) 2735new (SV *class, DC::RW rwops)
2481 CODE: 2736 CODE:
2482 RETVAL = Mix_LoadMUS_RW (rwops); 2737 RETVAL = Mix_LoadMUS_RW (rwops);
2483 OUTPUT: 2738 OUTPUT:
2484 RETVAL 2739 RETVAL
2485 2740
2486void 2741void
2487DESTROY (CFPlus::MixMusic self) 2742DESTROY (DC::MixMusic self)
2488 CODE: 2743 CODE:
2489 Mix_FreeMusic (self); 2744 Mix_FreeMusic (self);
2490 2745
2491int 2746int
2492play (CFPlus::MixMusic self, int loops = -1) 2747play (DC::MixMusic self, int loops = -1)
2493 CODE: 2748 CODE:
2494 RETVAL = Mix_PlayMusic (self, loops); 2749 RETVAL = Mix_PlayMusic (self, loops);
2495 OUTPUT: 2750 OUTPUT:
2496 RETVAL 2751 RETVAL
2497 2752
2498void 2753void
2499fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2754fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2500 CODE: 2755 CODE:
2501 Mix_FadeInMusicPos (self, loops, ms, position); 2756 Mix_FadeInMusicPos (self, loops, ms, position);
2502 2757
2503MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2758MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2504 2759
2505PROTOTYPES: ENABLE 2760PROTOTYPES: ENABLE
2506 2761
2507BOOT: 2762BOOT:
2508{ 2763{
2509 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2764 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2510 static const struct { 2765 static const struct {
2511 const char *name; 2766 const char *name;
2512 IV iv; 2767 IV iv;
2513 } *civ, const_iv[] = { 2768 } *civ, const_iv[] = {
2514# define const_iv(name) { # name, (IV)name } 2769# define const_iv(name) { # name, (IV)name }
2807void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3062void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2808 CODE: 3063 CODE:
2809 if (gl.SeparableFilter2D) 3064 if (gl.SeparableFilter2D)
2810 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3065 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2811 3066
2812void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3067void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2813 3068
2814void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3069void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2815 3070
2816void glDrawPixels (int width, int height, int format, int type, char *pixels) 3071void glDrawPixels (int width, int height, int format, int type, char *pixels)
2817 3072
2843 3098
2844void glEndList () 3099void glEndList ()
2845 3100
2846void glCallList (int list) 3101void glCallList (int list)
2847 3102
2848MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3103MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2849 3104
2850PROTOTYPES: DISABLE 3105PROTOTYPES: DISABLE
2851 3106
2852void 3107void
2853find_widget (SV *self, NV x, NV y) 3108find_widget (SV *self, NV x, NV y)
2857 XPUSHs (self); 3112 XPUSHs (self);
2858} 3113}
2859 3114
2860BOOT: 3115BOOT:
2861{ 3116{
2862 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3117 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2863 3118
2864 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3119 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2865 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3120 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2866 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3121 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2867 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3122 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2868} 3123}
2869 3124
2870void 3125void
2871draw (SV *self) 3126draw (SV *self)
2872 CODE: 3127 CODE:
2879 SV *draw_w_sv = GvSV (draw_w_gv); 3134 SV *draw_w_sv = GvSV (draw_w_gv);
2880 SV *draw_h_sv = GvSV (draw_h_gv); 3135 SV *draw_h_sv = GvSV (draw_h_gv);
2881 double draw_x, draw_y; 3136 double draw_x, draw_y;
2882 3137
2883 if (!SvROK (self)) 3138 if (!SvROK (self))
2884 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3139 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2885 3140
2886 hv = (HV *)SvRV (self); 3141 hv = (HV *)SvRV (self);
2887 3142
2888 if (SvTYPE (hv) != SVt_PVHV) 3143 if (SvTYPE (hv) != SVt_PVHV)
2889 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3144 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2890 3145
2891 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3146 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2892 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3147 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2893 3148
2894 if (!h || !w) 3149 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines