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.273 by root, Wed Aug 20 13:30:02 2008 UTC

39#include <SDL_endian.h> 39#include <SDL_endian.h>
40#include <SDL_image.h> 40#include <SDL_image.h>
41#include <SDL_mixer.h> 41#include <SDL_mixer.h>
42#include <SDL_opengl.h> 42#include <SDL_opengl.h>
43 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
44#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
46 51
47#include <glib/gmacros.h> 52#include <glib/gmacros.h>
48 53
49#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
50 66
51#ifndef _WIN32 67#ifndef _WIN32
52# include <sys/types.h> 68# include <sys/types.h>
53# include <sys/socket.h> 69# include <sys/socket.h>
54# include <netinet/in.h> 70# include <netinet/in.h>
55# include <netinet/tcp.h> 71# include <netinet/tcp.h>
56# include <inttypes.h> 72# include <inttypes.h>
57#endif 73#endif
58 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 85
61#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
62 87
63#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
65 90
66#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
67 92
68#if 0 93/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else
71# define PARACHUTE 0
72#endif
73 95
74static AV *texture_av; 96static AV *texture_av;
75 97
76static struct 98static struct
77{ 99{
120 142
121#include "pango-font.c" 143#include "pango-font.c"
122#include "pango-fontmap.c" 144#include "pango-fontmap.c"
123#include "pango-render.c" 145#include "pango-render.c"
124 146
125typedef IV CFPlus__Channel; 147typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 148typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 149typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 150typedef Mix_Music *DC__MixMusic;
129 151
130typedef PangoFontDescription *CFPlus__Font; 152typedef PangoFontDescription *DC__Font;
131 153
132static int 154static int
133shape_attr_p (PangoLayoutRun *run) 155shape_attr_p (PangoLayoutRun *run)
134{ 156{
135 GSList *attrs = run->item->analysis.extra_attrs; 157 GSList *attrs = run->item->analysis.extra_attrs;
149 171
150typedef struct cf_layout { 172typedef struct cf_layout {
151 PangoLayout *pl; 173 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 174 float r, g, b, a; // default color for rgba mode
153 int base_height; 175 int base_height;
154 CFPlus__Font font; 176 DC__Font font;
177 rc_t *rc;
155} *CFPlus__Layout; 178} *DC__Layout;
156 179
157static CFPlus__Font default_font; 180static DC__Font default_font;
158static PangoContext *opengl_context; 181static PangoContext *opengl_context;
159static PangoFontMap *opengl_fontmap; 182static PangoFontMap *opengl_fontmap;
160 183
161static void 184static void
162substitute_func (FcPattern *pattern, gpointer data) 185substitute_func (FcPattern *pattern, gpointer data)
167#endif 190#endif
168 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 191 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169} 192}
170 193
171static void 194static void
172layout_update_font (CFPlus__Layout self) 195layout_update_font (DC__Layout self)
173{ 196{
174 /* use a random scale factor to account for unknown descenders, 0.8 works 197 /* use a random scale factor to account for unknown descenders, 0.8 works
175 * reasonably well with bitstream vera 198 * reasonably well with dejavu/bistream fonts
176 */ 199 */
177 PangoFontDescription *font = self->font ? self->font : default_font; 200 PangoFontDescription *font = self->font ? self->font : default_font;
178 201
179 pango_font_description_set_absolute_size (font, 202 pango_font_description_set_absolute_size (font,
180 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 203 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
181 204
182 pango_layout_set_font_description (self->pl, font); 205 pango_layout_set_font_description (self->pl, font);
183} 206}
184 207
185static void 208static void
186layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 209layout_get_pixel_size (DC__Layout self, int *w, int *h)
187{ 210{
188 PangoRectangle rect; 211 PangoRectangle rect;
189 212
190 // get_pixel_* wrongly rounds down 213 // get_pixel_* wrongly rounds down
191 pango_layout_get_extents (self->pl, 0, &rect); 214 pango_layout_get_extents (self->pl, 0, &rect);
202 225
203typedef uint16_t tileid; 226typedef uint16_t tileid;
204typedef uint16_t faceid; 227typedef uint16_t faceid;
205 228
206typedef struct { 229typedef struct {
207 int name; 230 GLuint name;
208 int w, h; 231 int w, h;
209 float s, t; 232 float s, t;
210 uint8_t r, g, b, a; 233 uint8_t r, g, b, a;
211 tileid smoothtile; 234 tileid smoothtile;
212 uint8_t smoothlevel; 235 uint8_t smoothlevel;
230 int faces; tileid *face2tile; // [faceid] 253 int faces; tileid *face2tile; // [faceid]
231 int texs; maptex *tex; // [tileid] 254 int texs; maptex *tex; // [tileid]
232 255
233 int32_t rows; 256 int32_t rows;
234 maprow *row; 257 maprow *row;
235} *CFPlus__Map; 258} *DC__Map;
236 259
237static char * 260static char *
238prepend (char *ptr, int sze, int inc) 261prepend (char *ptr, int sze, int inc)
239{ 262{
240 char *p; 263 char *p;
278 self->texs *= 2; 301 self->texs *= 2;
279 } 302 }
280} 303}
281 304
282static maprow * 305static maprow *
283map_get_row (CFPlus__Map self, int y) 306map_get_row (DC__Map self, int y)
284{ 307{
285 if (0 > y) 308 if (0 > y)
286 { 309 {
287 int extend = - y + MAP_EXTEND_Y; 310 int extend = - y + MAP_EXTEND_Y;
288 Prepend (maprow, self->row, self->rows, extend); 311 Prepend (maprow, self->row, self->rows, extend);
326 349
327 return row->col + (x - row->c0); 350 return row->col + (x - row->c0);
328} 351}
329 352
330static mapcell * 353static mapcell *
331map_get_cell (CFPlus__Map self, int x, int y) 354map_get_cell (DC__Map self, int x, int y)
332{ 355{
333 return row_get_cell (map_get_row (self, y), x); 356 return row_get_cell (map_get_row (self, y), x);
334} 357}
335 358
336static void 359static void
337map_clear (CFPlus__Map self) 360map_clear (DC__Map self)
338{ 361{
339 int r; 362 int r;
340 363
341 for (r = 0; r < self->rows; r++) 364 for (r = 0; r < self->rows; r++)
342 Safefree (self->row[r].col); 365 Safefree (self->row[r].col);
349 self->oy = 0; 372 self->oy = 0;
350 self->row = 0; 373 self->row = 0;
351 self->rows = 0; 374 self->rows = 0;
352} 375}
353 376
377#define CELL_CLEAR(cell) \
378 do { \
379 if ((cell)->player) \
380 (cell)->tile [2] = 0; \
381 (cell)->darkness = 0; \
382 (cell)->stat_hp = 0; \
383 (cell)->flags = 0; \
384 (cell)->player = 0; \
385 } while (0)
386
354static void 387static void
355map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 388map_blank (DC__Map self, int x0, int y0, int w, int h)
356{ 389{
357 int x, y; 390 int x, y;
358 maprow *row; 391 maprow *row;
359 mapcell *cell; 392 mapcell *cell;
360 393
372 if (x >= row->c1) 405 if (x >= row->c1)
373 break; 406 break;
374 407
375 cell = row->col + x - row->c0; 408 cell = row->col + x - row->c0;
376 409
377 cell->darkness = 0; 410 CELL_CLEAR (cell);
378 cell->stat_hp = 0;
379 cell->flags = 0;
380 cell->player = 0;
381 } 411 }
382 } 412 }
383} 413}
384 414
385typedef struct { 415typedef struct {
439 n |= n >> 16; 469 n |= n >> 16;
440 470
441 return n + 1; 471 return n + 1;
442} 472}
443 473
474static unsigned int
475popcount (unsigned int n)
476{
477 n -= (n >> 1) & 0x55555555U;
478 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
479 n = ((n >> 4) + n) & 0x0f0f0f0fU;
480 n *= 0x01010101U;
481
482 return n >> 24;
483}
484
444/* SDL should provide this, really. */ 485/* SDL should provide this, really. */
445#define SDLK_MODIFIER_MIN 300 486#define SDLK_MODIFIER_MIN 300
446#define SDLK_MODIFIER_MAX 314 487#define SDLK_MODIFIER_MAX 314
447 488
448/******************************************************************************/ 489/******************************************************************************/
486 return 0; 527 return 0;
487 528
488 return 1; 529 return 1;
489} 530}
490 531
491MODULE = CFPlus PACKAGE = CFPlus 532static void
533deliantra_main ()
534{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537 dSP;
538}
539
540#ifdef __MACOSX__
541 /* to due surprising braindamage on the side of SDL design, we
542 * do some mind-boggling hack here: SDL requires a custom main()
543 * on OS X, so... we provide one and call the original main(), which,
544 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
545 * and which calls our main (== SDL_main) back.
546 */
547 extern C_LINKAGE int
548 main (int argc, char *argv[])
549 {
550 deliantra_main ();
551 }
552
553 #undef main
554
555 extern C_LINKAGE int main (int argc, char *argv[]);
556
557 static void
558 SDL_braino (void)
559 {
560 char *argv[] = { "deliantra client", 0 };
561 (main) (1, argv);
562 }
563#else
564 static void
565 SDL_braino (void)
566 {
567 deliantra_main ();
568 }
569#endif
570
571MODULE = Deliantra::Client PACKAGE = DC
492 572
493PROTOTYPES: ENABLE 573PROTOTYPES: ENABLE
494 574
495BOOT: 575BOOT:
496{ 576{
497 HV *stash = gv_stashpv ("CFPlus", 1); 577 HV *stash = gv_stashpv ("DC", 1);
498 static const struct { 578 static const struct {
499 const char *name; 579 const char *name;
500 IV iv; 580 IV iv;
501 } *civ, const_iv[] = { 581 } *civ, const_iv[] = {
502# define const_iv(name) { # name, (IV)name } 582# define const_iv(name) { # name, (IV)name }
524 604
525 const_iv (SDL_APPINPUTFOCUS), 605 const_iv (SDL_APPINPUTFOCUS),
526 const_iv (SDL_APPMOUSEFOCUS), 606 const_iv (SDL_APPMOUSEFOCUS),
527 const_iv (SDL_APPACTIVE), 607 const_iv (SDL_APPACTIVE),
528 608
609 const_iv (SDLK_FIRST),
610 const_iv (SDLK_LAST),
529 const_iv (SDLK_KP0), 611 const_iv (SDLK_KP0),
530 const_iv (SDLK_KP1), 612 const_iv (SDLK_KP1),
531 const_iv (SDLK_KP2), 613 const_iv (SDLK_KP2),
532 const_iv (SDLK_KP3), 614 const_iv (SDLK_KP3),
533 const_iv (SDLK_KP4), 615 const_iv (SDLK_KP4),
605 const_iv (KMOD_LMETA), 687 const_iv (KMOD_LMETA),
606 const_iv (KMOD_RMETA), 688 const_iv (KMOD_RMETA),
607 const_iv (KMOD_NUM), 689 const_iv (KMOD_NUM),
608 const_iv (KMOD_CAPS), 690 const_iv (KMOD_CAPS),
609 const_iv (KMOD_MODE), 691 const_iv (KMOD_MODE),
692
693 const_iv (MIX_DEFAULT_FORMAT),
694
695 const_iv (SDL_INIT_TIMER),
696 const_iv (SDL_INIT_AUDIO),
697 const_iv (SDL_INIT_VIDEO),
698 const_iv (SDL_INIT_CDROM),
699 const_iv (SDL_INIT_JOYSTICK),
700 const_iv (SDL_INIT_EVERYTHING),
701 const_iv (SDL_INIT_NOPARACHUTE),
702 const_iv (SDL_INIT_EVENTTHREAD),
703
704 const_iv (SDL_GL_RED_SIZE),
705 const_iv (SDL_GL_GREEN_SIZE),
706 const_iv (SDL_GL_BLUE_SIZE),
707 const_iv (SDL_GL_ALPHA_SIZE),
708 const_iv (SDL_GL_DOUBLEBUFFER),
709 const_iv (SDL_GL_BUFFER_SIZE),
710 const_iv (SDL_GL_DEPTH_SIZE),
711 const_iv (SDL_GL_STENCIL_SIZE),
712 const_iv (SDL_GL_ACCUM_RED_SIZE),
713 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
714 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
715 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
716 const_iv (SDL_GL_STEREO),
717 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
718 const_iv (SDL_GL_MULTISAMPLESAMPLES),
719 const_iv (SDL_GL_ACCELERATED_VISUAL),
720 const_iv (SDL_GL_SWAP_CONTROL),
721
722 const_iv (FOW_DARKNESS)
610# undef const_iv 723# undef const_iv
611 }; 724 };
612 725
613 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 726 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
614 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 727 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
632 745
633NV floor (NV x) 746NV floor (NV x)
634 747
635NV ceil (NV x) 748NV ceil (NV x)
636 749
750IV minpot (UV n)
751
752IV popcount (UV n)
753
637void 754void
638pango_init () 755pango_init ()
639 CODE: 756 CODE:
640{ 757{
641 opengl_fontmap = pango_opengl_font_map_new (); 758 opengl_fontmap = pango_opengl_font_map_new ();
642 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 759 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); 760 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
761 /*pango_context_set_font_description (opengl_context, default_font);*/
762#if PANGO_VERSION_CHECK (1, 15, 2)
763 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
764 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
765#endif
644} 766}
645 767
646char *
647SDL_GetError () 768char *SDL_GetError ()
648 769
649int 770void SDL_braino ()
650SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
651 771
652void 772int SDL_Init (U32 flags)
773
774int SDL_InitSubSystem (U32 flags)
775
776void SDL_QuitSubSystem (U32 flags)
777
653SDL_Quit () 778void SDL_Quit ()
779
780int SDL_GL_SetAttribute (int attr, int value)
781
782int SDL_GL_GetAttribute (int attr)
783 CODE:
784 if (SDL_GL_GetAttribute (attr, &RETVAL))
785 XSRETURN_UNDEF;
786 OUTPUT:
787 RETVAL
654 788
655void 789void
656SDL_ListModes (int rgb, int alpha) 790SDL_ListModes (int rgb, int alpha)
657 PPCODE: 791 PPCODE:
658{ 792{
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 804 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 805 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 806 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
673 807
674 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 808 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); 809 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
678#endif
679 810
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 811 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 812
682 if (m && m != (SDL_Rect **)-1) 813 if (m && m != (SDL_Rect **)-1)
683 while (*m) 814 while (*m)
684 { 815 {
685 if ((*m)->w >= 640 && (*m)->h >= 480) 816 if ((*m)->w >= 400 && (*m)->h >= 300)
686 { 817 {
687 AV *av = newAV (); 818 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 819 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 820 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 821 av_push (av, newSViv (rgb));
714 845
715 if (RETVAL) 846 if (RETVAL)
716 { 847 {
717 av_clear (texture_av); 848 av_clear (texture_av);
718 849
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 850 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 851#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
721#include "glfunc.h" 852#include "glfunc.h"
722#undef GL_FUNC 853#undef GL_FUNC
723 } 854 }
724} 855}
731char * 862char *
732SDL_GetKeyName (int sym) 863SDL_GetKeyName (int sym)
733 864
734int 865int
735SDL_GetAppState () 866SDL_GetAppState ()
867
868int
869SDL_GetModState ()
736 870
737void 871void
738poll_events () 872poll_events ()
739 PPCODE: 873 PPCODE:
740{ 874{
750 { 884 {
751 case SDL_KEYDOWN: 885 case SDL_KEYDOWN:
752 case SDL_KEYUP: 886 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 887 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 888 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 889 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 */ 890 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); 891 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 892 break;
759 893
760 case SDL_ACTIVEEVENT: 894 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 895 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
779 x = ev.motion.x; 913 x = ev.motion.x;
780 y = ev.motion.y; 914 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 915 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 916 }
783 917
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 918 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 919 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 920 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 921 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 922 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 923 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 924 }
791 break; 925 break;
792 926
793 case SDL_MOUSEBUTTONDOWN: 927 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 928 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 929 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 930
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 931 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 932 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 933 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 934 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 939 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 940 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 941 break;
808 } 942 }
809 943
810 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 944 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
811 } 945 }
812} 946}
813 947
814int 948int
815Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 949Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816 POSTCALL: 950 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 951 Mix_HookMusicFinished (music_finished);
818 Mix_ChannelFinished (channel_finished); 952 Mix_ChannelFinished (channel_finished);
953
954void
955Mix_QuerySpec ()
956 PPCODE:
957{
958 int freq, channels;
959 Uint16 format;
960
961 if (Mix_QuerySpec (&freq, &format, &channels))
962 {
963 EXTEND (SP, 3);
964 PUSHs (sv_2mortal (newSViv (freq)));
965 PUSHs (sv_2mortal (newSViv (format)));
966 PUSHs (sv_2mortal (newSViv (channels)));
967 }
968}
819 969
820void 970void
821Mix_CloseAudio () 971Mix_CloseAudio ()
822 972
823int 973int
858 } 1008 }
859 } 1009 }
860#endif 1010#endif
861} 1011}
862 1012
863void 1013int
864add_font (char *file) 1014add_font (char *file)
865 CODE: 1015 CODE:
866 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1016 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1017 OUTPUT:
1018 RETVAL
867 1019
868void 1020void
869load_image_inline (SV *image_) 1021load_image_inline (SV *image_)
870 ALIAS: 1022 ALIAS:
871 load_image_file = 1 1023 load_image_file = 1
957void 1109void
958error (char *message) 1110error (char *message)
959 CODE: 1111 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1112 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1113#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1114 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1115#endif
964 1116
965void 1117void
966fatal (char *message) 1118fatal (char *message)
967 CODE: 1119 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1120 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1121#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1122 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1123#endif
972 _exit (1); 1124 _exit (1);
973 1125
974void 1126void
975_exit (int retval = 0) 1127_exit (int retval = 0)
987#if DEBUG 1139#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1140 VALGRIND_DO_LEAK_CHECK;
989#endif 1141#endif
990} 1142}
991 1143
992MODULE = CFPlus PACKAGE = CFPlus::Font 1144MODULE = Deliantra::Client PACKAGE = DC::Font
993 1145
994PROTOTYPES: DISABLE 1146PROTOTYPES: DISABLE
995 1147
996CFPlus::Font 1148DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1149new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1150 CODE:
999{ 1151{
1000 int count; 1152 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1153 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1004} 1156}
1005 OUTPUT: 1157 OUTPUT:
1006 RETVAL 1158 RETVAL
1007 1159
1008void 1160void
1009DESTROY (CFPlus::Font self) 1161DESTROY (DC::Font self)
1010 CODE: 1162 CODE:
1011 pango_font_description_free (self); 1163 pango_font_description_free (self);
1012 1164
1013void 1165void
1014make_default (CFPlus::Font self) 1166make_default (DC::Font self)
1015 PROTOTYPE: $ 1167 PROTOTYPE: $
1016 CODE: 1168 CODE:
1017 default_font = self; 1169 default_font = self;
1018 1170
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1171MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1172
1021PROTOTYPES: DISABLE 1173PROTOTYPES: DISABLE
1022 1174
1023void 1175void
1024reset_glyph_cache () 1176glyph_cache_backup ()
1025 PROTOTYPE: 1177 PROTOTYPE:
1026 CODE: 1178 CODE:
1179 tc_backup ();
1180
1181void
1182glyph_cache_restore ()
1183 PROTOTYPE:
1184 CODE:
1027 tc_clear (); 1185 tc_restore ();
1028 1186
1029CFPlus::Layout 1187DC::Layout
1030new (SV *class) 1188new (SV *class)
1031 CODE: 1189 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1190 New (0, RETVAL, 1, struct cf_layout);
1033 1191
1034 RETVAL->pl = pango_layout_new (opengl_context); 1192 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->g = 1.; 1194 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1195 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1196 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1197 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1198 RETVAL->font = 0;
1199 RETVAL->rc = rc_alloc ();
1041 1200
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1201 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1202 layout_update_font (RETVAL);
1044 OUTPUT: 1203 OUTPUT:
1045 RETVAL 1204 RETVAL
1046 1205
1047void 1206void
1048DESTROY (CFPlus::Layout self) 1207DESTROY (DC::Layout self)
1049 CODE: 1208 CODE:
1050 g_object_unref (self->pl); 1209 g_object_unref (self->pl);
1210 rc_free (self->rc);
1051 Safefree (self); 1211 Safefree (self);
1052 1212
1053void 1213void
1054set_text (CFPlus::Layout self, SV *text_) 1214set_text (DC::Layout self, SV *text_)
1055 CODE: 1215 CODE:
1056{ 1216{
1057 STRLEN textlen; 1217 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1218 char *text = SvPVutf8 (text_, textlen);
1059 1219
1060 pango_layout_set_text (self->pl, text, textlen); 1220 pango_layout_set_text (self->pl, text, textlen);
1061} 1221}
1062 1222
1063void 1223void
1064set_markup (CFPlus::Layout self, SV *text_) 1224set_markup (DC::Layout self, SV *text_)
1065 CODE: 1225 CODE:
1066{ 1226{
1067 STRLEN textlen; 1227 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1228 char *text = SvPVutf8 (text_, textlen);
1069 1229
1070 pango_layout_set_markup (self->pl, text, textlen); 1230 pango_layout_set_markup (self->pl, text, textlen);
1071} 1231}
1072 1232
1073void 1233void
1074set_shapes (CFPlus::Layout self, ...) 1234set_shapes (DC::Layout self, ...)
1075 CODE: 1235 CODE:
1076{ 1236{
1077 PangoAttrList *attrs = 0; 1237 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1238 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1239 const char *pos = text;
1114 if (attrs) 1274 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1275 pango_layout_set_attributes (self->pl, attrs);
1116} 1276}
1117 1277
1118void 1278void
1119get_shapes (CFPlus::Layout self) 1279get_shapes (DC::Layout self)
1120 PPCODE: 1280 PPCODE:
1121{ 1281{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1282 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1283
1124 do 1284 do
1125 { 1285 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1286 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1287
1128 if (run && shape_attr_p (run)) 1288 if (run && shape_attr_p (run))
1129 { 1289 {
1130 PangoRectangle extents; 1290 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1291 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1299
1140 pango_layout_iter_free (iter); 1300 pango_layout_iter_free (iter);
1141} 1301}
1142 1302
1143int 1303int
1144has_wrapped (CFPlus::Layout self) 1304has_wrapped (DC::Layout self)
1145 CODE: 1305 CODE:
1146{ 1306{
1147 int lines = 1; 1307 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1308 const char *text = pango_layout_get_text (self->pl);
1149 1309
1154} 1314}
1155 OUTPUT: 1315 OUTPUT:
1156 RETVAL 1316 RETVAL
1157 1317
1158SV * 1318SV *
1159get_text (CFPlus::Layout self) 1319get_text (DC::Layout self)
1160 CODE: 1320 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1321 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1322 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1323 OUTPUT:
1164 RETVAL 1324 RETVAL
1165 1325
1166void 1326void
1167set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1327set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1168 CODE: 1328 CODE:
1169 self->r = r; 1329 self->r = r;
1170 self->g = g; 1330 self->g = g;
1171 self->b = b; 1331 self->b = b;
1172 self->a = a; 1332 self->a = a;
1173 1333
1174void 1334void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1335set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1336 CODE:
1177 if (self->font != font) 1337 if (self->font != font)
1178 { 1338 {
1179 self->font = font; 1339 self->font = font;
1180 layout_update_font (self); 1340 layout_update_font (self);
1181 } 1341 }
1182 1342
1183void 1343void
1184set_height (CFPlus::Layout self, int base_height) 1344set_height (DC::Layout self, int base_height)
1185 CODE: 1345 CODE:
1186 if (self->base_height != base_height) 1346 if (self->base_height != base_height)
1187 { 1347 {
1188 self->base_height = base_height; 1348 self->base_height = base_height;
1189 layout_update_font (self); 1349 layout_update_font (self);
1190 } 1350 }
1191 1351
1192void 1352void
1193set_width (CFPlus::Layout self, int max_width = -1) 1353set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1354 CODE:
1195 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1355 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1196 1356
1197void 1357void
1198set_indent (CFPlus::Layout self, int indent) 1358set_indent (DC::Layout self, int indent)
1199 CODE: 1359 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1360 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1361
1202void 1362void
1203set_spacing (CFPlus::Layout self, int spacing) 1363set_spacing (DC::Layout self, int spacing)
1204 CODE: 1364 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1365 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1366
1207void 1367void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1368set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1369 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1370 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1371 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1372 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1373 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1374 : PANGO_ELLIPSIZE_NONE
1215 ); 1375 );
1216 1376
1217void 1377void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1378set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1379 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1380 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1381
1222void 1382void
1223size (CFPlus::Layout self) 1383size (DC::Layout self)
1224 PPCODE: 1384 PPCODE:
1225{ 1385{
1226 int w, h; 1386 int w, h;
1227 1387
1228 layout_get_pixel_size (self, &w, &h); 1388 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1391 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1392 PUSHs (sv_2mortal (newSViv (h)));
1233} 1393}
1234 1394
1235int 1395int
1236descent (CFPlus::Layout self) 1396descent (DC::Layout self)
1237 CODE: 1397 CODE:
1238{ 1398{
1239 PangoRectangle rect; 1399 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1400 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1401 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1402 RETVAL = PANGO_DESCENT (rect);
1243} 1403}
1244 OUTPUT: 1404 OUTPUT:
1245 RETVAL 1405 RETVAL
1246 1406
1247int 1407int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1408xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1409 CODE:
1250{ 1410{
1251 int index, trailing; 1411 int index, trailing;
1252 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1412 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1253 RETVAL = index + trailing; 1413 RETVAL = index + trailing;
1254} 1414}
1255 OUTPUT: 1415 OUTPUT:
1256 RETVAL 1416 RETVAL
1257 1417
1258void 1418void
1259cursor_pos (CFPlus::Layout self, int index) 1419cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1420 PPCODE:
1261{ 1421{
1262 PangoRectangle strong_pos; 1422 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1423 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1424
1265 EXTEND (SP, 3); 1425 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1426 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1427 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1428 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1429}
1270 1430
1271void 1431void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1432index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1433 PPCODE:
1274{ 1434{
1275 int line, x; 1435 int line, x;
1276 1436
1277 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1437 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1438#if !PANGO_VERSION_CHECK (1, 17, 3)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1439 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1440 --line;
1441#endif
1280 EXTEND (SP, 2); 1442 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1443 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1444 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1445}
1284 1446
1285void 1447void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1448line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1449 PPCODE:
1288{ 1450{
1289 PangoLayoutLine *lp; 1451 PangoLayoutLine *lp;
1290 int index, trailing; 1452 int index, trailing;
1291 1453
1292 if (line < 0) 1454 if (line < 0)
1293 XSRETURN_EMPTY; 1455 XSRETURN_EMPTY;
1294 1456
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1457 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1458 XSRETURN_EMPTY; /* do better */
1297 1459
1298 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1460 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1299 1461
1300 EXTEND (SP, 2); 1462 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1468 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1469 }
1308} 1470}
1309 1471
1310void 1472void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1473render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1474 CODE:
1475 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1476 pango_opengl_render_layout_subpixel (
1314 self->pl, 1477 self->pl,
1478 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1479 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1480 self->r, self->g, self->b, self->a,
1317 flags 1481 flags
1318 ); 1482 );
1483 // we assume that context_change actually clears/frees stuff
1484 // and does not do any recomputation...
1485 pango_layout_context_changed (self->pl);
1319 1486
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1487void
1488draw (DC::Layout self)
1489 CODE:
1490{
1491 glEnable (GL_TEXTURE_2D);
1492 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1493 glEnable (GL_BLEND);
1494 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1495 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1496 glEnable (GL_ALPHA_TEST);
1497 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1498
1499 rc_draw (self->rc);
1500
1501 glDisable (GL_ALPHA_TEST);
1502 glDisable (GL_BLEND);
1503 glDisable (GL_TEXTURE_2D);
1504}
1505
1506MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1507
1322PROTOTYPES: ENABLE 1508PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1509
1326void 1510void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1511pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1512 CODE:
1329{ 1513{
1406 RETVAL = width > 0; 1590 RETVAL = width > 0;
1407} 1591}
1408 OUTPUT: 1592 OUTPUT:
1409 RETVAL 1593 RETVAL
1410 1594
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1595MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1596
1413PROTOTYPES: DISABLE 1597PROTOTYPES: DISABLE
1414 1598
1415CFPlus::Map 1599DC::Map
1416new (SV *class) 1600new (SV *class)
1417 CODE: 1601 CODE:
1418 New (0, RETVAL, 1, struct map); 1602 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1603 RETVAL->x = 0;
1420 RETVAL->y = 0; 1604 RETVAL->y = 0;
1428 RETVAL->row = 0; 1612 RETVAL->row = 0;
1429 OUTPUT: 1613 OUTPUT:
1430 RETVAL 1614 RETVAL
1431 1615
1432void 1616void
1433DESTROY (CFPlus::Map self) 1617DESTROY (DC::Map self)
1434 CODE: 1618 CODE:
1435{ 1619{
1436 map_clear (self); 1620 map_clear (self);
1437 Safefree (self->face2tile); 1621 Safefree (self->face2tile);
1438 Safefree (self->tex); 1622 Safefree (self->tex);
1439 Safefree (self); 1623 Safefree (self);
1440} 1624}
1441 1625
1442void 1626void
1443resize (CFPlus::Map self, int map_width, int map_height) 1627resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1628 CODE:
1445 self->w = map_width; 1629 self->w = map_width;
1446 self->h = map_height; 1630 self->h = map_height;
1447 1631
1448void 1632void
1449clear (CFPlus::Map self) 1633clear (DC::Map self)
1450 CODE: 1634 CODE:
1451 map_clear (self); 1635 map_clear (self);
1452 1636
1453void 1637void
1454set_tileid (CFPlus::Map self, int face, int tile) 1638set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1639 CODE:
1456{ 1640{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1641 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1642 need_texid (self, tile);
1459} 1643}
1460 1644
1461void 1645void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1646set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1647 CODE:
1464{ 1648{
1465 tileid texid; 1649 tileid texid;
1466 maptex *tex; 1650 maptex *tex;
1467 1651
1480 tex->smoothtile = self->face2tile [smooth]; 1664 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1665 tex->smoothlevel = level;
1482} 1666}
1483 1667
1484void 1668void
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) 1669set_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: 1670 CODE:
1487{ 1671{
1488 need_texid (self, texid); 1672 need_texid (self, texid);
1489 1673
1490 { 1674 {
1510 // from transparent color bleeding and ugly wrapping effects. 1694 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1695 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1696}
1513 1697
1514int 1698int
1515ox (CFPlus::Map self) 1699ox (DC::Map self)
1516 ALIAS: 1700 ALIAS:
1517 oy = 1 1701 oy = 1
1518 x = 2 1702 x = 2
1519 y = 3 1703 y = 3
1520 w = 4 1704 w = 4
1531 } 1715 }
1532 OUTPUT: 1716 OUTPUT:
1533 RETVAL 1717 RETVAL
1534 1718
1535void 1719void
1536scroll (CFPlus::Map self, int dx, int dy) 1720scroll (DC::Map self, int dx, int dy)
1537 CODE: 1721 CODE:
1538{ 1722{
1539 if (dx > 0) 1723 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 1724 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 1725 else if (dx < 0)
1557 self->y += MAP_EXTEND_Y; 1741 self->y += MAP_EXTEND_Y;
1558 } 1742 }
1559} 1743}
1560 1744
1561SV * 1745SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 1746map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 1747 CODE:
1564{ 1748{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1749 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 1750 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 1751 mapcell *cell;
1595 uint8_t ext, cmd; 1779 uint8_t ext, cmd;
1596 1780
1597 do 1781 do
1598 { 1782 {
1599 ext = *data++; 1783 ext = *data++;
1600 cmd = ext & 0x3f; 1784 cmd = ext & 0x7f;
1601 1785
1602 if (cmd < 4) 1786 if (cmd < 4)
1603 cell->darkness = 255 - ext * 64 + 1; 1787 cell->darkness = 255 - ext * 64 + 1;
1604 else if (cmd == 5) // health 1788 else if (cmd == 5) // health
1605 { 1789 {
1608 } 1792 }
1609 else if (cmd == 6) // monster width 1793 else if (cmd == 6) // monster width
1610 cell->stat_width = *data++ + 1; 1794 cell->stat_width = *data++ + 1;
1611 else if (cmd == 0x47) 1795 else if (cmd == 0x47)
1612 { 1796 {
1613 if (*data == 4) 1797 if (*data == 1) cell->player = data [1];
1614 ; // decode player count 1798 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1799 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1800 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1615 1801
1616 data += *data + 1; 1802 data += *data + 1;
1617 } 1803 }
1618 else if (cmd == 8) // cell flags 1804 else if (cmd == 8) // cell flags
1619 cell->flags = *data++; 1805 cell->flags = *data++;
1649 } 1835 }
1650 } 1836 }
1651 } 1837 }
1652 } 1838 }
1653 else 1839 else
1654 cell->darkness = 0; 1840 CELL_CLEAR (cell);
1655 } 1841 }
1656} 1842}
1657 OUTPUT: 1843 OUTPUT:
1658 RETVAL 1844 RETVAL
1659 1845
1660SV * 1846SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1847mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 1848 CODE:
1663{ 1849{
1664 int x1, x; 1850 int x1, x;
1665 int y1, y; 1851 int y1, y;
1666 int z; 1852 int z;
1711} 1897}
1712 OUTPUT: 1898 OUTPUT:
1713 RETVAL 1899 RETVAL
1714 1900
1715void 1901void
1716draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1902draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1717 CODE: 1903 CODE:
1718{ 1904{
1719 int x, y, z; 1905 int x, y, z;
1720 1906
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1907 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1908 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) 1909 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724 smooth_key skey; 1910 smooth_key skey;
1725 1911 int pl_x, pl_y;
1912 maptex pl_tex;
1726 rc_t *rc = rc_alloc (); 1913 rc_t *rc = rc_alloc ();
1727 rc_key_t key; 1914 rc_key_t key;
1728 rc_array_t *arr; 1915 rc_array_t *arr;
1916
1917 pl_tex.name = 0;
1729 1918
1730 // thats current max. sorry. 1919 // thats current max. sorry.
1731 if (sw > 255) sw = 255; 1920 if (sw > 255) sw = 255;
1732 if (sh > 255) sh = 255; 1921 if (sh > 255) sh = 255;
1733 1922
1788 tileid tile = cell->tile [z]; 1977 tileid tile = cell->tile [z];
1789 1978
1790 if (tile) 1979 if (tile)
1791 { 1980 {
1792 maptex tex = self->tex [tile]; 1981 maptex tex = self->tex [tile];
1793 int px, py; 1982 int px = (x + 1) * T - tex.w;
1983 int py = (y + 1) * T - tex.h;
1794 1984
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 1985 if (key.texname != tex.name)
1798 { 1986 {
1799 if (!tex.name) 1987 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 1988 tex = self->tex [2]; /* missing, replace by noface */
1801 1989
1802 key.texname = tex.name; 1990 key.texname = tex.name;
1803 arr = rc_array (rc, &key); 1991 arr = rc_array (rc, &key);
1804 } 1992 }
1805 1993
1806 px = (x + 1) * T - tex.w; 1994 if (expect_false (cell->player == player) && expect_false (z == 2))
1807 py = (y + 1) * T - tex.h; 1995 {
1996 pl_x = px;
1997 pl_y = py;
1998 pl_tex = tex;
1999 continue;
2000 }
1808 2001
1809 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2002 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2003 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); 2004 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); 2005 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1813 2006
1814 if (cell->flags && z == 2) 2007 if (expect_false (cell->flags) && expect_false (z == 2))
1815 { 2008 {
1816 // overlays such as the speech bubble, probably more to come 2009 // overlays such as the speech bubble, probably more to come
1817 if (cell->flags & 1) 2010 if (cell->flags & 1)
1818 { 2011 {
1819 maptex tex = self->tex [1]; 2012 maptex tex = self->tex [1];
1884 // go through all smoothlevels, lowest to highest, then draw. 2077 // go through all smoothlevels, lowest to highest, then draw.
1885 // this is basically counting sort 2078 // this is basically counting sort
1886 { 2079 {
1887 int w, b; 2080 int w, b;
1888 2081
2082 glEnable (GL_TEXTURE_2D);
2083 glBegin (GL_QUADS);
1889 for (w = 0; w < 256 / 32; ++w) 2084 for (w = 0; w < 256 / 32; ++w)
1890 { 2085 {
1891 uint32_t smask = smooth_level [w]; 2086 uint32_t smask = smooth_level [w];
1892 if (smask) 2087 if (smask)
1893 for (b = 0; b < 32; ++b) 2088 for (b = 0; b < 32; ++b)
1918 { 2113 {
1919 // this time avoiding texture state changes 2114 // this time avoiding texture state changes
1920 // save gobs of state changes. 2115 // save gobs of state changes.
1921 if (key.texname != tex.name) 2116 if (key.texname != tex.name)
1922 { 2117 {
2118 glEnd ();
1923 key.texname = tex.name; 2119 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1924 arr = rc_array (rc, &key); 2120 glBegin (GL_QUADS);
1925 } 2121 }
1926 2122
1927 if (border) 2123 if (border)
1928 { 2124 {
1929 float ox = border * dx; 2125 float ox = border * dx;
1930 2126
1931 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2127 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1932 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2128 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1933 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2129 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1934 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2130 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1935 } 2131 }
1936 2132
1937 if (corner) 2133 if (corner)
1938 { 2134 {
1939 float ox = corner * dx; 2135 float ox = corner * dx;
1940 2136
1941 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2137 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1942 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2138 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1943 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2139 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1944 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2140 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1945 } 2141 }
1946 } 2142 }
1947 } 2143 }
1948 } 2144 }
1949 } 2145 }
1950 } 2146 }
2147
2148 glEnd ();
2149 glDisable (GL_TEXTURE_2D);
2150 key.texname = -1;
1951 } 2151 }
1952 2152
1953 hv_clear (smooth); 2153 hv_clear (smooth);
2154 }
2155
2156 if (pl_tex.name)
2157 {
2158 maptex tex = pl_tex;
2159 int px = pl_x + sdx;
2160 int py = pl_y + sdy;
2161
2162 key.texname = tex.name;
2163 arr = rc_array (rc, &key);
2164
2165 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2166 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2167 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2169
1954 rc_draw (rc); 2170 rc_draw (rc);
1955 rc_clear (rc);
1956 } 2171 }
1957 2172
1958 glDisable (GL_BLEND); 2173 glDisable (GL_BLEND);
1959 rc_free (rc); 2174 rc_free (rc);
1960 2175
1989 } 2204 }
1990 } 2205 }
1991} 2206}
1992 2207
1993void 2208void
1994draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2209draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1995 CODE: 2210 CODE:
1996{ 2211{
1997 static float color[16][3] = { 2212 static float color[16][3] = {
1998 { 0.00F, 0.00F, 0.00F }, 2213 { 0.00F, 0.00F, 0.00F },
1999 { 1.00F, 1.00F, 1.00F }, 2214 { 1.00F, 1.00F, 1.00F },
2049 glDisable (GL_BLEND); 2264 glDisable (GL_BLEND);
2050 glDisable (GL_TEXTURE_2D); 2265 glDisable (GL_TEXTURE_2D);
2051} 2266}
2052 2267
2053void 2268void
2054fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2269fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2055 PPCODE: 2270 PPCODE:
2056{ 2271{
2057 int x, y; 2272 int x, y;
2058 int sw1 = sw + 2; 2273 int sw1 = sw + 2;
2059 int sh1 = sh + 2; 2274 int sh1 = sh + 2;
2067 SvCUR_set (darkness3_sv, sw34 * sh3); 2282 SvCUR_set (darkness3_sv, sw34 * sh3);
2068 2283
2069 mx += self->x - 1; 2284 mx += self->x - 1;
2070 my += self->y - 1; 2285 my += self->y - 1;
2071 2286
2072 memset (darkness1, 255, sw1 * sh1); 2287 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2073 2288
2074 for (y = 0; y < sh1; y++) 2289 for (y = 0; y < sh1; y++)
2075 if (0 <= y + my && y + my < self->rows) 2290 if (0 <= y + my && y + my < self->rows)
2076 { 2291 {
2077 maprow *row = self->row + (y + my); 2292 maprow *row = self->row + (y + my);
2130 PUSHs (sv_2mortal (newSViv (sh3))); 2345 PUSHs (sv_2mortal (newSViv (sh3)));
2131 PUSHs (darkness3_sv); 2346 PUSHs (darkness3_sv);
2132} 2347}
2133 2348
2134SV * 2349SV *
2135get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2350get_rect (DC::Map self, int x0, int y0, int w, int h)
2136 CODE: 2351 CODE:
2137{ 2352{
2138 int x, y, x1, y1; 2353 int x, y, x1, y1;
2139 SV *data_sv = newSV (w * h * 7 + 5); 2354 SV *data_sv = newSV (w * h * 7 + 5);
2140 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2355 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2197 else 2412 else
2198 *data++ = 0; 2413 *data++ = 0;
2199 } 2414 }
2200 } 2415 }
2201 2416
2417 /* if size is w*h + 5 then no data has been found */
2418 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2419 {
2202 SvPOK_only (data_sv); 2420 SvPOK_only (data_sv);
2203 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2421 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2422 }
2423
2204 RETVAL = data_sv; 2424 RETVAL = data_sv;
2205} 2425}
2206 OUTPUT: 2426 OUTPUT:
2207 RETVAL 2427 RETVAL
2208 2428
2209void 2429void
2210set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2430set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2211 PPCODE: 2431 PPCODE:
2212{ 2432{
2213 int x, y, z; 2433 int x, y, z;
2214 int w, h; 2434 int w, h;
2215 int x1, y1; 2435 int x1, y1;
2436 STRLEN len;
2437 uint8_t *data, *end;
2438
2439 len = SvLEN (data_sv);
2440 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2441 data = SvPVbyte_nolen (data_sv);
2442 end = data + len + 8;
2443
2444 if (len < 5)
2445 XSRETURN_EMPTY;
2216 2446
2217 if (*data++ != 0) 2447 if (*data++ != 0)
2218 return; /* version mismatch */ 2448 XSRETURN_EMPTY; /* version mismatch */
2219 2449
2220 w = *data++ << 8; w |= *data++; 2450 w = *data++ << 8; w |= *data++;
2221 h = *data++ << 8; h |= *data++; 2451 h = *data++ << 8; h |= *data++;
2222 2452
2223 // we need to do this 'cause we don't keep an absolute coord system for rows 2453 // we need to do this 'cause we don't keep an absolute coord system for rows
2235 { 2465 {
2236 maprow *row = map_get_row (self, y); 2466 maprow *row = map_get_row (self, y);
2237 2467
2238 for (x = x0; x < x1; x++) 2468 for (x = x0; x < x1; x++)
2239 { 2469 {
2470 uint8_t flags;
2471
2472 if (data + 7 >= end)
2473 XSRETURN_EMPTY;
2474
2240 uint8_t flags = *data++; 2475 flags = *data++;
2241 2476
2242 if (flags) 2477 if (flags)
2243 { 2478 {
2244 mapcell *cell = row_get_cell (row, x); 2479 mapcell *cell = row_get_cell (row, x);
2245 tileid tile[3] = { 0, 0, 0 }; 2480 tileid tile[3] = { 0, 0, 0 };
2248 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2483 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2249 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2484 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2250 2485
2251 if (cell->darkness == 0) 2486 if (cell->darkness == 0)
2252 { 2487 {
2253 cell->darkness = 0; 2488 /*cell->darkness = 0;*/
2489 EXTEND (SP, 3);
2254 2490
2255 for (z = 0; z <= 2; z++) 2491 for (z = 0; z <= 2; z++)
2256 { 2492 {
2257 tileid t = tile [z]; 2493 tileid t = tile [z];
2258 2494
2259 if (t >= self->texs || (t && !self->tex [t].name)) 2495 if (t >= self->texs || (t && !self->tex [t].name))
2260 { 2496 {
2261 XPUSHs (sv_2mortal (newSViv (t))); 2497 PUSHs (sv_2mortal (newSViv (t)));
2262 need_texid (self, t); 2498 need_texid (self, t);
2263 } 2499 }
2264 2500
2265 cell->tile [z] = t; 2501 cell->tile [z] = t;
2266 } 2502 }
2268 } 2504 }
2269 } 2505 }
2270 } 2506 }
2271} 2507}
2272 2508
2273MODULE = CFPlus PACKAGE = CFPlus::RW 2509MODULE = Deliantra::Client PACKAGE = DC::RW
2274 2510
2275CFPlus::RW 2511DC::RW
2276new (SV *class, SV *data_sv) 2512new (SV *class, SV *data_sv)
2277 CODE: 2513 CODE:
2278{ 2514{
2279 STRLEN datalen; 2515 STRLEN datalen;
2280 char *data = SvPVbyte (data_sv, datalen); 2516 char *data = SvPVbyte (data_sv, datalen);
2282 RETVAL = SDL_RWFromConstMem (data, datalen); 2518 RETVAL = SDL_RWFromConstMem (data, datalen);
2283} 2519}
2284 OUTPUT: 2520 OUTPUT:
2285 RETVAL 2521 RETVAL
2286 2522
2287CFPlus::RW 2523DC::RW
2288new_from_file (SV *class, const char *path, const char *mode = "rb") 2524new_from_file (SV *class, const char *path, const char *mode = "rb")
2289 CODE: 2525 CODE:
2290 RETVAL = SDL_RWFromFile (path, mode); 2526 RETVAL = SDL_RWFromFile (path, mode);
2291 OUTPUT: 2527 OUTPUT:
2292 RETVAL 2528 RETVAL
2293 2529
2294# fails on win32: 2530# fails on win32:
2295# CFPlus.xs(2268) : error C2059: syntax error : '(' 2531# dc.xs(2268) : error C2059: syntax error : '('
2296#void 2532#void
2297#close (CFPlus::RW self) 2533#close (DC::RW self)
2298# CODE: 2534# CODE:
2299# (self->(close)) (self); 2535# (self->(close)) (self);
2300 2536
2301MODULE = CFPlus PACKAGE = CFPlus::Channel 2537MODULE = Deliantra::Client PACKAGE = DC::Channel
2302 2538
2303PROTOTYPES: DISABLE 2539PROTOTYPES: DISABLE
2304 2540
2305CFPlus::Channel 2541DC::Channel
2306find () 2542find ()
2307 CODE: 2543 CODE:
2308{ 2544{
2309 RETVAL = Mix_GroupAvailable (-1); 2545 RETVAL = Mix_GroupAvailable (-1);
2310 2546
2323} 2559}
2324 OUTPUT: 2560 OUTPUT:
2325 RETVAL 2561 RETVAL
2326 2562
2327void 2563void
2328halt (CFPlus::Channel self) 2564halt (DC::Channel self)
2329 CODE: 2565 CODE:
2330 Mix_HaltChannel (self); 2566 Mix_HaltChannel (self);
2331 2567
2332void 2568void
2333expire (CFPlus::Channel self, int ticks = -1) 2569expire (DC::Channel self, int ticks = -1)
2334 CODE: 2570 CODE:
2335 Mix_ExpireChannel (self, ticks); 2571 Mix_ExpireChannel (self, ticks);
2336 2572
2337void 2573void
2338fade_out (CFPlus::Channel self, int ticks = -1) 2574fade_out (DC::Channel self, int ticks = -1)
2339 CODE: 2575 CODE:
2340 Mix_FadeOutChannel (self, ticks); 2576 Mix_FadeOutChannel (self, ticks);
2341 2577
2342int 2578int
2343volume (CFPlus::Channel self, int volume) 2579volume (DC::Channel self, int volume)
2344 CODE: 2580 CODE:
2345 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2581 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2346 OUTPUT: 2582 OUTPUT:
2347 RETVAL 2583 RETVAL
2348 2584
2349void 2585void
2350unregister_all_effects (CFPlus::Channel self) 2586unregister_all_effects (DC::Channel self)
2351 CODE: 2587 CODE:
2352 Mix_UnregisterAllEffects (self); 2588 Mix_UnregisterAllEffects (self);
2353 2589
2354void 2590void
2355set_panning (CFPlus::Channel self, int left, int right) 2591set_panning (DC::Channel self, int left, int right)
2356 CODE: 2592 CODE:
2357 left = CLAMP (left , 0, 255); 2593 left = CLAMP (left , 0, 255);
2358 right = CLAMP (right, 0, 255); 2594 right = CLAMP (right, 0, 255);
2359 Mix_SetPanning (self, left, right); 2595 Mix_SetPanning (self, left, right);
2360 2596
2361void 2597void
2362set_distance (CFPlus::Channel self, int distance) 2598set_distance (DC::Channel self, int distance)
2363 CODE: 2599 CODE:
2364 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2600 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2365 2601
2366void 2602void
2367set_position (CFPlus::Channel self, int angle, int distance) 2603set_position (DC::Channel self, int angle, int distance)
2368 CODE: 2604 CODE:
2369 2605
2370void 2606void
2371set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2607set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2372 CODE: 2608 CODE:
2373{ 2609{
2374 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2610 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); 2611 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2376 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2612 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2377} 2613}
2378 2614
2379void 2615void
2380set_reverse_stereo (CFPlus::Channel self, int flip) 2616set_reverse_stereo (DC::Channel self, int flip)
2381 CODE: 2617 CODE:
2382 Mix_SetReverseStereo (self, flip); 2618 Mix_SetReverseStereo (self, flip);
2383 2619
2384MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2620MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2385 2621
2386PROTOTYPES: DISABLE 2622PROTOTYPES: DISABLE
2387 2623
2388CFPlus::MixChunk 2624DC::MixChunk
2389new (SV *class, CFPlus::RW rwops) 2625new (SV *class, DC::RW rwops)
2390 CODE: 2626 CODE:
2391 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2627 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2392 OUTPUT: 2628 OUTPUT:
2393 RETVAL 2629 RETVAL
2394 2630
2395void 2631void
2396DESTROY (CFPlus::MixChunk self) 2632DESTROY (DC::MixChunk self)
2397 CODE: 2633 CODE:
2398 Mix_FreeChunk (self); 2634 Mix_FreeChunk (self);
2399 2635
2400int 2636int
2401volume (CFPlus::MixChunk self, int volume = -1) 2637volume (DC::MixChunk self, int volume = -1)
2402 CODE: 2638 CODE:
2403 if (items > 1) 2639 if (items > 1)
2404 volume = CLAMP (volume, 0, 128); 2640 volume = CLAMP (volume, 0, 128);
2405 RETVAL = Mix_VolumeChunk (self, volume); 2641 RETVAL = Mix_VolumeChunk (self, volume);
2406 OUTPUT: 2642 OUTPUT:
2407 RETVAL 2643 RETVAL
2408 2644
2409CFPlus::Channel 2645DC::Channel
2410play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2646play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2411 CODE: 2647 CODE:
2412{ 2648{
2413 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2649 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2414 2650
2415 if (RETVAL < 0) 2651 if (RETVAL < 0)
2422 } 2658 }
2423} 2659}
2424 OUTPUT: 2660 OUTPUT:
2425 RETVAL 2661 RETVAL
2426 2662
2427MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2663MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2428 2664
2429int 2665int
2430volume (int volume = -1) 2666volume (int volume = -1)
2431 PROTOTYPE: ;$ 2667 PROTOTYPE: ;$
2432 CODE: 2668 CODE:
2444void 2680void
2445halt () 2681halt ()
2446 CODE: 2682 CODE:
2447 Mix_HaltMusic (); 2683 Mix_HaltMusic ();
2448 2684
2449CFPlus::MixMusic 2685DC::MixMusic
2450new (SV *class, CFPlus::RW rwops) 2686new (SV *class, DC::RW rwops)
2451 CODE: 2687 CODE:
2452 RETVAL = Mix_LoadMUS_RW (rwops); 2688 RETVAL = Mix_LoadMUS_RW (rwops);
2453 OUTPUT: 2689 OUTPUT:
2454 RETVAL 2690 RETVAL
2455 2691
2456void 2692void
2457DESTROY (CFPlus::MixMusic self) 2693DESTROY (DC::MixMusic self)
2458 CODE: 2694 CODE:
2459 Mix_FreeMusic (self); 2695 Mix_FreeMusic (self);
2460 2696
2461int 2697int
2462play (CFPlus::MixMusic self, int loops = -1) 2698play (DC::MixMusic self, int loops = -1)
2463 CODE: 2699 CODE:
2464 RETVAL = Mix_PlayMusic (self, loops); 2700 RETVAL = Mix_PlayMusic (self, loops);
2465 OUTPUT: 2701 OUTPUT:
2466 RETVAL 2702 RETVAL
2467 2703
2468void 2704void
2469fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2705fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2470 CODE: 2706 CODE:
2471 Mix_FadeInMusicPos (self, loops, ms, position); 2707 Mix_FadeInMusicPos (self, loops, ms, position);
2472 2708
2473MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2709MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2474 2710
2475PROTOTYPES: ENABLE 2711PROTOTYPES: ENABLE
2476 2712
2477BOOT: 2713BOOT:
2478{ 2714{
2479 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2715 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2480 static const struct { 2716 static const struct {
2481 const char *name; 2717 const char *name;
2482 IV iv; 2718 IV iv;
2483 } *civ, const_iv[] = { 2719 } *civ, const_iv[] = {
2484# define const_iv(name) { # name, (IV)name } 2720# define const_iv(name) { # name, (IV)name }
2519 const_iv (GL_INTENSITY), 2755 const_iv (GL_INTENSITY),
2520 const_iv (GL_LUMINANCE), 2756 const_iv (GL_LUMINANCE),
2521 const_iv (GL_LUMINANCE_ALPHA), 2757 const_iv (GL_LUMINANCE_ALPHA),
2522 const_iv (GL_FLOAT), 2758 const_iv (GL_FLOAT),
2523 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2759 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2760 const_iv (GL_COMPRESSED_ALPHA_ARB),
2761 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2762 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2763 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2764 const_iv (GL_COMPRESSED_RGB_ARB),
2765 const_iv (GL_COMPRESSED_RGBA_ARB),
2524 const_iv (GL_COMPILE), 2766 const_iv (GL_COMPILE),
2525 const_iv (GL_PROXY_TEXTURE_1D), 2767 const_iv (GL_PROXY_TEXTURE_1D),
2526 const_iv (GL_PROXY_TEXTURE_2D), 2768 const_iv (GL_PROXY_TEXTURE_2D),
2527 const_iv (GL_TEXTURE_1D), 2769 const_iv (GL_TEXTURE_1D),
2528 const_iv (GL_TEXTURE_2D), 2770 const_iv (GL_TEXTURE_2D),
2567 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2809 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2568 const_iv (GL_POINT_SMOOTH_HINT), 2810 const_iv (GL_POINT_SMOOTH_HINT),
2569 const_iv (GL_LINE_SMOOTH_HINT), 2811 const_iv (GL_LINE_SMOOTH_HINT),
2570 const_iv (GL_POLYGON_SMOOTH_HINT), 2812 const_iv (GL_POLYGON_SMOOTH_HINT),
2571 const_iv (GL_GENERATE_MIPMAP_HINT), 2813 const_iv (GL_GENERATE_MIPMAP_HINT),
2814 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2572 const_iv (GL_FASTEST), 2815 const_iv (GL_FASTEST),
2573 const_iv (GL_DONT_CARE), 2816 const_iv (GL_DONT_CARE),
2574 const_iv (GL_NICEST), 2817 const_iv (GL_NICEST),
2575 const_iv (GL_V2F), 2818 const_iv (GL_V2F),
2576 const_iv (GL_V3F), 2819 const_iv (GL_V3F),
2584 2827
2585 texture_av = newAV (); 2828 texture_av = newAV ();
2586 AvREAL_off (texture_av); 2829 AvREAL_off (texture_av);
2587} 2830}
2588 2831
2832void
2833disable_GL_EXT_blend_func_separate ()
2834 CODE:
2835 gl.BlendFuncSeparate = 0;
2836 gl.BlendFuncSeparateEXT = 0;
2837
2589char * 2838char *
2590gl_vendor () 2839gl_vendor ()
2591 CODE: 2840 CODE:
2592 RETVAL = (char *)glGetString (GL_VENDOR); 2841 RETVAL = (char *)glGetString (GL_VENDOR);
2593 OUTPUT: 2842 OUTPUT:
2714 2963
2715void glRect (float x1, float y1, float x2, float y2) 2964void glRect (float x1, float y1, float x2, float y2)
2716 CODE: 2965 CODE:
2717 glRectf (x1, y1, x2, y2); 2966 glRectf (x1, y1, x2, y2);
2718 2967
2968void glRect_lineloop (float x1, float y1, float x2, float y2)
2969 CODE:
2970 glBegin (GL_LINE_LOOP);
2971 glVertex2f (x1, y1);
2972 glVertex2f (x2, y1);
2973 glVertex2f (x2, y2);
2974 glVertex2f (x1, y2);
2975 glEnd ();
2976
2719PROTOTYPES: ENABLE 2977PROTOTYPES: ENABLE
2720 2978
2721void glBegin (int mode) 2979void glBegin (int mode)
2722 2980
2723void glEnd () 2981void glEnd ()
2755void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3013void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2756 CODE: 3014 CODE:
2757 if (gl.SeparableFilter2D) 3015 if (gl.SeparableFilter2D)
2758 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3016 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2759 3017
2760void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3018void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2761 3019
2762void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3020void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2763 3021
2764void glDrawPixels (int width, int height, int format, int type, char *pixels) 3022void glDrawPixels (int width, int height, int format, int type, char *pixels)
2765 3023
2791 3049
2792void glEndList () 3050void glEndList ()
2793 3051
2794void glCallList (int list) 3052void glCallList (int list)
2795 3053
2796MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3054MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2797 3055
2798PROTOTYPES: DISABLE 3056PROTOTYPES: DISABLE
2799 3057
2800void 3058void
2801find_widget (SV *self, NV x, NV y) 3059find_widget (SV *self, NV x, NV y)
2805 XPUSHs (self); 3063 XPUSHs (self);
2806} 3064}
2807 3065
2808BOOT: 3066BOOT:
2809{ 3067{
2810 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3068 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2811 3069
2812 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3070 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); 3071 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); 3072 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); 3073 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2816} 3074}
2817 3075
2818void 3076void
2819draw (SV *self) 3077draw (SV *self)
2820 CODE: 3078 CODE:
2824 NV x, y, w, h; 3082 NV x, y, w, h;
2825 SV *draw_x_sv = GvSV (draw_x_gv); 3083 SV *draw_x_sv = GvSV (draw_x_gv);
2826 SV *draw_y_sv = GvSV (draw_y_gv); 3084 SV *draw_y_sv = GvSV (draw_y_gv);
2827 SV *draw_w_sv = GvSV (draw_w_gv); 3085 SV *draw_w_sv = GvSV (draw_w_gv);
2828 SV *draw_h_sv = GvSV (draw_h_gv); 3086 SV *draw_h_sv = GvSV (draw_h_gv);
2829 SV *hover;
2830 double draw_x, draw_y, draw_w, draw_h; 3087 double draw_x, draw_y;
2831 3088
2832 if (!SvROK (self)) 3089 if (!SvROK (self))
2833 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3090 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2834 3091
2835 hv = (HV *)SvRV (self); 3092 hv = (HV *)SvRV (self);
2836 3093
2837 if (SvTYPE (hv) != SVt_PVHV) 3094 if (SvTYPE (hv) != SVt_PVHV)
2838 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3095 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2839 3096
2840 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3097 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.; 3098 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2842 3099
2843 if (!h || !w) 3100 if (!h || !w)
2863 { 3120 {
2864 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3121 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2865 3122
2866 if (svp && SvTRUE (*svp)) 3123 if (svp && SvTRUE (*svp))
2867 { 3124 {
2868 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3125 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2869 glEnable (GL_BLEND); 3126 glEnable (GL_BLEND);
2870 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3127 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2871 glBegin (GL_QUADS); 3128 glBegin (GL_QUADS);
2872 glVertex2f (0, 0); 3129 glVertex2f (0, 0);
2873 glVertex2f (w, 0); 3130 glVertex2f (w, 0);
2876 glEnd (); 3133 glEnd ();
2877 glDisable (GL_BLEND); 3134 glDisable (GL_BLEND);
2878 } 3135 }
2879 } 3136 }
2880#if 0 3137#if 0
2881 if ($ENV{CFPLUS_DEBUG} & 1) { 3138 // draw borders, for debugging
2882 glPushMatrix; 3139 glPushMatrix ();
2883 glColor 1, 1, 0, 1; 3140 glColor4f (1., 1., 0., 1.);
2884 glTranslate 0.375, 0.375; 3141 glTranslatef (.5, .5, 0.);
2885 glBegin GL_LINE_LOOP; 3142 glBegin (GL_LINE_LOOP);
2886 glVertex 0 , 0; 3143 glVertex2f (0 , 0);
2887 glVertex $self->{w} - 1, 0; 3144 glVertex2f (w - 1, 0);
2888 glVertex $self->{w} - 1, $self->{h} - 1; 3145 glVertex2f (w - 1, h - 1);
2889 glVertex 0 , $self->{h} - 1; 3146 glVertex2f (0 , h - 1);
2890 glEnd; 3147 glEnd ();
2891 glPopMatrix; 3148 glPopMatrix ();
2892 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2893 }
2894#endif 3149#endif
2895 PUSHMARK (SP); 3150 PUSHMARK (SP);
2896 XPUSHs (self); 3151 XPUSHs (self);
2897 PUTBACK; 3152 PUTBACK;
2898 call_method ("_draw", G_VOID | G_DISCARD); 3153 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines