ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.224 by root, Sat Aug 11 11:21:46 2007 UTC vs.
Revision 1.267 by root, Sun Jul 20 02:55:36 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);
349 self->oy = 0; 367 self->oy = 0;
350 self->row = 0; 368 self->row = 0;
351 self->rows = 0; 369 self->rows = 0;
352} 370}
353 371
372#define CELL_CLEAR(cell) \
373 do { \
374 (cell)->darkness = 0; \
375 (cell)->stat_hp = 0; \
376 (cell)->flags = 0; \
377 (cell)->player = 0; \
378 } while (0)
379
354static void 380static void
355map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 381map_blank (DC__Map self, int x0, int y0, int w, int h)
356{ 382{
357 int x, y; 383 int x, y;
358 maprow *row; 384 maprow *row;
359 mapcell *cell; 385 mapcell *cell;
360 386
372 if (x >= row->c1) 398 if (x >= row->c1)
373 break; 399 break;
374 400
375 cell = row->col + x - row->c0; 401 cell = row->col + x - row->c0;
376 402
377 cell->darkness = 0; 403 CELL_CLEAR (cell);
378 cell->stat_hp = 0;
379 cell->flags = 0;
380 cell->player = 0;
381 } 404 }
382 } 405 }
383} 406}
384 407
385typedef struct { 408typedef struct {
439 n |= n >> 16; 462 n |= n >> 16;
440 463
441 return n + 1; 464 return n + 1;
442} 465}
443 466
467static unsigned int
468popcount (unsigned int n)
469{
470 n -= (n >> 1) & 0x55555555U;
471 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
472 n = ((n >> 4) + n) & 0x0f0f0f0fU;
473 n *= 0x01010101U;
474
475 return n >> 24;
476}
477
444/* SDL should provide this, really. */ 478/* SDL should provide this, really. */
445#define SDLK_MODIFIER_MIN 300 479#define SDLK_MODIFIER_MIN 300
446#define SDLK_MODIFIER_MAX 314 480#define SDLK_MODIFIER_MAX 314
447 481
448/******************************************************************************/ 482/******************************************************************************/
486 return 0; 520 return 0;
487 521
488 return 1; 522 return 1;
489} 523}
490 524
491MODULE = CFPlus PACKAGE = CFPlus 525MODULE = Deliantra::Client PACKAGE = DC
492 526
493PROTOTYPES: ENABLE 527PROTOTYPES: ENABLE
494 528
495BOOT: 529BOOT:
496{ 530{
497 HV *stash = gv_stashpv ("CFPlus", 1); 531 HV *stash = gv_stashpv ("DC", 1);
498 static const struct { 532 static const struct {
499 const char *name; 533 const char *name;
500 IV iv; 534 IV iv;
501 } *civ, const_iv[] = { 535 } *civ, const_iv[] = {
502# define const_iv(name) { # name, (IV)name } 536# define const_iv(name) { # name, (IV)name }
524 558
525 const_iv (SDL_APPINPUTFOCUS), 559 const_iv (SDL_APPINPUTFOCUS),
526 const_iv (SDL_APPMOUSEFOCUS), 560 const_iv (SDL_APPMOUSEFOCUS),
527 const_iv (SDL_APPACTIVE), 561 const_iv (SDL_APPACTIVE),
528 562
563 const_iv (SDLK_FIRST),
564 const_iv (SDLK_LAST),
529 const_iv (SDLK_KP0), 565 const_iv (SDLK_KP0),
530 const_iv (SDLK_KP1), 566 const_iv (SDLK_KP1),
531 const_iv (SDLK_KP2), 567 const_iv (SDLK_KP2),
532 const_iv (SDLK_KP3), 568 const_iv (SDLK_KP3),
533 const_iv (SDLK_KP4), 569 const_iv (SDLK_KP4),
605 const_iv (KMOD_LMETA), 641 const_iv (KMOD_LMETA),
606 const_iv (KMOD_RMETA), 642 const_iv (KMOD_RMETA),
607 const_iv (KMOD_NUM), 643 const_iv (KMOD_NUM),
608 const_iv (KMOD_CAPS), 644 const_iv (KMOD_CAPS),
609 const_iv (KMOD_MODE), 645 const_iv (KMOD_MODE),
646
647 const_iv (MIX_DEFAULT_FORMAT),
648
649 const_iv (SDL_INIT_TIMER),
650 const_iv (SDL_INIT_AUDIO),
651 const_iv (SDL_INIT_VIDEO),
652 const_iv (SDL_INIT_CDROM),
653 const_iv (SDL_INIT_JOYSTICK),
654 const_iv (SDL_INIT_EVERYTHING),
655 const_iv (SDL_INIT_NOPARACHUTE),
656 const_iv (SDL_INIT_EVENTTHREAD),
657
658 const_iv (SDL_GL_RED_SIZE),
659 const_iv (SDL_GL_GREEN_SIZE),
660 const_iv (SDL_GL_BLUE_SIZE),
661 const_iv (SDL_GL_ALPHA_SIZE),
662 const_iv (SDL_GL_DOUBLEBUFFER),
663 const_iv (SDL_GL_BUFFER_SIZE),
664 const_iv (SDL_GL_DEPTH_SIZE),
665 const_iv (SDL_GL_STENCIL_SIZE),
666 const_iv (SDL_GL_ACCUM_RED_SIZE),
667 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
668 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
669 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
670 const_iv (SDL_GL_STEREO),
671 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
672 const_iv (SDL_GL_MULTISAMPLESAMPLES),
673 const_iv (SDL_GL_ACCELERATED_VISUAL),
674 const_iv (SDL_GL_SWAP_CONTROL)
610# undef const_iv 675# undef const_iv
611 }; 676 };
612 677
613 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 678 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
614 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 679 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
632 697
633NV floor (NV x) 698NV floor (NV x)
634 699
635NV ceil (NV x) 700NV ceil (NV x)
636 701
702IV minpot (UV n)
703
704IV popcount (UV n)
705
637void 706void
638pango_init () 707pango_init ()
639 CODE: 708 CODE:
640{ 709{
641 opengl_fontmap = pango_opengl_font_map_new (); 710 opengl_fontmap = pango_opengl_font_map_new ();
642 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 711 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); 712 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
713 /*pango_context_set_font_description (opengl_context, default_font);*/
714#if PANGO_VERSION_CHECK (1, 15, 2)
715 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
716 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
717#endif
644} 718}
645 719
646char *
647SDL_GetError () 720char *SDL_GetError ()
648 721
649int 722int SDL_Init (U32 flags)
650SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
651 723
652void 724int SDL_InitSubSystem (U32 flags)
725
726void SDL_QuitSubSystem (U32 flags)
727
653SDL_Quit () 728void SDL_Quit ()
729
730int SDL_GL_SetAttribute (int attr, int value)
731
732int SDL_GL_GetAttribute (int attr)
733 CODE:
734 if (SDL_GL_GetAttribute (attr, &RETVAL))
735 XSRETURN_UNDEF;
736 OUTPUT:
737 RETVAL
654 738
655void 739void
656SDL_ListModes (int rgb, int alpha) 740SDL_ListModes (int rgb, int alpha)
657 PPCODE: 741 PPCODE:
658{ 742{
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 754 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 755 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 756 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
673 757
674 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 758 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); 759 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
678#endif
679 760
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 761 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 762
682 if (m && m != (SDL_Rect **)-1) 763 if (m && m != (SDL_Rect **)-1)
683 while (*m) 764 while (*m)
684 { 765 {
685 if ((*m)->w >= 640 && (*m)->h >= 480) 766 if ((*m)->w >= 400 && (*m)->h >= 300)
686 { 767 {
687 AV *av = newAV (); 768 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 769 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 770 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 771 av_push (av, newSViv (rgb));
714 795
715 if (RETVAL) 796 if (RETVAL)
716 { 797 {
717 av_clear (texture_av); 798 av_clear (texture_av);
718 799
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 800 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 801#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
721#include "glfunc.h" 802#include "glfunc.h"
722#undef GL_FUNC 803#undef GL_FUNC
723 } 804 }
724} 805}
731char * 812char *
732SDL_GetKeyName (int sym) 813SDL_GetKeyName (int sym)
733 814
734int 815int
735SDL_GetAppState () 816SDL_GetAppState ()
817
818int
819SDL_GetModState ()
736 820
737void 821void
738poll_events () 822poll_events ()
739 PPCODE: 823 PPCODE:
740{ 824{
750 { 834 {
751 case SDL_KEYDOWN: 835 case SDL_KEYDOWN:
752 case SDL_KEYUP: 836 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 837 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 838 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 839 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 */ 840 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); 841 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 842 break;
759 843
760 case SDL_ACTIVEEVENT: 844 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 845 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
779 x = ev.motion.x; 863 x = ev.motion.x;
780 y = ev.motion.y; 864 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 865 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 866 }
783 867
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 868 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 869 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 870 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 871 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 872 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 873 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 874 }
791 break; 875 break;
792 876
793 case SDL_MOUSEBUTTONDOWN: 877 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 878 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 879 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 880
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 881 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 882 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 883 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 884 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 889 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 890 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 891 break;
808 } 892 }
809 893
810 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 894 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
811 } 895 }
812} 896}
813 897
814int 898int
815Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 899Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816 POSTCALL: 900 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 901 Mix_HookMusicFinished (music_finished);
818 Mix_ChannelFinished (channel_finished); 902 Mix_ChannelFinished (channel_finished);
903
904void
905Mix_QuerySpec ()
906 PPCODE:
907{
908 int freq, channels;
909 Uint16 format;
910
911 if (Mix_QuerySpec (&freq, &format, &channels))
912 {
913 EXTEND (SP, 3);
914 PUSHs (sv_2mortal (newSViv (freq)));
915 PUSHs (sv_2mortal (newSViv (format)));
916 PUSHs (sv_2mortal (newSViv (channels)));
917 }
918}
819 919
820void 920void
821Mix_CloseAudio () 921Mix_CloseAudio ()
822 922
823int 923int
858 } 958 }
859 } 959 }
860#endif 960#endif
861} 961}
862 962
863void 963int
864add_font (char *file) 964add_font (char *file)
865 CODE: 965 CODE:
866 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 966 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
967 OUTPUT:
968 RETVAL
867 969
868void 970void
869load_image_inline (SV *image_) 971load_image_inline (SV *image_)
870 ALIAS: 972 ALIAS:
871 load_image_file = 1 973 load_image_file = 1
957void 1059void
958error (char *message) 1060error (char *message)
959 CODE: 1061 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1062 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1063#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1064 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1065#endif
964 1066
965void 1067void
966fatal (char *message) 1068fatal (char *message)
967 CODE: 1069 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1070 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1071#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1072 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1073#endif
972 _exit (1); 1074 _exit (1);
973 1075
974void 1076void
975_exit (int retval = 0) 1077_exit (int retval = 0)
987#if DEBUG 1089#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1090 VALGRIND_DO_LEAK_CHECK;
989#endif 1091#endif
990} 1092}
991 1093
992MODULE = CFPlus PACKAGE = CFPlus::Font 1094MODULE = Deliantra::Client PACKAGE = DC::Font
993 1095
994PROTOTYPES: DISABLE 1096PROTOTYPES: DISABLE
995 1097
996CFPlus::Font 1098DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1099new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1100 CODE:
999{ 1101{
1000 int count; 1102 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1103 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1004} 1106}
1005 OUTPUT: 1107 OUTPUT:
1006 RETVAL 1108 RETVAL
1007 1109
1008void 1110void
1009DESTROY (CFPlus::Font self) 1111DESTROY (DC::Font self)
1010 CODE: 1112 CODE:
1011 pango_font_description_free (self); 1113 pango_font_description_free (self);
1012 1114
1013void 1115void
1014make_default (CFPlus::Font self) 1116make_default (DC::Font self)
1015 PROTOTYPE: $ 1117 PROTOTYPE: $
1016 CODE: 1118 CODE:
1017 default_font = self; 1119 default_font = self;
1018 1120
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1121MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1122
1021PROTOTYPES: DISABLE 1123PROTOTYPES: DISABLE
1022 1124
1023void 1125void
1024reset_glyph_cache () 1126glyph_cache_backup ()
1025 PROTOTYPE: 1127 PROTOTYPE:
1026 CODE: 1128 CODE:
1129 tc_backup ();
1130
1131void
1132glyph_cache_restore ()
1133 PROTOTYPE:
1134 CODE:
1027 tc_clear (); 1135 tc_restore ();
1028 1136
1029CFPlus::Layout 1137DC::Layout
1030new (SV *class) 1138new (SV *class)
1031 CODE: 1139 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1140 New (0, RETVAL, 1, struct cf_layout);
1033 1141
1034 RETVAL->pl = pango_layout_new (opengl_context); 1142 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->g = 1.; 1144 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1145 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1146 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1147 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1148 RETVAL->font = 0;
1149 RETVAL->rc = rc_alloc ();
1041 1150
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1151 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1152 layout_update_font (RETVAL);
1044 OUTPUT: 1153 OUTPUT:
1045 RETVAL 1154 RETVAL
1046 1155
1047void 1156void
1048DESTROY (CFPlus::Layout self) 1157DESTROY (DC::Layout self)
1049 CODE: 1158 CODE:
1050 g_object_unref (self->pl); 1159 g_object_unref (self->pl);
1160 rc_free (self->rc);
1051 Safefree (self); 1161 Safefree (self);
1052 1162
1053void 1163void
1054set_text (CFPlus::Layout self, SV *text_) 1164set_text (DC::Layout self, SV *text_)
1055 CODE: 1165 CODE:
1056{ 1166{
1057 STRLEN textlen; 1167 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1168 char *text = SvPVutf8 (text_, textlen);
1059 1169
1060 pango_layout_set_text (self->pl, text, textlen); 1170 pango_layout_set_text (self->pl, text, textlen);
1061} 1171}
1062 1172
1063void 1173void
1064set_markup (CFPlus::Layout self, SV *text_) 1174set_markup (DC::Layout self, SV *text_)
1065 CODE: 1175 CODE:
1066{ 1176{
1067 STRLEN textlen; 1177 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1178 char *text = SvPVutf8 (text_, textlen);
1069 1179
1070 pango_layout_set_markup (self->pl, text, textlen); 1180 pango_layout_set_markup (self->pl, text, textlen);
1071} 1181}
1072 1182
1073void 1183void
1074set_shapes (CFPlus::Layout self, ...) 1184set_shapes (DC::Layout self, ...)
1075 CODE: 1185 CODE:
1076{ 1186{
1077 PangoAttrList *attrs = 0; 1187 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1188 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1189 const char *pos = text;
1114 if (attrs) 1224 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1225 pango_layout_set_attributes (self->pl, attrs);
1116} 1226}
1117 1227
1118void 1228void
1119get_shapes (CFPlus::Layout self) 1229get_shapes (DC::Layout self)
1120 PPCODE: 1230 PPCODE:
1121{ 1231{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1232 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1233
1124 do 1234 do
1125 { 1235 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1236 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1237
1128 if (run && shape_attr_p (run)) 1238 if (run && shape_attr_p (run))
1129 { 1239 {
1130 PangoRectangle extents; 1240 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1241 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1249
1140 pango_layout_iter_free (iter); 1250 pango_layout_iter_free (iter);
1141} 1251}
1142 1252
1143int 1253int
1144has_wrapped (CFPlus::Layout self) 1254has_wrapped (DC::Layout self)
1145 CODE: 1255 CODE:
1146{ 1256{
1147 int lines = 1; 1257 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1258 const char *text = pango_layout_get_text (self->pl);
1149 1259
1154} 1264}
1155 OUTPUT: 1265 OUTPUT:
1156 RETVAL 1266 RETVAL
1157 1267
1158SV * 1268SV *
1159get_text (CFPlus::Layout self) 1269get_text (DC::Layout self)
1160 CODE: 1270 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1271 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1272 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1273 OUTPUT:
1164 RETVAL 1274 RETVAL
1165 1275
1166void 1276void
1167set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1277set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1168 CODE: 1278 CODE:
1169 self->r = r; 1279 self->r = r;
1170 self->g = g; 1280 self->g = g;
1171 self->b = b; 1281 self->b = b;
1172 self->a = a; 1282 self->a = a;
1173 1283
1174void 1284void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1285set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1286 CODE:
1177 if (self->font != font) 1287 if (self->font != font)
1178 { 1288 {
1179 self->font = font; 1289 self->font = font;
1180 layout_update_font (self); 1290 layout_update_font (self);
1181 } 1291 }
1182 1292
1183void 1293void
1184set_height (CFPlus::Layout self, int base_height) 1294set_height (DC::Layout self, int base_height)
1185 CODE: 1295 CODE:
1186 if (self->base_height != base_height) 1296 if (self->base_height != base_height)
1187 { 1297 {
1188 self->base_height = base_height; 1298 self->base_height = base_height;
1189 layout_update_font (self); 1299 layout_update_font (self);
1190 } 1300 }
1191 1301
1192void 1302void
1193set_width (CFPlus::Layout self, int max_width = -1) 1303set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1304 CODE:
1195 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1305 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1196 1306
1197void 1307void
1198set_indent (CFPlus::Layout self, int indent) 1308set_indent (DC::Layout self, int indent)
1199 CODE: 1309 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1310 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1311
1202void 1312void
1203set_spacing (CFPlus::Layout self, int spacing) 1313set_spacing (DC::Layout self, int spacing)
1204 CODE: 1314 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1315 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1316
1207void 1317void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1318set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1319 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1320 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1321 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1322 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1323 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1324 : PANGO_ELLIPSIZE_NONE
1215 ); 1325 );
1216 1326
1217void 1327void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1328set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1329 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1330 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1331
1222void 1332void
1223size (CFPlus::Layout self) 1333size (DC::Layout self)
1224 PPCODE: 1334 PPCODE:
1225{ 1335{
1226 int w, h; 1336 int w, h;
1227 1337
1228 layout_get_pixel_size (self, &w, &h); 1338 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1341 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1342 PUSHs (sv_2mortal (newSViv (h)));
1233} 1343}
1234 1344
1235int 1345int
1236descent (CFPlus::Layout self) 1346descent (DC::Layout self)
1237 CODE: 1347 CODE:
1238{ 1348{
1239 PangoRectangle rect; 1349 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1350 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1351 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1352 RETVAL = PANGO_DESCENT (rect);
1243} 1353}
1244 OUTPUT: 1354 OUTPUT:
1245 RETVAL 1355 RETVAL
1246 1356
1247int 1357int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1358xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1359 CODE:
1250{ 1360{
1251 int index, trailing; 1361 int index, trailing;
1252 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1362 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1253 RETVAL = index + trailing; 1363 RETVAL = index + trailing;
1254} 1364}
1255 OUTPUT: 1365 OUTPUT:
1256 RETVAL 1366 RETVAL
1257 1367
1258void 1368void
1259cursor_pos (CFPlus::Layout self, int index) 1369cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1370 PPCODE:
1261{ 1371{
1262 PangoRectangle strong_pos; 1372 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1373 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1374
1265 EXTEND (SP, 3); 1375 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1376 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1377 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1378 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1379}
1270 1380
1271void 1381void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1382index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1383 PPCODE:
1274{ 1384{
1275 int line, x; 1385 int line, x;
1276 1386
1277 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1387 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1388#if !PANGO_VERSION_CHECK (1, 17, 3)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1389 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1390 --line;
1391#endif
1280 EXTEND (SP, 2); 1392 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1393 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1394 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1395}
1284 1396
1285void 1397void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1398line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1399 PPCODE:
1288{ 1400{
1289 PangoLayoutLine *lp; 1401 PangoLayoutLine *lp;
1290 int index, trailing; 1402 int index, trailing;
1291 1403
1292 if (line < 0) 1404 if (line < 0)
1293 XSRETURN_EMPTY; 1405 XSRETURN_EMPTY;
1294 1406
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1407 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1408 XSRETURN_EMPTY; /* do better */
1297 1409
1298 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1410 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1299 1411
1300 EXTEND (SP, 2); 1412 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1418 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1419 }
1308} 1420}
1309 1421
1310void 1422void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1423render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1424 CODE:
1425 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1426 pango_opengl_render_layout_subpixel (
1314 self->pl, 1427 self->pl,
1428 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1429 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1430 self->r, self->g, self->b, self->a,
1317 flags 1431 flags
1318 ); 1432 );
1433 // we assume that context_change actually clears/frees stuff
1434 // and does not do any recomputation...
1435 pango_layout_context_changed (self->pl);
1319 1436
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1437void
1438draw (DC::Layout self)
1439 CODE:
1440{
1441 glEnable (GL_TEXTURE_2D);
1442 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1443 glEnable (GL_BLEND);
1444 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1445 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1446 glEnable (GL_ALPHA_TEST);
1447 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1448
1449 rc_draw (self->rc);
1450
1451 glDisable (GL_ALPHA_TEST);
1452 glDisable (GL_BLEND);
1453 glDisable (GL_TEXTURE_2D);
1454}
1455
1456MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1457
1322PROTOTYPES: ENABLE 1458PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1459
1326void 1460void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1461pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1462 CODE:
1329{ 1463{
1406 RETVAL = width > 0; 1540 RETVAL = width > 0;
1407} 1541}
1408 OUTPUT: 1542 OUTPUT:
1409 RETVAL 1543 RETVAL
1410 1544
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1545MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1546
1413PROTOTYPES: DISABLE 1547PROTOTYPES: DISABLE
1414 1548
1415CFPlus::Map 1549DC::Map
1416new (SV *class) 1550new (SV *class)
1417 CODE: 1551 CODE:
1418 New (0, RETVAL, 1, struct map); 1552 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1553 RETVAL->x = 0;
1420 RETVAL->y = 0; 1554 RETVAL->y = 0;
1428 RETVAL->row = 0; 1562 RETVAL->row = 0;
1429 OUTPUT: 1563 OUTPUT:
1430 RETVAL 1564 RETVAL
1431 1565
1432void 1566void
1433DESTROY (CFPlus::Map self) 1567DESTROY (DC::Map self)
1434 CODE: 1568 CODE:
1435{ 1569{
1436 map_clear (self); 1570 map_clear (self);
1437 Safefree (self->face2tile); 1571 Safefree (self->face2tile);
1438 Safefree (self->tex); 1572 Safefree (self->tex);
1439 Safefree (self); 1573 Safefree (self);
1440} 1574}
1441 1575
1442void 1576void
1443resize (CFPlus::Map self, int map_width, int map_height) 1577resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1578 CODE:
1445 self->w = map_width; 1579 self->w = map_width;
1446 self->h = map_height; 1580 self->h = map_height;
1447 1581
1448void 1582void
1449clear (CFPlus::Map self) 1583clear (DC::Map self)
1450 CODE: 1584 CODE:
1451 map_clear (self); 1585 map_clear (self);
1452 1586
1453void 1587void
1454set_tileid (CFPlus::Map self, int face, int tile) 1588set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1589 CODE:
1456{ 1590{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1591 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1592 need_texid (self, tile);
1459} 1593}
1460 1594
1461void 1595void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1596set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1597 CODE:
1464{ 1598{
1465 tileid texid; 1599 tileid texid;
1466 maptex *tex; 1600 maptex *tex;
1467 1601
1480 tex->smoothtile = self->face2tile [smooth]; 1614 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1615 tex->smoothlevel = level;
1482} 1616}
1483 1617
1484void 1618void
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) 1619set_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: 1620 CODE:
1487{ 1621{
1488 need_texid (self, texid); 1622 need_texid (self, texid);
1489 1623
1490 { 1624 {
1510 // from transparent color bleeding and ugly wrapping effects. 1644 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1645 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1646}
1513 1647
1514int 1648int
1515ox (CFPlus::Map self) 1649ox (DC::Map self)
1516 ALIAS: 1650 ALIAS:
1517 oy = 1 1651 oy = 1
1518 x = 2 1652 x = 2
1519 y = 3 1653 y = 3
1520 w = 4 1654 w = 4
1531 } 1665 }
1532 OUTPUT: 1666 OUTPUT:
1533 RETVAL 1667 RETVAL
1534 1668
1535void 1669void
1536scroll (CFPlus::Map self, int dx, int dy) 1670scroll (DC::Map self, int dx, int dy)
1537 CODE: 1671 CODE:
1538{ 1672{
1539 if (dx > 0) 1673 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 1674 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 1675 else if (dx < 0)
1557 self->y += MAP_EXTEND_Y; 1691 self->y += MAP_EXTEND_Y;
1558 } 1692 }
1559} 1693}
1560 1694
1561SV * 1695SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 1696map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 1697 CODE:
1564{ 1698{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1699 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 1700 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 1701 mapcell *cell;
1595 uint8_t ext, cmd; 1729 uint8_t ext, cmd;
1596 1730
1597 do 1731 do
1598 { 1732 {
1599 ext = *data++; 1733 ext = *data++;
1600 cmd = ext & 0x3f; 1734 cmd = ext & 0x7f;
1601 1735
1602 if (cmd < 4) 1736 if (cmd < 4)
1603 cell->darkness = 255 - ext * 64 + 1; 1737 cell->darkness = 255 - ext * 64 + 1;
1604 else if (cmd == 5) // health 1738 else if (cmd == 5) // health
1605 { 1739 {
1608 } 1742 }
1609 else if (cmd == 6) // monster width 1743 else if (cmd == 6) // monster width
1610 cell->stat_width = *data++ + 1; 1744 cell->stat_width = *data++ + 1;
1611 else if (cmd == 0x47) 1745 else if (cmd == 0x47)
1612 { 1746 {
1613 if (*data == 4) 1747 if (*data == 1) cell->player = data [1];
1614 ; // decode player count 1748 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1749 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1750 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1615 1751
1616 data += *data + 1; 1752 data += *data + 1;
1617 } 1753 }
1618 else if (cmd == 8) // cell flags 1754 else if (cmd == 8) // cell flags
1619 cell->flags = *data++; 1755 cell->flags = *data++;
1649 } 1785 }
1650 } 1786 }
1651 } 1787 }
1652 } 1788 }
1653 else 1789 else
1654 cell->darkness = 0; 1790 CELL_CLEAR (cell);
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];
1884 // go through all smoothlevels, lowest to highest, then draw. 2027 // go through all smoothlevels, lowest to highest, then draw.
1885 // this is basically counting sort 2028 // this is basically counting sort
1886 { 2029 {
1887 int w, b; 2030 int w, b;
1888 2031
2032 glEnable (GL_TEXTURE_2D);
2033 glBegin (GL_QUADS);
1889 for (w = 0; w < 256 / 32; ++w) 2034 for (w = 0; w < 256 / 32; ++w)
1890 { 2035 {
1891 uint32_t smask = smooth_level [w]; 2036 uint32_t smask = smooth_level [w];
1892 if (smask) 2037 if (smask)
1893 for (b = 0; b < 32; ++b) 2038 for (b = 0; b < 32; ++b)
1918 { 2063 {
1919 // this time avoiding texture state changes 2064 // this time avoiding texture state changes
1920 // save gobs of state changes. 2065 // save gobs of state changes.
1921 if (key.texname != tex.name) 2066 if (key.texname != tex.name)
1922 { 2067 {
2068 glEnd ();
1923 key.texname = tex.name; 2069 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1924 arr = rc_array (rc, &key); 2070 glBegin (GL_QUADS);
1925 } 2071 }
1926 2072
1927 if (border) 2073 if (border)
1928 { 2074 {
1929 float ox = border * dx; 2075 float ox = border * dx;
1930 2076
1931 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2077 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1932 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2078 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1933 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2079 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1934 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2080 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1935 } 2081 }
1936 2082
1937 if (corner) 2083 if (corner)
1938 { 2084 {
1939 float ox = corner * dx; 2085 float ox = corner * dx;
1940 2086
1941 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2087 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1942 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2088 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1943 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);
1944 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2090 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1945 } 2091 }
1946 } 2092 }
1947 } 2093 }
1948 } 2094 }
1949 } 2095 }
1950 } 2096 }
2097
2098 glEnd ();
2099 glDisable (GL_TEXTURE_2D);
2100 key.texname = -1;
1951 } 2101 }
1952 2102
1953 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
1954 rc_draw (rc); 2120 rc_draw (rc);
1955 rc_clear (rc);
1956 } 2121 }
1957 2122
1958 glDisable (GL_BLEND); 2123 glDisable (GL_BLEND);
1959 rc_free (rc); 2124 rc_free (rc);
1960 2125
1989 } 2154 }
1990 } 2155 }
1991} 2156}
1992 2157
1993void 2158void
1994draw_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)
1995 CODE: 2160 CODE:
1996{ 2161{
1997 static float color[16][3] = { 2162 static float color[16][3] = {
1998 { 0.00F, 0.00F, 0.00F }, 2163 { 0.00F, 0.00F, 0.00F },
1999 { 1.00F, 1.00F, 1.00F }, 2164 { 1.00F, 1.00F, 1.00F },
2049 glDisable (GL_BLEND); 2214 glDisable (GL_BLEND);
2050 glDisable (GL_TEXTURE_2D); 2215 glDisable (GL_TEXTURE_2D);
2051} 2216}
2052 2217
2053void 2218void
2054fow_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)
2055 PPCODE: 2220 PPCODE:
2056{ 2221{
2057 int x, y; 2222 int x, y;
2058 int sw1 = sw + 2; 2223 int sw1 = sw + 2;
2059 int sh1 = sh + 2; 2224 int sh1 = sh + 2;
2130 PUSHs (sv_2mortal (newSViv (sh3))); 2295 PUSHs (sv_2mortal (newSViv (sh3)));
2131 PUSHs (darkness3_sv); 2296 PUSHs (darkness3_sv);
2132} 2297}
2133 2298
2134SV * 2299SV *
2135get_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)
2136 CODE: 2301 CODE:
2137{ 2302{
2138 int x, y, x1, y1; 2303 int x, y, x1, y1;
2139 SV *data_sv = newSV (w * h * 7 + 5); 2304 SV *data_sv = newSV (w * h * 7 + 5);
2140 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2305 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2197 else 2362 else
2198 *data++ = 0; 2363 *data++ = 0;
2199 } 2364 }
2200 } 2365 }
2201 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 {
2202 SvPOK_only (data_sv); 2370 SvPOK_only (data_sv);
2203 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2371 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2372 }
2373
2204 RETVAL = data_sv; 2374 RETVAL = data_sv;
2205} 2375}
2206 OUTPUT: 2376 OUTPUT:
2207 RETVAL 2377 RETVAL
2208 2378
2209void 2379void
2210set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2380set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2211 PPCODE: 2381 PPCODE:
2212{ 2382{
2213 int x, y, z; 2383 int x, y, z;
2214 int w, h; 2384 int w, h;
2215 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;
2216 2396
2217 if (*data++ != 0) 2397 if (*data++ != 0)
2218 return; /* version mismatch */ 2398 XSRETURN_EMPTY; /* version mismatch */
2219 2399
2220 w = *data++ << 8; w |= *data++; 2400 w = *data++ << 8; w |= *data++;
2221 h = *data++ << 8; h |= *data++; 2401 h = *data++ << 8; h |= *data++;
2222 2402
2223 // 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
2235 { 2415 {
2236 maprow *row = map_get_row (self, y); 2416 maprow *row = map_get_row (self, y);
2237 2417
2238 for (x = x0; x < x1; x++) 2418 for (x = x0; x < x1; x++)
2239 { 2419 {
2420 uint8_t flags;
2421
2422 if (data + 7 >= end)
2423 XSRETURN_EMPTY;
2424
2240 uint8_t flags = *data++; 2425 flags = *data++;
2241 2426
2242 if (flags) 2427 if (flags)
2243 { 2428 {
2244 mapcell *cell = row_get_cell (row, x); 2429 mapcell *cell = row_get_cell (row, x);
2245 tileid tile[3] = { 0, 0, 0 }; 2430 tileid tile[3] = { 0, 0, 0 };
2248 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2433 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2249 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2434 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2250 2435
2251 if (cell->darkness == 0) 2436 if (cell->darkness == 0)
2252 { 2437 {
2253 cell->darkness = 0; 2438 /*cell->darkness = 0;*/
2439 EXTEND (SP, 3);
2254 2440
2255 for (z = 0; z <= 2; z++) 2441 for (z = 0; z <= 2; z++)
2256 { 2442 {
2257 tileid t = tile [z]; 2443 tileid t = tile [z];
2258 2444
2259 if (t >= self->texs || (t && !self->tex [t].name)) 2445 if (t >= self->texs || (t && !self->tex [t].name))
2260 { 2446 {
2261 XPUSHs (sv_2mortal (newSViv (t))); 2447 PUSHs (sv_2mortal (newSViv (t)));
2262 need_texid (self, t); 2448 need_texid (self, t);
2263 } 2449 }
2264 2450
2265 cell->tile [z] = t; 2451 cell->tile [z] = t;
2266 } 2452 }
2268 } 2454 }
2269 } 2455 }
2270 } 2456 }
2271} 2457}
2272 2458
2273MODULE = CFPlus PACKAGE = CFPlus::RW 2459MODULE = Deliantra::Client PACKAGE = DC::RW
2274 2460
2275CFPlus::RW 2461DC::RW
2276new (SV *class, SV *data_sv) 2462new (SV *class, SV *data_sv)
2277 CODE: 2463 CODE:
2278{ 2464{
2279 STRLEN datalen; 2465 STRLEN datalen;
2280 char *data = SvPVbyte (data_sv, datalen); 2466 char *data = SvPVbyte (data_sv, datalen);
2282 RETVAL = SDL_RWFromConstMem (data, datalen); 2468 RETVAL = SDL_RWFromConstMem (data, datalen);
2283} 2469}
2284 OUTPUT: 2470 OUTPUT:
2285 RETVAL 2471 RETVAL
2286 2472
2287CFPlus::RW 2473DC::RW
2288new_from_file (SV *class, const char *path, const char *mode = "rb") 2474new_from_file (SV *class, const char *path, const char *mode = "rb")
2289 CODE: 2475 CODE:
2290 RETVAL = SDL_RWFromFile (path, mode); 2476 RETVAL = SDL_RWFromFile (path, mode);
2291 OUTPUT: 2477 OUTPUT:
2292 RETVAL 2478 RETVAL
2293 2479
2294# fails on win32: 2480# fails on win32:
2295# CFPlus.xs(2268) : error C2059: syntax error : '(' 2481# dc.xs(2268) : error C2059: syntax error : '('
2296#void 2482#void
2297#close (CFPlus::RW self) 2483#close (DC::RW self)
2298# CODE: 2484# CODE:
2299# (self->(close)) (self); 2485# (self->(close)) (self);
2300 2486
2301MODULE = CFPlus PACKAGE = CFPlus::Channel 2487MODULE = Deliantra::Client PACKAGE = DC::Channel
2302 2488
2303PROTOTYPES: DISABLE 2489PROTOTYPES: DISABLE
2304 2490
2305CFPlus::Channel 2491DC::Channel
2306find () 2492find ()
2307 CODE: 2493 CODE:
2308{ 2494{
2309 RETVAL = Mix_GroupAvailable (-1); 2495 RETVAL = Mix_GroupAvailable (-1);
2310 2496
2323} 2509}
2324 OUTPUT: 2510 OUTPUT:
2325 RETVAL 2511 RETVAL
2326 2512
2327void 2513void
2328halt (CFPlus::Channel self) 2514halt (DC::Channel self)
2329 CODE: 2515 CODE:
2330 Mix_HaltChannel (self); 2516 Mix_HaltChannel (self);
2331 2517
2332void 2518void
2333expire (CFPlus::Channel self, int ticks = -1) 2519expire (DC::Channel self, int ticks = -1)
2334 CODE: 2520 CODE:
2335 Mix_ExpireChannel (self, ticks); 2521 Mix_ExpireChannel (self, ticks);
2336 2522
2337void 2523void
2338fade_out (CFPlus::Channel self, int ticks = -1) 2524fade_out (DC::Channel self, int ticks = -1)
2339 CODE: 2525 CODE:
2340 Mix_FadeOutChannel (self, ticks); 2526 Mix_FadeOutChannel (self, ticks);
2341 2527
2342int 2528int
2343volume (CFPlus::Channel self, int volume) 2529volume (DC::Channel self, int volume)
2344 CODE: 2530 CODE:
2345 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2531 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2346 OUTPUT: 2532 OUTPUT:
2347 RETVAL 2533 RETVAL
2348 2534
2349void 2535void
2350unregister_all_effects (CFPlus::Channel self) 2536unregister_all_effects (DC::Channel self)
2351 CODE: 2537 CODE:
2352 Mix_UnregisterAllEffects (self); 2538 Mix_UnregisterAllEffects (self);
2353 2539
2354void 2540void
2355set_panning (CFPlus::Channel self, int left, int right) 2541set_panning (DC::Channel self, int left, int right)
2356 CODE: 2542 CODE:
2357 left = CLAMP (left , 0, 255); 2543 left = CLAMP (left , 0, 255);
2358 right = CLAMP (right, 0, 255); 2544 right = CLAMP (right, 0, 255);
2359 Mix_SetPanning (self, left, right); 2545 Mix_SetPanning (self, left, right);
2360 2546
2361void 2547void
2362set_distance (CFPlus::Channel self, int distance) 2548set_distance (DC::Channel self, int distance)
2363 CODE: 2549 CODE:
2364 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2550 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2365 2551
2366void 2552void
2367set_position (CFPlus::Channel self, int angle, int distance) 2553set_position (DC::Channel self, int angle, int distance)
2368 CODE: 2554 CODE:
2369 2555
2370void 2556void
2371set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2557set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2372 CODE: 2558 CODE:
2373{ 2559{
2374 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));
2375 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);
2376 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2562 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2377} 2563}
2378 2564
2379void 2565void
2380set_reverse_stereo (CFPlus::Channel self, int flip) 2566set_reverse_stereo (DC::Channel self, int flip)
2381 CODE: 2567 CODE:
2382 Mix_SetReverseStereo (self, flip); 2568 Mix_SetReverseStereo (self, flip);
2383 2569
2384MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2570MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2385 2571
2386PROTOTYPES: DISABLE 2572PROTOTYPES: DISABLE
2387 2573
2388CFPlus::MixChunk 2574DC::MixChunk
2389new (SV *class, CFPlus::RW rwops) 2575new (SV *class, DC::RW rwops)
2390 CODE: 2576 CODE:
2391 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2577 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2392 OUTPUT: 2578 OUTPUT:
2393 RETVAL 2579 RETVAL
2394 2580
2395void 2581void
2396DESTROY (CFPlus::MixChunk self) 2582DESTROY (DC::MixChunk self)
2397 CODE: 2583 CODE:
2398 Mix_FreeChunk (self); 2584 Mix_FreeChunk (self);
2399 2585
2400int 2586int
2401volume (CFPlus::MixChunk self, int volume = -1) 2587volume (DC::MixChunk self, int volume = -1)
2402 CODE: 2588 CODE:
2403 if (items > 1) 2589 if (items > 1)
2404 volume = CLAMP (volume, 0, 128); 2590 volume = CLAMP (volume, 0, 128);
2405 RETVAL = Mix_VolumeChunk (self, volume); 2591 RETVAL = Mix_VolumeChunk (self, volume);
2406 OUTPUT: 2592 OUTPUT:
2407 RETVAL 2593 RETVAL
2408 2594
2409CFPlus::Channel 2595DC::Channel
2410play (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)
2411 CODE: 2597 CODE:
2412{ 2598{
2413 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2599 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2414 2600
2415 if (RETVAL < 0) 2601 if (RETVAL < 0)
2422 } 2608 }
2423} 2609}
2424 OUTPUT: 2610 OUTPUT:
2425 RETVAL 2611 RETVAL
2426 2612
2427MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2613MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2428 2614
2429int 2615int
2430volume (int volume = -1) 2616volume (int volume = -1)
2431 PROTOTYPE: ;$ 2617 PROTOTYPE: ;$
2432 CODE: 2618 CODE:
2444void 2630void
2445halt () 2631halt ()
2446 CODE: 2632 CODE:
2447 Mix_HaltMusic (); 2633 Mix_HaltMusic ();
2448 2634
2449CFPlus::MixMusic 2635DC::MixMusic
2450new (SV *class, CFPlus::RW rwops) 2636new (SV *class, DC::RW rwops)
2451 CODE: 2637 CODE:
2452 RETVAL = Mix_LoadMUS_RW (rwops); 2638 RETVAL = Mix_LoadMUS_RW (rwops);
2453 OUTPUT: 2639 OUTPUT:
2454 RETVAL 2640 RETVAL
2455 2641
2456void 2642void
2457DESTROY (CFPlus::MixMusic self) 2643DESTROY (DC::MixMusic self)
2458 CODE: 2644 CODE:
2459 Mix_FreeMusic (self); 2645 Mix_FreeMusic (self);
2460 2646
2461int 2647int
2462play (CFPlus::MixMusic self, int loops = -1) 2648play (DC::MixMusic self, int loops = -1)
2463 CODE: 2649 CODE:
2464 RETVAL = Mix_PlayMusic (self, loops); 2650 RETVAL = Mix_PlayMusic (self, loops);
2465 OUTPUT: 2651 OUTPUT:
2466 RETVAL 2652 RETVAL
2467 2653
2468void 2654void
2469fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2655fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2470 CODE: 2656 CODE:
2471 Mix_FadeInMusicPos (self, loops, ms, position); 2657 Mix_FadeInMusicPos (self, loops, ms, position);
2472 2658
2473MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2659MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2474 2660
2475PROTOTYPES: ENABLE 2661PROTOTYPES: ENABLE
2476 2662
2477BOOT: 2663BOOT:
2478{ 2664{
2479 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2665 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2480 static const struct { 2666 static const struct {
2481 const char *name; 2667 const char *name;
2482 IV iv; 2668 IV iv;
2483 } *civ, const_iv[] = { 2669 } *civ, const_iv[] = {
2484# define const_iv(name) { # name, (IV)name } 2670# define const_iv(name) { # name, (IV)name }
2519 const_iv (GL_INTENSITY), 2705 const_iv (GL_INTENSITY),
2520 const_iv (GL_LUMINANCE), 2706 const_iv (GL_LUMINANCE),
2521 const_iv (GL_LUMINANCE_ALPHA), 2707 const_iv (GL_LUMINANCE_ALPHA),
2522 const_iv (GL_FLOAT), 2708 const_iv (GL_FLOAT),
2523 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),
2524 const_iv (GL_COMPILE), 2716 const_iv (GL_COMPILE),
2525 const_iv (GL_PROXY_TEXTURE_1D), 2717 const_iv (GL_PROXY_TEXTURE_1D),
2526 const_iv (GL_PROXY_TEXTURE_2D), 2718 const_iv (GL_PROXY_TEXTURE_2D),
2527 const_iv (GL_TEXTURE_1D), 2719 const_iv (GL_TEXTURE_1D),
2528 const_iv (GL_TEXTURE_2D), 2720 const_iv (GL_TEXTURE_2D),
2567 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2759 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2568 const_iv (GL_POINT_SMOOTH_HINT), 2760 const_iv (GL_POINT_SMOOTH_HINT),
2569 const_iv (GL_LINE_SMOOTH_HINT), 2761 const_iv (GL_LINE_SMOOTH_HINT),
2570 const_iv (GL_POLYGON_SMOOTH_HINT), 2762 const_iv (GL_POLYGON_SMOOTH_HINT),
2571 const_iv (GL_GENERATE_MIPMAP_HINT), 2763 const_iv (GL_GENERATE_MIPMAP_HINT),
2764 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2572 const_iv (GL_FASTEST), 2765 const_iv (GL_FASTEST),
2573 const_iv (GL_DONT_CARE), 2766 const_iv (GL_DONT_CARE),
2574 const_iv (GL_NICEST), 2767 const_iv (GL_NICEST),
2575 const_iv (GL_V2F), 2768 const_iv (GL_V2F),
2576 const_iv (GL_V3F), 2769 const_iv (GL_V3F),
2584 2777
2585 texture_av = newAV (); 2778 texture_av = newAV ();
2586 AvREAL_off (texture_av); 2779 AvREAL_off (texture_av);
2587} 2780}
2588 2781
2782void
2783disable_GL_EXT_blend_func_separate ()
2784 CODE:
2785 gl.BlendFuncSeparate = 0;
2786 gl.BlendFuncSeparateEXT = 0;
2787
2589char * 2788char *
2590gl_vendor () 2789gl_vendor ()
2591 CODE: 2790 CODE:
2592 RETVAL = (char *)glGetString (GL_VENDOR); 2791 RETVAL = (char *)glGetString (GL_VENDOR);
2593 OUTPUT: 2792 OUTPUT:
2714 2913
2715void glRect (float x1, float y1, float x2, float y2) 2914void glRect (float x1, float y1, float x2, float y2)
2716 CODE: 2915 CODE:
2717 glRectf (x1, y1, x2, y2); 2916 glRectf (x1, y1, x2, y2);
2718 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
2719PROTOTYPES: ENABLE 2927PROTOTYPES: ENABLE
2720 2928
2721void glBegin (int mode) 2929void glBegin (int mode)
2722 2930
2723void glEnd () 2931void glEnd ()
2755void 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)
2756 CODE: 2964 CODE:
2757 if (gl.SeparableFilter2D) 2965 if (gl.SeparableFilter2D)
2758 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2966 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2759 2967
2760void 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)
2761 2969
2762void 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)
2763 2971
2764void glDrawPixels (int width, int height, int format, int type, char *pixels) 2972void glDrawPixels (int width, int height, int format, int type, char *pixels)
2765 2973
2791 2999
2792void glEndList () 3000void glEndList ()
2793 3001
2794void glCallList (int list) 3002void glCallList (int list)
2795 3003
2796MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3004MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2797 3005
2798PROTOTYPES: DISABLE 3006PROTOTYPES: DISABLE
2799 3007
2800void 3008void
2801find_widget (SV *self, NV x, NV y) 3009find_widget (SV *self, NV x, NV y)
2805 XPUSHs (self); 3013 XPUSHs (self);
2806} 3014}
2807 3015
2808BOOT: 3016BOOT:
2809{ 3017{
2810 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3018 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2811 3019
2812 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);
2813 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);
2814 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);
2815 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);
2816} 3024}
2817 3025
2818void 3026void
2819draw (SV *self) 3027draw (SV *self)
2820 CODE: 3028 CODE:
2824 NV x, y, w, h; 3032 NV x, y, w, h;
2825 SV *draw_x_sv = GvSV (draw_x_gv); 3033 SV *draw_x_sv = GvSV (draw_x_gv);
2826 SV *draw_y_sv = GvSV (draw_y_gv); 3034 SV *draw_y_sv = GvSV (draw_y_gv);
2827 SV *draw_w_sv = GvSV (draw_w_gv); 3035 SV *draw_w_sv = GvSV (draw_w_gv);
2828 SV *draw_h_sv = GvSV (draw_h_gv); 3036 SV *draw_h_sv = GvSV (draw_h_gv);
2829 SV *hover;
2830 double draw_x, draw_y, draw_w, draw_h; 3037 double draw_x, draw_y;
2831 3038
2832 if (!SvROK (self)) 3039 if (!SvROK (self))
2833 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3040 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2834 3041
2835 hv = (HV *)SvRV (self); 3042 hv = (HV *)SvRV (self);
2836 3043
2837 if (SvTYPE (hv) != SVt_PVHV) 3044 if (SvTYPE (hv) != SVt_PVHV)
2838 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3045 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2839 3046
2840 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.;
2841 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.;
2842 3049
2843 if (!h || !w) 3050 if (!h || !w)
2863 { 3070 {
2864 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3071 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2865 3072
2866 if (svp && SvTRUE (*svp)) 3073 if (svp && SvTRUE (*svp))
2867 { 3074 {
2868 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);
2869 glEnable (GL_BLEND); 3076 glEnable (GL_BLEND);
2870 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3077 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2871 glBegin (GL_QUADS); 3078 glBegin (GL_QUADS);
2872 glVertex2f (0, 0); 3079 glVertex2f (0, 0);
2873 glVertex2f (w, 0); 3080 glVertex2f (w, 0);
2876 glEnd (); 3083 glEnd ();
2877 glDisable (GL_BLEND); 3084 glDisable (GL_BLEND);
2878 } 3085 }
2879 } 3086 }
2880#if 0 3087#if 0
2881 if ($ENV{CFPLUS_DEBUG} & 1) { 3088 // draw borders, for debugging
2882 glPushMatrix; 3089 glPushMatrix ();
2883 glColor 1, 1, 0, 1; 3090 glColor4f (1., 1., 0., 1.);
2884 glTranslate 0.375, 0.375; 3091 glTranslatef (.5, .5, 0.);
2885 glBegin GL_LINE_LOOP; 3092 glBegin (GL_LINE_LOOP);
2886 glVertex 0 , 0; 3093 glVertex2f (0 , 0);
2887 glVertex $self->{w} - 1, 0; 3094 glVertex2f (w - 1, 0);
2888 glVertex $self->{w} - 1, $self->{h} - 1; 3095 glVertex2f (w - 1, h - 1);
2889 glVertex 0 , $self->{h} - 1; 3096 glVertex2f (0 , h - 1);
2890 glEnd; 3097 glEnd ();
2891 glPopMatrix; 3098 glPopMatrix ();
2892 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2893 }
2894#endif 3099#endif
2895 PUSHMARK (SP); 3100 PUSHMARK (SP);
2896 XPUSHs (self); 3101 XPUSHs (self);
2897 PUTBACK; 3102 PUTBACK;
2898 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