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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines