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.231 by root, Sun Aug 19 14:09:28 2007 UTC vs.
Revision 1.267 by root, Sun Jul 20 02:55:36 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 (cell)->darkness = 0; \
375 (cell)->stat_hp = 0; \
376 (cell)->flags = 0; \
377 (cell)->player = 0; \
378 } while (0)
379
355static void 380static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 381map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 382{
358 int x, y; 383 int x, y;
359 maprow *row; 384 maprow *row;
360 mapcell *cell; 385 mapcell *cell;
361 386
373 if (x >= row->c1) 398 if (x >= row->c1)
374 break; 399 break;
375 400
376 cell = row->col + x - row->c0; 401 cell = row->col + x - row->c0;
377 402
378 cell->darkness = 0; 403 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 404 }
383 } 405 }
384} 406}
385 407
386typedef struct { 408typedef struct {
440 n |= n >> 16; 462 n |= n >> 16;
441 463
442 return n + 1; 464 return n + 1;
443} 465}
444 466
467static unsigned int
468popcount (unsigned int n)
469{
470 n -= (n >> 1) & 0x55555555U;
471 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
472 n = ((n >> 4) + n) & 0x0f0f0f0fU;
473 n *= 0x01010101U;
474
475 return n >> 24;
476}
477
445/* SDL should provide this, really. */ 478/* SDL should provide this, really. */
446#define SDLK_MODIFIER_MIN 300 479#define SDLK_MODIFIER_MIN 300
447#define SDLK_MODIFIER_MAX 314 480#define SDLK_MODIFIER_MAX 314
448 481
449/******************************************************************************/ 482/******************************************************************************/
487 return 0; 520 return 0;
488 521
489 return 1; 522 return 1;
490} 523}
491 524
492MODULE = CFPlus PACKAGE = CFPlus 525MODULE = Deliantra::Client PACKAGE = DC
493 526
494PROTOTYPES: ENABLE 527PROTOTYPES: ENABLE
495 528
496BOOT: 529BOOT:
497{ 530{
498 HV *stash = gv_stashpv ("CFPlus", 1); 531 HV *stash = gv_stashpv ("DC", 1);
499 static const struct { 532 static const struct {
500 const char *name; 533 const char *name;
501 IV iv; 534 IV iv;
502 } *civ, const_iv[] = { 535 } *civ, const_iv[] = {
503# define const_iv(name) { # name, (IV)name } 536# define const_iv(name) { # name, (IV)name }
525 558
526 const_iv (SDL_APPINPUTFOCUS), 559 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS), 560 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE), 561 const_iv (SDL_APPACTIVE),
529 562
563 const_iv (SDLK_FIRST),
564 const_iv (SDLK_LAST),
530 const_iv (SDLK_KP0), 565 const_iv (SDLK_KP0),
531 const_iv (SDLK_KP1), 566 const_iv (SDLK_KP1),
532 const_iv (SDLK_KP2), 567 const_iv (SDLK_KP2),
533 const_iv (SDLK_KP3), 568 const_iv (SDLK_KP3),
534 const_iv (SDLK_KP4), 569 const_iv (SDLK_KP4),
606 const_iv (KMOD_LMETA), 641 const_iv (KMOD_LMETA),
607 const_iv (KMOD_RMETA), 642 const_iv (KMOD_RMETA),
608 const_iv (KMOD_NUM), 643 const_iv (KMOD_NUM),
609 const_iv (KMOD_CAPS), 644 const_iv (KMOD_CAPS),
610 const_iv (KMOD_MODE), 645 const_iv (KMOD_MODE),
646
647 const_iv (MIX_DEFAULT_FORMAT),
648
649 const_iv (SDL_INIT_TIMER),
650 const_iv (SDL_INIT_AUDIO),
651 const_iv (SDL_INIT_VIDEO),
652 const_iv (SDL_INIT_CDROM),
653 const_iv (SDL_INIT_JOYSTICK),
654 const_iv (SDL_INIT_EVERYTHING),
655 const_iv (SDL_INIT_NOPARACHUTE),
656 const_iv (SDL_INIT_EVENTTHREAD),
657
658 const_iv (SDL_GL_RED_SIZE),
659 const_iv (SDL_GL_GREEN_SIZE),
660 const_iv (SDL_GL_BLUE_SIZE),
661 const_iv (SDL_GL_ALPHA_SIZE),
662 const_iv (SDL_GL_DOUBLEBUFFER),
663 const_iv (SDL_GL_BUFFER_SIZE),
664 const_iv (SDL_GL_DEPTH_SIZE),
665 const_iv (SDL_GL_STENCIL_SIZE),
666 const_iv (SDL_GL_ACCUM_RED_SIZE),
667 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
668 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
669 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
670 const_iv (SDL_GL_STEREO),
671 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
672 const_iv (SDL_GL_MULTISAMPLESAMPLES),
673 const_iv (SDL_GL_ACCELERATED_VISUAL),
674 const_iv (SDL_GL_SWAP_CONTROL)
611# undef const_iv 675# undef const_iv
612 }; 676 };
613 677
614 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 678 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 679 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
633 697
634NV floor (NV x) 698NV floor (NV x)
635 699
636NV ceil (NV x) 700NV ceil (NV x)
637 701
702IV minpot (UV n)
703
704IV popcount (UV n)
705
638void 706void
639pango_init () 707pango_init ()
640 CODE: 708 CODE:
641{ 709{
642 opengl_fontmap = pango_opengl_font_map_new (); 710 opengl_fontmap = pango_opengl_font_map_new ();
643 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 711 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); 712 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
713 /*pango_context_set_font_description (opengl_context, default_font);*/
714#if PANGO_VERSION_CHECK (1, 15, 2)
715 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
716 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
717#endif
645} 718}
646 719
647char *
648SDL_GetError () 720char *SDL_GetError ()
649 721
650int 722int SDL_Init (U32 flags)
651SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
652 723
653void 724int SDL_InitSubSystem (U32 flags)
725
726void SDL_QuitSubSystem (U32 flags)
727
654SDL_Quit () 728void SDL_Quit ()
729
730int SDL_GL_SetAttribute (int attr, int value)
731
732int SDL_GL_GetAttribute (int attr)
733 CODE:
734 if (SDL_GL_GetAttribute (attr, &RETVAL))
735 XSRETURN_UNDEF;
736 OUTPUT:
737 RETVAL
655 738
656void 739void
657SDL_ListModes (int rgb, int alpha) 740SDL_ListModes (int rgb, int alpha)
658 PPCODE: 741 PPCODE:
659{ 742{
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 754 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 755 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 756 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674 757
675 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 758 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); 759 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679#endif
680 760
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 761 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 762
683 if (m && m != (SDL_Rect **)-1) 763 if (m && m != (SDL_Rect **)-1)
684 while (*m) 764 while (*m)
685 { 765 {
686 if ((*m)->w >= 640 && (*m)->h >= 480) 766 if ((*m)->w >= 400 && (*m)->h >= 300)
687 { 767 {
688 AV *av = newAV (); 768 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 769 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 770 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 771 av_push (av, newSViv (rgb));
715 795
716 if (RETVAL) 796 if (RETVAL)
717 { 797 {
718 av_clear (texture_av); 798 av_clear (texture_av);
719 799
720 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 800 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 801#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
722#include "glfunc.h" 802#include "glfunc.h"
723#undef GL_FUNC 803#undef GL_FUNC
724 } 804 }
725} 805}
732char * 812char *
733SDL_GetKeyName (int sym) 813SDL_GetKeyName (int sym)
734 814
735int 815int
736SDL_GetAppState () 816SDL_GetAppState ()
817
818int
819SDL_GetModState ()
737 820
738void 821void
739poll_events () 822poll_events ()
740 PPCODE: 823 PPCODE:
741{ 824{
751 { 834 {
752 case SDL_KEYDOWN: 835 case SDL_KEYDOWN:
753 case SDL_KEYUP: 836 case SDL_KEYUP:
754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 837 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 838 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 839 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 */ 840 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); 841 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759 break; 842 break;
760 843
761 case SDL_ACTIVEEVENT: 844 case SDL_ACTIVEEVENT:
762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 845 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
780 x = ev.motion.x; 863 x = ev.motion.x;
781 y = ev.motion.y; 864 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 865 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 } 866 }
784 867
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 868 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 hv_store (hv, "state", 5, newSViv (state), 0); 869 hv_store (hv, "state", 5, newSViv (state), 0);
787 hv_store (hv, "x", 1, newSViv (x), 0); 870 hv_store (hv, "x", 1, newSViv (x), 0);
788 hv_store (hv, "y", 1, newSViv (y), 0); 871 hv_store (hv, "y", 1, newSViv (y), 0);
789 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 872 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 873 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 } 874 }
792 break; 875 break;
793 876
794 case SDL_MOUSEBUTTONDOWN: 877 case SDL_MOUSEBUTTONDOWN:
795 case SDL_MOUSEBUTTONUP: 878 case SDL_MOUSEBUTTONUP:
796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 879 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797 880
798 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 881 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 882 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 883 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 884 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 889 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 890 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 891 break;
809 } 892 }
810 893
811 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 894 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
812 } 895 }
813} 896}
814 897
815int 898int
816Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 899Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817 POSTCALL: 900 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 901 Mix_HookMusicFinished (music_finished);
819 Mix_ChannelFinished (channel_finished); 902 Mix_ChannelFinished (channel_finished);
903
904void
905Mix_QuerySpec ()
906 PPCODE:
907{
908 int freq, channels;
909 Uint16 format;
910
911 if (Mix_QuerySpec (&freq, &format, &channels))
912 {
913 EXTEND (SP, 3);
914 PUSHs (sv_2mortal (newSViv (freq)));
915 PUSHs (sv_2mortal (newSViv (format)));
916 PUSHs (sv_2mortal (newSViv (channels)));
917 }
918}
820 919
821void 920void
822Mix_CloseAudio () 921Mix_CloseAudio ()
823 922
824int 923int
859 } 958 }
860 } 959 }
861#endif 960#endif
862} 961}
863 962
864void 963int
865add_font (char *file) 964add_font (char *file)
866 CODE: 965 CODE:
867 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 966 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
967 OUTPUT:
968 RETVAL
868 969
869void 970void
870load_image_inline (SV *image_) 971load_image_inline (SV *image_)
871 ALIAS: 972 ALIAS:
872 load_image_file = 1 973 load_image_file = 1
958void 1059void
959error (char *message) 1060error (char *message)
960 CODE: 1061 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1062 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1063#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1064 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1065#endif
965 1066
966void 1067void
967fatal (char *message) 1068fatal (char *message)
968 CODE: 1069 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1070 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1071#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1072 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1073#endif
973 _exit (1); 1074 _exit (1);
974 1075
975void 1076void
976_exit (int retval = 0) 1077_exit (int retval = 0)
988#if DEBUG 1089#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1090 VALGRIND_DO_LEAK_CHECK;
990#endif 1091#endif
991} 1092}
992 1093
993MODULE = CFPlus PACKAGE = CFPlus::Font 1094MODULE = Deliantra::Client PACKAGE = DC::Font
994 1095
995PROTOTYPES: DISABLE 1096PROTOTYPES: DISABLE
996 1097
997CFPlus::Font 1098DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1099new_from_file (SV *class, char *path, int id = 0)
999 CODE: 1100 CODE:
1000{ 1101{
1001 int count; 1102 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1103 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1005} 1106}
1006 OUTPUT: 1107 OUTPUT:
1007 RETVAL 1108 RETVAL
1008 1109
1009void 1110void
1010DESTROY (CFPlus::Font self) 1111DESTROY (DC::Font self)
1011 CODE: 1112 CODE:
1012 pango_font_description_free (self); 1113 pango_font_description_free (self);
1013 1114
1014void 1115void
1015make_default (CFPlus::Font self) 1116make_default (DC::Font self)
1016 PROTOTYPE: $ 1117 PROTOTYPE: $
1017 CODE: 1118 CODE:
1018 default_font = self; 1119 default_font = self;
1019 1120
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1121MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1122
1022PROTOTYPES: DISABLE 1123PROTOTYPES: DISABLE
1023 1124
1024void 1125void
1025reset_glyph_cache () 1126glyph_cache_backup ()
1026 PROTOTYPE: 1127 PROTOTYPE:
1027 CODE: 1128 CODE:
1129 tc_backup ();
1130
1131void
1132glyph_cache_restore ()
1133 PROTOTYPE:
1134 CODE:
1028 tc_clear (); 1135 tc_restore ();
1029 1136
1030CFPlus::Layout 1137DC::Layout
1031new (SV *class) 1138new (SV *class)
1032 CODE: 1139 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1140 New (0, RETVAL, 1, struct cf_layout);
1034 1141
1035 RETVAL->pl = pango_layout_new (opengl_context); 1142 RETVAL->pl = pango_layout_new (opengl_context);
1045 layout_update_font (RETVAL); 1152 layout_update_font (RETVAL);
1046 OUTPUT: 1153 OUTPUT:
1047 RETVAL 1154 RETVAL
1048 1155
1049void 1156void
1050DESTROY (CFPlus::Layout self) 1157DESTROY (DC::Layout self)
1051 CODE: 1158 CODE:
1052 g_object_unref (self->pl); 1159 g_object_unref (self->pl);
1053 rc_free (self->rc); 1160 rc_free (self->rc);
1054 Safefree (self); 1161 Safefree (self);
1055 1162
1056void 1163void
1057set_text (CFPlus::Layout self, SV *text_) 1164set_text (DC::Layout self, SV *text_)
1058 CODE: 1165 CODE:
1059{ 1166{
1060 STRLEN textlen; 1167 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1168 char *text = SvPVutf8 (text_, textlen);
1062 1169
1063 pango_layout_set_text (self->pl, text, textlen); 1170 pango_layout_set_text (self->pl, text, textlen);
1064} 1171}
1065 1172
1066void 1173void
1067set_markup (CFPlus::Layout self, SV *text_) 1174set_markup (DC::Layout self, SV *text_)
1068 CODE: 1175 CODE:
1069{ 1176{
1070 STRLEN textlen; 1177 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1178 char *text = SvPVutf8 (text_, textlen);
1072 1179
1073 pango_layout_set_markup (self->pl, text, textlen); 1180 pango_layout_set_markup (self->pl, text, textlen);
1074} 1181}
1075 1182
1076void 1183void
1077set_shapes (CFPlus::Layout self, ...) 1184set_shapes (DC::Layout self, ...)
1078 CODE: 1185 CODE:
1079{ 1186{
1080 PangoAttrList *attrs = 0; 1187 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1188 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1189 const char *pos = text;
1117 if (attrs) 1224 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1225 pango_layout_set_attributes (self->pl, attrs);
1119} 1226}
1120 1227
1121void 1228void
1122get_shapes (CFPlus::Layout self) 1229get_shapes (DC::Layout self)
1123 PPCODE: 1230 PPCODE:
1124{ 1231{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1232 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1233
1127 do 1234 do
1128 { 1235 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1236 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1237
1131 if (run && shape_attr_p (run)) 1238 if (run && shape_attr_p (run))
1132 { 1239 {
1133 PangoRectangle extents; 1240 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1241 pango_layout_iter_get_run_extents (iter, 0, &extents);
1142 1249
1143 pango_layout_iter_free (iter); 1250 pango_layout_iter_free (iter);
1144} 1251}
1145 1252
1146int 1253int
1147has_wrapped (CFPlus::Layout self) 1254has_wrapped (DC::Layout self)
1148 CODE: 1255 CODE:
1149{ 1256{
1150 int lines = 1; 1257 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1258 const char *text = pango_layout_get_text (self->pl);
1152 1259
1157} 1264}
1158 OUTPUT: 1265 OUTPUT:
1159 RETVAL 1266 RETVAL
1160 1267
1161SV * 1268SV *
1162get_text (CFPlus::Layout self) 1269get_text (DC::Layout self)
1163 CODE: 1270 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1271 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1272 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1273 OUTPUT:
1167 RETVAL 1274 RETVAL
1168 1275
1169void 1276void
1170set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1277set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1171 CODE: 1278 CODE:
1172 self->r = r; 1279 self->r = r;
1173 self->g = g; 1280 self->g = g;
1174 self->b = b; 1281 self->b = b;
1175 self->a = a; 1282 self->a = a;
1176 1283
1177void 1284void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1285set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1286 CODE:
1180 if (self->font != font) 1287 if (self->font != font)
1181 { 1288 {
1182 self->font = font; 1289 self->font = font;
1183 layout_update_font (self); 1290 layout_update_font (self);
1184 } 1291 }
1185 1292
1186void 1293void
1187set_height (CFPlus::Layout self, int base_height) 1294set_height (DC::Layout self, int base_height)
1188 CODE: 1295 CODE:
1189 if (self->base_height != base_height) 1296 if (self->base_height != base_height)
1190 { 1297 {
1191 self->base_height = base_height; 1298 self->base_height = base_height;
1192 layout_update_font (self); 1299 layout_update_font (self);
1193 } 1300 }
1194 1301
1195void 1302void
1196set_width (CFPlus::Layout self, int max_width = -1) 1303set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1304 CODE:
1198 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1305 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1199 1306
1200void 1307void
1201set_indent (CFPlus::Layout self, int indent) 1308set_indent (DC::Layout self, int indent)
1202 CODE: 1309 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1310 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1311
1205void 1312void
1206set_spacing (CFPlus::Layout self, int spacing) 1313set_spacing (DC::Layout self, int spacing)
1207 CODE: 1314 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1315 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1316
1210void 1317void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1318set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1319 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1320 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1321 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1322 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1323 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1324 : PANGO_ELLIPSIZE_NONE
1218 ); 1325 );
1219 1326
1220void 1327void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1328set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1329 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1330 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1331
1225void 1332void
1226size (CFPlus::Layout self) 1333size (DC::Layout self)
1227 PPCODE: 1334 PPCODE:
1228{ 1335{
1229 int w, h; 1336 int w, h;
1230 1337
1231 layout_get_pixel_size (self, &w, &h); 1338 layout_get_pixel_size (self, &w, &h);
1234 PUSHs (sv_2mortal (newSViv (w))); 1341 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1342 PUSHs (sv_2mortal (newSViv (h)));
1236} 1343}
1237 1344
1238int 1345int
1239descent (CFPlus::Layout self) 1346descent (DC::Layout self)
1240 CODE: 1347 CODE:
1241{ 1348{
1242 PangoRectangle rect; 1349 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1350 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1351 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1352 RETVAL = PANGO_DESCENT (rect);
1246} 1353}
1247 OUTPUT: 1354 OUTPUT:
1248 RETVAL 1355 RETVAL
1249 1356
1250int 1357int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1358xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1359 CODE:
1253{ 1360{
1254 int index, trailing; 1361 int index, trailing;
1255 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1362 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1256 RETVAL = index + trailing; 1363 RETVAL = index + trailing;
1257} 1364}
1258 OUTPUT: 1365 OUTPUT:
1259 RETVAL 1366 RETVAL
1260 1367
1261void 1368void
1262cursor_pos (CFPlus::Layout self, int index) 1369cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1370 PPCODE:
1264{ 1371{
1265 PangoRectangle strong_pos; 1372 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1373 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1374
1268 EXTEND (SP, 3); 1375 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1376 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1377 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1378 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1379}
1273 1380
1274void 1381void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1382index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1383 PPCODE:
1277{ 1384{
1278 int line, x; 1385 int line, x;
1279 1386
1280 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1387 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1388#if !PANGO_VERSION_CHECK (1, 17, 3)
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1389 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1390 --line;
1391#endif
1283 EXTEND (SP, 2); 1392 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1393 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1394 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1395}
1287 1396
1288void 1397void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1398line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1399 PPCODE:
1291{ 1400{
1292 PangoLayoutLine *lp; 1401 PangoLayoutLine *lp;
1293 int index, trailing; 1402 int index, trailing;
1294 1403
1295 if (line < 0) 1404 if (line < 0)
1296 XSRETURN_EMPTY; 1405 XSRETURN_EMPTY;
1297 1406
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1407 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1408 XSRETURN_EMPTY; /* do better */
1300 1409
1301 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1410 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1302 1411
1303 EXTEND (SP, 2); 1412 EXTEND (SP, 2);
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1418 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1419 }
1311} 1420}
1312 1421
1313void 1422void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1423render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1424 CODE:
1316 rc_clear (self->rc); 1425 rc_clear (self->rc);
1317 pango_opengl_render_layout_subpixel ( 1426 pango_opengl_render_layout_subpixel (
1318 self->pl, 1427 self->pl,
1319 self->rc, 1428 self->rc,
1324 // we assume that context_change actually clears/frees stuff 1433 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1434 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1435 pango_layout_context_changed (self->pl);
1327 1436
1328void 1437void
1329draw (CFPlus::Layout self) 1438draw (DC::Layout self)
1330 CODE: 1439 CODE:
1331{ 1440{
1332 glEnable (GL_TEXTURE_2D); 1441 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1442 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1443 glEnable (GL_BLEND);
1342 glDisable (GL_ALPHA_TEST); 1451 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1452 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1453 glDisable (GL_TEXTURE_2D);
1345} 1454}
1346 1455
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1456MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1457
1349PROTOTYPES: ENABLE 1458PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1459
1353void 1460void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1461pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1462 CODE:
1356{ 1463{
1433 RETVAL = width > 0; 1540 RETVAL = width > 0;
1434} 1541}
1435 OUTPUT: 1542 OUTPUT:
1436 RETVAL 1543 RETVAL
1437 1544
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1545MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1546
1440PROTOTYPES: DISABLE 1547PROTOTYPES: DISABLE
1441 1548
1442CFPlus::Map 1549DC::Map
1443new (SV *class) 1550new (SV *class)
1444 CODE: 1551 CODE:
1445 New (0, RETVAL, 1, struct map); 1552 New (0, RETVAL, 1, struct map);
1446 RETVAL->x = 0; 1553 RETVAL->x = 0;
1447 RETVAL->y = 0; 1554 RETVAL->y = 0;
1455 RETVAL->row = 0; 1562 RETVAL->row = 0;
1456 OUTPUT: 1563 OUTPUT:
1457 RETVAL 1564 RETVAL
1458 1565
1459void 1566void
1460DESTROY (CFPlus::Map self) 1567DESTROY (DC::Map self)
1461 CODE: 1568 CODE:
1462{ 1569{
1463 map_clear (self); 1570 map_clear (self);
1464 Safefree (self->face2tile); 1571 Safefree (self->face2tile);
1465 Safefree (self->tex); 1572 Safefree (self->tex);
1466 Safefree (self); 1573 Safefree (self);
1467} 1574}
1468 1575
1469void 1576void
1470resize (CFPlus::Map self, int map_width, int map_height) 1577resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1578 CODE:
1472 self->w = map_width; 1579 self->w = map_width;
1473 self->h = map_height; 1580 self->h = map_height;
1474 1581
1475void 1582void
1476clear (CFPlus::Map self) 1583clear (DC::Map self)
1477 CODE: 1584 CODE:
1478 map_clear (self); 1585 map_clear (self);
1479 1586
1480void 1587void
1481set_tileid (CFPlus::Map self, int face, int tile) 1588set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1589 CODE:
1483{ 1590{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1591 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1592 need_texid (self, tile);
1486} 1593}
1487 1594
1488void 1595void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1596set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1597 CODE:
1491{ 1598{
1492 tileid texid; 1599 tileid texid;
1493 maptex *tex; 1600 maptex *tex;
1494 1601
1507 tex->smoothtile = self->face2tile [smooth]; 1614 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1615 tex->smoothlevel = level;
1509} 1616}
1510 1617
1511void 1618void
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) 1619set_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: 1620 CODE:
1514{ 1621{
1515 need_texid (self, texid); 1622 need_texid (self, texid);
1516 1623
1517 { 1624 {
1537 // from transparent color bleeding and ugly wrapping effects. 1644 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1645 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1646}
1540 1647
1541int 1648int
1542ox (CFPlus::Map self) 1649ox (DC::Map self)
1543 ALIAS: 1650 ALIAS:
1544 oy = 1 1651 oy = 1
1545 x = 2 1652 x = 2
1546 y = 3 1653 y = 3
1547 w = 4 1654 w = 4
1558 } 1665 }
1559 OUTPUT: 1666 OUTPUT:
1560 RETVAL 1667 RETVAL
1561 1668
1562void 1669void
1563scroll (CFPlus::Map self, int dx, int dy) 1670scroll (DC::Map self, int dx, int dy)
1564 CODE: 1671 CODE:
1565{ 1672{
1566 if (dx > 0) 1673 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 1674 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 1675 else if (dx < 0)
1584 self->y += MAP_EXTEND_Y; 1691 self->y += MAP_EXTEND_Y;
1585 } 1692 }
1586} 1693}
1587 1694
1588SV * 1695SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 1696map1a_update (DC::Map self, SV *data_, int extmap)
1590 CODE: 1697 CODE:
1591{ 1698{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1699 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 1700 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 1701 mapcell *cell;
1622 uint8_t ext, cmd; 1729 uint8_t ext, cmd;
1623 1730
1624 do 1731 do
1625 { 1732 {
1626 ext = *data++; 1733 ext = *data++;
1627 cmd = ext & 0x3f; 1734 cmd = ext & 0x7f;
1628 1735
1629 if (cmd < 4) 1736 if (cmd < 4)
1630 cell->darkness = 255 - ext * 64 + 1; 1737 cell->darkness = 255 - ext * 64 + 1;
1631 else if (cmd == 5) // health 1738 else if (cmd == 5) // health
1632 { 1739 {
1635 } 1742 }
1636 else if (cmd == 6) // monster width 1743 else if (cmd == 6) // monster width
1637 cell->stat_width = *data++ + 1; 1744 cell->stat_width = *data++ + 1;
1638 else if (cmd == 0x47) 1745 else if (cmd == 0x47)
1639 { 1746 {
1640 if (*data == 4) 1747 if (*data == 1) cell->player = data [1];
1641 ; // decode player count 1748 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1749 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1750 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1642 1751
1643 data += *data + 1; 1752 data += *data + 1;
1644 } 1753 }
1645 else if (cmd == 8) // cell flags 1754 else if (cmd == 8) // cell flags
1646 cell->flags = *data++; 1755 cell->flags = *data++;
1676 } 1785 }
1677 } 1786 }
1678 } 1787 }
1679 } 1788 }
1680 else 1789 else
1681 cell->darkness = 0; 1790 CELL_CLEAR (cell);
1682 } 1791 }
1683} 1792}
1684 OUTPUT: 1793 OUTPUT:
1685 RETVAL 1794 RETVAL
1686 1795
1687SV * 1796SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1797mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 1798 CODE:
1690{ 1799{
1691 int x1, x; 1800 int x1, x;
1692 int y1, y; 1801 int y1, y;
1693 int z; 1802 int z;
1738} 1847}
1739 OUTPUT: 1848 OUTPUT:
1740 RETVAL 1849 RETVAL
1741 1850
1742void 1851void
1743draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1852draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1744 CODE: 1853 CODE:
1745{ 1854{
1746 int x, y, z; 1855 int x, y, z;
1747 1856
1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1857 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1858 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) 1859 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751 smooth_key skey; 1860 smooth_key skey;
1752 1861 int pl_x, pl_y;
1862 maptex pl_tex;
1753 rc_t *rc = rc_alloc (); 1863 rc_t *rc = rc_alloc ();
1754 rc_key_t key; 1864 rc_key_t key;
1755 rc_array_t *arr; 1865 rc_array_t *arr;
1866
1867 pl_tex.name = 0;
1756 1868
1757 // thats current max. sorry. 1869 // thats current max. sorry.
1758 if (sw > 255) sw = 255; 1870 if (sw > 255) sw = 255;
1759 if (sh > 255) sh = 255; 1871 if (sh > 255) sh = 255;
1760 1872
1815 tileid tile = cell->tile [z]; 1927 tileid tile = cell->tile [z];
1816 1928
1817 if (tile) 1929 if (tile)
1818 { 1930 {
1819 maptex tex = self->tex [tile]; 1931 maptex tex = self->tex [tile];
1820 int px, py; 1932 int px = (x + 1) * T - tex.w;
1933 int py = (y + 1) * T - tex.h;
1821 1934
1822 if (key.texname != tex.name) 1935 if (key.texname != tex.name)
1823 { 1936 {
1824 if (!tex.name) 1937 if (!tex.name)
1825 tex = self->tex [2]; /* missing, replace by noface */ 1938 tex = self->tex [2]; /* missing, replace by noface */
1826 1939
1827 key.texname = tex.name; 1940 key.texname = tex.name;
1828 arr = rc_array (rc, &key); 1941 arr = rc_array (rc, &key);
1829 } 1942 }
1830 1943
1831 px = (x + 1) * T - tex.w; 1944 if (expect_false (cell->player == player) && expect_false (z == 2))
1832 py = (y + 1) * T - tex.h; 1945 {
1946 pl_x = px;
1947 pl_y = py;
1948 pl_tex = tex;
1949 continue;
1950 }
1833 1951
1834 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1952 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1835 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1953 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); 1954 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); 1955 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1838 1956
1839 if (cell->flags && z == 2) 1957 if (expect_false (cell->flags) && expect_false (z == 2))
1840 { 1958 {
1841 // overlays such as the speech bubble, probably more to come 1959 // overlays such as the speech bubble, probably more to come
1842 if (cell->flags & 1) 1960 if (cell->flags & 1)
1843 { 1961 {
1844 maptex tex = self->tex [1]; 1962 maptex tex = self->tex [1];
1983 } 2101 }
1984 2102
1985 hv_clear (smooth); 2103 hv_clear (smooth);
1986 } 2104 }
1987 2105
2106 if (pl_tex.name)
2107 {
2108 maptex tex = pl_tex;
2109 int px = pl_x + sdx;
2110 int py = pl_y + sdy;
2111
2112 key.texname = tex.name;
2113 arr = rc_array (rc, &key);
2114
2115 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2116 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2117 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2118 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2119
2120 rc_draw (rc);
2121 }
2122
1988 glDisable (GL_BLEND); 2123 glDisable (GL_BLEND);
1989 rc_free (rc); 2124 rc_free (rc);
1990 2125
1991 // top layer: overlays such as the health bar 2126 // top layer: overlays such as the health bar
1992 for (y = 0; y < sh; y++) 2127 for (y = 0; y < sh; y++)
2019 } 2154 }
2020 } 2155 }
2021} 2156}
2022 2157
2023void 2158void
2024draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2159draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2025 CODE: 2160 CODE:
2026{ 2161{
2027 static float color[16][3] = { 2162 static float color[16][3] = {
2028 { 0.00F, 0.00F, 0.00F }, 2163 { 0.00F, 0.00F, 0.00F },
2029 { 1.00F, 1.00F, 1.00F }, 2164 { 1.00F, 1.00F, 1.00F },
2079 glDisable (GL_BLEND); 2214 glDisable (GL_BLEND);
2080 glDisable (GL_TEXTURE_2D); 2215 glDisable (GL_TEXTURE_2D);
2081} 2216}
2082 2217
2083void 2218void
2084fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2219fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2085 PPCODE: 2220 PPCODE:
2086{ 2221{
2087 int x, y; 2222 int x, y;
2088 int sw1 = sw + 2; 2223 int sw1 = sw + 2;
2089 int sh1 = sh + 2; 2224 int sh1 = sh + 2;
2160 PUSHs (sv_2mortal (newSViv (sh3))); 2295 PUSHs (sv_2mortal (newSViv (sh3)));
2161 PUSHs (darkness3_sv); 2296 PUSHs (darkness3_sv);
2162} 2297}
2163 2298
2164SV * 2299SV *
2165get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2300get_rect (DC::Map self, int x0, int y0, int w, int h)
2166 CODE: 2301 CODE:
2167{ 2302{
2168 int x, y, x1, y1; 2303 int x, y, x1, y1;
2169 SV *data_sv = newSV (w * h * 7 + 5); 2304 SV *data_sv = newSV (w * h * 7 + 5);
2170 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2305 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2227 else 2362 else
2228 *data++ = 0; 2363 *data++ = 0;
2229 } 2364 }
2230 } 2365 }
2231 2366
2367 /* if size is w*h + 5 then no data has been found */
2368 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2369 {
2232 SvPOK_only (data_sv); 2370 SvPOK_only (data_sv);
2233 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2371 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2372 }
2373
2234 RETVAL = data_sv; 2374 RETVAL = data_sv;
2235} 2375}
2236 OUTPUT: 2376 OUTPUT:
2237 RETVAL 2377 RETVAL
2238 2378
2239void 2379void
2240set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2380set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2241 PPCODE: 2381 PPCODE:
2242{ 2382{
2243 int x, y, z; 2383 int x, y, z;
2244 int w, h; 2384 int w, h;
2245 int x1, y1; 2385 int x1, y1;
2386 STRLEN len;
2387 uint8_t *data, *end;
2388
2389 len = SvLEN (data_sv);
2390 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2391 data = SvPVbyte_nolen (data_sv);
2392 end = data + len + 8;
2393
2394 if (len < 5)
2395 XSRETURN_EMPTY;
2246 2396
2247 if (*data++ != 0) 2397 if (*data++ != 0)
2248 XSRETURN_EMPTY; /* version mismatch */ 2398 XSRETURN_EMPTY; /* version mismatch */
2249 2399
2250 w = *data++ << 8; w |= *data++; 2400 w = *data++ << 8; w |= *data++;
2265 { 2415 {
2266 maprow *row = map_get_row (self, y); 2416 maprow *row = map_get_row (self, y);
2267 2417
2268 for (x = x0; x < x1; x++) 2418 for (x = x0; x < x1; x++)
2269 { 2419 {
2420 uint8_t flags;
2421
2422 if (data + 7 >= end)
2423 XSRETURN_EMPTY;
2424
2270 uint8_t flags = *data++; 2425 flags = *data++;
2271 2426
2272 if (flags) 2427 if (flags)
2273 { 2428 {
2274 mapcell *cell = row_get_cell (row, x); 2429 mapcell *cell = row_get_cell (row, x);
2275 tileid tile[3] = { 0, 0, 0 }; 2430 tileid tile[3] = { 0, 0, 0 };
2278 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2433 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2279 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2434 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2280 2435
2281 if (cell->darkness == 0) 2436 if (cell->darkness == 0)
2282 { 2437 {
2283 cell->darkness = 0; 2438 /*cell->darkness = 0;*/
2439 EXTEND (SP, 3);
2284 2440
2285 for (z = 0; z <= 2; z++) 2441 for (z = 0; z <= 2; z++)
2286 { 2442 {
2287 tileid t = tile [z]; 2443 tileid t = tile [z];
2288 2444
2289 if (t >= self->texs || (t && !self->tex [t].name)) 2445 if (t >= self->texs || (t && !self->tex [t].name))
2290 { 2446 {
2291 XPUSHs (sv_2mortal (newSViv (t))); 2447 PUSHs (sv_2mortal (newSViv (t)));
2292 need_texid (self, t); 2448 need_texid (self, t);
2293 } 2449 }
2294 2450
2295 cell->tile [z] = t; 2451 cell->tile [z] = t;
2296 } 2452 }
2298 } 2454 }
2299 } 2455 }
2300 } 2456 }
2301} 2457}
2302 2458
2303MODULE = CFPlus PACKAGE = CFPlus::RW 2459MODULE = Deliantra::Client PACKAGE = DC::RW
2304 2460
2305CFPlus::RW 2461DC::RW
2306new (SV *class, SV *data_sv) 2462new (SV *class, SV *data_sv)
2307 CODE: 2463 CODE:
2308{ 2464{
2309 STRLEN datalen; 2465 STRLEN datalen;
2310 char *data = SvPVbyte (data_sv, datalen); 2466 char *data = SvPVbyte (data_sv, datalen);
2312 RETVAL = SDL_RWFromConstMem (data, datalen); 2468 RETVAL = SDL_RWFromConstMem (data, datalen);
2313} 2469}
2314 OUTPUT: 2470 OUTPUT:
2315 RETVAL 2471 RETVAL
2316 2472
2317CFPlus::RW 2473DC::RW
2318new_from_file (SV *class, const char *path, const char *mode = "rb") 2474new_from_file (SV *class, const char *path, const char *mode = "rb")
2319 CODE: 2475 CODE:
2320 RETVAL = SDL_RWFromFile (path, mode); 2476 RETVAL = SDL_RWFromFile (path, mode);
2321 OUTPUT: 2477 OUTPUT:
2322 RETVAL 2478 RETVAL
2323 2479
2324# fails on win32: 2480# fails on win32:
2325# CFPlus.xs(2268) : error C2059: syntax error : '(' 2481# dc.xs(2268) : error C2059: syntax error : '('
2326#void 2482#void
2327#close (CFPlus::RW self) 2483#close (DC::RW self)
2328# CODE: 2484# CODE:
2329# (self->(close)) (self); 2485# (self->(close)) (self);
2330 2486
2331MODULE = CFPlus PACKAGE = CFPlus::Channel 2487MODULE = Deliantra::Client PACKAGE = DC::Channel
2332 2488
2333PROTOTYPES: DISABLE 2489PROTOTYPES: DISABLE
2334 2490
2335CFPlus::Channel 2491DC::Channel
2336find () 2492find ()
2337 CODE: 2493 CODE:
2338{ 2494{
2339 RETVAL = Mix_GroupAvailable (-1); 2495 RETVAL = Mix_GroupAvailable (-1);
2340 2496
2353} 2509}
2354 OUTPUT: 2510 OUTPUT:
2355 RETVAL 2511 RETVAL
2356 2512
2357void 2513void
2358halt (CFPlus::Channel self) 2514halt (DC::Channel self)
2359 CODE: 2515 CODE:
2360 Mix_HaltChannel (self); 2516 Mix_HaltChannel (self);
2361 2517
2362void 2518void
2363expire (CFPlus::Channel self, int ticks = -1) 2519expire (DC::Channel self, int ticks = -1)
2364 CODE: 2520 CODE:
2365 Mix_ExpireChannel (self, ticks); 2521 Mix_ExpireChannel (self, ticks);
2366 2522
2367void 2523void
2368fade_out (CFPlus::Channel self, int ticks = -1) 2524fade_out (DC::Channel self, int ticks = -1)
2369 CODE: 2525 CODE:
2370 Mix_FadeOutChannel (self, ticks); 2526 Mix_FadeOutChannel (self, ticks);
2371 2527
2372int 2528int
2373volume (CFPlus::Channel self, int volume) 2529volume (DC::Channel self, int volume)
2374 CODE: 2530 CODE:
2375 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2531 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2376 OUTPUT: 2532 OUTPUT:
2377 RETVAL 2533 RETVAL
2378 2534
2379void 2535void
2380unregister_all_effects (CFPlus::Channel self) 2536unregister_all_effects (DC::Channel self)
2381 CODE: 2537 CODE:
2382 Mix_UnregisterAllEffects (self); 2538 Mix_UnregisterAllEffects (self);
2383 2539
2384void 2540void
2385set_panning (CFPlus::Channel self, int left, int right) 2541set_panning (DC::Channel self, int left, int right)
2386 CODE: 2542 CODE:
2387 left = CLAMP (left , 0, 255); 2543 left = CLAMP (left , 0, 255);
2388 right = CLAMP (right, 0, 255); 2544 right = CLAMP (right, 0, 255);
2389 Mix_SetPanning (self, left, right); 2545 Mix_SetPanning (self, left, right);
2390 2546
2391void 2547void
2392set_distance (CFPlus::Channel self, int distance) 2548set_distance (DC::Channel self, int distance)
2393 CODE: 2549 CODE:
2394 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2550 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2395 2551
2396void 2552void
2397set_position (CFPlus::Channel self, int angle, int distance) 2553set_position (DC::Channel self, int angle, int distance)
2398 CODE: 2554 CODE:
2399 2555
2400void 2556void
2401set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2557set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2402 CODE: 2558 CODE:
2403{ 2559{
2404 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2560 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); 2561 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2406 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2562 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2407} 2563}
2408 2564
2409void 2565void
2410set_reverse_stereo (CFPlus::Channel self, int flip) 2566set_reverse_stereo (DC::Channel self, int flip)
2411 CODE: 2567 CODE:
2412 Mix_SetReverseStereo (self, flip); 2568 Mix_SetReverseStereo (self, flip);
2413 2569
2414MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2570MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2415 2571
2416PROTOTYPES: DISABLE 2572PROTOTYPES: DISABLE
2417 2573
2418CFPlus::MixChunk 2574DC::MixChunk
2419new (SV *class, CFPlus::RW rwops) 2575new (SV *class, DC::RW rwops)
2420 CODE: 2576 CODE:
2421 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2577 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2422 OUTPUT: 2578 OUTPUT:
2423 RETVAL 2579 RETVAL
2424 2580
2425void 2581void
2426DESTROY (CFPlus::MixChunk self) 2582DESTROY (DC::MixChunk self)
2427 CODE: 2583 CODE:
2428 Mix_FreeChunk (self); 2584 Mix_FreeChunk (self);
2429 2585
2430int 2586int
2431volume (CFPlus::MixChunk self, int volume = -1) 2587volume (DC::MixChunk self, int volume = -1)
2432 CODE: 2588 CODE:
2433 if (items > 1) 2589 if (items > 1)
2434 volume = CLAMP (volume, 0, 128); 2590 volume = CLAMP (volume, 0, 128);
2435 RETVAL = Mix_VolumeChunk (self, volume); 2591 RETVAL = Mix_VolumeChunk (self, volume);
2436 OUTPUT: 2592 OUTPUT:
2437 RETVAL 2593 RETVAL
2438 2594
2439CFPlus::Channel 2595DC::Channel
2440play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2596play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2441 CODE: 2597 CODE:
2442{ 2598{
2443 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2599 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2444 2600
2445 if (RETVAL < 0) 2601 if (RETVAL < 0)
2452 } 2608 }
2453} 2609}
2454 OUTPUT: 2610 OUTPUT:
2455 RETVAL 2611 RETVAL
2456 2612
2457MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2613MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2458 2614
2459int 2615int
2460volume (int volume = -1) 2616volume (int volume = -1)
2461 PROTOTYPE: ;$ 2617 PROTOTYPE: ;$
2462 CODE: 2618 CODE:
2474void 2630void
2475halt () 2631halt ()
2476 CODE: 2632 CODE:
2477 Mix_HaltMusic (); 2633 Mix_HaltMusic ();
2478 2634
2479CFPlus::MixMusic 2635DC::MixMusic
2480new (SV *class, CFPlus::RW rwops) 2636new (SV *class, DC::RW rwops)
2481 CODE: 2637 CODE:
2482 RETVAL = Mix_LoadMUS_RW (rwops); 2638 RETVAL = Mix_LoadMUS_RW (rwops);
2483 OUTPUT: 2639 OUTPUT:
2484 RETVAL 2640 RETVAL
2485 2641
2486void 2642void
2487DESTROY (CFPlus::MixMusic self) 2643DESTROY (DC::MixMusic self)
2488 CODE: 2644 CODE:
2489 Mix_FreeMusic (self); 2645 Mix_FreeMusic (self);
2490 2646
2491int 2647int
2492play (CFPlus::MixMusic self, int loops = -1) 2648play (DC::MixMusic self, int loops = -1)
2493 CODE: 2649 CODE:
2494 RETVAL = Mix_PlayMusic (self, loops); 2650 RETVAL = Mix_PlayMusic (self, loops);
2495 OUTPUT: 2651 OUTPUT:
2496 RETVAL 2652 RETVAL
2497 2653
2498void 2654void
2499fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2655fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2500 CODE: 2656 CODE:
2501 Mix_FadeInMusicPos (self, loops, ms, position); 2657 Mix_FadeInMusicPos (self, loops, ms, position);
2502 2658
2503MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2659MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2504 2660
2505PROTOTYPES: ENABLE 2661PROTOTYPES: ENABLE
2506 2662
2507BOOT: 2663BOOT:
2508{ 2664{
2509 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2665 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2510 static const struct { 2666 static const struct {
2511 const char *name; 2667 const char *name;
2512 IV iv; 2668 IV iv;
2513 } *civ, const_iv[] = { 2669 } *civ, const_iv[] = {
2514# define const_iv(name) { # name, (IV)name } 2670# define const_iv(name) { # name, (IV)name }
2603 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2759 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2604 const_iv (GL_POINT_SMOOTH_HINT), 2760 const_iv (GL_POINT_SMOOTH_HINT),
2605 const_iv (GL_LINE_SMOOTH_HINT), 2761 const_iv (GL_LINE_SMOOTH_HINT),
2606 const_iv (GL_POLYGON_SMOOTH_HINT), 2762 const_iv (GL_POLYGON_SMOOTH_HINT),
2607 const_iv (GL_GENERATE_MIPMAP_HINT), 2763 const_iv (GL_GENERATE_MIPMAP_HINT),
2764 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2608 const_iv (GL_FASTEST), 2765 const_iv (GL_FASTEST),
2609 const_iv (GL_DONT_CARE), 2766 const_iv (GL_DONT_CARE),
2610 const_iv (GL_NICEST), 2767 const_iv (GL_NICEST),
2611 const_iv (GL_V2F), 2768 const_iv (GL_V2F),
2612 const_iv (GL_V3F), 2769 const_iv (GL_V3F),
2756 2913
2757void glRect (float x1, float y1, float x2, float y2) 2914void glRect (float x1, float y1, float x2, float y2)
2758 CODE: 2915 CODE:
2759 glRectf (x1, y1, x2, y2); 2916 glRectf (x1, y1, x2, y2);
2760 2917
2918void glRect_lineloop (float x1, float y1, float x2, float y2)
2919 CODE:
2920 glBegin (GL_LINE_LOOP);
2921 glVertex2f (x1, y1);
2922 glVertex2f (x2, y1);
2923 glVertex2f (x2, y2);
2924 glVertex2f (x1, y2);
2925 glEnd ();
2926
2761PROTOTYPES: ENABLE 2927PROTOTYPES: ENABLE
2762 2928
2763void glBegin (int mode) 2929void glBegin (int mode)
2764 2930
2765void glEnd () 2931void glEnd ()
2797void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2963void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2798 CODE: 2964 CODE:
2799 if (gl.SeparableFilter2D) 2965 if (gl.SeparableFilter2D)
2800 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2966 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2801 2967
2802void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2968void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2803 2969
2804void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2970void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2805 2971
2806void glDrawPixels (int width, int height, int format, int type, char *pixels) 2972void glDrawPixels (int width, int height, int format, int type, char *pixels)
2807 2973
2833 2999
2834void glEndList () 3000void glEndList ()
2835 3001
2836void glCallList (int list) 3002void glCallList (int list)
2837 3003
2838MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3004MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2839 3005
2840PROTOTYPES: DISABLE 3006PROTOTYPES: DISABLE
2841 3007
2842void 3008void
2843find_widget (SV *self, NV x, NV y) 3009find_widget (SV *self, NV x, NV y)
2847 XPUSHs (self); 3013 XPUSHs (self);
2848} 3014}
2849 3015
2850BOOT: 3016BOOT:
2851{ 3017{
2852 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3018 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2853 3019
2854 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3020 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2855 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3021 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2856 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3022 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2857 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3023 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2858} 3024}
2859 3025
2860void 3026void
2861draw (SV *self) 3027draw (SV *self)
2862 CODE: 3028 CODE:
2869 SV *draw_w_sv = GvSV (draw_w_gv); 3035 SV *draw_w_sv = GvSV (draw_w_gv);
2870 SV *draw_h_sv = GvSV (draw_h_gv); 3036 SV *draw_h_sv = GvSV (draw_h_gv);
2871 double draw_x, draw_y; 3037 double draw_x, draw_y;
2872 3038
2873 if (!SvROK (self)) 3039 if (!SvROK (self))
2874 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3040 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2875 3041
2876 hv = (HV *)SvRV (self); 3042 hv = (HV *)SvRV (self);
2877 3043
2878 if (SvTYPE (hv) != SVt_PVHV) 3044 if (SvTYPE (hv) != SVt_PVHV)
2879 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3045 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2880 3046
2881 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3047 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2882 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3048 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2883 3049
2884 if (!h || !w) 3050 if (!h || !w)
2917 glEnd (); 3083 glEnd ();
2918 glDisable (GL_BLEND); 3084 glDisable (GL_BLEND);
2919 } 3085 }
2920 } 3086 }
2921#if 0 3087#if 0
2922 if ($ENV{CFPLUS_DEBUG} & 1) { 3088 // draw borders, for debugging
2923 glPushMatrix; 3089 glPushMatrix ();
2924 glColor 1, 1, 0, 1; 3090 glColor4f (1., 1., 0., 1.);
2925 glTranslate 0.375, 0.375; 3091 glTranslatef (.5, .5, 0.);
2926 glBegin GL_LINE_LOOP; 3092 glBegin (GL_LINE_LOOP);
2927 glVertex 0 , 0; 3093 glVertex2f (0 , 0);
2928 glVertex $self->{w} - 1, 0; 3094 glVertex2f (w - 1, 0);
2929 glVertex $self->{w} - 1, $self->{h} - 1; 3095 glVertex2f (w - 1, h - 1);
2930 glVertex 0 , $self->{h} - 1; 3096 glVertex2f (0 , h - 1);
2931 glEnd; 3097 glEnd ();
2932 glPopMatrix; 3098 glPopMatrix ();
2933 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2934 }
2935#endif 3099#endif
2936 PUSHMARK (SP); 3100 PUSHMARK (SP);
2937 XPUSHs (self); 3101 XPUSHs (self);
2938 PUTBACK; 3102 PUTBACK;
2939 call_method ("_draw", G_VOID | G_DISCARD); 3103 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines