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.224 by root, Sat Aug 11 11:21:46 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;
172 rc_t *rc;
155} *CFPlus__Layout; 173} *DC__Layout;
156 174
157static CFPlus__Font default_font; 175static DC__Font default_font;
158static PangoContext *opengl_context; 176static PangoContext *opengl_context;
159static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
160 178
161static void 179static void
162substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
167#endif 185#endif
168 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169} 187}
170 188
171static void 189static void
172layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
173{ 191{
174 /* 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
175 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
176 */ 194 */
177 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
178 196
179 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
180 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
181 199
182 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
183} 201}
184 202
185static void 203static void
186layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
187{ 205{
188 PangoRectangle rect; 206 PangoRectangle rect;
189 207
190 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
191 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
202 220
203typedef uint16_t tileid; 221typedef uint16_t tileid;
204typedef uint16_t faceid; 222typedef uint16_t faceid;
205 223
206typedef struct { 224typedef struct {
207 int name; 225 GLuint name;
208 int w, h; 226 int w, h;
209 float s, t; 227 float s, t;
210 uint8_t r, g, b, a; 228 uint8_t r, g, b, a;
211 tileid smoothtile; 229 tileid smoothtile;
212 uint8_t smoothlevel; 230 uint8_t smoothlevel;
230 int faces; tileid *face2tile; // [faceid] 248 int faces; tileid *face2tile; // [faceid]
231 int texs; maptex *tex; // [tileid] 249 int texs; maptex *tex; // [tileid]
232 250
233 int32_t rows; 251 int32_t rows;
234 maprow *row; 252 maprow *row;
235} *CFPlus__Map; 253} *DC__Map;
236 254
237static char * 255static char *
238prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
239{ 257{
240 char *p; 258 char *p;
278 self->texs *= 2; 296 self->texs *= 2;
279 } 297 }
280} 298}
281 299
282static maprow * 300static maprow *
283map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
284{ 302{
285 if (0 > y) 303 if (0 > y)
286 { 304 {
287 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
288 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
326 344
327 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
328} 346}
329 347
330static mapcell * 348static mapcell *
331map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
332{ 350{
333 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
334} 352}
335 353
336static void 354static void
337map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
338{ 356{
339 int r; 357 int r;
340 358
341 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
342 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
350 self->row = 0; 368 self->row = 0;
351 self->rows = 0; 369 self->rows = 0;
352} 370}
353 371
354static void 372static void
355map_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)
356{ 374{
357 int x, y; 375 int x, y;
358 maprow *row; 376 maprow *row;
359 mapcell *cell; 377 mapcell *cell;
360 378
439 n |= n >> 16; 457 n |= n >> 16;
440 458
441 return n + 1; 459 return n + 1;
442} 460}
443 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
444/* SDL should provide this, really. */ 473/* SDL should provide this, really. */
445#define SDLK_MODIFIER_MIN 300 474#define SDLK_MODIFIER_MIN 300
446#define SDLK_MODIFIER_MAX 314 475#define SDLK_MODIFIER_MAX 314
447 476
448/******************************************************************************/ 477/******************************************************************************/
486 return 0; 515 return 0;
487 516
488 return 1; 517 return 1;
489} 518}
490 519
491MODULE = CFPlus PACKAGE = CFPlus 520MODULE = Deliantra::Client PACKAGE = DC
492 521
493PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
494 523
495BOOT: 524BOOT:
496{ 525{
497 HV *stash = gv_stashpv ("CFPlus", 1); 526 HV *stash = gv_stashpv ("DC", 1);
498 static const struct { 527 static const struct {
499 const char *name; 528 const char *name;
500 IV iv; 529 IV iv;
501 } *civ, const_iv[] = { 530 } *civ, const_iv[] = {
502# define const_iv(name) { # name, (IV)name } 531# define const_iv(name) { # name, (IV)name }
524 553
525 const_iv (SDL_APPINPUTFOCUS), 554 const_iv (SDL_APPINPUTFOCUS),
526 const_iv (SDL_APPMOUSEFOCUS), 555 const_iv (SDL_APPMOUSEFOCUS),
527 const_iv (SDL_APPACTIVE), 556 const_iv (SDL_APPACTIVE),
528 557
558 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST),
529 const_iv (SDLK_KP0), 560 const_iv (SDLK_KP0),
530 const_iv (SDLK_KP1), 561 const_iv (SDLK_KP1),
531 const_iv (SDLK_KP2), 562 const_iv (SDLK_KP2),
532 const_iv (SDLK_KP3), 563 const_iv (SDLK_KP3),
533 const_iv (SDLK_KP4), 564 const_iv (SDLK_KP4),
605 const_iv (KMOD_LMETA), 636 const_iv (KMOD_LMETA),
606 const_iv (KMOD_RMETA), 637 const_iv (KMOD_RMETA),
607 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
608 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
609 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)
610# undef const_iv 670# undef const_iv
611 }; 671 };
612 672
613 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; )
614 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
632 692
633NV floor (NV x) 693NV floor (NV x)
634 694
635NV ceil (NV x) 695NV ceil (NV x)
636 696
697IV minpot (UV n)
698
699IV popcount (UV n)
700
637void 701void
638pango_init () 702pango_init ()
639 CODE: 703 CODE:
640{ 704{
641 opengl_fontmap = pango_opengl_font_map_new (); 705 opengl_fontmap = pango_opengl_font_map_new ();
642 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);
643 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
644} 713}
645 714
646char *
647SDL_GetError () 715char *SDL_GetError ()
648 716
649int 717int SDL_Init (U32 flags)
650SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
651 718
652void 719int SDL_InitSubSystem (U32 flags)
720
721void SDL_QuitSubSystem (U32 flags)
722
653SDL_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
654 733
655void 734void
656SDL_ListModes (int rgb, int alpha) 735SDL_ListModes (int rgb, int alpha)
657 PPCODE: 736 PPCODE:
658{ 737{
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 749 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 750 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 751 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
673 752
674 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 753 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
675#if SDL_VERSION_ATLEAST(1,2,10)
676 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
677 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 754 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
678#endif
679 755
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 757
682 if (m && m != (SDL_Rect **)-1) 758 if (m && m != (SDL_Rect **)-1)
683 while (*m) 759 while (*m)
684 { 760 {
685 if ((*m)->w >= 640 && (*m)->h >= 480)
686 {
687 AV *av = newAV (); 761 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 762 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 763 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 764 av_push (av, newSViv (rgb));
691 av_push (av, newSViv (alpha)); 765 av_push (av, newSViv (alpha));
692 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 766 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
693 }
694 767
695 ++m; 768 ++m;
696 } 769 }
697} 770}
698 771
714 787
715 if (RETVAL) 788 if (RETVAL)
716 { 789 {
717 av_clear (texture_av); 790 av_clear (texture_av);
718 791
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 792 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720#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);
721#include "glfunc.h" 794#include "glfunc.h"
722#undef GL_FUNC 795#undef GL_FUNC
723 } 796 }
724} 797}
731char * 804char *
732SDL_GetKeyName (int sym) 805SDL_GetKeyName (int sym)
733 806
734int 807int
735SDL_GetAppState () 808SDL_GetAppState ()
809
810int
811SDL_GetModState ()
736 812
737void 813void
738poll_events () 814poll_events ()
739 PPCODE: 815 PPCODE:
740{ 816{
750 { 826 {
751 case SDL_KEYDOWN: 827 case SDL_KEYDOWN:
752 case SDL_KEYUP: 828 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 829 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 830 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 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);
756 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 */
757 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 833 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 834 break;
759 835
760 case SDL_ACTIVEEVENT: 836 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 837 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
779 x = ev.motion.x; 855 x = ev.motion.x;
780 y = ev.motion.y; 856 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 857 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 858 }
783 859
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 860 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 861 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 862 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 863 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 864 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 865 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 866 }
791 break; 867 break;
792 868
793 case SDL_MOUSEBUTTONDOWN: 869 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 870 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 871 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 872
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 873 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 874 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 875 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 876 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 881 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 882 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 883 break;
808 } 884 }
809 885
810 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))));
811 } 887 }
812} 888}
813 889
814int 890int
815Mix_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)
816 POSTCALL: 892 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 893 Mix_HookMusicFinished (music_finished);
818 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}
819 911
820void 912void
821Mix_CloseAudio () 913Mix_CloseAudio ()
822 914
823int 915int
858 } 950 }
859 } 951 }
860#endif 952#endif
861} 953}
862 954
863void 955int
864add_font (char *file) 956add_font (char *file)
865 CODE: 957 CODE:
866 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 958 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
959 OUTPUT:
960 RETVAL
867 961
868void 962void
869load_image_inline (SV *image_) 963load_image_inline (SV *image_)
870 ALIAS: 964 ALIAS:
871 load_image_file = 1 965 load_image_file = 1
957void 1051void
958error (char *message) 1052error (char *message)
959 CODE: 1053 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1054 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1055#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1056 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1057#endif
964 1058
965void 1059void
966fatal (char *message) 1060fatal (char *message)
967 CODE: 1061 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1062 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1063#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1064 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1065#endif
972 _exit (1); 1066 _exit (1);
973 1067
974void 1068void
975_exit (int retval = 0) 1069_exit (int retval = 0)
987#if DEBUG 1081#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1082 VALGRIND_DO_LEAK_CHECK;
989#endif 1083#endif
990} 1084}
991 1085
992MODULE = CFPlus PACKAGE = CFPlus::Font 1086MODULE = Deliantra::Client PACKAGE = DC::Font
993 1087
994PROTOTYPES: DISABLE 1088PROTOTYPES: DISABLE
995 1089
996CFPlus::Font 1090DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1091new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1092 CODE:
999{ 1093{
1000 int count; 1094 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1095 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1004} 1098}
1005 OUTPUT: 1099 OUTPUT:
1006 RETVAL 1100 RETVAL
1007 1101
1008void 1102void
1009DESTROY (CFPlus::Font self) 1103DESTROY (DC::Font self)
1010 CODE: 1104 CODE:
1011 pango_font_description_free (self); 1105 pango_font_description_free (self);
1012 1106
1013void 1107void
1014make_default (CFPlus::Font self) 1108make_default (DC::Font self)
1015 PROTOTYPE: $ 1109 PROTOTYPE: $
1016 CODE: 1110 CODE:
1017 default_font = self; 1111 default_font = self;
1018 1112
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1113MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1114
1021PROTOTYPES: DISABLE 1115PROTOTYPES: DISABLE
1022 1116
1023void 1117void
1024reset_glyph_cache () 1118glyph_cache_backup ()
1025 PROTOTYPE: 1119 PROTOTYPE:
1026 CODE: 1120 CODE:
1121 tc_backup ();
1122
1123void
1124glyph_cache_restore ()
1125 PROTOTYPE:
1126 CODE:
1027 tc_clear (); 1127 tc_restore ();
1028 1128
1029CFPlus::Layout 1129DC::Layout
1030new (SV *class) 1130new (SV *class)
1031 CODE: 1131 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1132 New (0, RETVAL, 1, struct cf_layout);
1033 1133
1034 RETVAL->pl = pango_layout_new (opengl_context); 1134 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->g = 1.; 1136 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1137 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1138 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1139 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1140 RETVAL->font = 0;
1141 RETVAL->rc = rc_alloc ();
1041 1142
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1143 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1144 layout_update_font (RETVAL);
1044 OUTPUT: 1145 OUTPUT:
1045 RETVAL 1146 RETVAL
1046 1147
1047void 1148void
1048DESTROY (CFPlus::Layout self) 1149DESTROY (DC::Layout self)
1049 CODE: 1150 CODE:
1050 g_object_unref (self->pl); 1151 g_object_unref (self->pl);
1152 rc_free (self->rc);
1051 Safefree (self); 1153 Safefree (self);
1052 1154
1053void 1155void
1054set_text (CFPlus::Layout self, SV *text_) 1156set_text (DC::Layout self, SV *text_)
1055 CODE: 1157 CODE:
1056{ 1158{
1057 STRLEN textlen; 1159 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1160 char *text = SvPVutf8 (text_, textlen);
1059 1161
1060 pango_layout_set_text (self->pl, text, textlen); 1162 pango_layout_set_text (self->pl, text, textlen);
1061} 1163}
1062 1164
1063void 1165void
1064set_markup (CFPlus::Layout self, SV *text_) 1166set_markup (DC::Layout self, SV *text_)
1065 CODE: 1167 CODE:
1066{ 1168{
1067 STRLEN textlen; 1169 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1170 char *text = SvPVutf8 (text_, textlen);
1069 1171
1070 pango_layout_set_markup (self->pl, text, textlen); 1172 pango_layout_set_markup (self->pl, text, textlen);
1071} 1173}
1072 1174
1073void 1175void
1074set_shapes (CFPlus::Layout self, ...) 1176set_shapes (DC::Layout self, ...)
1075 CODE: 1177 CODE:
1076{ 1178{
1077 PangoAttrList *attrs = 0; 1179 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1180 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1181 const char *pos = text;
1114 if (attrs) 1216 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1217 pango_layout_set_attributes (self->pl, attrs);
1116} 1218}
1117 1219
1118void 1220void
1119get_shapes (CFPlus::Layout self) 1221get_shapes (DC::Layout self)
1120 PPCODE: 1222 PPCODE:
1121{ 1223{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1224 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1225
1124 do 1226 do
1125 { 1227 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1228 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1229
1128 if (run && shape_attr_p (run)) 1230 if (run && shape_attr_p (run))
1129 { 1231 {
1130 PangoRectangle extents; 1232 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1233 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1241
1140 pango_layout_iter_free (iter); 1242 pango_layout_iter_free (iter);
1141} 1243}
1142 1244
1143int 1245int
1144has_wrapped (CFPlus::Layout self) 1246has_wrapped (DC::Layout self)
1145 CODE: 1247 CODE:
1146{ 1248{
1147 int lines = 1; 1249 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1250 const char *text = pango_layout_get_text (self->pl);
1149 1251
1154} 1256}
1155 OUTPUT: 1257 OUTPUT:
1156 RETVAL 1258 RETVAL
1157 1259
1158SV * 1260SV *
1159get_text (CFPlus::Layout self) 1261get_text (DC::Layout self)
1160 CODE: 1262 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1263 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1264 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1265 OUTPUT:
1164 RETVAL 1266 RETVAL
1165 1267
1166void 1268void
1167set_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.)
1168 CODE: 1270 CODE:
1169 self->r = r; 1271 self->r = r;
1170 self->g = g; 1272 self->g = g;
1171 self->b = b; 1273 self->b = b;
1172 self->a = a; 1274 self->a = a;
1173 1275
1174void 1276void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1277set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1278 CODE:
1177 if (self->font != font) 1279 if (self->font != font)
1178 { 1280 {
1179 self->font = font; 1281 self->font = font;
1180 layout_update_font (self); 1282 layout_update_font (self);
1181 } 1283 }
1182 1284
1183void 1285void
1184set_height (CFPlus::Layout self, int base_height) 1286set_height (DC::Layout self, int base_height)
1185 CODE: 1287 CODE:
1186 if (self->base_height != base_height) 1288 if (self->base_height != base_height)
1187 { 1289 {
1188 self->base_height = base_height; 1290 self->base_height = base_height;
1189 layout_update_font (self); 1291 layout_update_font (self);
1190 } 1292 }
1191 1293
1192void 1294void
1193set_width (CFPlus::Layout self, int max_width = -1) 1295set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1296 CODE:
1195 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);
1196 1298
1197void 1299void
1198set_indent (CFPlus::Layout self, int indent) 1300set_indent (DC::Layout self, int indent)
1199 CODE: 1301 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1302 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1303
1202void 1304void
1203set_spacing (CFPlus::Layout self, int spacing) 1305set_spacing (DC::Layout self, int spacing)
1204 CODE: 1306 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1307 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1308
1207void 1309void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1310set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1311 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1312 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1313 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1314 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1315 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1316 : PANGO_ELLIPSIZE_NONE
1215 ); 1317 );
1216 1318
1217void 1319void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1320set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1321 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1322 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1323
1222void 1324void
1223size (CFPlus::Layout self) 1325size (DC::Layout self)
1224 PPCODE: 1326 PPCODE:
1225{ 1327{
1226 int w, h; 1328 int w, h;
1227 1329
1228 layout_get_pixel_size (self, &w, &h); 1330 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1333 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1334 PUSHs (sv_2mortal (newSViv (h)));
1233} 1335}
1234 1336
1235int 1337int
1236descent (CFPlus::Layout self) 1338descent (DC::Layout self)
1237 CODE: 1339 CODE:
1238{ 1340{
1239 PangoRectangle rect; 1341 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1342 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1343 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1344 RETVAL = PANGO_DESCENT (rect);
1243} 1345}
1244 OUTPUT: 1346 OUTPUT:
1245 RETVAL 1347 RETVAL
1246 1348
1247int 1349int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1350xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1351 CODE:
1250{ 1352{
1251 int index, trailing; 1353 int index, trailing;
1252 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);
1253 RETVAL = index + trailing; 1355 RETVAL = index + trailing;
1254} 1356}
1255 OUTPUT: 1357 OUTPUT:
1256 RETVAL 1358 RETVAL
1257 1359
1258void 1360void
1259cursor_pos (CFPlus::Layout self, int index) 1361cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1362 PPCODE:
1261{ 1363{
1262 PangoRectangle strong_pos; 1364 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1365 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1366
1265 EXTEND (SP, 3); 1367 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1368 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1369 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1370 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1371}
1270 1372
1271void 1373void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1374index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1375 PPCODE:
1274{ 1376{
1275 int line, x; 1377 int line, x;
1276 1378
1277 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)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1381 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1382 --line;
1383#endif
1280 EXTEND (SP, 2); 1384 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1385 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1386 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1387}
1284 1388
1285void 1389void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1390line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1391 PPCODE:
1288{ 1392{
1289 PangoLayoutLine *lp; 1393 PangoLayoutLine *lp;
1290 int index, trailing; 1394 int index, trailing;
1291 1395
1292 if (line < 0) 1396 if (line < 0)
1293 XSRETURN_EMPTY; 1397 XSRETURN_EMPTY;
1294 1398
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1399 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1400 XSRETURN_EMPTY; /* do better */
1297 1401
1298 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);
1299 1403
1300 EXTEND (SP, 2); 1404 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1410 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1411 }
1308} 1412}
1309 1413
1310void 1414void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1415render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1416 CODE:
1417 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1418 pango_opengl_render_layout_subpixel (
1314 self->pl, 1419 self->pl,
1420 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1421 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1422 self->r, self->g, self->b, self->a,
1317 flags 1423 flags
1318 ); 1424 );
1425 // we assume that context_change actually clears/frees stuff
1426 // and does not do any recomputation...
1427 pango_layout_context_changed (self->pl);
1319 1428
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1429void
1430draw (DC::Layout self)
1431 CODE:
1432{
1433 glEnable (GL_TEXTURE_2D);
1434 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1435 glEnable (GL_BLEND);
1436 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1437 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1438 glEnable (GL_ALPHA_TEST);
1439 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1440
1441 rc_draw (self->rc);
1442
1443 glDisable (GL_ALPHA_TEST);
1444 glDisable (GL_BLEND);
1445 glDisable (GL_TEXTURE_2D);
1446}
1447
1448MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1449
1322PROTOTYPES: ENABLE 1450PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1451
1326void 1452void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1453pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1454 CODE:
1329{ 1455{
1406 RETVAL = width > 0; 1532 RETVAL = width > 0;
1407} 1533}
1408 OUTPUT: 1534 OUTPUT:
1409 RETVAL 1535 RETVAL
1410 1536
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1537MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1538
1413PROTOTYPES: DISABLE 1539PROTOTYPES: DISABLE
1414 1540
1415CFPlus::Map 1541DC::Map
1416new (SV *class) 1542new (SV *class)
1417 CODE: 1543 CODE:
1418 New (0, RETVAL, 1, struct map); 1544 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1545 RETVAL->x = 0;
1420 RETVAL->y = 0; 1546 RETVAL->y = 0;
1428 RETVAL->row = 0; 1554 RETVAL->row = 0;
1429 OUTPUT: 1555 OUTPUT:
1430 RETVAL 1556 RETVAL
1431 1557
1432void 1558void
1433DESTROY (CFPlus::Map self) 1559DESTROY (DC::Map self)
1434 CODE: 1560 CODE:
1435{ 1561{
1436 map_clear (self); 1562 map_clear (self);
1437 Safefree (self->face2tile); 1563 Safefree (self->face2tile);
1438 Safefree (self->tex); 1564 Safefree (self->tex);
1439 Safefree (self); 1565 Safefree (self);
1440} 1566}
1441 1567
1442void 1568void
1443resize (CFPlus::Map self, int map_width, int map_height) 1569resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1570 CODE:
1445 self->w = map_width; 1571 self->w = map_width;
1446 self->h = map_height; 1572 self->h = map_height;
1447 1573
1448void 1574void
1449clear (CFPlus::Map self) 1575clear (DC::Map self)
1450 CODE: 1576 CODE:
1451 map_clear (self); 1577 map_clear (self);
1452 1578
1453void 1579void
1454set_tileid (CFPlus::Map self, int face, int tile) 1580set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1581 CODE:
1456{ 1582{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1583 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1584 need_texid (self, tile);
1459} 1585}
1460 1586
1461void 1587void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1588set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1589 CODE:
1464{ 1590{
1465 tileid texid; 1591 tileid texid;
1466 maptex *tex; 1592 maptex *tex;
1467 1593
1480 tex->smoothtile = self->face2tile [smooth]; 1606 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1607 tex->smoothlevel = level;
1482} 1608}
1483 1609
1484void 1610void
1485set_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)
1486 CODE: 1612 CODE:
1487{ 1613{
1488 need_texid (self, texid); 1614 need_texid (self, texid);
1489 1615
1490 { 1616 {
1510 // from transparent color bleeding and ugly wrapping effects. 1636 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1637 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1638}
1513 1639
1514int 1640int
1515ox (CFPlus::Map self) 1641ox (DC::Map self)
1516 ALIAS: 1642 ALIAS:
1517 oy = 1 1643 oy = 1
1518 x = 2 1644 x = 2
1519 y = 3 1645 y = 3
1520 w = 4 1646 w = 4
1531 } 1657 }
1532 OUTPUT: 1658 OUTPUT:
1533 RETVAL 1659 RETVAL
1534 1660
1535void 1661void
1536scroll (CFPlus::Map self, int dx, int dy) 1662scroll (DC::Map self, int dx, int dy)
1537 CODE: 1663 CODE:
1538{ 1664{
1539 if (dx > 0) 1665 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 1666 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 1667 else if (dx < 0)
1557 self->y += MAP_EXTEND_Y; 1683 self->y += MAP_EXTEND_Y;
1558 } 1684 }
1559} 1685}
1560 1686
1561SV * 1687SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 1688map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 1689 CODE:
1564{ 1690{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1691 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 1692 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 1693 mapcell *cell;
1595 uint8_t ext, cmd; 1721 uint8_t ext, cmd;
1596 1722
1597 do 1723 do
1598 { 1724 {
1599 ext = *data++; 1725 ext = *data++;
1600 cmd = ext & 0x3f; 1726 cmd = ext & 0x7f;
1601 1727
1602 if (cmd < 4) 1728 if (cmd < 4)
1603 cell->darkness = 255 - ext * 64 + 1; 1729 cell->darkness = 255 - ext * 64 + 1;
1604 else if (cmd == 5) // health 1730 else if (cmd == 5) // health
1605 { 1731 {
1608 } 1734 }
1609 else if (cmd == 6) // monster width 1735 else if (cmd == 6) // monster width
1610 cell->stat_width = *data++ + 1; 1736 cell->stat_width = *data++ + 1;
1611 else if (cmd == 0x47) 1737 else if (cmd == 0x47)
1612 { 1738 {
1613 if (*data == 4) 1739 if (*data == 1) cell->player = data [1];
1614 ; // 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);
1615 1743
1616 data += *data + 1; 1744 data += *data + 1;
1617 } 1745 }
1618 else if (cmd == 8) // cell flags 1746 else if (cmd == 8) // cell flags
1619 cell->flags = *data++; 1747 cell->flags = *data++;
1656} 1784}
1657 OUTPUT: 1785 OUTPUT:
1658 RETVAL 1786 RETVAL
1659 1787
1660SV * 1788SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1789mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 1790 CODE:
1663{ 1791{
1664 int x1, x; 1792 int x1, x;
1665 int y1, y; 1793 int y1, y;
1666 int z; 1794 int z;
1711} 1839}
1712 OUTPUT: 1840 OUTPUT:
1713 RETVAL 1841 RETVAL
1714 1842
1715void 1843void
1716draw (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)
1717 CODE: 1845 CODE:
1718{ 1846{
1719 int x, y, z; 1847 int x, y, z;
1720 1848
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1849 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 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
1723 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)
1724 smooth_key skey; 1852 smooth_key skey;
1725 1853 int pl_x, pl_y;
1854 maptex pl_tex;
1726 rc_t *rc = rc_alloc (); 1855 rc_t *rc = rc_alloc ();
1727 rc_key_t key; 1856 rc_key_t key;
1728 rc_array_t *arr; 1857 rc_array_t *arr;
1858
1859 pl_tex.name = 0;
1729 1860
1730 // thats current max. sorry. 1861 // thats current max. sorry.
1731 if (sw > 255) sw = 255; 1862 if (sw > 255) sw = 255;
1732 if (sh > 255) sh = 255; 1863 if (sh > 255) sh = 255;
1733 1864
1788 tileid tile = cell->tile [z]; 1919 tileid tile = cell->tile [z];
1789 1920
1790 if (tile) 1921 if (tile)
1791 { 1922 {
1792 maptex tex = self->tex [tile]; 1923 maptex tex = self->tex [tile];
1793 int px, py; 1924 int px = (x + 1) * T - tex.w;
1925 int py = (y + 1) * T - tex.h;
1794 1926
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 1927 if (key.texname != tex.name)
1798 { 1928 {
1799 if (!tex.name) 1929 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 1930 tex = self->tex [2]; /* missing, replace by noface */
1801 1931
1802 key.texname = tex.name; 1932 key.texname = tex.name;
1803 arr = rc_array (rc, &key); 1933 arr = rc_array (rc, &key);
1804 } 1934 }
1805 1935
1806 px = (x + 1) * T - tex.w; 1936 if (expect_false (cell->player == player) && expect_false (z == 2))
1807 py = (y + 1) * T - tex.h; 1937 {
1938 pl_x = px;
1939 pl_y = py;
1940 pl_tex = tex;
1941 continue;
1942 }
1808 1943
1809 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1944 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810 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);
1811 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);
1812 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);
1813 1948
1814 if (cell->flags && z == 2) 1949 if (expect_false (cell->flags) && expect_false (z == 2))
1815 { 1950 {
1816 // overlays such as the speech bubble, probably more to come 1951 // overlays such as the speech bubble, probably more to come
1817 if (cell->flags & 1) 1952 if (cell->flags & 1)
1818 { 1953 {
1819 maptex tex = self->tex [1]; 1954 maptex tex = self->tex [1];
1884 // go through all smoothlevels, lowest to highest, then draw. 2019 // go through all smoothlevels, lowest to highest, then draw.
1885 // this is basically counting sort 2020 // this is basically counting sort
1886 { 2021 {
1887 int w, b; 2022 int w, b;
1888 2023
2024 glEnable (GL_TEXTURE_2D);
2025 glBegin (GL_QUADS);
1889 for (w = 0; w < 256 / 32; ++w) 2026 for (w = 0; w < 256 / 32; ++w)
1890 { 2027 {
1891 uint32_t smask = smooth_level [w]; 2028 uint32_t smask = smooth_level [w];
1892 if (smask) 2029 if (smask)
1893 for (b = 0; b < 32; ++b) 2030 for (b = 0; b < 32; ++b)
1918 { 2055 {
1919 // this time avoiding texture state changes 2056 // this time avoiding texture state changes
1920 // save gobs of state changes. 2057 // save gobs of state changes.
1921 if (key.texname != tex.name) 2058 if (key.texname != tex.name)
1922 { 2059 {
2060 glEnd ();
1923 key.texname = tex.name; 2061 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1924 arr = rc_array (rc, &key); 2062 glBegin (GL_QUADS);
1925 } 2063 }
1926 2064
1927 if (border) 2065 if (border)
1928 { 2066 {
1929 float ox = border * dx; 2067 float ox = border * dx;
1930 2068
1931 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2069 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1932 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2070 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1933 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2071 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1934 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2072 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1935 } 2073 }
1936 2074
1937 if (corner) 2075 if (corner)
1938 { 2076 {
1939 float ox = corner * dx; 2077 float ox = corner * dx;
1940 2078
1941 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2079 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1942 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2080 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1943 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);
1944 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2082 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1945 } 2083 }
1946 } 2084 }
1947 } 2085 }
1948 } 2086 }
1949 } 2087 }
1950 } 2088 }
2089
2090 glEnd ();
2091 glDisable (GL_TEXTURE_2D);
2092 key.texname = -1;
1951 } 2093 }
1952 2094
1953 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
1954 rc_draw (rc); 2112 rc_draw (rc);
1955 rc_clear (rc);
1956 } 2113 }
1957 2114
1958 glDisable (GL_BLEND); 2115 glDisable (GL_BLEND);
1959 rc_free (rc); 2116 rc_free (rc);
1960 2117
1989 } 2146 }
1990 } 2147 }
1991} 2148}
1992 2149
1993void 2150void
1994draw_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)
1995 CODE: 2152 CODE:
1996{ 2153{
1997 static float color[16][3] = { 2154 static float color[16][3] = {
1998 { 0.00F, 0.00F, 0.00F }, 2155 { 0.00F, 0.00F, 0.00F },
1999 { 1.00F, 1.00F, 1.00F }, 2156 { 1.00F, 1.00F, 1.00F },
2049 glDisable (GL_BLEND); 2206 glDisable (GL_BLEND);
2050 glDisable (GL_TEXTURE_2D); 2207 glDisable (GL_TEXTURE_2D);
2051} 2208}
2052 2209
2053void 2210void
2054fow_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)
2055 PPCODE: 2212 PPCODE:
2056{ 2213{
2057 int x, y; 2214 int x, y;
2058 int sw1 = sw + 2; 2215 int sw1 = sw + 2;
2059 int sh1 = sh + 2; 2216 int sh1 = sh + 2;
2130 PUSHs (sv_2mortal (newSViv (sh3))); 2287 PUSHs (sv_2mortal (newSViv (sh3)));
2131 PUSHs (darkness3_sv); 2288 PUSHs (darkness3_sv);
2132} 2289}
2133 2290
2134SV * 2291SV *
2135get_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)
2136 CODE: 2293 CODE:
2137{ 2294{
2138 int x, y, x1, y1; 2295 int x, y, x1, y1;
2139 SV *data_sv = newSV (w * h * 7 + 5); 2296 SV *data_sv = newSV (w * h * 7 + 5);
2140 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2297 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2197 else 2354 else
2198 *data++ = 0; 2355 *data++ = 0;
2199 } 2356 }
2200 } 2357 }
2201 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 {
2202 SvPOK_only (data_sv); 2362 SvPOK_only (data_sv);
2203 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2363 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2364 }
2365
2204 RETVAL = data_sv; 2366 RETVAL = data_sv;
2205} 2367}
2206 OUTPUT: 2368 OUTPUT:
2207 RETVAL 2369 RETVAL
2208 2370
2209void 2371void
2210set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2372set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2211 PPCODE: 2373 PPCODE:
2212{ 2374{
2213 int x, y, z; 2375 int x, y, z;
2214 int w, h; 2376 int w, h;
2215 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;
2216 2388
2217 if (*data++ != 0) 2389 if (*data++ != 0)
2218 return; /* version mismatch */ 2390 XSRETURN_EMPTY; /* version mismatch */
2219 2391
2220 w = *data++ << 8; w |= *data++; 2392 w = *data++ << 8; w |= *data++;
2221 h = *data++ << 8; h |= *data++; 2393 h = *data++ << 8; h |= *data++;
2222 2394
2223 // 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
2235 { 2407 {
2236 maprow *row = map_get_row (self, y); 2408 maprow *row = map_get_row (self, y);
2237 2409
2238 for (x = x0; x < x1; x++) 2410 for (x = x0; x < x1; x++)
2239 { 2411 {
2412 uint8_t flags;
2413
2414 if (data + 7 >= end)
2415 XSRETURN_EMPTY;
2416
2240 uint8_t flags = *data++; 2417 flags = *data++;
2241 2418
2242 if (flags) 2419 if (flags)
2243 { 2420 {
2244 mapcell *cell = row_get_cell (row, x); 2421 mapcell *cell = row_get_cell (row, x);
2245 tileid tile[3] = { 0, 0, 0 }; 2422 tileid tile[3] = { 0, 0, 0 };
2248 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2425 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2249 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2426 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2250 2427
2251 if (cell->darkness == 0) 2428 if (cell->darkness == 0)
2252 { 2429 {
2253 cell->darkness = 0; 2430 /*cell->darkness = 0;*/
2431 EXTEND (SP, 3);
2254 2432
2255 for (z = 0; z <= 2; z++) 2433 for (z = 0; z <= 2; z++)
2256 { 2434 {
2257 tileid t = tile [z]; 2435 tileid t = tile [z];
2258 2436
2259 if (t >= self->texs || (t && !self->tex [t].name)) 2437 if (t >= self->texs || (t && !self->tex [t].name))
2260 { 2438 {
2261 XPUSHs (sv_2mortal (newSViv (t))); 2439 PUSHs (sv_2mortal (newSViv (t)));
2262 need_texid (self, t); 2440 need_texid (self, t);
2263 } 2441 }
2264 2442
2265 cell->tile [z] = t; 2443 cell->tile [z] = t;
2266 } 2444 }
2268 } 2446 }
2269 } 2447 }
2270 } 2448 }
2271} 2449}
2272 2450
2273MODULE = CFPlus PACKAGE = CFPlus::RW 2451MODULE = Deliantra::Client PACKAGE = DC::RW
2274 2452
2275CFPlus::RW 2453DC::RW
2276new (SV *class, SV *data_sv) 2454new (SV *class, SV *data_sv)
2277 CODE: 2455 CODE:
2278{ 2456{
2279 STRLEN datalen; 2457 STRLEN datalen;
2280 char *data = SvPVbyte (data_sv, datalen); 2458 char *data = SvPVbyte (data_sv, datalen);
2282 RETVAL = SDL_RWFromConstMem (data, datalen); 2460 RETVAL = SDL_RWFromConstMem (data, datalen);
2283} 2461}
2284 OUTPUT: 2462 OUTPUT:
2285 RETVAL 2463 RETVAL
2286 2464
2287CFPlus::RW 2465DC::RW
2288new_from_file (SV *class, const char *path, const char *mode = "rb") 2466new_from_file (SV *class, const char *path, const char *mode = "rb")
2289 CODE: 2467 CODE:
2290 RETVAL = SDL_RWFromFile (path, mode); 2468 RETVAL = SDL_RWFromFile (path, mode);
2291 OUTPUT: 2469 OUTPUT:
2292 RETVAL 2470 RETVAL
2293 2471
2294# fails on win32: 2472# fails on win32:
2295# CFPlus.xs(2268) : error C2059: syntax error : '(' 2473# dc.xs(2268) : error C2059: syntax error : '('
2296#void 2474#void
2297#close (CFPlus::RW self) 2475#close (DC::RW self)
2298# CODE: 2476# CODE:
2299# (self->(close)) (self); 2477# (self->(close)) (self);
2300 2478
2301MODULE = CFPlus PACKAGE = CFPlus::Channel 2479MODULE = Deliantra::Client PACKAGE = DC::Channel
2302 2480
2303PROTOTYPES: DISABLE 2481PROTOTYPES: DISABLE
2304 2482
2305CFPlus::Channel 2483DC::Channel
2306find () 2484find ()
2307 CODE: 2485 CODE:
2308{ 2486{
2309 RETVAL = Mix_GroupAvailable (-1); 2487 RETVAL = Mix_GroupAvailable (-1);
2310 2488
2323} 2501}
2324 OUTPUT: 2502 OUTPUT:
2325 RETVAL 2503 RETVAL
2326 2504
2327void 2505void
2328halt (CFPlus::Channel self) 2506halt (DC::Channel self)
2329 CODE: 2507 CODE:
2330 Mix_HaltChannel (self); 2508 Mix_HaltChannel (self);
2331 2509
2332void 2510void
2333expire (CFPlus::Channel self, int ticks = -1) 2511expire (DC::Channel self, int ticks = -1)
2334 CODE: 2512 CODE:
2335 Mix_ExpireChannel (self, ticks); 2513 Mix_ExpireChannel (self, ticks);
2336 2514
2337void 2515void
2338fade_out (CFPlus::Channel self, int ticks = -1) 2516fade_out (DC::Channel self, int ticks = -1)
2339 CODE: 2517 CODE:
2340 Mix_FadeOutChannel (self, ticks); 2518 Mix_FadeOutChannel (self, ticks);
2341 2519
2342int 2520int
2343volume (CFPlus::Channel self, int volume) 2521volume (DC::Channel self, int volume)
2344 CODE: 2522 CODE:
2345 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2523 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2346 OUTPUT: 2524 OUTPUT:
2347 RETVAL 2525 RETVAL
2348 2526
2349void 2527void
2350unregister_all_effects (CFPlus::Channel self) 2528unregister_all_effects (DC::Channel self)
2351 CODE: 2529 CODE:
2352 Mix_UnregisterAllEffects (self); 2530 Mix_UnregisterAllEffects (self);
2353 2531
2354void 2532void
2355set_panning (CFPlus::Channel self, int left, int right) 2533set_panning (DC::Channel self, int left, int right)
2356 CODE: 2534 CODE:
2357 left = CLAMP (left , 0, 255); 2535 left = CLAMP (left , 0, 255);
2358 right = CLAMP (right, 0, 255); 2536 right = CLAMP (right, 0, 255);
2359 Mix_SetPanning (self, left, right); 2537 Mix_SetPanning (self, left, right);
2360 2538
2361void 2539void
2362set_distance (CFPlus::Channel self, int distance) 2540set_distance (DC::Channel self, int distance)
2363 CODE: 2541 CODE:
2364 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2542 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2365 2543
2366void 2544void
2367set_position (CFPlus::Channel self, int angle, int distance) 2545set_position (DC::Channel self, int angle, int distance)
2368 CODE: 2546 CODE:
2369 2547
2370void 2548void
2371set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2549set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2372 CODE: 2550 CODE:
2373{ 2551{
2374 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));
2375 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);
2376 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2554 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2377} 2555}
2378 2556
2379void 2557void
2380set_reverse_stereo (CFPlus::Channel self, int flip) 2558set_reverse_stereo (DC::Channel self, int flip)
2381 CODE: 2559 CODE:
2382 Mix_SetReverseStereo (self, flip); 2560 Mix_SetReverseStereo (self, flip);
2383 2561
2384MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2562MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2385 2563
2386PROTOTYPES: DISABLE 2564PROTOTYPES: DISABLE
2387 2565
2388CFPlus::MixChunk 2566DC::MixChunk
2389new (SV *class, CFPlus::RW rwops) 2567new (SV *class, DC::RW rwops)
2390 CODE: 2568 CODE:
2391 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2569 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2392 OUTPUT: 2570 OUTPUT:
2393 RETVAL 2571 RETVAL
2394 2572
2395void 2573void
2396DESTROY (CFPlus::MixChunk self) 2574DESTROY (DC::MixChunk self)
2397 CODE: 2575 CODE:
2398 Mix_FreeChunk (self); 2576 Mix_FreeChunk (self);
2399 2577
2400int 2578int
2401volume (CFPlus::MixChunk self, int volume = -1) 2579volume (DC::MixChunk self, int volume = -1)
2402 CODE: 2580 CODE:
2403 if (items > 1) 2581 if (items > 1)
2404 volume = CLAMP (volume, 0, 128); 2582 volume = CLAMP (volume, 0, 128);
2405 RETVAL = Mix_VolumeChunk (self, volume); 2583 RETVAL = Mix_VolumeChunk (self, volume);
2406 OUTPUT: 2584 OUTPUT:
2407 RETVAL 2585 RETVAL
2408 2586
2409CFPlus::Channel 2587DC::Channel
2410play (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)
2411 CODE: 2589 CODE:
2412{ 2590{
2413 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2591 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2414 2592
2415 if (RETVAL < 0) 2593 if (RETVAL < 0)
2422 } 2600 }
2423} 2601}
2424 OUTPUT: 2602 OUTPUT:
2425 RETVAL 2603 RETVAL
2426 2604
2427MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2605MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2428 2606
2429int 2607int
2430volume (int volume = -1) 2608volume (int volume = -1)
2431 PROTOTYPE: ;$ 2609 PROTOTYPE: ;$
2432 CODE: 2610 CODE:
2444void 2622void
2445halt () 2623halt ()
2446 CODE: 2624 CODE:
2447 Mix_HaltMusic (); 2625 Mix_HaltMusic ();
2448 2626
2449CFPlus::MixMusic 2627DC::MixMusic
2450new (SV *class, CFPlus::RW rwops) 2628new (SV *class, DC::RW rwops)
2451 CODE: 2629 CODE:
2452 RETVAL = Mix_LoadMUS_RW (rwops); 2630 RETVAL = Mix_LoadMUS_RW (rwops);
2453 OUTPUT: 2631 OUTPUT:
2454 RETVAL 2632 RETVAL
2455 2633
2456void 2634void
2457DESTROY (CFPlus::MixMusic self) 2635DESTROY (DC::MixMusic self)
2458 CODE: 2636 CODE:
2459 Mix_FreeMusic (self); 2637 Mix_FreeMusic (self);
2460 2638
2461int 2639int
2462play (CFPlus::MixMusic self, int loops = -1) 2640play (DC::MixMusic self, int loops = -1)
2463 CODE: 2641 CODE:
2464 RETVAL = Mix_PlayMusic (self, loops); 2642 RETVAL = Mix_PlayMusic (self, loops);
2465 OUTPUT: 2643 OUTPUT:
2466 RETVAL 2644 RETVAL
2467 2645
2468void 2646void
2469fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2647fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2470 CODE: 2648 CODE:
2471 Mix_FadeInMusicPos (self, loops, ms, position); 2649 Mix_FadeInMusicPos (self, loops, ms, position);
2472 2650
2473MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2651MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2474 2652
2475PROTOTYPES: ENABLE 2653PROTOTYPES: ENABLE
2476 2654
2477BOOT: 2655BOOT:
2478{ 2656{
2479 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2657 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2480 static const struct { 2658 static const struct {
2481 const char *name; 2659 const char *name;
2482 IV iv; 2660 IV iv;
2483 } *civ, const_iv[] = { 2661 } *civ, const_iv[] = {
2484# define const_iv(name) { # name, (IV)name } 2662# define const_iv(name) { # name, (IV)name }
2519 const_iv (GL_INTENSITY), 2697 const_iv (GL_INTENSITY),
2520 const_iv (GL_LUMINANCE), 2698 const_iv (GL_LUMINANCE),
2521 const_iv (GL_LUMINANCE_ALPHA), 2699 const_iv (GL_LUMINANCE_ALPHA),
2522 const_iv (GL_FLOAT), 2700 const_iv (GL_FLOAT),
2523 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),
2524 const_iv (GL_COMPILE), 2708 const_iv (GL_COMPILE),
2525 const_iv (GL_PROXY_TEXTURE_1D), 2709 const_iv (GL_PROXY_TEXTURE_1D),
2526 const_iv (GL_PROXY_TEXTURE_2D), 2710 const_iv (GL_PROXY_TEXTURE_2D),
2527 const_iv (GL_TEXTURE_1D), 2711 const_iv (GL_TEXTURE_1D),
2528 const_iv (GL_TEXTURE_2D), 2712 const_iv (GL_TEXTURE_2D),
2567 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2751 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2568 const_iv (GL_POINT_SMOOTH_HINT), 2752 const_iv (GL_POINT_SMOOTH_HINT),
2569 const_iv (GL_LINE_SMOOTH_HINT), 2753 const_iv (GL_LINE_SMOOTH_HINT),
2570 const_iv (GL_POLYGON_SMOOTH_HINT), 2754 const_iv (GL_POLYGON_SMOOTH_HINT),
2571 const_iv (GL_GENERATE_MIPMAP_HINT), 2755 const_iv (GL_GENERATE_MIPMAP_HINT),
2756 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2572 const_iv (GL_FASTEST), 2757 const_iv (GL_FASTEST),
2573 const_iv (GL_DONT_CARE), 2758 const_iv (GL_DONT_CARE),
2574 const_iv (GL_NICEST), 2759 const_iv (GL_NICEST),
2575 const_iv (GL_V2F), 2760 const_iv (GL_V2F),
2576 const_iv (GL_V3F), 2761 const_iv (GL_V3F),
2584 2769
2585 texture_av = newAV (); 2770 texture_av = newAV ();
2586 AvREAL_off (texture_av); 2771 AvREAL_off (texture_av);
2587} 2772}
2588 2773
2774void
2775disable_GL_EXT_blend_func_separate ()
2776 CODE:
2777 gl.BlendFuncSeparate = 0;
2778 gl.BlendFuncSeparateEXT = 0;
2779
2589char * 2780char *
2590gl_vendor () 2781gl_vendor ()
2591 CODE: 2782 CODE:
2592 RETVAL = (char *)glGetString (GL_VENDOR); 2783 RETVAL = (char *)glGetString (GL_VENDOR);
2593 OUTPUT: 2784 OUTPUT:
2714 2905
2715void glRect (float x1, float y1, float x2, float y2) 2906void glRect (float x1, float y1, float x2, float y2)
2716 CODE: 2907 CODE:
2717 glRectf (x1, y1, x2, y2); 2908 glRectf (x1, y1, x2, y2);
2718 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
2719PROTOTYPES: ENABLE 2919PROTOTYPES: ENABLE
2720 2920
2721void glBegin (int mode) 2921void glBegin (int mode)
2722 2922
2723void glEnd () 2923void glEnd ()
2755void 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)
2756 CODE: 2956 CODE:
2757 if (gl.SeparableFilter2D) 2957 if (gl.SeparableFilter2D)
2758 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2958 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2759 2959
2760void 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)
2761 2961
2762void 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)
2763 2963
2764void glDrawPixels (int width, int height, int format, int type, char *pixels) 2964void glDrawPixels (int width, int height, int format, int type, char *pixels)
2765 2965
2791 2991
2792void glEndList () 2992void glEndList ()
2793 2993
2794void glCallList (int list) 2994void glCallList (int list)
2795 2995
2796MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2996MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2797 2997
2798PROTOTYPES: DISABLE 2998PROTOTYPES: DISABLE
2799 2999
2800void 3000void
2801find_widget (SV *self, NV x, NV y) 3001find_widget (SV *self, NV x, NV y)
2805 XPUSHs (self); 3005 XPUSHs (self);
2806} 3006}
2807 3007
2808BOOT: 3008BOOT:
2809{ 3009{
2810 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3010 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2811 3011
2812 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);
2813 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);
2814 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);
2815 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);
2816} 3016}
2817 3017
2818void 3018void
2819draw (SV *self) 3019draw (SV *self)
2820 CODE: 3020 CODE:
2824 NV x, y, w, h; 3024 NV x, y, w, h;
2825 SV *draw_x_sv = GvSV (draw_x_gv); 3025 SV *draw_x_sv = GvSV (draw_x_gv);
2826 SV *draw_y_sv = GvSV (draw_y_gv); 3026 SV *draw_y_sv = GvSV (draw_y_gv);
2827 SV *draw_w_sv = GvSV (draw_w_gv); 3027 SV *draw_w_sv = GvSV (draw_w_gv);
2828 SV *draw_h_sv = GvSV (draw_h_gv); 3028 SV *draw_h_sv = GvSV (draw_h_gv);
2829 SV *hover;
2830 double draw_x, draw_y, draw_w, draw_h; 3029 double draw_x, draw_y;
2831 3030
2832 if (!SvROK (self)) 3031 if (!SvROK (self))
2833 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3032 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2834 3033
2835 hv = (HV *)SvRV (self); 3034 hv = (HV *)SvRV (self);
2836 3035
2837 if (SvTYPE (hv) != SVt_PVHV) 3036 if (SvTYPE (hv) != SVt_PVHV)
2838 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3037 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2839 3038
2840 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.;
2841 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.;
2842 3041
2843 if (!h || !w) 3042 if (!h || !w)
2863 { 3062 {
2864 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3063 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2865 3064
2866 if (svp && SvTRUE (*svp)) 3065 if (svp && SvTRUE (*svp))
2867 { 3066 {
2868 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);
2869 glEnable (GL_BLEND); 3068 glEnable (GL_BLEND);
2870 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3069 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2871 glBegin (GL_QUADS); 3070 glBegin (GL_QUADS);
2872 glVertex2f (0, 0); 3071 glVertex2f (0, 0);
2873 glVertex2f (w, 0); 3072 glVertex2f (w, 0);
2876 glEnd (); 3075 glEnd ();
2877 glDisable (GL_BLEND); 3076 glDisable (GL_BLEND);
2878 } 3077 }
2879 } 3078 }
2880#if 0 3079#if 0
2881 if ($ENV{CFPLUS_DEBUG} & 1) { 3080 // draw borders, for debugging
2882 glPushMatrix; 3081 glPushMatrix ();
2883 glColor 1, 1, 0, 1; 3082 glColor4f (1., 1., 0., 1.);
2884 glTranslate 0.375, 0.375; 3083 glTranslatef (.5, .5, 0.);
2885 glBegin GL_LINE_LOOP; 3084 glBegin (GL_LINE_LOOP);
2886 glVertex 0 , 0; 3085 glVertex2f (0 , 0);
2887 glVertex $self->{w} - 1, 0; 3086 glVertex2f (w - 1, 0);
2888 glVertex $self->{w} - 1, $self->{h} - 1; 3087 glVertex2f (w - 1, h - 1);
2889 glVertex 0 , $self->{h} - 1; 3088 glVertex2f (0 , h - 1);
2890 glEnd; 3089 glEnd ();
2891 glPopMatrix; 3090 glPopMatrix ();
2892 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2893 }
2894#endif 3091#endif
2895 PUSHMARK (SP); 3092 PUSHMARK (SP);
2896 XPUSHs (self); 3093 XPUSHs (self);
2897 PUTBACK; 3094 PUTBACK;
2898 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