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.223 by root, Sat Aug 11 11:07:08 2007 UTC vs.
Revision 1.266 by root, Sun Jul 20 02:51:40 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) 761 if ((*m)->w >= 400 && (*m)->h >= 300)
686 { 762 {
687 AV *av = newAV (); 763 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 764 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 765 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 766 av_push (av, newSViv (rgb));
714 790
715 if (RETVAL) 791 if (RETVAL)
716 { 792 {
717 av_clear (texture_av); 793 av_clear (texture_av);
718 794
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 795 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720#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);
721#include "glfunc.h" 797#include "glfunc.h"
722#undef GL_FUNC 798#undef GL_FUNC
723 } 799 }
724} 800}
731char * 807char *
732SDL_GetKeyName (int sym) 808SDL_GetKeyName (int sym)
733 809
734int 810int
735SDL_GetAppState () 811SDL_GetAppState ()
812
813int
814SDL_GetModState ()
736 815
737void 816void
738poll_events () 817poll_events ()
739 PPCODE: 818 PPCODE:
740{ 819{
750 { 829 {
751 case SDL_KEYDOWN: 830 case SDL_KEYDOWN:
752 case SDL_KEYUP: 831 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 832 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 833 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 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);
756 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 */
757 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 836 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 837 break;
759 838
760 case SDL_ACTIVEEVENT: 839 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 840 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
779 x = ev.motion.x; 858 x = ev.motion.x;
780 y = ev.motion.y; 859 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 860 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 861 }
783 862
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 863 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 864 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 865 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 866 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 867 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 868 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 869 }
791 break; 870 break;
792 871
793 case SDL_MOUSEBUTTONDOWN: 872 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 873 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 874 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 875
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 876 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 877 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 878 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 879 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 884 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 885 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 886 break;
808 } 887 }
809 888
810 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))));
811 } 890 }
812} 891}
813 892
814int 893int
815Mix_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)
816 POSTCALL: 895 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 896 Mix_HookMusicFinished (music_finished);
818 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}
819 914
820void 915void
821Mix_CloseAudio () 916Mix_CloseAudio ()
822 917
823int 918int
858 } 953 }
859 } 954 }
860#endif 955#endif
861} 956}
862 957
863void 958int
864add_font (char *file) 959add_font (char *file)
865 CODE: 960 CODE:
866 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 961 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
962 OUTPUT:
963 RETVAL
867 964
868void 965void
869load_image_inline (SV *image_) 966load_image_inline (SV *image_)
870 ALIAS: 967 ALIAS:
871 load_image_file = 1 968 load_image_file = 1
957void 1054void
958error (char *message) 1055error (char *message)
959 CODE: 1056 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1057 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1058#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1059 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1060#endif
964 1061
965void 1062void
966fatal (char *message) 1063fatal (char *message)
967 CODE: 1064 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1065 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1066#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1067 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1068#endif
972 _exit (1); 1069 _exit (1);
973 1070
974void 1071void
975_exit (int retval = 0) 1072_exit (int retval = 0)
987#if DEBUG 1084#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1085 VALGRIND_DO_LEAK_CHECK;
989#endif 1086#endif
990} 1087}
991 1088
992MODULE = CFPlus PACKAGE = CFPlus::Font 1089MODULE = Deliantra::Client PACKAGE = DC::Font
993 1090
994PROTOTYPES: DISABLE 1091PROTOTYPES: DISABLE
995 1092
996CFPlus::Font 1093DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1094new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1095 CODE:
999{ 1096{
1000 int count; 1097 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1098 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1004} 1101}
1005 OUTPUT: 1102 OUTPUT:
1006 RETVAL 1103 RETVAL
1007 1104
1008void 1105void
1009DESTROY (CFPlus::Font self) 1106DESTROY (DC::Font self)
1010 CODE: 1107 CODE:
1011 pango_font_description_free (self); 1108 pango_font_description_free (self);
1012 1109
1013void 1110void
1014make_default (CFPlus::Font self) 1111make_default (DC::Font self)
1015 PROTOTYPE: $ 1112 PROTOTYPE: $
1016 CODE: 1113 CODE:
1017 default_font = self; 1114 default_font = self;
1018 1115
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1116MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1117
1021PROTOTYPES: DISABLE 1118PROTOTYPES: DISABLE
1022 1119
1023void 1120void
1024reset_glyph_cache () 1121glyph_cache_backup ()
1025 PROTOTYPE: 1122 PROTOTYPE:
1026 CODE: 1123 CODE:
1124 tc_backup ();
1125
1126void
1127glyph_cache_restore ()
1128 PROTOTYPE:
1129 CODE:
1027 tc_clear (); 1130 tc_restore ();
1028 1131
1029CFPlus::Layout 1132DC::Layout
1030new (SV *class) 1133new (SV *class)
1031 CODE: 1134 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1135 New (0, RETVAL, 1, struct cf_layout);
1033 1136
1034 RETVAL->pl = pango_layout_new (opengl_context); 1137 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->g = 1.; 1139 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1140 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1141 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1142 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1143 RETVAL->font = 0;
1144 RETVAL->rc = rc_alloc ();
1041 1145
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1146 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1147 layout_update_font (RETVAL);
1044 OUTPUT: 1148 OUTPUT:
1045 RETVAL 1149 RETVAL
1046 1150
1047void 1151void
1048DESTROY (CFPlus::Layout self) 1152DESTROY (DC::Layout self)
1049 CODE: 1153 CODE:
1050 g_object_unref (self->pl); 1154 g_object_unref (self->pl);
1155 rc_free (self->rc);
1051 Safefree (self); 1156 Safefree (self);
1052 1157
1053void 1158void
1054set_text (CFPlus::Layout self, SV *text_) 1159set_text (DC::Layout self, SV *text_)
1055 CODE: 1160 CODE:
1056{ 1161{
1057 STRLEN textlen; 1162 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1163 char *text = SvPVutf8 (text_, textlen);
1059 1164
1060 pango_layout_set_text (self->pl, text, textlen); 1165 pango_layout_set_text (self->pl, text, textlen);
1061} 1166}
1062 1167
1063void 1168void
1064set_markup (CFPlus::Layout self, SV *text_) 1169set_markup (DC::Layout self, SV *text_)
1065 CODE: 1170 CODE:
1066{ 1171{
1067 STRLEN textlen; 1172 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1173 char *text = SvPVutf8 (text_, textlen);
1069 1174
1070 pango_layout_set_markup (self->pl, text, textlen); 1175 pango_layout_set_markup (self->pl, text, textlen);
1071} 1176}
1072 1177
1073void 1178void
1074set_shapes (CFPlus::Layout self, ...) 1179set_shapes (DC::Layout self, ...)
1075 CODE: 1180 CODE:
1076{ 1181{
1077 PangoAttrList *attrs = 0; 1182 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1183 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1184 const char *pos = text;
1114 if (attrs) 1219 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1220 pango_layout_set_attributes (self->pl, attrs);
1116} 1221}
1117 1222
1118void 1223void
1119get_shapes (CFPlus::Layout self) 1224get_shapes (DC::Layout self)
1120 PPCODE: 1225 PPCODE:
1121{ 1226{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1227 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1228
1124 do 1229 do
1125 { 1230 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1231 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1232
1128 if (run && shape_attr_p (run)) 1233 if (run && shape_attr_p (run))
1129 { 1234 {
1130 PangoRectangle extents; 1235 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1236 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1244
1140 pango_layout_iter_free (iter); 1245 pango_layout_iter_free (iter);
1141} 1246}
1142 1247
1143int 1248int
1144has_wrapped (CFPlus::Layout self) 1249has_wrapped (DC::Layout self)
1145 CODE: 1250 CODE:
1146{ 1251{
1147 int lines = 1; 1252 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1253 const char *text = pango_layout_get_text (self->pl);
1149 1254
1154} 1259}
1155 OUTPUT: 1260 OUTPUT:
1156 RETVAL 1261 RETVAL
1157 1262
1158SV * 1263SV *
1159get_text (CFPlus::Layout self) 1264get_text (DC::Layout self)
1160 CODE: 1265 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1266 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1267 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1268 OUTPUT:
1164 RETVAL 1269 RETVAL
1165 1270
1166void 1271void
1167set_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.)
1168 CODE: 1273 CODE:
1169 self->r = r; 1274 self->r = r;
1170 self->g = g; 1275 self->g = g;
1171 self->b = b; 1276 self->b = b;
1172 self->a = a; 1277 self->a = a;
1173 1278
1174void 1279void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1280set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1281 CODE:
1177 if (self->font != font) 1282 if (self->font != font)
1178 { 1283 {
1179 self->font = font; 1284 self->font = font;
1180 layout_update_font (self); 1285 layout_update_font (self);
1181 } 1286 }
1182 1287
1183void 1288void
1184set_height (CFPlus::Layout self, int base_height) 1289set_height (DC::Layout self, int base_height)
1185 CODE: 1290 CODE:
1186 if (self->base_height != base_height) 1291 if (self->base_height != base_height)
1187 { 1292 {
1188 self->base_height = base_height; 1293 self->base_height = base_height;
1189 layout_update_font (self); 1294 layout_update_font (self);
1190 } 1295 }
1191 1296
1192void 1297void
1193set_width (CFPlus::Layout self, int max_width = -1) 1298set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1299 CODE:
1195 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);
1196 1301
1197void 1302void
1198set_indent (CFPlus::Layout self, int indent) 1303set_indent (DC::Layout self, int indent)
1199 CODE: 1304 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1305 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1306
1202void 1307void
1203set_spacing (CFPlus::Layout self, int spacing) 1308set_spacing (DC::Layout self, int spacing)
1204 CODE: 1309 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1310 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1311
1207void 1312void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1313set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1314 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1315 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1316 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1317 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1318 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1319 : PANGO_ELLIPSIZE_NONE
1215 ); 1320 );
1216 1321
1217void 1322void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1323set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1324 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1325 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1326
1222void 1327void
1223size (CFPlus::Layout self) 1328size (DC::Layout self)
1224 PPCODE: 1329 PPCODE:
1225{ 1330{
1226 int w, h; 1331 int w, h;
1227 1332
1228 layout_get_pixel_size (self, &w, &h); 1333 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1336 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1337 PUSHs (sv_2mortal (newSViv (h)));
1233} 1338}
1234 1339
1235int 1340int
1236descent (CFPlus::Layout self) 1341descent (DC::Layout self)
1237 CODE: 1342 CODE:
1238{ 1343{
1239 PangoRectangle rect; 1344 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1345 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1346 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1347 RETVAL = PANGO_DESCENT (rect);
1243} 1348}
1244 OUTPUT: 1349 OUTPUT:
1245 RETVAL 1350 RETVAL
1246 1351
1247int 1352int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1353xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1354 CODE:
1250{ 1355{
1251 int index, trailing; 1356 int index, trailing;
1252 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);
1253 RETVAL = index + trailing; 1358 RETVAL = index + trailing;
1254} 1359}
1255 OUTPUT: 1360 OUTPUT:
1256 RETVAL 1361 RETVAL
1257 1362
1258void 1363void
1259cursor_pos (CFPlus::Layout self, int index) 1364cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1365 PPCODE:
1261{ 1366{
1262 PangoRectangle strong_pos; 1367 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1368 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1369
1265 EXTEND (SP, 3); 1370 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1371 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1372 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1373 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1374}
1270 1375
1271void 1376void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1377index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1378 PPCODE:
1274{ 1379{
1275 int line, x; 1380 int line, x;
1276 1381
1277 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)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1384 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1385 --line;
1386#endif
1280 EXTEND (SP, 2); 1387 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1388 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1389 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1390}
1284 1391
1285void 1392void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1393line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1394 PPCODE:
1288{ 1395{
1289 PangoLayoutLine *lp; 1396 PangoLayoutLine *lp;
1290 int index, trailing; 1397 int index, trailing;
1291 1398
1292 if (line < 0) 1399 if (line < 0)
1293 XSRETURN_EMPTY; 1400 XSRETURN_EMPTY;
1294 1401
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1402 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1403 XSRETURN_EMPTY; /* do better */
1297 1404
1298 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);
1299 1406
1300 EXTEND (SP, 2); 1407 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1413 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1414 }
1308} 1415}
1309 1416
1310void 1417void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1418render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1419 CODE:
1420 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1421 pango_opengl_render_layout_subpixel (
1314 self->pl, 1422 self->pl,
1423 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1424 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1425 self->r, self->g, self->b, self->a,
1317 flags 1426 flags
1318 ); 1427 );
1428 // we assume that context_change actually clears/frees stuff
1429 // and does not do any recomputation...
1430 pango_layout_context_changed (self->pl);
1319 1431
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1432void
1433draw (DC::Layout self)
1434 CODE:
1435{
1436 glEnable (GL_TEXTURE_2D);
1437 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1438 glEnable (GL_BLEND);
1439 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1440 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1441 glEnable (GL_ALPHA_TEST);
1442 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1443
1444 rc_draw (self->rc);
1445
1446 glDisable (GL_ALPHA_TEST);
1447 glDisable (GL_BLEND);
1448 glDisable (GL_TEXTURE_2D);
1449}
1450
1451MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1452
1322PROTOTYPES: ENABLE 1453PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1454
1326void 1455void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1456pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1457 CODE:
1329{ 1458{
1406 RETVAL = width > 0; 1535 RETVAL = width > 0;
1407} 1536}
1408 OUTPUT: 1537 OUTPUT:
1409 RETVAL 1538 RETVAL
1410 1539
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1540MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1541
1413PROTOTYPES: DISABLE 1542PROTOTYPES: DISABLE
1414 1543
1415CFPlus::Map 1544DC::Map
1416new (SV *class) 1545new (SV *class)
1417 CODE: 1546 CODE:
1418 New (0, RETVAL, 1, struct map); 1547 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1548 RETVAL->x = 0;
1420 RETVAL->y = 0; 1549 RETVAL->y = 0;
1428 RETVAL->row = 0; 1557 RETVAL->row = 0;
1429 OUTPUT: 1558 OUTPUT:
1430 RETVAL 1559 RETVAL
1431 1560
1432void 1561void
1433DESTROY (CFPlus::Map self) 1562DESTROY (DC::Map self)
1434 CODE: 1563 CODE:
1435{ 1564{
1436 map_clear (self); 1565 map_clear (self);
1437 Safefree (self->face2tile); 1566 Safefree (self->face2tile);
1438 Safefree (self->tex); 1567 Safefree (self->tex);
1439 Safefree (self); 1568 Safefree (self);
1440} 1569}
1441 1570
1442void 1571void
1443resize (CFPlus::Map self, int map_width, int map_height) 1572resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1573 CODE:
1445 self->w = map_width; 1574 self->w = map_width;
1446 self->h = map_height; 1575 self->h = map_height;
1447 1576
1448void 1577void
1449clear (CFPlus::Map self) 1578clear (DC::Map self)
1450 CODE: 1579 CODE:
1451 map_clear (self); 1580 map_clear (self);
1452 1581
1453void 1582void
1454set_tileid (CFPlus::Map self, int face, int tile) 1583set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1584 CODE:
1456{ 1585{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1586 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1587 need_texid (self, tile);
1459} 1588}
1460 1589
1461void 1590void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1591set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1592 CODE:
1464{ 1593{
1465 tileid texid; 1594 tileid texid;
1466 maptex *tex; 1595 maptex *tex;
1467 1596
1480 tex->smoothtile = self->face2tile [smooth]; 1609 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1610 tex->smoothlevel = level;
1482} 1611}
1483 1612
1484void 1613void
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) 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)
1486 CODE: 1615 CODE:
1487{ 1616{
1488 need_texid (self, texid); 1617 need_texid (self, texid);
1489 1618
1490 { 1619 {
1510 // from transparent color bleeding and ugly wrapping effects. 1639 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1640 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1641}
1513 1642
1514int 1643int
1515ox (CFPlus::Map self) 1644ox (DC::Map self)
1516 ALIAS: 1645 ALIAS:
1517 oy = 1 1646 oy = 1
1518 x = 2 1647 x = 2
1519 y = 3 1648 y = 3
1520 w = 4 1649 w = 4
1531 } 1660 }
1532 OUTPUT: 1661 OUTPUT:
1533 RETVAL 1662 RETVAL
1534 1663
1535void 1664void
1536scroll (CFPlus::Map self, int dx, int dy) 1665scroll (DC::Map self, int dx, int dy)
1537 CODE: 1666 CODE:
1538{ 1667{
1539 if (dx > 0) 1668 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 1669 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 1670 else if (dx < 0)
1557 self->y += MAP_EXTEND_Y; 1686 self->y += MAP_EXTEND_Y;
1558 } 1687 }
1559} 1688}
1560 1689
1561SV * 1690SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 1691map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 1692 CODE:
1564{ 1693{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1694 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 1695 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 1696 mapcell *cell;
1595 uint8_t ext, cmd; 1724 uint8_t ext, cmd;
1596 1725
1597 do 1726 do
1598 { 1727 {
1599 ext = *data++; 1728 ext = *data++;
1600 cmd = ext & 0x3f; 1729 cmd = ext & 0x7f;
1601 1730
1602 if (cmd < 4) 1731 if (cmd < 4)
1603 cell->darkness = 255 - ext * 64 + 1; 1732 cell->darkness = 255 - ext * 64 + 1;
1604 else if (cmd == 5) // health 1733 else if (cmd == 5) // health
1605 { 1734 {
1608 } 1737 }
1609 else if (cmd == 6) // monster width 1738 else if (cmd == 6) // monster width
1610 cell->stat_width = *data++ + 1; 1739 cell->stat_width = *data++ + 1;
1611 else if (cmd == 0x47) 1740 else if (cmd == 0x47)
1612 { 1741 {
1613 if (*data == 4) 1742 if (*data == 1) cell->player = data [1];
1614 ; // 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);
1615 1746
1616 data += *data + 1; 1747 data += *data + 1;
1617 } 1748 }
1618 else if (cmd == 8) // cell flags 1749 else if (cmd == 8) // cell flags
1619 cell->flags = *data++; 1750 cell->flags = *data++;
1649 } 1780 }
1650 } 1781 }
1651 } 1782 }
1652 } 1783 }
1653 else 1784 else
1785 {
1654 cell->darkness = 0; 1786 cell->darkness = 0;
1787 cell->stat_hp = 0;
1788 cell->flags = 0;
1789 cell->player = 0;
1790 }
1655 } 1791 }
1656} 1792}
1657 OUTPUT: 1793 OUTPUT:
1658 RETVAL 1794 RETVAL
1659 1795
1660SV * 1796SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1797mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 1798 CODE:
1663{ 1799{
1664 int x1, x; 1800 int x1, x;
1665 int y1, y; 1801 int y1, y;
1666 int z; 1802 int z;
1711} 1847}
1712 OUTPUT: 1848 OUTPUT:
1713 RETVAL 1849 RETVAL
1714 1850
1715void 1851void
1716draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1852draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1717 CODE: 1853 CODE:
1718{ 1854{
1719 int x, y, z; 1855 int x, y, z;
1720 1856
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1857 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1858 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1723 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1859 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724 smooth_key skey; 1860 smooth_key skey;
1725 1861 int pl_x, pl_y;
1862 maptex pl_tex;
1726 rc_t *rc = rc_alloc (); 1863 rc_t *rc = rc_alloc ();
1727 rc_key_t key; 1864 rc_key_t key;
1728 rc_array_t *arr; 1865 rc_array_t *arr;
1866
1867 pl_tex.name = 0;
1729 1868
1730 // thats current max. sorry. 1869 // thats current max. sorry.
1731 if (sw > 255) sw = 255; 1870 if (sw > 255) sw = 255;
1732 if (sh > 255) sh = 255; 1871 if (sh > 255) sh = 255;
1733 1872
1788 tileid tile = cell->tile [z]; 1927 tileid tile = cell->tile [z];
1789 1928
1790 if (tile) 1929 if (tile)
1791 { 1930 {
1792 maptex tex = self->tex [tile]; 1931 maptex tex = self->tex [tile];
1793 int px, py; 1932 int px = (x + 1) * T - tex.w;
1933 int py = (y + 1) * T - tex.h;
1794 1934
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 1935 if (key.texname != tex.name)
1798 { 1936 {
1799 if (!tex.name) 1937 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 1938 tex = self->tex [2]; /* missing, replace by noface */
1801 1939
1802 key.texname = tex.name; 1940 key.texname = tex.name;
1803 arr = rc_array (rc, &key); 1941 arr = rc_array (rc, &key);
1804 } 1942 }
1805 1943
1806 px = (x + 1) * T - tex.w; 1944 if (expect_false (cell->player == player) && expect_false (z == 2))
1807 py = (y + 1) * T - tex.h; 1945 {
1946 pl_x = px;
1947 pl_y = py;
1948 pl_tex = tex;
1949 continue;
1950 }
1808 1951
1809 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1952 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1953 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1811 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 1954 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1812 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 1955 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1813 1956
1814 if (cell->flags && z == 2) 1957 if (expect_false (cell->flags) && expect_false (z == 2))
1815 { 1958 {
1816 // overlays such as the speech bubble, probably more to come 1959 // overlays such as the speech bubble, probably more to come
1817 if (cell->flags & 1) 1960 if (cell->flags & 1)
1818 { 1961 {
1819 maptex tex = self->tex [1]; 1962 maptex tex = self->tex [1];
1876 } 2019 }
1877 } 2020 }
1878 } 2021 }
1879 } 2022 }
1880 2023
2024 rc_draw (rc);
2025 rc_clear (rc);
2026
1881 // go through all smoothlevels, lowest to highest, then draw. 2027 // go through all smoothlevels, lowest to highest, then draw.
1882 // this is basically counting sort 2028 // this is basically counting sort
1883 { 2029 {
1884 int w, b; 2030 int w, b;
1885 2031
2032 glEnable (GL_TEXTURE_2D);
2033 glBegin (GL_QUADS);
1886 for (w = 0; w < 256 / 32; ++w) 2034 for (w = 0; w < 256 / 32; ++w)
1887 { 2035 {
1888 uint32_t smask = smooth_level [w]; 2036 uint32_t smask = smooth_level [w];
1889 if (smask) 2037 if (smask)
1890 for (b = 0; b < 32; ++b) 2038 for (b = 0; b < 32; ++b)
1915 { 2063 {
1916 // this time avoiding texture state changes 2064 // this time avoiding texture state changes
1917 // save gobs of state changes. 2065 // save gobs of state changes.
1918 if (key.texname != tex.name) 2066 if (key.texname != tex.name)
1919 { 2067 {
2068 glEnd ();
1920 key.texname = tex.name; 2069 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1921 arr = rc_array (rc, &key); 2070 glBegin (GL_QUADS);
1922 } 2071 }
1923 2072
1924 if (border) 2073 if (border)
1925 { 2074 {
1926 float ox = border * dx; 2075 float ox = border * dx;
1927 2076
1928 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2077 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1929 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2078 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1930 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2079 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1931 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2080 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1932 } 2081 }
1933 2082
1934 if (corner) 2083 if (corner)
1935 { 2084 {
1936 float ox = corner * dx; 2085 float ox = corner * dx;
1937 2086
1938 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2087 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1939 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2088 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1940 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2089 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1941 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2090 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1942 } 2091 }
1943 } 2092 }
1944 } 2093 }
1945 } 2094 }
1946 } 2095 }
1947 } 2096 }
2097
2098 glEnd ();
2099 glDisable (GL_TEXTURE_2D);
2100 key.texname = -1;
1948 } 2101 }
1949 2102
1950 hv_clear (smooth); 2103 hv_clear (smooth);
2104 }
2105
2106 if (pl_tex.name)
2107 {
2108 maptex tex = pl_tex;
2109 int px = pl_x + sdx;
2110 int py = pl_y + sdy;
2111
2112 key.texname = tex.name;
2113 arr = rc_array (rc, &key);
2114
2115 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2116 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2117 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2118 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2119
1951 rc_draw (rc); 2120 rc_draw (rc);
1952 rc_clear (rc);
1953 } 2121 }
1954 2122
1955 glDisable (GL_BLEND); 2123 glDisable (GL_BLEND);
1956 rc_free (rc); 2124 rc_free (rc);
1957 2125
1986 } 2154 }
1987 } 2155 }
1988} 2156}
1989 2157
1990void 2158void
1991draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2159draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1992 CODE: 2160 CODE:
1993{ 2161{
1994 static float color[16][3] = { 2162 static float color[16][3] = {
1995 { 0.00F, 0.00F, 0.00F }, 2163 { 0.00F, 0.00F, 0.00F },
1996 { 1.00F, 1.00F, 1.00F }, 2164 { 1.00F, 1.00F, 1.00F },
2046 glDisable (GL_BLEND); 2214 glDisable (GL_BLEND);
2047 glDisable (GL_TEXTURE_2D); 2215 glDisable (GL_TEXTURE_2D);
2048} 2216}
2049 2217
2050void 2218void
2051fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2219fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2052 PPCODE: 2220 PPCODE:
2053{ 2221{
2054 int x, y; 2222 int x, y;
2055 int sw1 = sw + 2; 2223 int sw1 = sw + 2;
2056 int sh1 = sh + 2; 2224 int sh1 = sh + 2;
2127 PUSHs (sv_2mortal (newSViv (sh3))); 2295 PUSHs (sv_2mortal (newSViv (sh3)));
2128 PUSHs (darkness3_sv); 2296 PUSHs (darkness3_sv);
2129} 2297}
2130 2298
2131SV * 2299SV *
2132get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2300get_rect (DC::Map self, int x0, int y0, int w, int h)
2133 CODE: 2301 CODE:
2134{ 2302{
2135 int x, y, x1, y1; 2303 int x, y, x1, y1;
2136 SV *data_sv = newSV (w * h * 7 + 5); 2304 SV *data_sv = newSV (w * h * 7 + 5);
2137 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2305 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2194 else 2362 else
2195 *data++ = 0; 2363 *data++ = 0;
2196 } 2364 }
2197 } 2365 }
2198 2366
2367 /* if size is w*h + 5 then no data has been found */
2368 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2369 {
2199 SvPOK_only (data_sv); 2370 SvPOK_only (data_sv);
2200 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2371 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2372 }
2373
2201 RETVAL = data_sv; 2374 RETVAL = data_sv;
2202} 2375}
2203 OUTPUT: 2376 OUTPUT:
2204 RETVAL 2377 RETVAL
2205 2378
2206void 2379void
2207set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2380set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2208 PPCODE: 2381 PPCODE:
2209{ 2382{
2210 int x, y, z; 2383 int x, y, z;
2211 int w, h; 2384 int w, h;
2212 int x1, y1; 2385 int x1, y1;
2386 STRLEN len;
2387 uint8_t *data, *end;
2388
2389 len = SvLEN (data_sv);
2390 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2391 data = SvPVbyte_nolen (data_sv);
2392 end = data + len + 8;
2393
2394 if (len < 5)
2395 XSRETURN_EMPTY;
2213 2396
2214 if (*data++ != 0) 2397 if (*data++ != 0)
2215 return; /* version mismatch */ 2398 XSRETURN_EMPTY; /* version mismatch */
2216 2399
2217 w = *data++ << 8; w |= *data++; 2400 w = *data++ << 8; w |= *data++;
2218 h = *data++ << 8; h |= *data++; 2401 h = *data++ << 8; h |= *data++;
2219 2402
2220 // we need to do this 'cause we don't keep an absolute coord system for rows 2403 // we need to do this 'cause we don't keep an absolute coord system for rows
2232 { 2415 {
2233 maprow *row = map_get_row (self, y); 2416 maprow *row = map_get_row (self, y);
2234 2417
2235 for (x = x0; x < x1; x++) 2418 for (x = x0; x < x1; x++)
2236 { 2419 {
2420 uint8_t flags;
2421
2422 if (data + 7 >= end)
2423 XSRETURN_EMPTY;
2424
2237 uint8_t flags = *data++; 2425 flags = *data++;
2238 2426
2239 if (flags) 2427 if (flags)
2240 { 2428 {
2241 mapcell *cell = row_get_cell (row, x); 2429 mapcell *cell = row_get_cell (row, x);
2242 tileid tile[3] = { 0, 0, 0 }; 2430 tileid tile[3] = { 0, 0, 0 };
2245 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2433 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2246 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2434 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2247 2435
2248 if (cell->darkness == 0) 2436 if (cell->darkness == 0)
2249 { 2437 {
2250 cell->darkness = 0; 2438 /*cell->darkness = 0;*/
2439 EXTEND (SP, 3);
2251 2440
2252 for (z = 0; z <= 2; z++) 2441 for (z = 0; z <= 2; z++)
2253 { 2442 {
2254 tileid t = tile [z]; 2443 tileid t = tile [z];
2255 2444
2256 if (t >= self->texs || (t && !self->tex [t].name)) 2445 if (t >= self->texs || (t && !self->tex [t].name))
2257 { 2446 {
2258 XPUSHs (sv_2mortal (newSViv (t))); 2447 PUSHs (sv_2mortal (newSViv (t)));
2259 need_texid (self, t); 2448 need_texid (self, t);
2260 } 2449 }
2261 2450
2262 cell->tile [z] = t; 2451 cell->tile [z] = t;
2263 } 2452 }
2265 } 2454 }
2266 } 2455 }
2267 } 2456 }
2268} 2457}
2269 2458
2270MODULE = CFPlus PACKAGE = CFPlus::RW 2459MODULE = Deliantra::Client PACKAGE = DC::RW
2271 2460
2272CFPlus::RW 2461DC::RW
2273new (SV *class, SV *data_sv) 2462new (SV *class, SV *data_sv)
2274 CODE: 2463 CODE:
2275{ 2464{
2276 STRLEN datalen; 2465 STRLEN datalen;
2277 char *data = SvPVbyte (data_sv, datalen); 2466 char *data = SvPVbyte (data_sv, datalen);
2279 RETVAL = SDL_RWFromConstMem (data, datalen); 2468 RETVAL = SDL_RWFromConstMem (data, datalen);
2280} 2469}
2281 OUTPUT: 2470 OUTPUT:
2282 RETVAL 2471 RETVAL
2283 2472
2284CFPlus::RW 2473DC::RW
2285new_from_file (SV *class, const char *path, const char *mode = "rb") 2474new_from_file (SV *class, const char *path, const char *mode = "rb")
2286 CODE: 2475 CODE:
2287 RETVAL = SDL_RWFromFile (path, mode); 2476 RETVAL = SDL_RWFromFile (path, mode);
2288 OUTPUT: 2477 OUTPUT:
2289 RETVAL 2478 RETVAL
2290 2479
2291# fails on win32: 2480# fails on win32:
2292# CFPlus.xs(2268) : error C2059: syntax error : '(' 2481# dc.xs(2268) : error C2059: syntax error : '('
2293#void 2482#void
2294#close (CFPlus::RW self) 2483#close (DC::RW self)
2295# CODE: 2484# CODE:
2296# (self->(close)) (self); 2485# (self->(close)) (self);
2297 2486
2298MODULE = CFPlus PACKAGE = CFPlus::Channel 2487MODULE = Deliantra::Client PACKAGE = DC::Channel
2299 2488
2300PROTOTYPES: DISABLE 2489PROTOTYPES: DISABLE
2301 2490
2302CFPlus::Channel 2491DC::Channel
2303find () 2492find ()
2304 CODE: 2493 CODE:
2305{ 2494{
2306 RETVAL = Mix_GroupAvailable (-1); 2495 RETVAL = Mix_GroupAvailable (-1);
2307 2496
2320} 2509}
2321 OUTPUT: 2510 OUTPUT:
2322 RETVAL 2511 RETVAL
2323 2512
2324void 2513void
2325halt (CFPlus::Channel self) 2514halt (DC::Channel self)
2326 CODE: 2515 CODE:
2327 Mix_HaltChannel (self); 2516 Mix_HaltChannel (self);
2328 2517
2329void 2518void
2330expire (CFPlus::Channel self, int ticks = -1) 2519expire (DC::Channel self, int ticks = -1)
2331 CODE: 2520 CODE:
2332 Mix_ExpireChannel (self, ticks); 2521 Mix_ExpireChannel (self, ticks);
2333 2522
2334void 2523void
2335fade_out (CFPlus::Channel self, int ticks = -1) 2524fade_out (DC::Channel self, int ticks = -1)
2336 CODE: 2525 CODE:
2337 Mix_FadeOutChannel (self, ticks); 2526 Mix_FadeOutChannel (self, ticks);
2338 2527
2339int 2528int
2340volume (CFPlus::Channel self, int volume) 2529volume (DC::Channel self, int volume)
2341 CODE: 2530 CODE:
2342 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2531 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2343 OUTPUT: 2532 OUTPUT:
2344 RETVAL 2533 RETVAL
2345 2534
2346void 2535void
2347unregister_all_effects (CFPlus::Channel self) 2536unregister_all_effects (DC::Channel self)
2348 CODE: 2537 CODE:
2349 Mix_UnregisterAllEffects (self); 2538 Mix_UnregisterAllEffects (self);
2350 2539
2351void 2540void
2352set_panning (CFPlus::Channel self, int left, int right) 2541set_panning (DC::Channel self, int left, int right)
2353 CODE: 2542 CODE:
2354 left = CLAMP (left , 0, 255); 2543 left = CLAMP (left , 0, 255);
2355 right = CLAMP (right, 0, 255); 2544 right = CLAMP (right, 0, 255);
2356 Mix_SetPanning (self, left, right); 2545 Mix_SetPanning (self, left, right);
2357 2546
2358void 2547void
2359set_distance (CFPlus::Channel self, int distance) 2548set_distance (DC::Channel self, int distance)
2360 CODE: 2549 CODE:
2361 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2550 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2362 2551
2363void 2552void
2364set_position (CFPlus::Channel self, int angle, int distance) 2553set_position (DC::Channel self, int angle, int distance)
2365 CODE: 2554 CODE:
2366 2555
2367void 2556void
2368set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2557set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2369 CODE: 2558 CODE:
2370{ 2559{
2371 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2560 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2372 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2561 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2373 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2562 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2374} 2563}
2375 2564
2376void 2565void
2377set_reverse_stereo (CFPlus::Channel self, int flip) 2566set_reverse_stereo (DC::Channel self, int flip)
2378 CODE: 2567 CODE:
2379 Mix_SetReverseStereo (self, flip); 2568 Mix_SetReverseStereo (self, flip);
2380 2569
2381MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2570MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2382 2571
2383PROTOTYPES: DISABLE 2572PROTOTYPES: DISABLE
2384 2573
2385CFPlus::MixChunk 2574DC::MixChunk
2386new (SV *class, CFPlus::RW rwops) 2575new (SV *class, DC::RW rwops)
2387 CODE: 2576 CODE:
2388 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2577 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2389 OUTPUT: 2578 OUTPUT:
2390 RETVAL 2579 RETVAL
2391 2580
2392void 2581void
2393DESTROY (CFPlus::MixChunk self) 2582DESTROY (DC::MixChunk self)
2394 CODE: 2583 CODE:
2395 Mix_FreeChunk (self); 2584 Mix_FreeChunk (self);
2396 2585
2397int 2586int
2398volume (CFPlus::MixChunk self, int volume = -1) 2587volume (DC::MixChunk self, int volume = -1)
2399 CODE: 2588 CODE:
2400 if (items > 1) 2589 if (items > 1)
2401 volume = CLAMP (volume, 0, 128); 2590 volume = CLAMP (volume, 0, 128);
2402 RETVAL = Mix_VolumeChunk (self, volume); 2591 RETVAL = Mix_VolumeChunk (self, volume);
2403 OUTPUT: 2592 OUTPUT:
2404 RETVAL 2593 RETVAL
2405 2594
2406CFPlus::Channel 2595DC::Channel
2407play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2596play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2408 CODE: 2597 CODE:
2409{ 2598{
2410 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2599 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2411 2600
2412 if (RETVAL < 0) 2601 if (RETVAL < 0)
2419 } 2608 }
2420} 2609}
2421 OUTPUT: 2610 OUTPUT:
2422 RETVAL 2611 RETVAL
2423 2612
2424MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2613MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2425 2614
2426int 2615int
2427volume (int volume = -1) 2616volume (int volume = -1)
2428 PROTOTYPE: ;$ 2617 PROTOTYPE: ;$
2429 CODE: 2618 CODE:
2441void 2630void
2442halt () 2631halt ()
2443 CODE: 2632 CODE:
2444 Mix_HaltMusic (); 2633 Mix_HaltMusic ();
2445 2634
2446CFPlus::MixMusic 2635DC::MixMusic
2447new (SV *class, CFPlus::RW rwops) 2636new (SV *class, DC::RW rwops)
2448 CODE: 2637 CODE:
2449 RETVAL = Mix_LoadMUS_RW (rwops); 2638 RETVAL = Mix_LoadMUS_RW (rwops);
2450 OUTPUT: 2639 OUTPUT:
2451 RETVAL 2640 RETVAL
2452 2641
2453void 2642void
2454DESTROY (CFPlus::MixMusic self) 2643DESTROY (DC::MixMusic self)
2455 CODE: 2644 CODE:
2456 Mix_FreeMusic (self); 2645 Mix_FreeMusic (self);
2457 2646
2458int 2647int
2459play (CFPlus::MixMusic self, int loops = -1) 2648play (DC::MixMusic self, int loops = -1)
2460 CODE: 2649 CODE:
2461 RETVAL = Mix_PlayMusic (self, loops); 2650 RETVAL = Mix_PlayMusic (self, loops);
2462 OUTPUT: 2651 OUTPUT:
2463 RETVAL 2652 RETVAL
2464 2653
2465void 2654void
2466fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2655fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2467 CODE: 2656 CODE:
2468 Mix_FadeInMusicPos (self, loops, ms, position); 2657 Mix_FadeInMusicPos (self, loops, ms, position);
2469 2658
2470MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2659MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2471 2660
2472PROTOTYPES: ENABLE 2661PROTOTYPES: ENABLE
2473 2662
2474BOOT: 2663BOOT:
2475{ 2664{
2476 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2665 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2477 static const struct { 2666 static const struct {
2478 const char *name; 2667 const char *name;
2479 IV iv; 2668 IV iv;
2480 } *civ, const_iv[] = { 2669 } *civ, const_iv[] = {
2481# define const_iv(name) { # name, (IV)name } 2670# define const_iv(name) { # name, (IV)name }
2516 const_iv (GL_INTENSITY), 2705 const_iv (GL_INTENSITY),
2517 const_iv (GL_LUMINANCE), 2706 const_iv (GL_LUMINANCE),
2518 const_iv (GL_LUMINANCE_ALPHA), 2707 const_iv (GL_LUMINANCE_ALPHA),
2519 const_iv (GL_FLOAT), 2708 const_iv (GL_FLOAT),
2520 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2709 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2710 const_iv (GL_COMPRESSED_ALPHA_ARB),
2711 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2712 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2713 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2714 const_iv (GL_COMPRESSED_RGB_ARB),
2715 const_iv (GL_COMPRESSED_RGBA_ARB),
2521 const_iv (GL_COMPILE), 2716 const_iv (GL_COMPILE),
2522 const_iv (GL_PROXY_TEXTURE_1D), 2717 const_iv (GL_PROXY_TEXTURE_1D),
2523 const_iv (GL_PROXY_TEXTURE_2D), 2718 const_iv (GL_PROXY_TEXTURE_2D),
2524 const_iv (GL_TEXTURE_1D), 2719 const_iv (GL_TEXTURE_1D),
2525 const_iv (GL_TEXTURE_2D), 2720 const_iv (GL_TEXTURE_2D),
2564 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2759 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2565 const_iv (GL_POINT_SMOOTH_HINT), 2760 const_iv (GL_POINT_SMOOTH_HINT),
2566 const_iv (GL_LINE_SMOOTH_HINT), 2761 const_iv (GL_LINE_SMOOTH_HINT),
2567 const_iv (GL_POLYGON_SMOOTH_HINT), 2762 const_iv (GL_POLYGON_SMOOTH_HINT),
2568 const_iv (GL_GENERATE_MIPMAP_HINT), 2763 const_iv (GL_GENERATE_MIPMAP_HINT),
2764 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2569 const_iv (GL_FASTEST), 2765 const_iv (GL_FASTEST),
2570 const_iv (GL_DONT_CARE), 2766 const_iv (GL_DONT_CARE),
2571 const_iv (GL_NICEST), 2767 const_iv (GL_NICEST),
2572 const_iv (GL_V2F), 2768 const_iv (GL_V2F),
2573 const_iv (GL_V3F), 2769 const_iv (GL_V3F),
2581 2777
2582 texture_av = newAV (); 2778 texture_av = newAV ();
2583 AvREAL_off (texture_av); 2779 AvREAL_off (texture_av);
2584} 2780}
2585 2781
2782void
2783disable_GL_EXT_blend_func_separate ()
2784 CODE:
2785 gl.BlendFuncSeparate = 0;
2786 gl.BlendFuncSeparateEXT = 0;
2787
2586char * 2788char *
2587gl_vendor () 2789gl_vendor ()
2588 CODE: 2790 CODE:
2589 RETVAL = (char *)glGetString (GL_VENDOR); 2791 RETVAL = (char *)glGetString (GL_VENDOR);
2590 OUTPUT: 2792 OUTPUT:
2711 2913
2712void glRect (float x1, float y1, float x2, float y2) 2914void glRect (float x1, float y1, float x2, float y2)
2713 CODE: 2915 CODE:
2714 glRectf (x1, y1, x2, y2); 2916 glRectf (x1, y1, x2, y2);
2715 2917
2918void glRect_lineloop (float x1, float y1, float x2, float y2)
2919 CODE:
2920 glBegin (GL_LINE_LOOP);
2921 glVertex2f (x1, y1);
2922 glVertex2f (x2, y1);
2923 glVertex2f (x2, y2);
2924 glVertex2f (x1, y2);
2925 glEnd ();
2926
2716PROTOTYPES: ENABLE 2927PROTOTYPES: ENABLE
2717 2928
2718void glBegin (int mode) 2929void glBegin (int mode)
2719 2930
2720void glEnd () 2931void glEnd ()
2752void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2963void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2753 CODE: 2964 CODE:
2754 if (gl.SeparableFilter2D) 2965 if (gl.SeparableFilter2D)
2755 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2966 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2756 2967
2757void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2968void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2758 2969
2759void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2970void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2760 2971
2761void glDrawPixels (int width, int height, int format, int type, char *pixels) 2972void glDrawPixels (int width, int height, int format, int type, char *pixels)
2762 2973
2788 2999
2789void glEndList () 3000void glEndList ()
2790 3001
2791void glCallList (int list) 3002void glCallList (int list)
2792 3003
2793MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3004MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2794 3005
2795PROTOTYPES: DISABLE 3006PROTOTYPES: DISABLE
2796 3007
2797void 3008void
2798find_widget (SV *self, NV x, NV y) 3009find_widget (SV *self, NV x, NV y)
2802 XPUSHs (self); 3013 XPUSHs (self);
2803} 3014}
2804 3015
2805BOOT: 3016BOOT:
2806{ 3017{
2807 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3018 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2808 3019
2809 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3020 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2810 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3021 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2811 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3022 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2812 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3023 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2813} 3024}
2814 3025
2815void 3026void
2816draw (SV *self) 3027draw (SV *self)
2817 CODE: 3028 CODE:
2821 NV x, y, w, h; 3032 NV x, y, w, h;
2822 SV *draw_x_sv = GvSV (draw_x_gv); 3033 SV *draw_x_sv = GvSV (draw_x_gv);
2823 SV *draw_y_sv = GvSV (draw_y_gv); 3034 SV *draw_y_sv = GvSV (draw_y_gv);
2824 SV *draw_w_sv = GvSV (draw_w_gv); 3035 SV *draw_w_sv = GvSV (draw_w_gv);
2825 SV *draw_h_sv = GvSV (draw_h_gv); 3036 SV *draw_h_sv = GvSV (draw_h_gv);
2826 SV *hover;
2827 double draw_x, draw_y, draw_w, draw_h; 3037 double draw_x, draw_y;
2828 3038
2829 if (!SvROK (self)) 3039 if (!SvROK (self))
2830 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3040 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2831 3041
2832 hv = (HV *)SvRV (self); 3042 hv = (HV *)SvRV (self);
2833 3043
2834 if (SvTYPE (hv) != SVt_PVHV) 3044 if (SvTYPE (hv) != SVt_PVHV)
2835 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3045 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2836 3046
2837 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3047 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2838 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3048 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2839 3049
2840 if (!h || !w) 3050 if (!h || !w)
2860 { 3070 {
2861 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3071 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2862 3072
2863 if (svp && SvTRUE (*svp)) 3073 if (svp && SvTRUE (*svp))
2864 { 3074 {
2865 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3075 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2866 glEnable (GL_BLEND); 3076 glEnable (GL_BLEND);
2867 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3077 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2868 glBegin (GL_QUADS); 3078 glBegin (GL_QUADS);
2869 glVertex2f (0, 0); 3079 glVertex2f (0, 0);
2870 glVertex2f (w, 0); 3080 glVertex2f (w, 0);
2873 glEnd (); 3083 glEnd ();
2874 glDisable (GL_BLEND); 3084 glDisable (GL_BLEND);
2875 } 3085 }
2876 } 3086 }
2877#if 0 3087#if 0
2878 if ($ENV{CFPLUS_DEBUG} & 1) { 3088 // draw borders, for debugging
2879 glPushMatrix; 3089 glPushMatrix ();
2880 glColor 1, 1, 0, 1; 3090 glColor4f (1., 1., 0., 1.);
2881 glTranslate 0.375, 0.375; 3091 glTranslatef (.5, .5, 0.);
2882 glBegin GL_LINE_LOOP; 3092 glBegin (GL_LINE_LOOP);
2883 glVertex 0 , 0; 3093 glVertex2f (0 , 0);
2884 glVertex $self->{w} - 1, 0; 3094 glVertex2f (w - 1, 0);
2885 glVertex $self->{w} - 1, $self->{h} - 1; 3095 glVertex2f (w - 1, h - 1);
2886 glVertex 0 , $self->{h} - 1; 3096 glVertex2f (0 , h - 1);
2887 glEnd; 3097 glEnd ();
2888 glPopMatrix; 3098 glPopMatrix ();
2889 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2890 }
2891#endif 3099#endif
2892 PUSHMARK (SP); 3100 PUSHMARK (SP);
2893 XPUSHs (self); 3101 XPUSHs (self);
2894 PUTBACK; 3102 PUTBACK;
2895 call_method ("_draw", G_VOID | G_DISCARD); 3103 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines