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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines