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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines