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.225 by root, Sat Aug 11 12:07:54 2007 UTC vs.
Revision 1.264 by root, Fri Jul 18 22:32:54 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);
203 220
204typedef uint16_t tileid; 221typedef uint16_t tileid;
205typedef uint16_t faceid; 222typedef uint16_t faceid;
206 223
207typedef struct { 224typedef struct {
208 int name; 225 GLuint name;
209 int w, h; 226 int w, h;
210 float s, t; 227 float s, t;
211 uint8_t r, g, b, a; 228 uint8_t r, g, b, a;
212 tileid smoothtile; 229 tileid smoothtile;
213 uint8_t smoothlevel; 230 uint8_t smoothlevel;
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);
351 self->row = 0; 368 self->row = 0;
352 self->rows = 0; 369 self->rows = 0;
353} 370}
354 371
355static void 372static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 373map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 374{
358 int x, y; 375 int x, y;
359 maprow *row; 376 maprow *row;
360 mapcell *cell; 377 mapcell *cell;
361 378
440 n |= n >> 16; 457 n |= n >> 16;
441 458
442 return n + 1; 459 return n + 1;
443} 460}
444 461
462static unsigned int
463popcount (unsigned int n)
464{
465 n -= (n >> 1) & 0x55555555U;
466 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
467 n = ((n >> 4) + n) & 0x0f0f0f0fU;
468 n *= 0x01010101U;
469
470 return n >> 24;
471}
472
445/* SDL should provide this, really. */ 473/* SDL should provide this, really. */
446#define SDLK_MODIFIER_MIN 300 474#define SDLK_MODIFIER_MIN 300
447#define SDLK_MODIFIER_MAX 314 475#define SDLK_MODIFIER_MAX 314
448 476
449/******************************************************************************/ 477/******************************************************************************/
487 return 0; 515 return 0;
488 516
489 return 1; 517 return 1;
490} 518}
491 519
492MODULE = CFPlus PACKAGE = CFPlus 520MODULE = Deliantra::Client PACKAGE = DC
493 521
494PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
495 523
496BOOT: 524BOOT:
497{ 525{
498 HV *stash = gv_stashpv ("CFPlus", 1); 526 HV *stash = gv_stashpv ("DC", 1);
499 static const struct { 527 static const struct {
500 const char *name; 528 const char *name;
501 IV iv; 529 IV iv;
502 } *civ, const_iv[] = { 530 } *civ, const_iv[] = {
503# define const_iv(name) { # name, (IV)name } 531# define const_iv(name) { # name, (IV)name }
525 553
526 const_iv (SDL_APPINPUTFOCUS), 554 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS), 555 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE), 556 const_iv (SDL_APPACTIVE),
529 557
558 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST),
530 const_iv (SDLK_KP0), 560 const_iv (SDLK_KP0),
531 const_iv (SDLK_KP1), 561 const_iv (SDLK_KP1),
532 const_iv (SDLK_KP2), 562 const_iv (SDLK_KP2),
533 const_iv (SDLK_KP3), 563 const_iv (SDLK_KP3),
534 const_iv (SDLK_KP4), 564 const_iv (SDLK_KP4),
606 const_iv (KMOD_LMETA), 636 const_iv (KMOD_LMETA),
607 const_iv (KMOD_RMETA), 637 const_iv (KMOD_RMETA),
608 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
609 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
610 const_iv (KMOD_MODE), 640 const_iv (KMOD_MODE),
641
642 const_iv (MIX_DEFAULT_FORMAT),
643
644 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO),
647 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD),
652
653 const_iv (SDL_GL_RED_SIZE),
654 const_iv (SDL_GL_GREEN_SIZE),
655 const_iv (SDL_GL_BLUE_SIZE),
656 const_iv (SDL_GL_ALPHA_SIZE),
657 const_iv (SDL_GL_DOUBLEBUFFER),
658 const_iv (SDL_GL_BUFFER_SIZE),
659 const_iv (SDL_GL_DEPTH_SIZE),
660 const_iv (SDL_GL_STENCIL_SIZE),
661 const_iv (SDL_GL_ACCUM_RED_SIZE),
662 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
663 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL)
611# undef const_iv 670# undef const_iv
612 }; 671 };
613 672
614 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
633 692
634NV floor (NV x) 693NV floor (NV x)
635 694
636NV ceil (NV x) 695NV ceil (NV x)
637 696
697IV minpot (UV n)
698
699IV popcount (UV n)
700
638void 701void
639pango_init () 702pango_init ()
640 CODE: 703 CODE:
641{ 704{
642 opengl_fontmap = pango_opengl_font_map_new (); 705 opengl_fontmap = pango_opengl_font_map_new ();
643 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 706 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); 707 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
708 /*pango_context_set_font_description (opengl_context, default_font);*/
709#if PANGO_VERSION_CHECK (1, 15, 2)
710 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
711 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
712#endif
645} 713}
646 714
647char *
648SDL_GetError () 715char *SDL_GetError ()
649 716
650int 717int SDL_Init (U32 flags)
651SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
652 718
653void 719int SDL_InitSubSystem (U32 flags)
720
721void SDL_QuitSubSystem (U32 flags)
722
654SDL_Quit () 723void SDL_Quit ()
724
725int SDL_GL_SetAttribute (int attr, int value)
726
727int SDL_GL_GetAttribute (int attr)
728 CODE:
729 if (SDL_GL_GetAttribute (attr, &RETVAL))
730 XSRETURN_UNDEF;
731 OUTPUT:
732 RETVAL
655 733
656void 734void
657SDL_ListModes (int rgb, int alpha) 735SDL_ListModes (int rgb, int alpha)
658 PPCODE: 736 PPCODE:
659{ 737{
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 749 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 750 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 751 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674 752
675 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 753 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); 754 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679#endif
680 755
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 757
683 if (m && m != (SDL_Rect **)-1) 758 if (m && m != (SDL_Rect **)-1)
684 while (*m) 759 while (*m)
685 { 760 {
686 if ((*m)->w >= 640 && (*m)->h >= 480)
687 {
688 AV *av = newAV (); 761 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 762 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 763 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 764 av_push (av, newSViv (rgb));
692 av_push (av, newSViv (alpha)); 765 av_push (av, newSViv (alpha));
693 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 766 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
694 }
695 767
696 ++m; 768 ++m;
697 } 769 }
698} 770}
699 771
715 787
716 if (RETVAL) 788 if (RETVAL)
717 { 789 {
718 av_clear (texture_av); 790 av_clear (texture_av);
719 791
720 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 792 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 793#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
722#include "glfunc.h" 794#include "glfunc.h"
723#undef GL_FUNC 795#undef GL_FUNC
724 } 796 }
725} 797}
732char * 804char *
733SDL_GetKeyName (int sym) 805SDL_GetKeyName (int sym)
734 806
735int 807int
736SDL_GetAppState () 808SDL_GetAppState ()
809
810int
811SDL_GetModState ()
737 812
738void 813void
739poll_events () 814poll_events ()
740 PPCODE: 815 PPCODE:
741{ 816{
751 { 826 {
752 case SDL_KEYDOWN: 827 case SDL_KEYDOWN:
753 case SDL_KEYUP: 828 case SDL_KEYUP:
754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 829 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 830 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 831 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 */ 832 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); 833 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759 break; 834 break;
760 835
761 case SDL_ACTIVEEVENT: 836 case SDL_ACTIVEEVENT:
762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 837 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
780 x = ev.motion.x; 855 x = ev.motion.x;
781 y = ev.motion.y; 856 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 857 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 } 858 }
784 859
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 860 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 hv_store (hv, "state", 5, newSViv (state), 0); 861 hv_store (hv, "state", 5, newSViv (state), 0);
787 hv_store (hv, "x", 1, newSViv (x), 0); 862 hv_store (hv, "x", 1, newSViv (x), 0);
788 hv_store (hv, "y", 1, newSViv (y), 0); 863 hv_store (hv, "y", 1, newSViv (y), 0);
789 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 864 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 865 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 } 866 }
792 break; 867 break;
793 868
794 case SDL_MOUSEBUTTONDOWN: 869 case SDL_MOUSEBUTTONDOWN:
795 case SDL_MOUSEBUTTONUP: 870 case SDL_MOUSEBUTTONUP:
796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 871 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797 872
798 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 873 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 874 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 875 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 876 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 881 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 882 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 883 break;
809 } 884 }
810 885
811 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 886 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
812 } 887 }
813} 888}
814 889
815int 890int
816Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 891Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817 POSTCALL: 892 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 893 Mix_HookMusicFinished (music_finished);
819 Mix_ChannelFinished (channel_finished); 894 Mix_ChannelFinished (channel_finished);
895
896void
897Mix_QuerySpec ()
898 PPCODE:
899{
900 int freq, channels;
901 Uint16 format;
902
903 if (Mix_QuerySpec (&freq, &format, &channels))
904 {
905 EXTEND (SP, 3);
906 PUSHs (sv_2mortal (newSViv (freq)));
907 PUSHs (sv_2mortal (newSViv (format)));
908 PUSHs (sv_2mortal (newSViv (channels)));
909 }
910}
820 911
821void 912void
822Mix_CloseAudio () 913Mix_CloseAudio ()
823 914
824int 915int
859 } 950 }
860 } 951 }
861#endif 952#endif
862} 953}
863 954
864void 955int
865add_font (char *file) 956add_font (char *file)
866 CODE: 957 CODE:
867 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 958 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
959 OUTPUT:
960 RETVAL
868 961
869void 962void
870load_image_inline (SV *image_) 963load_image_inline (SV *image_)
871 ALIAS: 964 ALIAS:
872 load_image_file = 1 965 load_image_file = 1
958void 1051void
959error (char *message) 1052error (char *message)
960 CODE: 1053 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1054 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1055#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1056 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1057#endif
965 1058
966void 1059void
967fatal (char *message) 1060fatal (char *message)
968 CODE: 1061 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1062 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1063#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1064 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1065#endif
973 _exit (1); 1066 _exit (1);
974 1067
975void 1068void
976_exit (int retval = 0) 1069_exit (int retval = 0)
988#if DEBUG 1081#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1082 VALGRIND_DO_LEAK_CHECK;
990#endif 1083#endif
991} 1084}
992 1085
993MODULE = CFPlus PACKAGE = CFPlus::Font 1086MODULE = Deliantra::Client PACKAGE = DC::Font
994 1087
995PROTOTYPES: DISABLE 1088PROTOTYPES: DISABLE
996 1089
997CFPlus::Font 1090DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1091new_from_file (SV *class, char *path, int id = 0)
999 CODE: 1092 CODE:
1000{ 1093{
1001 int count; 1094 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1095 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1005} 1098}
1006 OUTPUT: 1099 OUTPUT:
1007 RETVAL 1100 RETVAL
1008 1101
1009void 1102void
1010DESTROY (CFPlus::Font self) 1103DESTROY (DC::Font self)
1011 CODE: 1104 CODE:
1012 pango_font_description_free (self); 1105 pango_font_description_free (self);
1013 1106
1014void 1107void
1015make_default (CFPlus::Font self) 1108make_default (DC::Font self)
1016 PROTOTYPE: $ 1109 PROTOTYPE: $
1017 CODE: 1110 CODE:
1018 default_font = self; 1111 default_font = self;
1019 1112
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1113MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1114
1022PROTOTYPES: DISABLE 1115PROTOTYPES: DISABLE
1023 1116
1024void 1117void
1025reset_glyph_cache () 1118glyph_cache_backup ()
1026 PROTOTYPE: 1119 PROTOTYPE:
1027 CODE: 1120 CODE:
1121 tc_backup ();
1122
1123void
1124glyph_cache_restore ()
1125 PROTOTYPE:
1126 CODE:
1028 tc_clear (); 1127 tc_restore ();
1029 1128
1030CFPlus::Layout 1129DC::Layout
1031new (SV *class) 1130new (SV *class)
1032 CODE: 1131 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1132 New (0, RETVAL, 1, struct cf_layout);
1034 1133
1035 RETVAL->pl = pango_layout_new (opengl_context); 1134 RETVAL->pl = pango_layout_new (opengl_context);
1045 layout_update_font (RETVAL); 1144 layout_update_font (RETVAL);
1046 OUTPUT: 1145 OUTPUT:
1047 RETVAL 1146 RETVAL
1048 1147
1049void 1148void
1050DESTROY (CFPlus::Layout self) 1149DESTROY (DC::Layout self)
1051 CODE: 1150 CODE:
1052 g_object_unref (self->pl); 1151 g_object_unref (self->pl);
1053 rc_free (self->rc); 1152 rc_free (self->rc);
1054 Safefree (self); 1153 Safefree (self);
1055 1154
1056void 1155void
1057set_text (CFPlus::Layout self, SV *text_) 1156set_text (DC::Layout self, SV *text_)
1058 CODE: 1157 CODE:
1059{ 1158{
1060 STRLEN textlen; 1159 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1160 char *text = SvPVutf8 (text_, textlen);
1062 1161
1063 pango_layout_set_text (self->pl, text, textlen); 1162 pango_layout_set_text (self->pl, text, textlen);
1064} 1163}
1065 1164
1066void 1165void
1067set_markup (CFPlus::Layout self, SV *text_) 1166set_markup (DC::Layout self, SV *text_)
1068 CODE: 1167 CODE:
1069{ 1168{
1070 STRLEN textlen; 1169 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1170 char *text = SvPVutf8 (text_, textlen);
1072 1171
1073 pango_layout_set_markup (self->pl, text, textlen); 1172 pango_layout_set_markup (self->pl, text, textlen);
1074} 1173}
1075 1174
1076void 1175void
1077set_shapes (CFPlus::Layout self, ...) 1176set_shapes (DC::Layout self, ...)
1078 CODE: 1177 CODE:
1079{ 1178{
1080 PangoAttrList *attrs = 0; 1179 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1180 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1181 const char *pos = text;
1117 if (attrs) 1216 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1217 pango_layout_set_attributes (self->pl, attrs);
1119} 1218}
1120 1219
1121void 1220void
1122get_shapes (CFPlus::Layout self) 1221get_shapes (DC::Layout self)
1123 PPCODE: 1222 PPCODE:
1124{ 1223{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1224 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1225
1127 do 1226 do
1128 { 1227 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1228 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1229
1131 if (run && shape_attr_p (run)) 1230 if (run && shape_attr_p (run))
1132 { 1231 {
1133 PangoRectangle extents; 1232 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1233 pango_layout_iter_get_run_extents (iter, 0, &extents);
1142 1241
1143 pango_layout_iter_free (iter); 1242 pango_layout_iter_free (iter);
1144} 1243}
1145 1244
1146int 1245int
1147has_wrapped (CFPlus::Layout self) 1246has_wrapped (DC::Layout self)
1148 CODE: 1247 CODE:
1149{ 1248{
1150 int lines = 1; 1249 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1250 const char *text = pango_layout_get_text (self->pl);
1152 1251
1157} 1256}
1158 OUTPUT: 1257 OUTPUT:
1159 RETVAL 1258 RETVAL
1160 1259
1161SV * 1260SV *
1162get_text (CFPlus::Layout self) 1261get_text (DC::Layout self)
1163 CODE: 1262 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1263 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1264 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1265 OUTPUT:
1167 RETVAL 1266 RETVAL
1168 1267
1169void 1268void
1170set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1269set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1171 CODE: 1270 CODE:
1172 self->r = r; 1271 self->r = r;
1173 self->g = g; 1272 self->g = g;
1174 self->b = b; 1273 self->b = b;
1175 self->a = a; 1274 self->a = a;
1176 1275
1177void 1276void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1277set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1278 CODE:
1180 if (self->font != font) 1279 if (self->font != font)
1181 { 1280 {
1182 self->font = font; 1281 self->font = font;
1183 layout_update_font (self); 1282 layout_update_font (self);
1184 } 1283 }
1185 1284
1186void 1285void
1187set_height (CFPlus::Layout self, int base_height) 1286set_height (DC::Layout self, int base_height)
1188 CODE: 1287 CODE:
1189 if (self->base_height != base_height) 1288 if (self->base_height != base_height)
1190 { 1289 {
1191 self->base_height = base_height; 1290 self->base_height = base_height;
1192 layout_update_font (self); 1291 layout_update_font (self);
1193 } 1292 }
1194 1293
1195void 1294void
1196set_width (CFPlus::Layout self, int max_width = -1) 1295set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1296 CODE:
1198 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1297 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1199 1298
1200void 1299void
1201set_indent (CFPlus::Layout self, int indent) 1300set_indent (DC::Layout self, int indent)
1202 CODE: 1301 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1302 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1303
1205void 1304void
1206set_spacing (CFPlus::Layout self, int spacing) 1305set_spacing (DC::Layout self, int spacing)
1207 CODE: 1306 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1307 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1308
1210void 1309void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1310set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1311 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1312 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1313 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1314 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1315 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1316 : PANGO_ELLIPSIZE_NONE
1218 ); 1317 );
1219 1318
1220void 1319void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1320set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1321 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1322 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1323
1225void 1324void
1226size (CFPlus::Layout self) 1325size (DC::Layout self)
1227 PPCODE: 1326 PPCODE:
1228{ 1327{
1229 int w, h; 1328 int w, h;
1230 1329
1231 layout_get_pixel_size (self, &w, &h); 1330 layout_get_pixel_size (self, &w, &h);
1234 PUSHs (sv_2mortal (newSViv (w))); 1333 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1334 PUSHs (sv_2mortal (newSViv (h)));
1236} 1335}
1237 1336
1238int 1337int
1239descent (CFPlus::Layout self) 1338descent (DC::Layout self)
1240 CODE: 1339 CODE:
1241{ 1340{
1242 PangoRectangle rect; 1341 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1342 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1343 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1344 RETVAL = PANGO_DESCENT (rect);
1246} 1345}
1247 OUTPUT: 1346 OUTPUT:
1248 RETVAL 1347 RETVAL
1249 1348
1250int 1349int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1350xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1351 CODE:
1253{ 1352{
1254 int index, trailing; 1353 int index, trailing;
1255 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1354 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1256 RETVAL = index + trailing; 1355 RETVAL = index + trailing;
1257} 1356}
1258 OUTPUT: 1357 OUTPUT:
1259 RETVAL 1358 RETVAL
1260 1359
1261void 1360void
1262cursor_pos (CFPlus::Layout self, int index) 1361cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1362 PPCODE:
1264{ 1363{
1265 PangoRectangle strong_pos; 1364 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1365 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1366
1268 EXTEND (SP, 3); 1367 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1368 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1369 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1370 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1371}
1273 1372
1274void 1373void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1374index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1375 PPCODE:
1277{ 1376{
1278 int line, x; 1377 int line, x;
1279 1378
1280 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1379 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1380#if !PANGO_VERSION_CHECK (1, 17, 3)
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1381 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1382 --line;
1383#endif
1283 EXTEND (SP, 2); 1384 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1385 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1386 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1387}
1287 1388
1288void 1389void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1390line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1391 PPCODE:
1291{ 1392{
1292 PangoLayoutLine *lp; 1393 PangoLayoutLine *lp;
1293 int index, trailing; 1394 int index, trailing;
1294 1395
1295 if (line < 0) 1396 if (line < 0)
1296 XSRETURN_EMPTY; 1397 XSRETURN_EMPTY;
1297 1398
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1399 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1400 XSRETURN_EMPTY; /* do better */
1300 1401
1301 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1402 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1302 1403
1303 EXTEND (SP, 2); 1404 EXTEND (SP, 2);
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1410 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1411 }
1311} 1412}
1312 1413
1313void 1414void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1415render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1416 CODE:
1316 rc_clear (self->rc); 1417 rc_clear (self->rc);
1317 pango_opengl_render_layout_subpixel ( 1418 pango_opengl_render_layout_subpixel (
1318 self->pl, 1419 self->pl,
1319 self->rc, 1420 self->rc,
1324 // we assume that context_change actually clears/frees stuff 1425 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1426 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1427 pango_layout_context_changed (self->pl);
1327 1428
1328void 1429void
1329draw (CFPlus::Layout self) 1430draw (DC::Layout self)
1330 CODE: 1431 CODE:
1331{ 1432{
1332 glEnable (GL_TEXTURE_2D); 1433 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1434 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1435 glEnable (GL_BLEND);
1342 glDisable (GL_ALPHA_TEST); 1443 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1444 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1445 glDisable (GL_TEXTURE_2D);
1345} 1446}
1346 1447
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1448MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1449
1349PROTOTYPES: ENABLE 1450PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1451
1353void 1452void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1453pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1454 CODE:
1356{ 1455{
1433 RETVAL = width > 0; 1532 RETVAL = width > 0;
1434} 1533}
1435 OUTPUT: 1534 OUTPUT:
1436 RETVAL 1535 RETVAL
1437 1536
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1537MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1538
1440PROTOTYPES: DISABLE 1539PROTOTYPES: DISABLE
1441 1540
1442CFPlus::Map 1541DC::Map
1443new (SV *class) 1542new (SV *class)
1444 CODE: 1543 CODE:
1445 New (0, RETVAL, 1, struct map); 1544 New (0, RETVAL, 1, struct map);
1446 RETVAL->x = 0; 1545 RETVAL->x = 0;
1447 RETVAL->y = 0; 1546 RETVAL->y = 0;
1455 RETVAL->row = 0; 1554 RETVAL->row = 0;
1456 OUTPUT: 1555 OUTPUT:
1457 RETVAL 1556 RETVAL
1458 1557
1459void 1558void
1460DESTROY (CFPlus::Map self) 1559DESTROY (DC::Map self)
1461 CODE: 1560 CODE:
1462{ 1561{
1463 map_clear (self); 1562 map_clear (self);
1464 Safefree (self->face2tile); 1563 Safefree (self->face2tile);
1465 Safefree (self->tex); 1564 Safefree (self->tex);
1466 Safefree (self); 1565 Safefree (self);
1467} 1566}
1468 1567
1469void 1568void
1470resize (CFPlus::Map self, int map_width, int map_height) 1569resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1570 CODE:
1472 self->w = map_width; 1571 self->w = map_width;
1473 self->h = map_height; 1572 self->h = map_height;
1474 1573
1475void 1574void
1476clear (CFPlus::Map self) 1575clear (DC::Map self)
1477 CODE: 1576 CODE:
1478 map_clear (self); 1577 map_clear (self);
1479 1578
1480void 1579void
1481set_tileid (CFPlus::Map self, int face, int tile) 1580set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1581 CODE:
1483{ 1582{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1583 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1584 need_texid (self, tile);
1486} 1585}
1487 1586
1488void 1587void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1588set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1589 CODE:
1491{ 1590{
1492 tileid texid; 1591 tileid texid;
1493 maptex *tex; 1592 maptex *tex;
1494 1593
1507 tex->smoothtile = self->face2tile [smooth]; 1606 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1607 tex->smoothlevel = level;
1509} 1608}
1510 1609
1511void 1610void
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) 1611set_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: 1612 CODE:
1514{ 1613{
1515 need_texid (self, texid); 1614 need_texid (self, texid);
1516 1615
1517 { 1616 {
1537 // from transparent color bleeding and ugly wrapping effects. 1636 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1637 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1638}
1540 1639
1541int 1640int
1542ox (CFPlus::Map self) 1641ox (DC::Map self)
1543 ALIAS: 1642 ALIAS:
1544 oy = 1 1643 oy = 1
1545 x = 2 1644 x = 2
1546 y = 3 1645 y = 3
1547 w = 4 1646 w = 4
1558 } 1657 }
1559 OUTPUT: 1658 OUTPUT:
1560 RETVAL 1659 RETVAL
1561 1660
1562void 1661void
1563scroll (CFPlus::Map self, int dx, int dy) 1662scroll (DC::Map self, int dx, int dy)
1564 CODE: 1663 CODE:
1565{ 1664{
1566 if (dx > 0) 1665 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 1666 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 1667 else if (dx < 0)
1584 self->y += MAP_EXTEND_Y; 1683 self->y += MAP_EXTEND_Y;
1585 } 1684 }
1586} 1685}
1587 1686
1588SV * 1687SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 1688map1a_update (DC::Map self, SV *data_, int extmap)
1590 CODE: 1689 CODE:
1591{ 1690{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1691 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 1692 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 1693 mapcell *cell;
1622 uint8_t ext, cmd; 1721 uint8_t ext, cmd;
1623 1722
1624 do 1723 do
1625 { 1724 {
1626 ext = *data++; 1725 ext = *data++;
1627 cmd = ext & 0x3f; 1726 cmd = ext & 0x7f;
1628 1727
1629 if (cmd < 4) 1728 if (cmd < 4)
1630 cell->darkness = 255 - ext * 64 + 1; 1729 cell->darkness = 255 - ext * 64 + 1;
1631 else if (cmd == 5) // health 1730 else if (cmd == 5) // health
1632 { 1731 {
1635 } 1734 }
1636 else if (cmd == 6) // monster width 1735 else if (cmd == 6) // monster width
1637 cell->stat_width = *data++ + 1; 1736 cell->stat_width = *data++ + 1;
1638 else if (cmd == 0x47) 1737 else if (cmd == 0x47)
1639 { 1738 {
1640 if (*data == 4) 1739 if (*data == 1) cell->player = data [1];
1641 ; // decode player count 1740 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1741 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1742 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1642 1743
1643 data += *data + 1; 1744 data += *data + 1;
1644 } 1745 }
1645 else if (cmd == 8) // cell flags 1746 else if (cmd == 8) // cell flags
1646 cell->flags = *data++; 1747 cell->flags = *data++;
1683} 1784}
1684 OUTPUT: 1785 OUTPUT:
1685 RETVAL 1786 RETVAL
1686 1787
1687SV * 1788SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1789mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 1790 CODE:
1690{ 1791{
1691 int x1, x; 1792 int x1, x;
1692 int y1, y; 1793 int y1, y;
1693 int z; 1794 int z;
1738} 1839}
1739 OUTPUT: 1840 OUTPUT:
1740 RETVAL 1841 RETVAL
1741 1842
1742void 1843void
1743draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1844draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1744 CODE: 1845 CODE:
1745{ 1846{
1746 int x, y, z; 1847 int x, y, z;
1747 1848
1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1849 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1850 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1750 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1851 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751 smooth_key skey; 1852 smooth_key skey;
1752 1853 int pl_x, pl_y;
1854 maptex pl_tex;
1753 rc_t *rc = rc_alloc (); 1855 rc_t *rc = rc_alloc ();
1754 rc_key_t key; 1856 rc_key_t key;
1755 rc_array_t *arr; 1857 rc_array_t *arr;
1858
1859 pl_tex.name = 0;
1756 1860
1757 // thats current max. sorry. 1861 // thats current max. sorry.
1758 if (sw > 255) sw = 255; 1862 if (sw > 255) sw = 255;
1759 if (sh > 255) sh = 255; 1863 if (sh > 255) sh = 255;
1760 1864
1815 tileid tile = cell->tile [z]; 1919 tileid tile = cell->tile [z];
1816 1920
1817 if (tile) 1921 if (tile)
1818 { 1922 {
1819 maptex tex = self->tex [tile]; 1923 maptex tex = self->tex [tile];
1820 int px, py; 1924 int px = (x + 1) * T - tex.w;
1925 int py = (y + 1) * T - tex.h;
1821 1926
1822 // suppressing texture state switches here
1823 // is only moderately effective, but worth the extra effort
1824 if (key.texname != tex.name) 1927 if (key.texname != tex.name)
1825 { 1928 {
1826 if (!tex.name) 1929 if (!tex.name)
1827 tex = self->tex [2]; /* missing, replace by noface */ 1930 tex = self->tex [2]; /* missing, replace by noface */
1828 1931
1829 key.texname = tex.name; 1932 key.texname = tex.name;
1830 arr = rc_array (rc, &key); 1933 arr = rc_array (rc, &key);
1831 } 1934 }
1832 1935
1833 px = (x + 1) * T - tex.w; 1936 if (expect_false (cell->player == player) && expect_false (z == 2))
1834 py = (y + 1) * T - tex.h; 1937 {
1938 pl_x = px;
1939 pl_y = py;
1940 pl_tex = tex;
1941 continue;
1942 }
1835 1943
1836 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1944 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1837 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1945 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1838 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 1946 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1839 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 1947 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1840 1948
1841 if (cell->flags && z == 2) 1949 if (expect_false (cell->flags) && expect_false (z == 2))
1842 { 1950 {
1843 // overlays such as the speech bubble, probably more to come 1951 // overlays such as the speech bubble, probably more to come
1844 if (cell->flags & 1) 1952 if (cell->flags & 1)
1845 { 1953 {
1846 maptex tex = self->tex [1]; 1954 maptex tex = self->tex [1];
1911 // go through all smoothlevels, lowest to highest, then draw. 2019 // go through all smoothlevels, lowest to highest, then draw.
1912 // this is basically counting sort 2020 // this is basically counting sort
1913 { 2021 {
1914 int w, b; 2022 int w, b;
1915 2023
2024 glEnable (GL_TEXTURE_2D);
2025 glBegin (GL_QUADS);
1916 for (w = 0; w < 256 / 32; ++w) 2026 for (w = 0; w < 256 / 32; ++w)
1917 { 2027 {
1918 uint32_t smask = smooth_level [w]; 2028 uint32_t smask = smooth_level [w];
1919 if (smask) 2029 if (smask)
1920 for (b = 0; b < 32; ++b) 2030 for (b = 0; b < 32; ++b)
1945 { 2055 {
1946 // this time avoiding texture state changes 2056 // this time avoiding texture state changes
1947 // save gobs of state changes. 2057 // save gobs of state changes.
1948 if (key.texname != tex.name) 2058 if (key.texname != tex.name)
1949 { 2059 {
2060 glEnd ();
1950 key.texname = tex.name; 2061 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1951 arr = rc_array (rc, &key); 2062 glBegin (GL_QUADS);
1952 } 2063 }
1953 2064
1954 if (border) 2065 if (border)
1955 { 2066 {
1956 float ox = border * dx; 2067 float ox = border * dx;
1957 2068
1958 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2069 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1959 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2070 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1960 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2071 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1961 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2072 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1962 } 2073 }
1963 2074
1964 if (corner) 2075 if (corner)
1965 { 2076 {
1966 float ox = corner * dx; 2077 float ox = corner * dx;
1967 2078
1968 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2079 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1969 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2080 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1970 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2081 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1971 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2082 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1972 } 2083 }
1973 } 2084 }
1974 } 2085 }
1975 } 2086 }
1976 } 2087 }
1977 } 2088 }
2089
2090 glEnd ();
2091 glDisable (GL_TEXTURE_2D);
2092 key.texname = -1;
1978 } 2093 }
1979 2094
1980 hv_clear (smooth); 2095 hv_clear (smooth);
2096 }
2097
2098 if (pl_tex.name)
2099 {
2100 maptex tex = pl_tex;
2101 int px = pl_x + pdx;
2102 int py = pl_y + pdy;
2103
2104 key.texname = tex.name;
2105 arr = rc_array (rc, &key);
2106
2107 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2108 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2109 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2110 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2111
1981 rc_draw (rc); 2112 rc_draw (rc);
1982 rc_clear (rc);
1983 } 2113 }
1984 2114
1985 glDisable (GL_BLEND); 2115 glDisable (GL_BLEND);
1986 rc_free (rc); 2116 rc_free (rc);
1987 2117
2016 } 2146 }
2017 } 2147 }
2018} 2148}
2019 2149
2020void 2150void
2021draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2151draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2022 CODE: 2152 CODE:
2023{ 2153{
2024 static float color[16][3] = { 2154 static float color[16][3] = {
2025 { 0.00F, 0.00F, 0.00F }, 2155 { 0.00F, 0.00F, 0.00F },
2026 { 1.00F, 1.00F, 1.00F }, 2156 { 1.00F, 1.00F, 1.00F },
2076 glDisable (GL_BLEND); 2206 glDisable (GL_BLEND);
2077 glDisable (GL_TEXTURE_2D); 2207 glDisable (GL_TEXTURE_2D);
2078} 2208}
2079 2209
2080void 2210void
2081fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2211fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2082 PPCODE: 2212 PPCODE:
2083{ 2213{
2084 int x, y; 2214 int x, y;
2085 int sw1 = sw + 2; 2215 int sw1 = sw + 2;
2086 int sh1 = sh + 2; 2216 int sh1 = sh + 2;
2157 PUSHs (sv_2mortal (newSViv (sh3))); 2287 PUSHs (sv_2mortal (newSViv (sh3)));
2158 PUSHs (darkness3_sv); 2288 PUSHs (darkness3_sv);
2159} 2289}
2160 2290
2161SV * 2291SV *
2162get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2292get_rect (DC::Map self, int x0, int y0, int w, int h)
2163 CODE: 2293 CODE:
2164{ 2294{
2165 int x, y, x1, y1; 2295 int x, y, x1, y1;
2166 SV *data_sv = newSV (w * h * 7 + 5); 2296 SV *data_sv = newSV (w * h * 7 + 5);
2167 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2297 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2224 else 2354 else
2225 *data++ = 0; 2355 *data++ = 0;
2226 } 2356 }
2227 } 2357 }
2228 2358
2359 /* if size is w*h + 5 then no data has been found */
2360 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2361 {
2229 SvPOK_only (data_sv); 2362 SvPOK_only (data_sv);
2230 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2363 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2364 }
2365
2231 RETVAL = data_sv; 2366 RETVAL = data_sv;
2232} 2367}
2233 OUTPUT: 2368 OUTPUT:
2234 RETVAL 2369 RETVAL
2235 2370
2236void 2371void
2237set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2372set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2238 PPCODE: 2373 PPCODE:
2239{ 2374{
2240 int x, y, z; 2375 int x, y, z;
2241 int w, h; 2376 int w, h;
2242 int x1, y1; 2377 int x1, y1;
2378 STRLEN len;
2379 uint8_t *data, *end;
2380
2381 len = SvLEN (data_sv);
2382 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2383 data = SvPVbyte_nolen (data_sv);
2384 end = data + len + 8;
2385
2386 if (len < 5)
2387 XSRETURN_EMPTY;
2243 2388
2244 if (*data++ != 0) 2389 if (*data++ != 0)
2245 return; /* version mismatch */ 2390 XSRETURN_EMPTY; /* version mismatch */
2246 2391
2247 w = *data++ << 8; w |= *data++; 2392 w = *data++ << 8; w |= *data++;
2248 h = *data++ << 8; h |= *data++; 2393 h = *data++ << 8; h |= *data++;
2249 2394
2250 // we need to do this 'cause we don't keep an absolute coord system for rows 2395 // we need to do this 'cause we don't keep an absolute coord system for rows
2262 { 2407 {
2263 maprow *row = map_get_row (self, y); 2408 maprow *row = map_get_row (self, y);
2264 2409
2265 for (x = x0; x < x1; x++) 2410 for (x = x0; x < x1; x++)
2266 { 2411 {
2412 uint8_t flags;
2413
2414 if (data + 7 >= end)
2415 XSRETURN_EMPTY;
2416
2267 uint8_t flags = *data++; 2417 flags = *data++;
2268 2418
2269 if (flags) 2419 if (flags)
2270 { 2420 {
2271 mapcell *cell = row_get_cell (row, x); 2421 mapcell *cell = row_get_cell (row, x);
2272 tileid tile[3] = { 0, 0, 0 }; 2422 tileid tile[3] = { 0, 0, 0 };
2275 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2425 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2276 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2426 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2277 2427
2278 if (cell->darkness == 0) 2428 if (cell->darkness == 0)
2279 { 2429 {
2280 cell->darkness = 0; 2430 /*cell->darkness = 0;*/
2431 EXTEND (SP, 3);
2281 2432
2282 for (z = 0; z <= 2; z++) 2433 for (z = 0; z <= 2; z++)
2283 { 2434 {
2284 tileid t = tile [z]; 2435 tileid t = tile [z];
2285 2436
2286 if (t >= self->texs || (t && !self->tex [t].name)) 2437 if (t >= self->texs || (t && !self->tex [t].name))
2287 { 2438 {
2288 XPUSHs (sv_2mortal (newSViv (t))); 2439 PUSHs (sv_2mortal (newSViv (t)));
2289 need_texid (self, t); 2440 need_texid (self, t);
2290 } 2441 }
2291 2442
2292 cell->tile [z] = t; 2443 cell->tile [z] = t;
2293 } 2444 }
2295 } 2446 }
2296 } 2447 }
2297 } 2448 }
2298} 2449}
2299 2450
2300MODULE = CFPlus PACKAGE = CFPlus::RW 2451MODULE = Deliantra::Client PACKAGE = DC::RW
2301 2452
2302CFPlus::RW 2453DC::RW
2303new (SV *class, SV *data_sv) 2454new (SV *class, SV *data_sv)
2304 CODE: 2455 CODE:
2305{ 2456{
2306 STRLEN datalen; 2457 STRLEN datalen;
2307 char *data = SvPVbyte (data_sv, datalen); 2458 char *data = SvPVbyte (data_sv, datalen);
2309 RETVAL = SDL_RWFromConstMem (data, datalen); 2460 RETVAL = SDL_RWFromConstMem (data, datalen);
2310} 2461}
2311 OUTPUT: 2462 OUTPUT:
2312 RETVAL 2463 RETVAL
2313 2464
2314CFPlus::RW 2465DC::RW
2315new_from_file (SV *class, const char *path, const char *mode = "rb") 2466new_from_file (SV *class, const char *path, const char *mode = "rb")
2316 CODE: 2467 CODE:
2317 RETVAL = SDL_RWFromFile (path, mode); 2468 RETVAL = SDL_RWFromFile (path, mode);
2318 OUTPUT: 2469 OUTPUT:
2319 RETVAL 2470 RETVAL
2320 2471
2321# fails on win32: 2472# fails on win32:
2322# CFPlus.xs(2268) : error C2059: syntax error : '(' 2473# dc.xs(2268) : error C2059: syntax error : '('
2323#void 2474#void
2324#close (CFPlus::RW self) 2475#close (DC::RW self)
2325# CODE: 2476# CODE:
2326# (self->(close)) (self); 2477# (self->(close)) (self);
2327 2478
2328MODULE = CFPlus PACKAGE = CFPlus::Channel 2479MODULE = Deliantra::Client PACKAGE = DC::Channel
2329 2480
2330PROTOTYPES: DISABLE 2481PROTOTYPES: DISABLE
2331 2482
2332CFPlus::Channel 2483DC::Channel
2333find () 2484find ()
2334 CODE: 2485 CODE:
2335{ 2486{
2336 RETVAL = Mix_GroupAvailable (-1); 2487 RETVAL = Mix_GroupAvailable (-1);
2337 2488
2350} 2501}
2351 OUTPUT: 2502 OUTPUT:
2352 RETVAL 2503 RETVAL
2353 2504
2354void 2505void
2355halt (CFPlus::Channel self) 2506halt (DC::Channel self)
2356 CODE: 2507 CODE:
2357 Mix_HaltChannel (self); 2508 Mix_HaltChannel (self);
2358 2509
2359void 2510void
2360expire (CFPlus::Channel self, int ticks = -1) 2511expire (DC::Channel self, int ticks = -1)
2361 CODE: 2512 CODE:
2362 Mix_ExpireChannel (self, ticks); 2513 Mix_ExpireChannel (self, ticks);
2363 2514
2364void 2515void
2365fade_out (CFPlus::Channel self, int ticks = -1) 2516fade_out (DC::Channel self, int ticks = -1)
2366 CODE: 2517 CODE:
2367 Mix_FadeOutChannel (self, ticks); 2518 Mix_FadeOutChannel (self, ticks);
2368 2519
2369int 2520int
2370volume (CFPlus::Channel self, int volume) 2521volume (DC::Channel self, int volume)
2371 CODE: 2522 CODE:
2372 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2523 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2373 OUTPUT: 2524 OUTPUT:
2374 RETVAL 2525 RETVAL
2375 2526
2376void 2527void
2377unregister_all_effects (CFPlus::Channel self) 2528unregister_all_effects (DC::Channel self)
2378 CODE: 2529 CODE:
2379 Mix_UnregisterAllEffects (self); 2530 Mix_UnregisterAllEffects (self);
2380 2531
2381void 2532void
2382set_panning (CFPlus::Channel self, int left, int right) 2533set_panning (DC::Channel self, int left, int right)
2383 CODE: 2534 CODE:
2384 left = CLAMP (left , 0, 255); 2535 left = CLAMP (left , 0, 255);
2385 right = CLAMP (right, 0, 255); 2536 right = CLAMP (right, 0, 255);
2386 Mix_SetPanning (self, left, right); 2537 Mix_SetPanning (self, left, right);
2387 2538
2388void 2539void
2389set_distance (CFPlus::Channel self, int distance) 2540set_distance (DC::Channel self, int distance)
2390 CODE: 2541 CODE:
2391 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2542 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2392 2543
2393void 2544void
2394set_position (CFPlus::Channel self, int angle, int distance) 2545set_position (DC::Channel self, int angle, int distance)
2395 CODE: 2546 CODE:
2396 2547
2397void 2548void
2398set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2549set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2399 CODE: 2550 CODE:
2400{ 2551{
2401 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2552 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2402 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2553 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2403 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2554 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2404} 2555}
2405 2556
2406void 2557void
2407set_reverse_stereo (CFPlus::Channel self, int flip) 2558set_reverse_stereo (DC::Channel self, int flip)
2408 CODE: 2559 CODE:
2409 Mix_SetReverseStereo (self, flip); 2560 Mix_SetReverseStereo (self, flip);
2410 2561
2411MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2562MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2412 2563
2413PROTOTYPES: DISABLE 2564PROTOTYPES: DISABLE
2414 2565
2415CFPlus::MixChunk 2566DC::MixChunk
2416new (SV *class, CFPlus::RW rwops) 2567new (SV *class, DC::RW rwops)
2417 CODE: 2568 CODE:
2418 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2569 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2419 OUTPUT: 2570 OUTPUT:
2420 RETVAL 2571 RETVAL
2421 2572
2422void 2573void
2423DESTROY (CFPlus::MixChunk self) 2574DESTROY (DC::MixChunk self)
2424 CODE: 2575 CODE:
2425 Mix_FreeChunk (self); 2576 Mix_FreeChunk (self);
2426 2577
2427int 2578int
2428volume (CFPlus::MixChunk self, int volume = -1) 2579volume (DC::MixChunk self, int volume = -1)
2429 CODE: 2580 CODE:
2430 if (items > 1) 2581 if (items > 1)
2431 volume = CLAMP (volume, 0, 128); 2582 volume = CLAMP (volume, 0, 128);
2432 RETVAL = Mix_VolumeChunk (self, volume); 2583 RETVAL = Mix_VolumeChunk (self, volume);
2433 OUTPUT: 2584 OUTPUT:
2434 RETVAL 2585 RETVAL
2435 2586
2436CFPlus::Channel 2587DC::Channel
2437play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2588play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2438 CODE: 2589 CODE:
2439{ 2590{
2440 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2591 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2441 2592
2442 if (RETVAL < 0) 2593 if (RETVAL < 0)
2449 } 2600 }
2450} 2601}
2451 OUTPUT: 2602 OUTPUT:
2452 RETVAL 2603 RETVAL
2453 2604
2454MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2605MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2455 2606
2456int 2607int
2457volume (int volume = -1) 2608volume (int volume = -1)
2458 PROTOTYPE: ;$ 2609 PROTOTYPE: ;$
2459 CODE: 2610 CODE:
2471void 2622void
2472halt () 2623halt ()
2473 CODE: 2624 CODE:
2474 Mix_HaltMusic (); 2625 Mix_HaltMusic ();
2475 2626
2476CFPlus::MixMusic 2627DC::MixMusic
2477new (SV *class, CFPlus::RW rwops) 2628new (SV *class, DC::RW rwops)
2478 CODE: 2629 CODE:
2479 RETVAL = Mix_LoadMUS_RW (rwops); 2630 RETVAL = Mix_LoadMUS_RW (rwops);
2480 OUTPUT: 2631 OUTPUT:
2481 RETVAL 2632 RETVAL
2482 2633
2483void 2634void
2484DESTROY (CFPlus::MixMusic self) 2635DESTROY (DC::MixMusic self)
2485 CODE: 2636 CODE:
2486 Mix_FreeMusic (self); 2637 Mix_FreeMusic (self);
2487 2638
2488int 2639int
2489play (CFPlus::MixMusic self, int loops = -1) 2640play (DC::MixMusic self, int loops = -1)
2490 CODE: 2641 CODE:
2491 RETVAL = Mix_PlayMusic (self, loops); 2642 RETVAL = Mix_PlayMusic (self, loops);
2492 OUTPUT: 2643 OUTPUT:
2493 RETVAL 2644 RETVAL
2494 2645
2495void 2646void
2496fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2647fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2497 CODE: 2648 CODE:
2498 Mix_FadeInMusicPos (self, loops, ms, position); 2649 Mix_FadeInMusicPos (self, loops, ms, position);
2499 2650
2500MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2651MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2501 2652
2502PROTOTYPES: ENABLE 2653PROTOTYPES: ENABLE
2503 2654
2504BOOT: 2655BOOT:
2505{ 2656{
2506 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2657 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2507 static const struct { 2658 static const struct {
2508 const char *name; 2659 const char *name;
2509 IV iv; 2660 IV iv;
2510 } *civ, const_iv[] = { 2661 } *civ, const_iv[] = {
2511# define const_iv(name) { # name, (IV)name } 2662# define const_iv(name) { # name, (IV)name }
2546 const_iv (GL_INTENSITY), 2697 const_iv (GL_INTENSITY),
2547 const_iv (GL_LUMINANCE), 2698 const_iv (GL_LUMINANCE),
2548 const_iv (GL_LUMINANCE_ALPHA), 2699 const_iv (GL_LUMINANCE_ALPHA),
2549 const_iv (GL_FLOAT), 2700 const_iv (GL_FLOAT),
2550 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2701 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2702 const_iv (GL_COMPRESSED_ALPHA_ARB),
2703 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2704 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2705 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2706 const_iv (GL_COMPRESSED_RGB_ARB),
2707 const_iv (GL_COMPRESSED_RGBA_ARB),
2551 const_iv (GL_COMPILE), 2708 const_iv (GL_COMPILE),
2552 const_iv (GL_PROXY_TEXTURE_1D), 2709 const_iv (GL_PROXY_TEXTURE_1D),
2553 const_iv (GL_PROXY_TEXTURE_2D), 2710 const_iv (GL_PROXY_TEXTURE_2D),
2554 const_iv (GL_TEXTURE_1D), 2711 const_iv (GL_TEXTURE_1D),
2555 const_iv (GL_TEXTURE_2D), 2712 const_iv (GL_TEXTURE_2D),
2594 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2751 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2595 const_iv (GL_POINT_SMOOTH_HINT), 2752 const_iv (GL_POINT_SMOOTH_HINT),
2596 const_iv (GL_LINE_SMOOTH_HINT), 2753 const_iv (GL_LINE_SMOOTH_HINT),
2597 const_iv (GL_POLYGON_SMOOTH_HINT), 2754 const_iv (GL_POLYGON_SMOOTH_HINT),
2598 const_iv (GL_GENERATE_MIPMAP_HINT), 2755 const_iv (GL_GENERATE_MIPMAP_HINT),
2756 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2599 const_iv (GL_FASTEST), 2757 const_iv (GL_FASTEST),
2600 const_iv (GL_DONT_CARE), 2758 const_iv (GL_DONT_CARE),
2601 const_iv (GL_NICEST), 2759 const_iv (GL_NICEST),
2602 const_iv (GL_V2F), 2760 const_iv (GL_V2F),
2603 const_iv (GL_V3F), 2761 const_iv (GL_V3F),
2611 2769
2612 texture_av = newAV (); 2770 texture_av = newAV ();
2613 AvREAL_off (texture_av); 2771 AvREAL_off (texture_av);
2614} 2772}
2615 2773
2774void
2775disable_GL_EXT_blend_func_separate ()
2776 CODE:
2777 gl.BlendFuncSeparate = 0;
2778 gl.BlendFuncSeparateEXT = 0;
2779
2616char * 2780char *
2617gl_vendor () 2781gl_vendor ()
2618 CODE: 2782 CODE:
2619 RETVAL = (char *)glGetString (GL_VENDOR); 2783 RETVAL = (char *)glGetString (GL_VENDOR);
2620 OUTPUT: 2784 OUTPUT:
2741 2905
2742void glRect (float x1, float y1, float x2, float y2) 2906void glRect (float x1, float y1, float x2, float y2)
2743 CODE: 2907 CODE:
2744 glRectf (x1, y1, x2, y2); 2908 glRectf (x1, y1, x2, y2);
2745 2909
2910void glRect_lineloop (float x1, float y1, float x2, float y2)
2911 CODE:
2912 glBegin (GL_LINE_LOOP);
2913 glVertex2f (x1, y1);
2914 glVertex2f (x2, y1);
2915 glVertex2f (x2, y2);
2916 glVertex2f (x1, y2);
2917 glEnd ();
2918
2746PROTOTYPES: ENABLE 2919PROTOTYPES: ENABLE
2747 2920
2748void glBegin (int mode) 2921void glBegin (int mode)
2749 2922
2750void glEnd () 2923void glEnd ()
2782void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2955void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2783 CODE: 2956 CODE:
2784 if (gl.SeparableFilter2D) 2957 if (gl.SeparableFilter2D)
2785 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2958 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2786 2959
2787void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2960void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2788 2961
2789void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2962void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2790 2963
2791void glDrawPixels (int width, int height, int format, int type, char *pixels) 2964void glDrawPixels (int width, int height, int format, int type, char *pixels)
2792 2965
2818 2991
2819void glEndList () 2992void glEndList ()
2820 2993
2821void glCallList (int list) 2994void glCallList (int list)
2822 2995
2823MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2996MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2824 2997
2825PROTOTYPES: DISABLE 2998PROTOTYPES: DISABLE
2826 2999
2827void 3000void
2828find_widget (SV *self, NV x, NV y) 3001find_widget (SV *self, NV x, NV y)
2832 XPUSHs (self); 3005 XPUSHs (self);
2833} 3006}
2834 3007
2835BOOT: 3008BOOT:
2836{ 3009{
2837 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3010 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2838 3011
2839 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3012 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2840 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3013 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2841 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3014 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2842 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3015 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2843} 3016}
2844 3017
2845void 3018void
2846draw (SV *self) 3019draw (SV *self)
2847 CODE: 3020 CODE:
2851 NV x, y, w, h; 3024 NV x, y, w, h;
2852 SV *draw_x_sv = GvSV (draw_x_gv); 3025 SV *draw_x_sv = GvSV (draw_x_gv);
2853 SV *draw_y_sv = GvSV (draw_y_gv); 3026 SV *draw_y_sv = GvSV (draw_y_gv);
2854 SV *draw_w_sv = GvSV (draw_w_gv); 3027 SV *draw_w_sv = GvSV (draw_w_gv);
2855 SV *draw_h_sv = GvSV (draw_h_gv); 3028 SV *draw_h_sv = GvSV (draw_h_gv);
2856 SV *hover;
2857 double draw_x, draw_y, draw_w, draw_h; 3029 double draw_x, draw_y;
2858 3030
2859 if (!SvROK (self)) 3031 if (!SvROK (self))
2860 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3032 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2861 3033
2862 hv = (HV *)SvRV (self); 3034 hv = (HV *)SvRV (self);
2863 3035
2864 if (SvTYPE (hv) != SVt_PVHV) 3036 if (SvTYPE (hv) != SVt_PVHV)
2865 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3037 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2866 3038
2867 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3039 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2868 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3040 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2869 3041
2870 if (!h || !w) 3042 if (!h || !w)
2890 { 3062 {
2891 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3063 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2892 3064
2893 if (svp && SvTRUE (*svp)) 3065 if (svp && SvTRUE (*svp))
2894 { 3066 {
2895 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3067 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2896 glEnable (GL_BLEND); 3068 glEnable (GL_BLEND);
2897 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3069 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2898 glBegin (GL_QUADS); 3070 glBegin (GL_QUADS);
2899 glVertex2f (0, 0); 3071 glVertex2f (0, 0);
2900 glVertex2f (w, 0); 3072 glVertex2f (w, 0);
2903 glEnd (); 3075 glEnd ();
2904 glDisable (GL_BLEND); 3076 glDisable (GL_BLEND);
2905 } 3077 }
2906 } 3078 }
2907#if 0 3079#if 0
2908 if ($ENV{CFPLUS_DEBUG} & 1) { 3080 // draw borders, for debugging
2909 glPushMatrix; 3081 glPushMatrix ();
2910 glColor 1, 1, 0, 1; 3082 glColor4f (1., 1., 0., 1.);
2911 glTranslate 0.375, 0.375; 3083 glTranslatef (.5, .5, 0.);
2912 glBegin GL_LINE_LOOP; 3084 glBegin (GL_LINE_LOOP);
2913 glVertex 0 , 0; 3085 glVertex2f (0 , 0);
2914 glVertex $self->{w} - 1, 0; 3086 glVertex2f (w - 1, 0);
2915 glVertex $self->{w} - 1, $self->{h} - 1; 3087 glVertex2f (w - 1, h - 1);
2916 glVertex 0 , $self->{h} - 1; 3088 glVertex2f (0 , h - 1);
2917 glEnd; 3089 glEnd ();
2918 glPopMatrix; 3090 glPopMatrix ();
2919 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2920 }
2921#endif 3091#endif
2922 PUSHMARK (SP); 3092 PUSHMARK (SP);
2923 XPUSHs (self); 3093 XPUSHs (self);
2924 PUTBACK; 3094 PUTBACK;
2925 call_method ("_draw", G_VOID | G_DISCARD); 3095 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines