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.229 by root, Mon Aug 13 16:20:17 2007 UTC vs.
Revision 1.270 by root, Sun Jul 20 15:05:13 2008 UTC

46 46
47#include <glib/gmacros.h> 47#include <glib/gmacros.h>
48 48
49#include <pango/pango.h> 49#include <pango/pango.h>
50 50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
61
51#ifndef _WIN32 62#ifndef _WIN32
52# include <sys/types.h> 63# include <sys/types.h>
53# include <sys/socket.h> 64# include <sys/socket.h>
54# include <netinet/in.h> 65# include <netinet/in.h>
55# include <netinet/tcp.h> 66# include <netinet/tcp.h>
56# include <inttypes.h> 67# include <inttypes.h>
57#endif 68#endif
58 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 80
61#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
62 82
63#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
65 85
66#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
67 87
68#if 0 88/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else
71# define PARACHUTE 0
72#endif
73 90
74static AV *texture_av; 91static AV *texture_av;
75 92
76static struct 93static struct
77{ 94{
120 137
121#include "pango-font.c" 138#include "pango-font.c"
122#include "pango-fontmap.c" 139#include "pango-fontmap.c"
123#include "pango-render.c" 140#include "pango-render.c"
124 141
125typedef IV CFPlus__Channel; 142typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 143typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 144typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 145typedef Mix_Music *DC__MixMusic;
129 146
130typedef PangoFontDescription *CFPlus__Font; 147typedef PangoFontDescription *DC__Font;
131 148
132static int 149static int
133shape_attr_p (PangoLayoutRun *run) 150shape_attr_p (PangoLayoutRun *run)
134{ 151{
135 GSList *attrs = run->item->analysis.extra_attrs; 152 GSList *attrs = run->item->analysis.extra_attrs;
149 166
150typedef struct cf_layout { 167typedef struct cf_layout {
151 PangoLayout *pl; 168 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 169 float r, g, b, a; // default color for rgba mode
153 int base_height; 170 int base_height;
154 CFPlus__Font font; 171 DC__Font font;
155 rc_t *rc; 172 rc_t *rc;
156} *CFPlus__Layout; 173} *DC__Layout;
157 174
158static CFPlus__Font default_font; 175static DC__Font default_font;
159static PangoContext *opengl_context; 176static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
161 178
162static void 179static void
163substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
168#endif 185#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 187}
171 188
172static void 189static void
173layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
174{ 191{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 192 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
177 */ 194 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
179 196
180 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 199
183 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
184} 201}
185 202
186static void 203static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 205{
189 PangoRectangle rect; 206 PangoRectangle rect;
190 207
191 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
231 int faces; tileid *face2tile; // [faceid] 248 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 249 int texs; maptex *tex; // [tileid]
233 250
234 int32_t rows; 251 int32_t rows;
235 maprow *row; 252 maprow *row;
236} *CFPlus__Map; 253} *DC__Map;
237 254
238static char * 255static char *
239prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
240{ 257{
241 char *p; 258 char *p;
279 self->texs *= 2; 296 self->texs *= 2;
280 } 297 }
281} 298}
282 299
283static maprow * 300static maprow *
284map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
285{ 302{
286 if (0 > y) 303 if (0 > y)
287 { 304 {
288 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
327 344
328 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
329} 346}
330 347
331static mapcell * 348static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
333{ 350{
334 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
335} 352}
336 353
337static void 354static void
338map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
339{ 356{
340 int r; 357 int r;
341 358
342 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
350 self->oy = 0; 367 self->oy = 0;
351 self->row = 0; 368 self->row = 0;
352 self->rows = 0; 369 self->rows = 0;
353} 370}
354 371
372#define CELL_CLEAR(cell) \
373 do { \
374 if ((cell)->player) \
375 (cell)->tile [2] = 0; \
376 (cell)->darkness = 0; \
377 (cell)->stat_hp = 0; \
378 (cell)->flags = 0; \
379 (cell)->player = 0; \
380 } while (0)
381
355static void 382static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 383map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 384{
358 int x, y; 385 int x, y;
359 maprow *row; 386 maprow *row;
360 mapcell *cell; 387 mapcell *cell;
361 388
373 if (x >= row->c1) 400 if (x >= row->c1)
374 break; 401 break;
375 402
376 cell = row->col + x - row->c0; 403 cell = row->col + x - row->c0;
377 404
378 cell->darkness = 0; 405 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 406 }
383 } 407 }
384} 408}
385 409
386typedef struct { 410typedef struct {
440 n |= n >> 16; 464 n |= n >> 16;
441 465
442 return n + 1; 466 return n + 1;
443} 467}
444 468
469static unsigned int
470popcount (unsigned int n)
471{
472 n -= (n >> 1) & 0x55555555U;
473 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
474 n = ((n >> 4) + n) & 0x0f0f0f0fU;
475 n *= 0x01010101U;
476
477 return n >> 24;
478}
479
445/* SDL should provide this, really. */ 480/* SDL should provide this, really. */
446#define SDLK_MODIFIER_MIN 300 481#define SDLK_MODIFIER_MIN 300
447#define SDLK_MODIFIER_MAX 314 482#define SDLK_MODIFIER_MAX 314
448 483
449/******************************************************************************/ 484/******************************************************************************/
487 return 0; 522 return 0;
488 523
489 return 1; 524 return 1;
490} 525}
491 526
492MODULE = CFPlus PACKAGE = CFPlus 527MODULE = Deliantra::Client PACKAGE = DC
493 528
494PROTOTYPES: ENABLE 529PROTOTYPES: ENABLE
495 530
496BOOT: 531BOOT:
497{ 532{
498 HV *stash = gv_stashpv ("CFPlus", 1); 533 HV *stash = gv_stashpv ("DC", 1);
499 static const struct { 534 static const struct {
500 const char *name; 535 const char *name;
501 IV iv; 536 IV iv;
502 } *civ, const_iv[] = { 537 } *civ, const_iv[] = {
503# define const_iv(name) { # name, (IV)name } 538# define const_iv(name) { # name, (IV)name }
525 560
526 const_iv (SDL_APPINPUTFOCUS), 561 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS), 562 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE), 563 const_iv (SDL_APPACTIVE),
529 564
565 const_iv (SDLK_FIRST),
566 const_iv (SDLK_LAST),
530 const_iv (SDLK_KP0), 567 const_iv (SDLK_KP0),
531 const_iv (SDLK_KP1), 568 const_iv (SDLK_KP1),
532 const_iv (SDLK_KP2), 569 const_iv (SDLK_KP2),
533 const_iv (SDLK_KP3), 570 const_iv (SDLK_KP3),
534 const_iv (SDLK_KP4), 571 const_iv (SDLK_KP4),
606 const_iv (KMOD_LMETA), 643 const_iv (KMOD_LMETA),
607 const_iv (KMOD_RMETA), 644 const_iv (KMOD_RMETA),
608 const_iv (KMOD_NUM), 645 const_iv (KMOD_NUM),
609 const_iv (KMOD_CAPS), 646 const_iv (KMOD_CAPS),
610 const_iv (KMOD_MODE), 647 const_iv (KMOD_MODE),
648
649 const_iv (MIX_DEFAULT_FORMAT),
650
651 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO),
654 const_iv (SDL_INIT_CDROM),
655 const_iv (SDL_INIT_JOYSTICK),
656 const_iv (SDL_INIT_EVERYTHING),
657 const_iv (SDL_INIT_NOPARACHUTE),
658 const_iv (SDL_INIT_EVENTTHREAD),
659
660 const_iv (SDL_GL_RED_SIZE),
661 const_iv (SDL_GL_GREEN_SIZE),
662 const_iv (SDL_GL_BLUE_SIZE),
663 const_iv (SDL_GL_ALPHA_SIZE),
664 const_iv (SDL_GL_DOUBLEBUFFER),
665 const_iv (SDL_GL_BUFFER_SIZE),
666 const_iv (SDL_GL_DEPTH_SIZE),
667 const_iv (SDL_GL_STENCIL_SIZE),
668 const_iv (SDL_GL_ACCUM_RED_SIZE),
669 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
670 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
671 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
672 const_iv (SDL_GL_STEREO),
673 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
674 const_iv (SDL_GL_MULTISAMPLESAMPLES),
675 const_iv (SDL_GL_ACCELERATED_VISUAL),
676 const_iv (SDL_GL_SWAP_CONTROL),
677
678 const_iv (FOW_DARKNESS)
611# undef const_iv 679# undef const_iv
612 }; 680 };
613 681
614 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 682 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
633 701
634NV floor (NV x) 702NV floor (NV x)
635 703
636NV ceil (NV x) 704NV ceil (NV x)
637 705
706NV ceilabs (NV x)
707 CODE:
708 RETVAL = x < 0. ? - ceil (-x) : ceil (x);
709 OUTPUT:
710 RETVAL
711
712IV minpot (UV n)
713
714IV popcount (UV n)
715
638void 716void
639pango_init () 717pango_init ()
640 CODE: 718 CODE:
641{ 719{
642 opengl_fontmap = pango_opengl_font_map_new (); 720 opengl_fontmap = pango_opengl_font_map_new ();
643 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 721 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); 722 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
723 /*pango_context_set_font_description (opengl_context, default_font);*/
724#if PANGO_VERSION_CHECK (1, 15, 2)
725 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
726 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
727#endif
645} 728}
646 729
647char *
648SDL_GetError () 730char *SDL_GetError ()
649 731
650int 732int SDL_Init (U32 flags)
651SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
652 733
653void 734int SDL_InitSubSystem (U32 flags)
735
736void SDL_QuitSubSystem (U32 flags)
737
654SDL_Quit () 738void SDL_Quit ()
739
740int SDL_GL_SetAttribute (int attr, int value)
741
742int SDL_GL_GetAttribute (int attr)
743 CODE:
744 if (SDL_GL_GetAttribute (attr, &RETVAL))
745 XSRETURN_UNDEF;
746 OUTPUT:
747 RETVAL
655 748
656void 749void
657SDL_ListModes (int rgb, int alpha) 750SDL_ListModes (int rgb, int alpha)
658 PPCODE: 751 PPCODE:
659{ 752{
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 764 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 765 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 766 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674 767
675 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 768 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); 769 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679#endif
680 770
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 771 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 772
683 if (m && m != (SDL_Rect **)-1) 773 if (m && m != (SDL_Rect **)-1)
684 while (*m) 774 while (*m)
685 { 775 {
686 if ((*m)->w >= 640 && (*m)->h >= 480) 776 if ((*m)->w >= 400 && (*m)->h >= 300)
687 { 777 {
688 AV *av = newAV (); 778 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 779 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 780 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 781 av_push (av, newSViv (rgb));
715 805
716 if (RETVAL) 806 if (RETVAL)
717 { 807 {
718 av_clear (texture_av); 808 av_clear (texture_av);
719 809
720 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 810 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 811#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
722#include "glfunc.h" 812#include "glfunc.h"
723#undef GL_FUNC 813#undef GL_FUNC
724 } 814 }
725} 815}
732char * 822char *
733SDL_GetKeyName (int sym) 823SDL_GetKeyName (int sym)
734 824
735int 825int
736SDL_GetAppState () 826SDL_GetAppState ()
827
828int
829SDL_GetModState ()
737 830
738void 831void
739poll_events () 832poll_events ()
740 PPCODE: 833 PPCODE:
741{ 834{
751 { 844 {
752 case SDL_KEYDOWN: 845 case SDL_KEYDOWN:
753 case SDL_KEYUP: 846 case SDL_KEYUP:
754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 847 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 848 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 849 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 */ 850 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); 851 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759 break; 852 break;
760 853
761 case SDL_ACTIVEEVENT: 854 case SDL_ACTIVEEVENT:
762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 855 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
780 x = ev.motion.x; 873 x = ev.motion.x;
781 y = ev.motion.y; 874 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 875 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 } 876 }
784 877
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 878 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 hv_store (hv, "state", 5, newSViv (state), 0); 879 hv_store (hv, "state", 5, newSViv (state), 0);
787 hv_store (hv, "x", 1, newSViv (x), 0); 880 hv_store (hv, "x", 1, newSViv (x), 0);
788 hv_store (hv, "y", 1, newSViv (y), 0); 881 hv_store (hv, "y", 1, newSViv (y), 0);
789 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 882 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 883 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 } 884 }
792 break; 885 break;
793 886
794 case SDL_MOUSEBUTTONDOWN: 887 case SDL_MOUSEBUTTONDOWN:
795 case SDL_MOUSEBUTTONUP: 888 case SDL_MOUSEBUTTONUP:
796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 889 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797 890
798 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 891 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 892 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 893 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 894 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 899 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 900 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 901 break;
809 } 902 }
810 903
811 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 904 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
812 } 905 }
813} 906}
814 907
815int 908int
816Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 909Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817 POSTCALL: 910 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 911 Mix_HookMusicFinished (music_finished);
819 Mix_ChannelFinished (channel_finished); 912 Mix_ChannelFinished (channel_finished);
913
914void
915Mix_QuerySpec ()
916 PPCODE:
917{
918 int freq, channels;
919 Uint16 format;
920
921 if (Mix_QuerySpec (&freq, &format, &channels))
922 {
923 EXTEND (SP, 3);
924 PUSHs (sv_2mortal (newSViv (freq)));
925 PUSHs (sv_2mortal (newSViv (format)));
926 PUSHs (sv_2mortal (newSViv (channels)));
927 }
928}
820 929
821void 930void
822Mix_CloseAudio () 931Mix_CloseAudio ()
823 932
824int 933int
859 } 968 }
860 } 969 }
861#endif 970#endif
862} 971}
863 972
864void 973int
865add_font (char *file) 974add_font (char *file)
866 CODE: 975 CODE:
867 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 976 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
977 OUTPUT:
978 RETVAL
868 979
869void 980void
870load_image_inline (SV *image_) 981load_image_inline (SV *image_)
871 ALIAS: 982 ALIAS:
872 load_image_file = 1 983 load_image_file = 1
958void 1069void
959error (char *message) 1070error (char *message)
960 CODE: 1071 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1072 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1073#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1074 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1075#endif
965 1076
966void 1077void
967fatal (char *message) 1078fatal (char *message)
968 CODE: 1079 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1080 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1081#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1082 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1083#endif
973 _exit (1); 1084 _exit (1);
974 1085
975void 1086void
976_exit (int retval = 0) 1087_exit (int retval = 0)
988#if DEBUG 1099#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1100 VALGRIND_DO_LEAK_CHECK;
990#endif 1101#endif
991} 1102}
992 1103
993MODULE = CFPlus PACKAGE = CFPlus::Font 1104MODULE = Deliantra::Client PACKAGE = DC::Font
994 1105
995PROTOTYPES: DISABLE 1106PROTOTYPES: DISABLE
996 1107
997CFPlus::Font 1108DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1109new_from_file (SV *class, char *path, int id = 0)
999 CODE: 1110 CODE:
1000{ 1111{
1001 int count; 1112 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1113 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1005} 1116}
1006 OUTPUT: 1117 OUTPUT:
1007 RETVAL 1118 RETVAL
1008 1119
1009void 1120void
1010DESTROY (CFPlus::Font self) 1121DESTROY (DC::Font self)
1011 CODE: 1122 CODE:
1012 pango_font_description_free (self); 1123 pango_font_description_free (self);
1013 1124
1014void 1125void
1015make_default (CFPlus::Font self) 1126make_default (DC::Font self)
1016 PROTOTYPE: $ 1127 PROTOTYPE: $
1017 CODE: 1128 CODE:
1018 default_font = self; 1129 default_font = self;
1019 1130
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1131MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1132
1022PROTOTYPES: DISABLE 1133PROTOTYPES: DISABLE
1023 1134
1024void 1135void
1025reset_glyph_cache () 1136glyph_cache_backup ()
1026 PROTOTYPE: 1137 PROTOTYPE:
1027 CODE: 1138 CODE:
1139 tc_backup ();
1140
1141void
1142glyph_cache_restore ()
1143 PROTOTYPE:
1144 CODE:
1028 tc_clear (); 1145 tc_restore ();
1029 1146
1030CFPlus::Layout 1147DC::Layout
1031new (SV *class) 1148new (SV *class)
1032 CODE: 1149 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1150 New (0, RETVAL, 1, struct cf_layout);
1034 1151
1035 RETVAL->pl = pango_layout_new (opengl_context); 1152 RETVAL->pl = pango_layout_new (opengl_context);
1045 layout_update_font (RETVAL); 1162 layout_update_font (RETVAL);
1046 OUTPUT: 1163 OUTPUT:
1047 RETVAL 1164 RETVAL
1048 1165
1049void 1166void
1050DESTROY (CFPlus::Layout self) 1167DESTROY (DC::Layout self)
1051 CODE: 1168 CODE:
1052 g_object_unref (self->pl); 1169 g_object_unref (self->pl);
1053 rc_free (self->rc); 1170 rc_free (self->rc);
1054 Safefree (self); 1171 Safefree (self);
1055 1172
1056void 1173void
1057set_text (CFPlus::Layout self, SV *text_) 1174set_text (DC::Layout self, SV *text_)
1058 CODE: 1175 CODE:
1059{ 1176{
1060 STRLEN textlen; 1177 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1178 char *text = SvPVutf8 (text_, textlen);
1062 1179
1063 pango_layout_set_text (self->pl, text, textlen); 1180 pango_layout_set_text (self->pl, text, textlen);
1064} 1181}
1065 1182
1066void 1183void
1067set_markup (CFPlus::Layout self, SV *text_) 1184set_markup (DC::Layout self, SV *text_)
1068 CODE: 1185 CODE:
1069{ 1186{
1070 STRLEN textlen; 1187 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1188 char *text = SvPVutf8 (text_, textlen);
1072 1189
1073 pango_layout_set_markup (self->pl, text, textlen); 1190 pango_layout_set_markup (self->pl, text, textlen);
1074} 1191}
1075 1192
1076void 1193void
1077set_shapes (CFPlus::Layout self, ...) 1194set_shapes (DC::Layout self, ...)
1078 CODE: 1195 CODE:
1079{ 1196{
1080 PangoAttrList *attrs = 0; 1197 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1198 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1199 const char *pos = text;
1117 if (attrs) 1234 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1235 pango_layout_set_attributes (self->pl, attrs);
1119} 1236}
1120 1237
1121void 1238void
1122get_shapes (CFPlus::Layout self) 1239get_shapes (DC::Layout self)
1123 PPCODE: 1240 PPCODE:
1124{ 1241{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1242 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1243
1127 do 1244 do
1128 { 1245 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1246 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1247
1131 if (run && shape_attr_p (run)) 1248 if (run && shape_attr_p (run))
1132 { 1249 {
1133 PangoRectangle extents; 1250 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1251 pango_layout_iter_get_run_extents (iter, 0, &extents);
1142 1259
1143 pango_layout_iter_free (iter); 1260 pango_layout_iter_free (iter);
1144} 1261}
1145 1262
1146int 1263int
1147has_wrapped (CFPlus::Layout self) 1264has_wrapped (DC::Layout self)
1148 CODE: 1265 CODE:
1149{ 1266{
1150 int lines = 1; 1267 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1268 const char *text = pango_layout_get_text (self->pl);
1152 1269
1157} 1274}
1158 OUTPUT: 1275 OUTPUT:
1159 RETVAL 1276 RETVAL
1160 1277
1161SV * 1278SV *
1162get_text (CFPlus::Layout self) 1279get_text (DC::Layout self)
1163 CODE: 1280 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1281 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1282 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1283 OUTPUT:
1167 RETVAL 1284 RETVAL
1168 1285
1169void 1286void
1170set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1287set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1171 CODE: 1288 CODE:
1172 self->r = r; 1289 self->r = r;
1173 self->g = g; 1290 self->g = g;
1174 self->b = b; 1291 self->b = b;
1175 self->a = a; 1292 self->a = a;
1176 1293
1177void 1294void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1295set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1296 CODE:
1180 if (self->font != font) 1297 if (self->font != font)
1181 { 1298 {
1182 self->font = font; 1299 self->font = font;
1183 layout_update_font (self); 1300 layout_update_font (self);
1184 } 1301 }
1185 1302
1186void 1303void
1187set_height (CFPlus::Layout self, int base_height) 1304set_height (DC::Layout self, int base_height)
1188 CODE: 1305 CODE:
1189 if (self->base_height != base_height) 1306 if (self->base_height != base_height)
1190 { 1307 {
1191 self->base_height = base_height; 1308 self->base_height = base_height;
1192 layout_update_font (self); 1309 layout_update_font (self);
1193 } 1310 }
1194 1311
1195void 1312void
1196set_width (CFPlus::Layout self, int max_width = -1) 1313set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1314 CODE:
1198 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1315 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1199 1316
1200void 1317void
1201set_indent (CFPlus::Layout self, int indent) 1318set_indent (DC::Layout self, int indent)
1202 CODE: 1319 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1320 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1321
1205void 1322void
1206set_spacing (CFPlus::Layout self, int spacing) 1323set_spacing (DC::Layout self, int spacing)
1207 CODE: 1324 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1325 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1326
1210void 1327void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1328set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1329 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1330 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1331 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1332 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1333 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1334 : PANGO_ELLIPSIZE_NONE
1218 ); 1335 );
1219 1336
1220void 1337void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1338set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1339 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1340 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1341
1225void 1342void
1226size (CFPlus::Layout self) 1343size (DC::Layout self)
1227 PPCODE: 1344 PPCODE:
1228{ 1345{
1229 int w, h; 1346 int w, h;
1230 1347
1231 layout_get_pixel_size (self, &w, &h); 1348 layout_get_pixel_size (self, &w, &h);
1234 PUSHs (sv_2mortal (newSViv (w))); 1351 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1352 PUSHs (sv_2mortal (newSViv (h)));
1236} 1353}
1237 1354
1238int 1355int
1239descent (CFPlus::Layout self) 1356descent (DC::Layout self)
1240 CODE: 1357 CODE:
1241{ 1358{
1242 PangoRectangle rect; 1359 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1360 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1361 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1362 RETVAL = PANGO_DESCENT (rect);
1246} 1363}
1247 OUTPUT: 1364 OUTPUT:
1248 RETVAL 1365 RETVAL
1249 1366
1250int 1367int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1368xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1369 CODE:
1253{ 1370{
1254 int index, trailing; 1371 int index, trailing;
1255 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1372 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1256 RETVAL = index + trailing; 1373 RETVAL = index + trailing;
1257} 1374}
1258 OUTPUT: 1375 OUTPUT:
1259 RETVAL 1376 RETVAL
1260 1377
1261void 1378void
1262cursor_pos (CFPlus::Layout self, int index) 1379cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1380 PPCODE:
1264{ 1381{
1265 PangoRectangle strong_pos; 1382 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1383 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1384
1268 EXTEND (SP, 3); 1385 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1386 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1387 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1388 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1389}
1273 1390
1274void 1391void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1392index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1393 PPCODE:
1277{ 1394{
1278 int line, x; 1395 int line, x;
1279 1396
1280 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1397 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1398#if !PANGO_VERSION_CHECK (1, 17, 3)
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1399 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1400 --line;
1401#endif
1283 EXTEND (SP, 2); 1402 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1403 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1404 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1405}
1287 1406
1288void 1407void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1408line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1409 PPCODE:
1291{ 1410{
1292 PangoLayoutLine *lp; 1411 PangoLayoutLine *lp;
1293 int index, trailing; 1412 int index, trailing;
1294 1413
1295 if (line < 0) 1414 if (line < 0)
1296 XSRETURN_EMPTY; 1415 XSRETURN_EMPTY;
1297 1416
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1417 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1418 XSRETURN_EMPTY; /* do better */
1300 1419
1301 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1420 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1302 1421
1303 EXTEND (SP, 2); 1422 EXTEND (SP, 2);
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1428 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1429 }
1311} 1430}
1312 1431
1313void 1432void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1433render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1434 CODE:
1316 rc_clear (self->rc); 1435 rc_clear (self->rc);
1317 pango_opengl_render_layout_subpixel ( 1436 pango_opengl_render_layout_subpixel (
1318 self->pl, 1437 self->pl,
1319 self->rc, 1438 self->rc,
1324 // we assume that context_change actually clears/frees stuff 1443 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1444 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1445 pango_layout_context_changed (self->pl);
1327 1446
1328void 1447void
1329draw (CFPlus::Layout self) 1448draw (DC::Layout self)
1330 CODE: 1449 CODE:
1331{ 1450{
1332 glEnable (GL_TEXTURE_2D); 1451 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1452 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1453 glEnable (GL_BLEND);
1342 glDisable (GL_ALPHA_TEST); 1461 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1462 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1463 glDisable (GL_TEXTURE_2D);
1345} 1464}
1346 1465
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1466MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1467
1349PROTOTYPES: ENABLE 1468PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1469
1353void 1470void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1471pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1472 CODE:
1356{ 1473{
1433 RETVAL = width > 0; 1550 RETVAL = width > 0;
1434} 1551}
1435 OUTPUT: 1552 OUTPUT:
1436 RETVAL 1553 RETVAL
1437 1554
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1555MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1556
1440PROTOTYPES: DISABLE 1557PROTOTYPES: DISABLE
1441 1558
1442CFPlus::Map 1559DC::Map
1443new (SV *class) 1560new (SV *class)
1444 CODE: 1561 CODE:
1445 New (0, RETVAL, 1, struct map); 1562 New (0, RETVAL, 1, struct map);
1446 RETVAL->x = 0; 1563 RETVAL->x = 0;
1447 RETVAL->y = 0; 1564 RETVAL->y = 0;
1455 RETVAL->row = 0; 1572 RETVAL->row = 0;
1456 OUTPUT: 1573 OUTPUT:
1457 RETVAL 1574 RETVAL
1458 1575
1459void 1576void
1460DESTROY (CFPlus::Map self) 1577DESTROY (DC::Map self)
1461 CODE: 1578 CODE:
1462{ 1579{
1463 map_clear (self); 1580 map_clear (self);
1464 Safefree (self->face2tile); 1581 Safefree (self->face2tile);
1465 Safefree (self->tex); 1582 Safefree (self->tex);
1466 Safefree (self); 1583 Safefree (self);
1467} 1584}
1468 1585
1469void 1586void
1470resize (CFPlus::Map self, int map_width, int map_height) 1587resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1588 CODE:
1472 self->w = map_width; 1589 self->w = map_width;
1473 self->h = map_height; 1590 self->h = map_height;
1474 1591
1475void 1592void
1476clear (CFPlus::Map self) 1593clear (DC::Map self)
1477 CODE: 1594 CODE:
1478 map_clear (self); 1595 map_clear (self);
1479 1596
1480void 1597void
1481set_tileid (CFPlus::Map self, int face, int tile) 1598set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1599 CODE:
1483{ 1600{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1601 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1602 need_texid (self, tile);
1486} 1603}
1487 1604
1488void 1605void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1606set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1607 CODE:
1491{ 1608{
1492 tileid texid; 1609 tileid texid;
1493 maptex *tex; 1610 maptex *tex;
1494 1611
1507 tex->smoothtile = self->face2tile [smooth]; 1624 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1625 tex->smoothlevel = level;
1509} 1626}
1510 1627
1511void 1628void
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) 1629set_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: 1630 CODE:
1514{ 1631{
1515 need_texid (self, texid); 1632 need_texid (self, texid);
1516 1633
1517 { 1634 {
1537 // from transparent color bleeding and ugly wrapping effects. 1654 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1655 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1656}
1540 1657
1541int 1658int
1542ox (CFPlus::Map self) 1659ox (DC::Map self)
1543 ALIAS: 1660 ALIAS:
1544 oy = 1 1661 oy = 1
1545 x = 2 1662 x = 2
1546 y = 3 1663 y = 3
1547 w = 4 1664 w = 4
1558 } 1675 }
1559 OUTPUT: 1676 OUTPUT:
1560 RETVAL 1677 RETVAL
1561 1678
1562void 1679void
1563scroll (CFPlus::Map self, int dx, int dy) 1680scroll (DC::Map self, int dx, int dy)
1564 CODE: 1681 CODE:
1565{ 1682{
1566 if (dx > 0) 1683 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 1684 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 1685 else if (dx < 0)
1584 self->y += MAP_EXTEND_Y; 1701 self->y += MAP_EXTEND_Y;
1585 } 1702 }
1586} 1703}
1587 1704
1588SV * 1705SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 1706map1a_update (DC::Map self, SV *data_, int extmap)
1590 CODE: 1707 CODE:
1591{ 1708{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1709 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 1710 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 1711 mapcell *cell;
1622 uint8_t ext, cmd; 1739 uint8_t ext, cmd;
1623 1740
1624 do 1741 do
1625 { 1742 {
1626 ext = *data++; 1743 ext = *data++;
1627 cmd = ext & 0x3f; 1744 cmd = ext & 0x7f;
1628 1745
1629 if (cmd < 4) 1746 if (cmd < 4)
1630 cell->darkness = 255 - ext * 64 + 1; 1747 cell->darkness = 255 - ext * 64 + 1;
1631 else if (cmd == 5) // health 1748 else if (cmd == 5) // health
1632 { 1749 {
1635 } 1752 }
1636 else if (cmd == 6) // monster width 1753 else if (cmd == 6) // monster width
1637 cell->stat_width = *data++ + 1; 1754 cell->stat_width = *data++ + 1;
1638 else if (cmd == 0x47) 1755 else if (cmd == 0x47)
1639 { 1756 {
1640 if (*data == 4) 1757 if (*data == 1) cell->player = data [1];
1641 ; // decode player count 1758 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1759 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1760 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1642 1761
1643 data += *data + 1; 1762 data += *data + 1;
1644 } 1763 }
1645 else if (cmd == 8) // cell flags 1764 else if (cmd == 8) // cell flags
1646 cell->flags = *data++; 1765 cell->flags = *data++;
1676 } 1795 }
1677 } 1796 }
1678 } 1797 }
1679 } 1798 }
1680 else 1799 else
1681 cell->darkness = 0; 1800 CELL_CLEAR (cell);
1682 } 1801 }
1683} 1802}
1684 OUTPUT: 1803 OUTPUT:
1685 RETVAL 1804 RETVAL
1686 1805
1687SV * 1806SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1807mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 1808 CODE:
1690{ 1809{
1691 int x1, x; 1810 int x1, x;
1692 int y1, y; 1811 int y1, y;
1693 int z; 1812 int z;
1738} 1857}
1739 OUTPUT: 1858 OUTPUT:
1740 RETVAL 1859 RETVAL
1741 1860
1742void 1861void
1743draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1862draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1744 CODE: 1863 CODE:
1745{ 1864{
1746 int x, y, z; 1865 int x, y, z;
1747 1866
1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1867 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1868 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) 1869 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751 smooth_key skey; 1870 smooth_key skey;
1752 1871 int pl_x, pl_y;
1872 maptex pl_tex;
1753 rc_t *rc = rc_alloc (); 1873 rc_t *rc = rc_alloc ();
1754 rc_key_t key; 1874 rc_key_t key;
1755 rc_array_t *arr; 1875 rc_array_t *arr;
1876
1877 pl_tex.name = 0;
1756 1878
1757 // thats current max. sorry. 1879 // thats current max. sorry.
1758 if (sw > 255) sw = 255; 1880 if (sw > 255) sw = 255;
1759 if (sh > 255) sh = 255; 1881 if (sh > 255) sh = 255;
1760 1882
1815 tileid tile = cell->tile [z]; 1937 tileid tile = cell->tile [z];
1816 1938
1817 if (tile) 1939 if (tile)
1818 { 1940 {
1819 maptex tex = self->tex [tile]; 1941 maptex tex = self->tex [tile];
1820 int px, py; 1942 int px = (x + 1) * T - tex.w;
1943 int py = (y + 1) * T - tex.h;
1821 1944
1822 if (key.texname != tex.name) 1945 if (key.texname != tex.name)
1823 { 1946 {
1824 if (!tex.name) 1947 if (!tex.name)
1825 tex = self->tex [2]; /* missing, replace by noface */ 1948 tex = self->tex [2]; /* missing, replace by noface */
1826 1949
1827 key.texname = tex.name; 1950 key.texname = tex.name;
1828 arr = rc_array (rc, &key); 1951 arr = rc_array (rc, &key);
1829 } 1952 }
1830 1953
1831 px = (x + 1) * T - tex.w; 1954 if (expect_false (cell->player == player) && expect_false (z == 2))
1832 py = (y + 1) * T - tex.h; 1955 {
1956 pl_x = px;
1957 pl_y = py;
1958 pl_tex = tex;
1959 continue;
1960 }
1833 1961
1834 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1962 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1835 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1963 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); 1964 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); 1965 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1838 1966
1839 if (cell->flags && z == 2) 1967 if (expect_false (cell->flags) && expect_false (z == 2))
1840 { 1968 {
1841 // overlays such as the speech bubble, probably more to come 1969 // overlays such as the speech bubble, probably more to come
1842 if (cell->flags & 1) 1970 if (cell->flags & 1)
1843 { 1971 {
1844 maptex tex = self->tex [1]; 1972 maptex tex = self->tex [1];
1983 } 2111 }
1984 2112
1985 hv_clear (smooth); 2113 hv_clear (smooth);
1986 } 2114 }
1987 2115
2116 if (pl_tex.name)
2117 {
2118 maptex tex = pl_tex;
2119 int px = pl_x + sdx;
2120 int py = pl_y + sdy;
2121
2122 key.texname = tex.name;
2123 arr = rc_array (rc, &key);
2124
2125 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2126 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2127 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2128 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2129
2130 rc_draw (rc);
2131 }
2132
1988 glDisable (GL_BLEND); 2133 glDisable (GL_BLEND);
1989 rc_free (rc); 2134 rc_free (rc);
1990 2135
1991 // top layer: overlays such as the health bar 2136 // top layer: overlays such as the health bar
1992 for (y = 0; y < sh; y++) 2137 for (y = 0; y < sh; y++)
2019 } 2164 }
2020 } 2165 }
2021} 2166}
2022 2167
2023void 2168void
2024draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2169draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2025 CODE: 2170 CODE:
2026{ 2171{
2027 static float color[16][3] = { 2172 static float color[16][3] = {
2028 { 0.00F, 0.00F, 0.00F }, 2173 { 0.00F, 0.00F, 0.00F },
2029 { 1.00F, 1.00F, 1.00F }, 2174 { 1.00F, 1.00F, 1.00F },
2079 glDisable (GL_BLEND); 2224 glDisable (GL_BLEND);
2080 glDisable (GL_TEXTURE_2D); 2225 glDisable (GL_TEXTURE_2D);
2081} 2226}
2082 2227
2083void 2228void
2084fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2229fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2085 PPCODE: 2230 PPCODE:
2086{ 2231{
2087 int x, y; 2232 int x, y;
2088 int sw1 = sw + 2; 2233 int sw1 = sw + 2;
2089 int sh1 = sh + 2; 2234 int sh1 = sh + 2;
2097 SvCUR_set (darkness3_sv, sw34 * sh3); 2242 SvCUR_set (darkness3_sv, sw34 * sh3);
2098 2243
2099 mx += self->x - 1; 2244 mx += self->x - 1;
2100 my += self->y - 1; 2245 my += self->y - 1;
2101 2246
2102 memset (darkness1, 255, sw1 * sh1); 2247 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2103 2248
2104 for (y = 0; y < sh1; y++) 2249 for (y = 0; y < sh1; y++)
2105 if (0 <= y + my && y + my < self->rows) 2250 if (0 <= y + my && y + my < self->rows)
2106 { 2251 {
2107 maprow *row = self->row + (y + my); 2252 maprow *row = self->row + (y + my);
2160 PUSHs (sv_2mortal (newSViv (sh3))); 2305 PUSHs (sv_2mortal (newSViv (sh3)));
2161 PUSHs (darkness3_sv); 2306 PUSHs (darkness3_sv);
2162} 2307}
2163 2308
2164SV * 2309SV *
2165get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2310get_rect (DC::Map self, int x0, int y0, int w, int h)
2166 CODE: 2311 CODE:
2167{ 2312{
2168 int x, y, x1, y1; 2313 int x, y, x1, y1;
2169 SV *data_sv = newSV (w * h * 7 + 5); 2314 SV *data_sv = newSV (w * h * 7 + 5);
2170 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2315 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2227 else 2372 else
2228 *data++ = 0; 2373 *data++ = 0;
2229 } 2374 }
2230 } 2375 }
2231 2376
2377 /* if size is w*h + 5 then no data has been found */
2378 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2379 {
2232 SvPOK_only (data_sv); 2380 SvPOK_only (data_sv);
2233 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2381 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2382 }
2383
2234 RETVAL = data_sv; 2384 RETVAL = data_sv;
2235} 2385}
2236 OUTPUT: 2386 OUTPUT:
2237 RETVAL 2387 RETVAL
2238 2388
2239void 2389void
2240set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2390set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2241 PPCODE: 2391 PPCODE:
2242{ 2392{
2243 int x, y, z; 2393 int x, y, z;
2244 int w, h; 2394 int w, h;
2245 int x1, y1; 2395 int x1, y1;
2396 STRLEN len;
2397 uint8_t *data, *end;
2398
2399 len = SvLEN (data_sv);
2400 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2401 data = SvPVbyte_nolen (data_sv);
2402 end = data + len + 8;
2403
2404 if (len < 5)
2405 XSRETURN_EMPTY;
2246 2406
2247 if (*data++ != 0) 2407 if (*data++ != 0)
2248 XSRETURN_EMPTY; /* version mismatch */ 2408 XSRETURN_EMPTY; /* version mismatch */
2249 2409
2250 w = *data++ << 8; w |= *data++; 2410 w = *data++ << 8; w |= *data++;
2265 { 2425 {
2266 maprow *row = map_get_row (self, y); 2426 maprow *row = map_get_row (self, y);
2267 2427
2268 for (x = x0; x < x1; x++) 2428 for (x = x0; x < x1; x++)
2269 { 2429 {
2430 uint8_t flags;
2431
2432 if (data + 7 >= end)
2433 XSRETURN_EMPTY;
2434
2270 uint8_t flags = *data++; 2435 flags = *data++;
2271 2436
2272 if (flags) 2437 if (flags)
2273 { 2438 {
2274 mapcell *cell = row_get_cell (row, x); 2439 mapcell *cell = row_get_cell (row, x);
2275 tileid tile[3] = { 0, 0, 0 }; 2440 tileid tile[3] = { 0, 0, 0 };
2278 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2443 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2279 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2444 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2280 2445
2281 if (cell->darkness == 0) 2446 if (cell->darkness == 0)
2282 { 2447 {
2283 cell->darkness = 0; 2448 /*cell->darkness = 0;*/
2449 EXTEND (SP, 3);
2284 2450
2285 for (z = 0; z <= 2; z++) 2451 for (z = 0; z <= 2; z++)
2286 { 2452 {
2287 tileid t = tile [z]; 2453 tileid t = tile [z];
2288 2454
2289 if (t >= self->texs || (t && !self->tex [t].name)) 2455 if (t >= self->texs || (t && !self->tex [t].name))
2290 { 2456 {
2291 XPUSHs (sv_2mortal (newSViv (t))); 2457 PUSHs (sv_2mortal (newSViv (t)));
2292 need_texid (self, t); 2458 need_texid (self, t);
2293 } 2459 }
2294 2460
2295 cell->tile [z] = t; 2461 cell->tile [z] = t;
2296 } 2462 }
2298 } 2464 }
2299 } 2465 }
2300 } 2466 }
2301} 2467}
2302 2468
2303MODULE = CFPlus PACKAGE = CFPlus::RW 2469MODULE = Deliantra::Client PACKAGE = DC::RW
2304 2470
2305CFPlus::RW 2471DC::RW
2306new (SV *class, SV *data_sv) 2472new (SV *class, SV *data_sv)
2307 CODE: 2473 CODE:
2308{ 2474{
2309 STRLEN datalen; 2475 STRLEN datalen;
2310 char *data = SvPVbyte (data_sv, datalen); 2476 char *data = SvPVbyte (data_sv, datalen);
2312 RETVAL = SDL_RWFromConstMem (data, datalen); 2478 RETVAL = SDL_RWFromConstMem (data, datalen);
2313} 2479}
2314 OUTPUT: 2480 OUTPUT:
2315 RETVAL 2481 RETVAL
2316 2482
2317CFPlus::RW 2483DC::RW
2318new_from_file (SV *class, const char *path, const char *mode = "rb") 2484new_from_file (SV *class, const char *path, const char *mode = "rb")
2319 CODE: 2485 CODE:
2320 RETVAL = SDL_RWFromFile (path, mode); 2486 RETVAL = SDL_RWFromFile (path, mode);
2321 OUTPUT: 2487 OUTPUT:
2322 RETVAL 2488 RETVAL
2323 2489
2324# fails on win32: 2490# fails on win32:
2325# CFPlus.xs(2268) : error C2059: syntax error : '(' 2491# dc.xs(2268) : error C2059: syntax error : '('
2326#void 2492#void
2327#close (CFPlus::RW self) 2493#close (DC::RW self)
2328# CODE: 2494# CODE:
2329# (self->(close)) (self); 2495# (self->(close)) (self);
2330 2496
2331MODULE = CFPlus PACKAGE = CFPlus::Channel 2497MODULE = Deliantra::Client PACKAGE = DC::Channel
2332 2498
2333PROTOTYPES: DISABLE 2499PROTOTYPES: DISABLE
2334 2500
2335CFPlus::Channel 2501DC::Channel
2336find () 2502find ()
2337 CODE: 2503 CODE:
2338{ 2504{
2339 RETVAL = Mix_GroupAvailable (-1); 2505 RETVAL = Mix_GroupAvailable (-1);
2340 2506
2353} 2519}
2354 OUTPUT: 2520 OUTPUT:
2355 RETVAL 2521 RETVAL
2356 2522
2357void 2523void
2358halt (CFPlus::Channel self) 2524halt (DC::Channel self)
2359 CODE: 2525 CODE:
2360 Mix_HaltChannel (self); 2526 Mix_HaltChannel (self);
2361 2527
2362void 2528void
2363expire (CFPlus::Channel self, int ticks = -1) 2529expire (DC::Channel self, int ticks = -1)
2364 CODE: 2530 CODE:
2365 Mix_ExpireChannel (self, ticks); 2531 Mix_ExpireChannel (self, ticks);
2366 2532
2367void 2533void
2368fade_out (CFPlus::Channel self, int ticks = -1) 2534fade_out (DC::Channel self, int ticks = -1)
2369 CODE: 2535 CODE:
2370 Mix_FadeOutChannel (self, ticks); 2536 Mix_FadeOutChannel (self, ticks);
2371 2537
2372int 2538int
2373volume (CFPlus::Channel self, int volume) 2539volume (DC::Channel self, int volume)
2374 CODE: 2540 CODE:
2375 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2541 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2376 OUTPUT: 2542 OUTPUT:
2377 RETVAL 2543 RETVAL
2378 2544
2379void 2545void
2380unregister_all_effects (CFPlus::Channel self) 2546unregister_all_effects (DC::Channel self)
2381 CODE: 2547 CODE:
2382 Mix_UnregisterAllEffects (self); 2548 Mix_UnregisterAllEffects (self);
2383 2549
2384void 2550void
2385set_panning (CFPlus::Channel self, int left, int right) 2551set_panning (DC::Channel self, int left, int right)
2386 CODE: 2552 CODE:
2387 left = CLAMP (left , 0, 255); 2553 left = CLAMP (left , 0, 255);
2388 right = CLAMP (right, 0, 255); 2554 right = CLAMP (right, 0, 255);
2389 Mix_SetPanning (self, left, right); 2555 Mix_SetPanning (self, left, right);
2390 2556
2391void 2557void
2392set_distance (CFPlus::Channel self, int distance) 2558set_distance (DC::Channel self, int distance)
2393 CODE: 2559 CODE:
2394 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2560 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2395 2561
2396void 2562void
2397set_position (CFPlus::Channel self, int angle, int distance) 2563set_position (DC::Channel self, int angle, int distance)
2398 CODE: 2564 CODE:
2399 2565
2400void 2566void
2401set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2567set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2402 CODE: 2568 CODE:
2403{ 2569{
2404 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2570 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); 2571 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2406 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2572 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2407} 2573}
2408 2574
2409void 2575void
2410set_reverse_stereo (CFPlus::Channel self, int flip) 2576set_reverse_stereo (DC::Channel self, int flip)
2411 CODE: 2577 CODE:
2412 Mix_SetReverseStereo (self, flip); 2578 Mix_SetReverseStereo (self, flip);
2413 2579
2414MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2580MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2415 2581
2416PROTOTYPES: DISABLE 2582PROTOTYPES: DISABLE
2417 2583
2418CFPlus::MixChunk 2584DC::MixChunk
2419new (SV *class, CFPlus::RW rwops) 2585new (SV *class, DC::RW rwops)
2420 CODE: 2586 CODE:
2421 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2587 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2422 OUTPUT: 2588 OUTPUT:
2423 RETVAL 2589 RETVAL
2424 2590
2425void 2591void
2426DESTROY (CFPlus::MixChunk self) 2592DESTROY (DC::MixChunk self)
2427 CODE: 2593 CODE:
2428 Mix_FreeChunk (self); 2594 Mix_FreeChunk (self);
2429 2595
2430int 2596int
2431volume (CFPlus::MixChunk self, int volume = -1) 2597volume (DC::MixChunk self, int volume = -1)
2432 CODE: 2598 CODE:
2433 if (items > 1) 2599 if (items > 1)
2434 volume = CLAMP (volume, 0, 128); 2600 volume = CLAMP (volume, 0, 128);
2435 RETVAL = Mix_VolumeChunk (self, volume); 2601 RETVAL = Mix_VolumeChunk (self, volume);
2436 OUTPUT: 2602 OUTPUT:
2437 RETVAL 2603 RETVAL
2438 2604
2439CFPlus::Channel 2605DC::Channel
2440play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2606play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2441 CODE: 2607 CODE:
2442{ 2608{
2443 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2609 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2444 2610
2445 if (RETVAL < 0) 2611 if (RETVAL < 0)
2452 } 2618 }
2453} 2619}
2454 OUTPUT: 2620 OUTPUT:
2455 RETVAL 2621 RETVAL
2456 2622
2457MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2623MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2458 2624
2459int 2625int
2460volume (int volume = -1) 2626volume (int volume = -1)
2461 PROTOTYPE: ;$ 2627 PROTOTYPE: ;$
2462 CODE: 2628 CODE:
2474void 2640void
2475halt () 2641halt ()
2476 CODE: 2642 CODE:
2477 Mix_HaltMusic (); 2643 Mix_HaltMusic ();
2478 2644
2479CFPlus::MixMusic 2645DC::MixMusic
2480new (SV *class, CFPlus::RW rwops) 2646new (SV *class, DC::RW rwops)
2481 CODE: 2647 CODE:
2482 RETVAL = Mix_LoadMUS_RW (rwops); 2648 RETVAL = Mix_LoadMUS_RW (rwops);
2483 OUTPUT: 2649 OUTPUT:
2484 RETVAL 2650 RETVAL
2485 2651
2486void 2652void
2487DESTROY (CFPlus::MixMusic self) 2653DESTROY (DC::MixMusic self)
2488 CODE: 2654 CODE:
2489 Mix_FreeMusic (self); 2655 Mix_FreeMusic (self);
2490 2656
2491int 2657int
2492play (CFPlus::MixMusic self, int loops = -1) 2658play (DC::MixMusic self, int loops = -1)
2493 CODE: 2659 CODE:
2494 RETVAL = Mix_PlayMusic (self, loops); 2660 RETVAL = Mix_PlayMusic (self, loops);
2495 OUTPUT: 2661 OUTPUT:
2496 RETVAL 2662 RETVAL
2497 2663
2498void 2664void
2499fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2665fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2500 CODE: 2666 CODE:
2501 Mix_FadeInMusicPos (self, loops, ms, position); 2667 Mix_FadeInMusicPos (self, loops, ms, position);
2502 2668
2503MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2669MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2504 2670
2505PROTOTYPES: ENABLE 2671PROTOTYPES: ENABLE
2506 2672
2507BOOT: 2673BOOT:
2508{ 2674{
2509 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2675 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2510 static const struct { 2676 static const struct {
2511 const char *name; 2677 const char *name;
2512 IV iv; 2678 IV iv;
2513 } *civ, const_iv[] = { 2679 } *civ, const_iv[] = {
2514# define const_iv(name) { # name, (IV)name } 2680# define const_iv(name) { # name, (IV)name }
2549 const_iv (GL_INTENSITY), 2715 const_iv (GL_INTENSITY),
2550 const_iv (GL_LUMINANCE), 2716 const_iv (GL_LUMINANCE),
2551 const_iv (GL_LUMINANCE_ALPHA), 2717 const_iv (GL_LUMINANCE_ALPHA),
2552 const_iv (GL_FLOAT), 2718 const_iv (GL_FLOAT),
2553 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2719 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2720 const_iv (GL_COMPRESSED_ALPHA_ARB),
2721 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2722 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2723 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2724 const_iv (GL_COMPRESSED_RGB_ARB),
2725 const_iv (GL_COMPRESSED_RGBA_ARB),
2554 const_iv (GL_COMPILE), 2726 const_iv (GL_COMPILE),
2555 const_iv (GL_PROXY_TEXTURE_1D), 2727 const_iv (GL_PROXY_TEXTURE_1D),
2556 const_iv (GL_PROXY_TEXTURE_2D), 2728 const_iv (GL_PROXY_TEXTURE_2D),
2557 const_iv (GL_TEXTURE_1D), 2729 const_iv (GL_TEXTURE_1D),
2558 const_iv (GL_TEXTURE_2D), 2730 const_iv (GL_TEXTURE_2D),
2597 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2769 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2598 const_iv (GL_POINT_SMOOTH_HINT), 2770 const_iv (GL_POINT_SMOOTH_HINT),
2599 const_iv (GL_LINE_SMOOTH_HINT), 2771 const_iv (GL_LINE_SMOOTH_HINT),
2600 const_iv (GL_POLYGON_SMOOTH_HINT), 2772 const_iv (GL_POLYGON_SMOOTH_HINT),
2601 const_iv (GL_GENERATE_MIPMAP_HINT), 2773 const_iv (GL_GENERATE_MIPMAP_HINT),
2774 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2602 const_iv (GL_FASTEST), 2775 const_iv (GL_FASTEST),
2603 const_iv (GL_DONT_CARE), 2776 const_iv (GL_DONT_CARE),
2604 const_iv (GL_NICEST), 2777 const_iv (GL_NICEST),
2605 const_iv (GL_V2F), 2778 const_iv (GL_V2F),
2606 const_iv (GL_V3F), 2779 const_iv (GL_V3F),
2614 2787
2615 texture_av = newAV (); 2788 texture_av = newAV ();
2616 AvREAL_off (texture_av); 2789 AvREAL_off (texture_av);
2617} 2790}
2618 2791
2792void
2793disable_GL_EXT_blend_func_separate ()
2794 CODE:
2795 gl.BlendFuncSeparate = 0;
2796 gl.BlendFuncSeparateEXT = 0;
2797
2619char * 2798char *
2620gl_vendor () 2799gl_vendor ()
2621 CODE: 2800 CODE:
2622 RETVAL = (char *)glGetString (GL_VENDOR); 2801 RETVAL = (char *)glGetString (GL_VENDOR);
2623 OUTPUT: 2802 OUTPUT:
2744 2923
2745void glRect (float x1, float y1, float x2, float y2) 2924void glRect (float x1, float y1, float x2, float y2)
2746 CODE: 2925 CODE:
2747 glRectf (x1, y1, x2, y2); 2926 glRectf (x1, y1, x2, y2);
2748 2927
2928void glRect_lineloop (float x1, float y1, float x2, float y2)
2929 CODE:
2930 glBegin (GL_LINE_LOOP);
2931 glVertex2f (x1, y1);
2932 glVertex2f (x2, y1);
2933 glVertex2f (x2, y2);
2934 glVertex2f (x1, y2);
2935 glEnd ();
2936
2749PROTOTYPES: ENABLE 2937PROTOTYPES: ENABLE
2750 2938
2751void glBegin (int mode) 2939void glBegin (int mode)
2752 2940
2753void glEnd () 2941void glEnd ()
2785void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2973void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2786 CODE: 2974 CODE:
2787 if (gl.SeparableFilter2D) 2975 if (gl.SeparableFilter2D)
2788 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2976 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2789 2977
2790void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2978void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2791 2979
2792void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2980void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2793 2981
2794void glDrawPixels (int width, int height, int format, int type, char *pixels) 2982void glDrawPixels (int width, int height, int format, int type, char *pixels)
2795 2983
2821 3009
2822void glEndList () 3010void glEndList ()
2823 3011
2824void glCallList (int list) 3012void glCallList (int list)
2825 3013
2826MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3014MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2827 3015
2828PROTOTYPES: DISABLE 3016PROTOTYPES: DISABLE
2829 3017
2830void 3018void
2831find_widget (SV *self, NV x, NV y) 3019find_widget (SV *self, NV x, NV y)
2835 XPUSHs (self); 3023 XPUSHs (self);
2836} 3024}
2837 3025
2838BOOT: 3026BOOT:
2839{ 3027{
2840 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3028 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2841 3029
2842 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3030 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2843 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3031 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2844 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3032 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2845 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3033 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2846} 3034}
2847 3035
2848void 3036void
2849draw (SV *self) 3037draw (SV *self)
2850 CODE: 3038 CODE:
2857 SV *draw_w_sv = GvSV (draw_w_gv); 3045 SV *draw_w_sv = GvSV (draw_w_gv);
2858 SV *draw_h_sv = GvSV (draw_h_gv); 3046 SV *draw_h_sv = GvSV (draw_h_gv);
2859 double draw_x, draw_y; 3047 double draw_x, draw_y;
2860 3048
2861 if (!SvROK (self)) 3049 if (!SvROK (self))
2862 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3050 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2863 3051
2864 hv = (HV *)SvRV (self); 3052 hv = (HV *)SvRV (self);
2865 3053
2866 if (SvTYPE (hv) != SVt_PVHV) 3054 if (SvTYPE (hv) != SVt_PVHV)
2867 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3055 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2868 3056
2869 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3057 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2870 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3058 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2871 3059
2872 if (!h || !w) 3060 if (!h || !w)
2905 glEnd (); 3093 glEnd ();
2906 glDisable (GL_BLEND); 3094 glDisable (GL_BLEND);
2907 } 3095 }
2908 } 3096 }
2909#if 0 3097#if 0
2910 if ($ENV{CFPLUS_DEBUG} & 1) { 3098 // draw borders, for debugging
2911 glPushMatrix; 3099 glPushMatrix ();
2912 glColor 1, 1, 0, 1; 3100 glColor4f (1., 1., 0., 1.);
2913 glTranslate 0.375, 0.375; 3101 glTranslatef (.5, .5, 0.);
2914 glBegin GL_LINE_LOOP; 3102 glBegin (GL_LINE_LOOP);
2915 glVertex 0 , 0; 3103 glVertex2f (0 , 0);
2916 glVertex $self->{w} - 1, 0; 3104 glVertex2f (w - 1, 0);
2917 glVertex $self->{w} - 1, $self->{h} - 1; 3105 glVertex2f (w - 1, h - 1);
2918 glVertex 0 , $self->{h} - 1; 3106 glVertex2f (0 , h - 1);
2919 glEnd; 3107 glEnd ();
2920 glPopMatrix; 3108 glPopMatrix ();
2921 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2922 }
2923#endif 3109#endif
2924 PUSHMARK (SP); 3110 PUSHMARK (SP);
2925 XPUSHs (self); 3111 XPUSHs (self);
2926 PUTBACK; 3112 PUTBACK;
2927 call_method ("_draw", G_VOID | G_DISCARD); 3113 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines