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.221 by root, Fri Aug 10 04:02:13 2007 UTC vs.
Revision 1.264 by root, Fri Jul 18 22:32:54 2008 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
40#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
41 46
42#include <glib/gmacros.h> 47#include <glib/gmacros.h>
43 48
44#include <pango/pango.h> 49#include <pango/pango.h>
50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
45 61
46#ifndef _WIN32 62#ifndef _WIN32
47# include <sys/types.h> 63# include <sys/types.h>
48# include <sys/socket.h> 64# include <sys/socket.h>
49# include <netinet/in.h> 65# include <netinet/in.h>
50# include <netinet/tcp.h> 66# include <netinet/tcp.h>
51# include <inttypes.h> 67# include <inttypes.h>
52#endif 68#endif
53 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
54#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
55 80
56#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
57 82
58#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
59#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
60 85
61#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
62 87
63#if 0 88/* mask out modifiers we are not interested in */
64# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
65#else
66# define PARACHUTE 0
67#endif
68 90
69static AV *texture_av; 91static AV *texture_av;
70 92
71static struct 93static struct
72{ 94{
109 av_push (texture_av, (SV *)(size_t)name); 131 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 132 glDeleteTextures (1, &name);
111} 133}
112 134
113#include "texcache.c" 135#include "texcache.c"
136#include "rendercache.c"
114 137
115#include "pango-font.c" 138#include "pango-font.c"
116#include "pango-fontmap.c" 139#include "pango-fontmap.c"
117#include "pango-render.c" 140#include "pango-render.c"
118 141
119typedef IV CFPlus__Channel; 142typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 143typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 144typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 145typedef Mix_Music *DC__MixMusic;
123 146
124typedef PangoFontDescription *CFPlus__Font; 147typedef PangoFontDescription *DC__Font;
125 148
126static int 149static int
127shape_attr_p (PangoLayoutRun *run) 150shape_attr_p (PangoLayoutRun *run)
128{ 151{
129 GSList *attrs = run->item->analysis.extra_attrs; 152 GSList *attrs = run->item->analysis.extra_attrs;
143 166
144typedef struct cf_layout { 167typedef struct cf_layout {
145 PangoLayout *pl; 168 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 169 float r, g, b, a; // default color for rgba mode
147 int base_height; 170 int base_height;
148 CFPlus__Font font; 171 DC__Font font;
172 rc_t *rc;
149} *CFPlus__Layout; 173} *DC__Layout;
150 174
151static CFPlus__Font default_font; 175static DC__Font default_font;
152static PangoContext *opengl_context; 176static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
154 178
155static void 179static void
156substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
161#endif 185#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 187}
164 188
165static void 189static void
166layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
167{ 191{
168 /* use a random scale factor to account for unknown descenders, 0.8 works 192 /* use a random scale factor to account for unknown descenders, 0.8 works
169 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
170 */ 194 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
172 196
173 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
174 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175 199
176 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
177} 201}
178 202
179static void 203static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 205{
182 PangoRectangle rect; 206 PangoRectangle rect;
183 207
184 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
196 220
197typedef uint16_t tileid; 221typedef uint16_t tileid;
198typedef uint16_t faceid; 222typedef uint16_t faceid;
199 223
200typedef struct { 224typedef struct {
201 int name; 225 GLuint name;
202 int w, h; 226 int w, h;
203 float s, t; 227 float s, t;
204 uint8_t r, g, b, a; 228 uint8_t r, g, b, a;
205 tileid smoothtile; 229 tileid smoothtile;
206 uint8_t smoothlevel; 230 uint8_t smoothlevel;
224 int faces; tileid *face2tile; // [faceid] 248 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 249 int texs; maptex *tex; // [tileid]
226 250
227 int32_t rows; 251 int32_t rows;
228 maprow *row; 252 maprow *row;
229} *CFPlus__Map; 253} *DC__Map;
230 254
231static char * 255static char *
232prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
233{ 257{
234 char *p; 258 char *p;
272 self->texs *= 2; 296 self->texs *= 2;
273 } 297 }
274} 298}
275 299
276static maprow * 300static maprow *
277map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
278{ 302{
279 if (0 > y) 303 if (0 > y)
280 { 304 {
281 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
320 344
321 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
322} 346}
323 347
324static mapcell * 348static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
326{ 350{
327 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
328} 352}
329 353
330static void 354static void
331map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
332{ 356{
333 int r; 357 int r;
334 358
335 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
344 self->row = 0; 368 self->row = 0;
345 self->rows = 0; 369 self->rows = 0;
346} 370}
347 371
348static void 372static void
349map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 373map_blank (DC__Map self, int x0, int y0, int w, int h)
350{ 374{
351 int x, y; 375 int x, y;
352 maprow *row; 376 maprow *row;
353 mapcell *cell; 377 mapcell *cell;
354 378
433 n |= n >> 16; 457 n |= n >> 16;
434 458
435 return n + 1; 459 return n + 1;
436} 460}
437 461
462static unsigned int
463popcount (unsigned int n)
464{
465 n -= (n >> 1) & 0x55555555U;
466 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
467 n = ((n >> 4) + n) & 0x0f0f0f0fU;
468 n *= 0x01010101U;
469
470 return n >> 24;
471}
472
438/* SDL should provide this, really. */ 473/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 474#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 475#define SDLK_MODIFIER_MAX 314
441 476
442/******************************************************************************/ 477/******************************************************************************/
480 return 0; 515 return 0;
481 516
482 return 1; 517 return 1;
483} 518}
484 519
485MODULE = CFPlus PACKAGE = CFPlus 520MODULE = Deliantra::Client PACKAGE = DC
486 521
487PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
488 523
489BOOT: 524BOOT:
490{ 525{
491 HV *stash = gv_stashpv ("CFPlus", 1); 526 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 527 static const struct {
493 const char *name; 528 const char *name;
494 IV iv; 529 IV iv;
495 } *civ, const_iv[] = { 530 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 531# define const_iv(name) { # name, (IV)name }
518 553
519 const_iv (SDL_APPINPUTFOCUS), 554 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 555 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 556 const_iv (SDL_APPACTIVE),
522 557
558 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 560 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 561 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 562 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 563 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 564 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 636 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 637 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 640 const_iv (KMOD_MODE),
641
642 const_iv (MIX_DEFAULT_FORMAT),
643
644 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO),
647 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD),
652
653 const_iv (SDL_GL_RED_SIZE),
654 const_iv (SDL_GL_GREEN_SIZE),
655 const_iv (SDL_GL_BLUE_SIZE),
656 const_iv (SDL_GL_ALPHA_SIZE),
657 const_iv (SDL_GL_DOUBLEBUFFER),
658 const_iv (SDL_GL_BUFFER_SIZE),
659 const_iv (SDL_GL_DEPTH_SIZE),
660 const_iv (SDL_GL_STENCIL_SIZE),
661 const_iv (SDL_GL_ACCUM_RED_SIZE),
662 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
663 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL)
604# undef const_iv 670# undef const_iv
605 }; 671 };
606 672
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 692
627NV floor (NV x) 693NV floor (NV x)
628 694
629NV ceil (NV x) 695NV ceil (NV x)
630 696
697IV minpot (UV n)
698
699IV popcount (UV n)
700
631void 701void
632pango_init () 702pango_init ()
633 CODE: 703 CODE:
634{ 704{
635 opengl_fontmap = pango_opengl_font_map_new (); 705 opengl_fontmap = pango_opengl_font_map_new ();
636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 706 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
637 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 707 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
708 /*pango_context_set_font_description (opengl_context, default_font);*/
709#if PANGO_VERSION_CHECK (1, 15, 2)
710 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
711 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
712#endif
638} 713}
639 714
640char *
641SDL_GetError () 715char *SDL_GetError ()
642 716
643int 717int SDL_Init (U32 flags)
644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
645 718
646void 719int SDL_InitSubSystem (U32 flags)
720
721void SDL_QuitSubSystem (U32 flags)
722
647SDL_Quit () 723void SDL_Quit ()
724
725int SDL_GL_SetAttribute (int attr, int value)
726
727int SDL_GL_GetAttribute (int attr)
728 CODE:
729 if (SDL_GL_GetAttribute (attr, &RETVAL))
730 XSRETURN_UNDEF;
731 OUTPUT:
732 RETVAL
648 733
649void 734void
650SDL_ListModes (int rgb, int alpha) 735SDL_ListModes (int rgb, int alpha)
651 PPCODE: 736 PPCODE:
652{ 737{
664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 749 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 750 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 751 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667 752
668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 753 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
669#if SDL_VERSION_ATLEAST(1,2,10)
670 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
671 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 754 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672#endif
673 755
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 757
676 if (m && m != (SDL_Rect **)-1) 758 if (m && m != (SDL_Rect **)-1)
677 while (*m) 759 while (*m)
678 { 760 {
679 if ((*m)->w >= 640 && (*m)->h >= 480)
680 {
681 AV *av = newAV (); 761 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 762 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 763 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 764 av_push (av, newSViv (rgb));
685 av_push (av, newSViv (alpha)); 765 av_push (av, newSViv (alpha));
686 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 766 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
687 }
688 767
689 ++m; 768 ++m;
690 } 769 }
691} 770}
692 771
708 787
709 if (RETVAL) 788 if (RETVAL)
710 { 789 {
711 av_clear (texture_av); 790 av_clear (texture_av);
712 791
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 792 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 793#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 794#include "glfunc.h"
716#undef GL_FUNC 795#undef GL_FUNC
717 } 796 }
718} 797}
725char * 804char *
726SDL_GetKeyName (int sym) 805SDL_GetKeyName (int sym)
727 806
728int 807int
729SDL_GetAppState () 808SDL_GetAppState ()
809
810int
811SDL_GetModState ()
730 812
731void 813void
732poll_events () 814poll_events ()
733 PPCODE: 815 PPCODE:
734{ 816{
744 { 826 {
745 case SDL_KEYDOWN: 827 case SDL_KEYDOWN:
746 case SDL_KEYUP: 828 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 829 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 830 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 831 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
750 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 832 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 833 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 834 break;
753 835
754 case SDL_ACTIVEEVENT: 836 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 837 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 855 x = ev.motion.x;
774 y = ev.motion.y; 856 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 857 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 858 }
777 859
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 860 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 861 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 862 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 863 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 864 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 865 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 866 }
785 break; 867 break;
786 868
787 case SDL_MOUSEBUTTONDOWN: 869 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 870 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 871 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 872
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 873 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 874 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 875 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 876 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 881 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 882 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 883 break;
802 } 884 }
803 885
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 886 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 887 }
806} 888}
807 889
808int 890int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 891Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 892 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 893 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 894 Mix_ChannelFinished (channel_finished);
895
896void
897Mix_QuerySpec ()
898 PPCODE:
899{
900 int freq, channels;
901 Uint16 format;
902
903 if (Mix_QuerySpec (&freq, &format, &channels))
904 {
905 EXTEND (SP, 3);
906 PUSHs (sv_2mortal (newSViv (freq)));
907 PUSHs (sv_2mortal (newSViv (format)));
908 PUSHs (sv_2mortal (newSViv (channels)));
909 }
910}
813 911
814void 912void
815Mix_CloseAudio () 913Mix_CloseAudio ()
816 914
817int 915int
852 } 950 }
853 } 951 }
854#endif 952#endif
855} 953}
856 954
857void 955int
858add_font (char *file) 956add_font (char *file)
859 CODE: 957 CODE:
860 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 958 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
959 OUTPUT:
960 RETVAL
861 961
862void 962void
863load_image_inline (SV *image_) 963load_image_inline (SV *image_)
864 ALIAS: 964 ALIAS:
865 load_image_file = 1 965 load_image_file = 1
951void 1051void
952error (char *message) 1052error (char *message)
953 CODE: 1053 CODE:
954 fprintf (stderr, "ERROR: %s\n", message); 1054 fprintf (stderr, "ERROR: %s\n", message);
955#ifdef _WIN32 1055#ifdef _WIN32
956 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1056 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957#endif 1057#endif
958 1058
959void 1059void
960fatal (char *message) 1060fatal (char *message)
961 CODE: 1061 CODE:
962 fprintf (stderr, "FATAL: %s\n", message); 1062 fprintf (stderr, "FATAL: %s\n", message);
963#ifdef _WIN32 1063#ifdef _WIN32
964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1064 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965#endif 1065#endif
966 _exit (1); 1066 _exit (1);
967 1067
968void 1068void
969_exit (int retval = 0) 1069_exit (int retval = 0)
981#if DEBUG 1081#if DEBUG
982 VALGRIND_DO_LEAK_CHECK; 1082 VALGRIND_DO_LEAK_CHECK;
983#endif 1083#endif
984} 1084}
985 1085
986MODULE = CFPlus PACKAGE = CFPlus::Font 1086MODULE = Deliantra::Client PACKAGE = DC::Font
987 1087
988PROTOTYPES: DISABLE 1088PROTOTYPES: DISABLE
989 1089
990CFPlus::Font 1090DC::Font
991new_from_file (SV *class, char *path, int id = 0) 1091new_from_file (SV *class, char *path, int id = 0)
992 CODE: 1092 CODE:
993{ 1093{
994 int count; 1094 int count;
995 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1095 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
998} 1098}
999 OUTPUT: 1099 OUTPUT:
1000 RETVAL 1100 RETVAL
1001 1101
1002void 1102void
1003DESTROY (CFPlus::Font self) 1103DESTROY (DC::Font self)
1004 CODE: 1104 CODE:
1005 pango_font_description_free (self); 1105 pango_font_description_free (self);
1006 1106
1007void 1107void
1008make_default (CFPlus::Font self) 1108make_default (DC::Font self)
1009 PROTOTYPE: $ 1109 PROTOTYPE: $
1010 CODE: 1110 CODE:
1011 default_font = self; 1111 default_font = self;
1012 1112
1013MODULE = CFPlus PACKAGE = CFPlus::Layout 1113MODULE = Deliantra::Client PACKAGE = DC::Layout
1014 1114
1015PROTOTYPES: DISABLE 1115PROTOTYPES: DISABLE
1016 1116
1017void 1117void
1018reset_glyph_cache () 1118glyph_cache_backup ()
1019 PROTOTYPE: 1119 PROTOTYPE:
1020 CODE: 1120 CODE:
1121 tc_backup ();
1122
1123void
1124glyph_cache_restore ()
1125 PROTOTYPE:
1126 CODE:
1021 tc_clear (); 1127 tc_restore ();
1022 1128
1023CFPlus::Layout 1129DC::Layout
1024new (SV *class) 1130new (SV *class)
1025 CODE: 1131 CODE:
1026 New (0, RETVAL, 1, struct cf_layout); 1132 New (0, RETVAL, 1, struct cf_layout);
1027 1133
1028 RETVAL->pl = pango_layout_new (opengl_context); 1134 RETVAL->pl = pango_layout_new (opengl_context);
1030 RETVAL->g = 1.; 1136 RETVAL->g = 1.;
1031 RETVAL->b = 1.; 1137 RETVAL->b = 1.;
1032 RETVAL->a = 1.; 1138 RETVAL->a = 1.;
1033 RETVAL->base_height = MIN_FONT_HEIGHT; 1139 RETVAL->base_height = MIN_FONT_HEIGHT;
1034 RETVAL->font = 0; 1140 RETVAL->font = 0;
1141 RETVAL->rc = rc_alloc ();
1035 1142
1036 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1143 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037 layout_update_font (RETVAL); 1144 layout_update_font (RETVAL);
1038 OUTPUT: 1145 OUTPUT:
1039 RETVAL 1146 RETVAL
1040 1147
1041void 1148void
1042DESTROY (CFPlus::Layout self) 1149DESTROY (DC::Layout self)
1043 CODE: 1150 CODE:
1044 g_object_unref (self->pl); 1151 g_object_unref (self->pl);
1152 rc_free (self->rc);
1045 Safefree (self); 1153 Safefree (self);
1046 1154
1047void 1155void
1048set_text (CFPlus::Layout self, SV *text_) 1156set_text (DC::Layout self, SV *text_)
1049 CODE: 1157 CODE:
1050{ 1158{
1051 STRLEN textlen; 1159 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1160 char *text = SvPVutf8 (text_, textlen);
1053 1161
1054 pango_layout_set_text (self->pl, text, textlen); 1162 pango_layout_set_text (self->pl, text, textlen);
1055} 1163}
1056 1164
1057void 1165void
1058set_markup (CFPlus::Layout self, SV *text_) 1166set_markup (DC::Layout self, SV *text_)
1059 CODE: 1167 CODE:
1060{ 1168{
1061 STRLEN textlen; 1169 STRLEN textlen;
1062 char *text = SvPVutf8 (text_, textlen); 1170 char *text = SvPVutf8 (text_, textlen);
1063 1171
1064 pango_layout_set_markup (self->pl, text, textlen); 1172 pango_layout_set_markup (self->pl, text, textlen);
1065} 1173}
1066 1174
1067void 1175void
1068set_shapes (CFPlus::Layout self, ...) 1176set_shapes (DC::Layout self, ...)
1069 CODE: 1177 CODE:
1070{ 1178{
1071 PangoAttrList *attrs = 0; 1179 PangoAttrList *attrs = 0;
1072 const char *text = pango_layout_get_text (self->pl); 1180 const char *text = pango_layout_get_text (self->pl);
1073 const char *pos = text; 1181 const char *pos = text;
1108 if (attrs) 1216 if (attrs)
1109 pango_layout_set_attributes (self->pl, attrs); 1217 pango_layout_set_attributes (self->pl, attrs);
1110} 1218}
1111 1219
1112void 1220void
1113get_shapes (CFPlus::Layout self) 1221get_shapes (DC::Layout self)
1114 PPCODE: 1222 PPCODE:
1115{ 1223{
1116 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1224 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117 1225
1118 do 1226 do
1119 { 1227 {
1120 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1228 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121 1229
1122 if (run && shape_attr_p (run)) 1230 if (run && shape_attr_p (run))
1123 { 1231 {
1124 PangoRectangle extents; 1232 PangoRectangle extents;
1125 pango_layout_iter_get_run_extents (iter, 0, &extents); 1233 pango_layout_iter_get_run_extents (iter, 0, &extents);
1133 1241
1134 pango_layout_iter_free (iter); 1242 pango_layout_iter_free (iter);
1135} 1243}
1136 1244
1137int 1245int
1138has_wrapped (CFPlus::Layout self) 1246has_wrapped (DC::Layout self)
1139 CODE: 1247 CODE:
1140{ 1248{
1141 int lines = 1; 1249 int lines = 1;
1142 const char *text = pango_layout_get_text (self->pl); 1250 const char *text = pango_layout_get_text (self->pl);
1143 1251
1148} 1256}
1149 OUTPUT: 1257 OUTPUT:
1150 RETVAL 1258 RETVAL
1151 1259
1152SV * 1260SV *
1153get_text (CFPlus::Layout self) 1261get_text (DC::Layout self)
1154 CODE: 1262 CODE:
1155 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1263 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156 sv_utf8_decode (RETVAL); 1264 sv_utf8_decode (RETVAL);
1157 OUTPUT: 1265 OUTPUT:
1158 RETVAL 1266 RETVAL
1159 1267
1160void 1268void
1161set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1269set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1162 CODE: 1270 CODE:
1163 self->r = r; 1271 self->r = r;
1164 self->g = g; 1272 self->g = g;
1165 self->b = b; 1273 self->b = b;
1166 self->a = a; 1274 self->a = a;
1167 1275
1168void 1276void
1169set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1277set_font (DC::Layout self, DC::Font font = 0)
1170 CODE: 1278 CODE:
1171 if (self->font != font) 1279 if (self->font != font)
1172 { 1280 {
1173 self->font = font; 1281 self->font = font;
1174 layout_update_font (self); 1282 layout_update_font (self);
1175 } 1283 }
1176 1284
1177void 1285void
1178set_height (CFPlus::Layout self, int base_height) 1286set_height (DC::Layout self, int base_height)
1179 CODE: 1287 CODE:
1180 if (self->base_height != base_height) 1288 if (self->base_height != base_height)
1181 { 1289 {
1182 self->base_height = base_height; 1290 self->base_height = base_height;
1183 layout_update_font (self); 1291 layout_update_font (self);
1184 } 1292 }
1185 1293
1186void 1294void
1187set_width (CFPlus::Layout self, int max_width = -1) 1295set_width (DC::Layout self, int max_width = -1)
1188 CODE: 1296 CODE:
1189 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1297 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1190 1298
1191void 1299void
1192set_indent (CFPlus::Layout self, int indent) 1300set_indent (DC::Layout self, int indent)
1193 CODE: 1301 CODE:
1194 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1302 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195 1303
1196void 1304void
1197set_spacing (CFPlus::Layout self, int spacing) 1305set_spacing (DC::Layout self, int spacing)
1198 CODE: 1306 CODE:
1199 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1307 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200 1308
1201void 1309void
1202set_ellipsise (CFPlus::Layout self, int ellipsise) 1310set_ellipsise (DC::Layout self, int ellipsise)
1203 CODE: 1311 CODE:
1204 pango_layout_set_ellipsize (self->pl, 1312 pango_layout_set_ellipsize (self->pl,
1205 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1313 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1314 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1315 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208 : PANGO_ELLIPSIZE_NONE 1316 : PANGO_ELLIPSIZE_NONE
1209 ); 1317 );
1210 1318
1211void 1319void
1212set_single_paragraph_mode (CFPlus::Layout self, int spm) 1320set_single_paragraph_mode (DC::Layout self, int spm)
1213 CODE: 1321 CODE:
1214 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1322 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215 1323
1216void 1324void
1217size (CFPlus::Layout self) 1325size (DC::Layout self)
1218 PPCODE: 1326 PPCODE:
1219{ 1327{
1220 int w, h; 1328 int w, h;
1221 1329
1222 layout_get_pixel_size (self, &w, &h); 1330 layout_get_pixel_size (self, &w, &h);
1225 PUSHs (sv_2mortal (newSViv (w))); 1333 PUSHs (sv_2mortal (newSViv (w)));
1226 PUSHs (sv_2mortal (newSViv (h))); 1334 PUSHs (sv_2mortal (newSViv (h)));
1227} 1335}
1228 1336
1229int 1337int
1230descent (CFPlus::Layout self) 1338descent (DC::Layout self)
1231 CODE: 1339 CODE:
1232{ 1340{
1233 PangoRectangle rect; 1341 PangoRectangle rect;
1234 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1342 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235 pango_layout_line_get_pixel_extents (line, 0, &rect); 1343 pango_layout_line_get_pixel_extents (line, 0, &rect);
1236 RETVAL = PANGO_DESCENT (rect); 1344 RETVAL = PANGO_DESCENT (rect);
1237} 1345}
1238 OUTPUT: 1346 OUTPUT:
1239 RETVAL 1347 RETVAL
1240 1348
1241int 1349int
1242xy_to_index (CFPlus::Layout self, int x, int y) 1350xy_to_index (DC::Layout self, int x, int y)
1243 CODE: 1351 CODE:
1244{ 1352{
1245 int index, trailing; 1353 int index, trailing;
1246 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1354 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1247 RETVAL = index + trailing; 1355 RETVAL = index + trailing;
1248} 1356}
1249 OUTPUT: 1357 OUTPUT:
1250 RETVAL 1358 RETVAL
1251 1359
1252void 1360void
1253cursor_pos (CFPlus::Layout self, int index) 1361cursor_pos (DC::Layout self, int index)
1254 PPCODE: 1362 PPCODE:
1255{ 1363{
1256 PangoRectangle strong_pos; 1364 PangoRectangle pos;
1257 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1365 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258 1366
1259 EXTEND (SP, 3); 1367 EXTEND (SP, 3);
1260 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1368 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1369 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1370 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263} 1371}
1264 1372
1265void 1373void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1374index_to_line_x (DC::Layout self, int index, int trailing = 0)
1267 PPCODE: 1375 PPCODE:
1268{ 1376{
1269 int line, x; 1377 int line, x;
1270 1378
1271 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1379 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1380#if !PANGO_VERSION_CHECK (1, 17, 3)
1272 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1381 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273 1382 --line;
1383#endif
1274 EXTEND (SP, 2); 1384 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (newSViv (line - 1))); 1385 PUSHs (sv_2mortal (newSViv (line)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1386 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277} 1387}
1278 1388
1279void 1389void
1280line_x_to_index (CFPlus::Layout self, int line, int x) 1390line_x_to_index (DC::Layout self, int line, int x)
1281 PPCODE: 1391 PPCODE:
1282{ 1392{
1283 PangoLayoutLine *lp; 1393 PangoLayoutLine *lp;
1284 int index, trailing; 1394 int index, trailing;
1285 1395
1286 if (line < 0) 1396 if (line < 0)
1287 XSRETURN_EMPTY; 1397 XSRETURN_EMPTY;
1288 1398
1289 if (!(lp = pango_layout_get_line (self->pl, line))) 1399 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290 XSRETURN_EMPTY; /* do better */ 1400 XSRETURN_EMPTY; /* do better */
1291 1401
1292 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1402 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1293 1403
1294 EXTEND (SP, 2); 1404 EXTEND (SP, 2);
1300 PUSHs (sv_2mortal (newSViv (trailing))); 1410 PUSHs (sv_2mortal (newSViv (trailing)));
1301 } 1411 }
1302} 1412}
1303 1413
1304void 1414void
1305render (CFPlus::Layout self, float x, float y, int flags = 0) 1415render (DC::Layout self, float x, float y, int flags = 0)
1306 PPCODE: 1416 CODE:
1417 rc_clear (self->rc);
1307 pango_opengl_render_layout_subpixel ( 1418 pango_opengl_render_layout_subpixel (
1308 self->pl, 1419 self->pl,
1420 self->rc,
1309 x * PANGO_SCALE, y * PANGO_SCALE, 1421 x * PANGO_SCALE, y * PANGO_SCALE,
1310 self->r, self->g, self->b, self->a, 1422 self->r, self->g, self->b, self->a,
1311 flags 1423 flags
1312 ); 1424 );
1425 // we assume that context_change actually clears/frees stuff
1426 // and does not do any recomputation...
1427 pango_layout_context_changed (self->pl);
1313 1428
1314MODULE = CFPlus PACKAGE = CFPlus::Texture 1429void
1430draw (DC::Layout self)
1431 CODE:
1432{
1433 glEnable (GL_TEXTURE_2D);
1434 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1435 glEnable (GL_BLEND);
1436 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1437 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1438 glEnable (GL_ALPHA_TEST);
1439 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1440
1441 rc_draw (self->rc);
1442
1443 glDisable (GL_ALPHA_TEST);
1444 glDisable (GL_BLEND);
1445 glDisable (GL_TEXTURE_2D);
1446}
1447
1448MODULE = Deliantra::Client PACKAGE = DC::Texture
1315 1449
1316PROTOTYPES: ENABLE 1450PROTOTYPES: ENABLE
1317
1318int minpot (int n)
1319 1451
1320void 1452void
1321pad (SV *data_, int ow, int oh, int nw, int nh) 1453pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE: 1454 CODE:
1323{ 1455{
1400 RETVAL = width > 0; 1532 RETVAL = width > 0;
1401} 1533}
1402 OUTPUT: 1534 OUTPUT:
1403 RETVAL 1535 RETVAL
1404 1536
1405MODULE = CFPlus PACKAGE = CFPlus::Map 1537MODULE = Deliantra::Client PACKAGE = DC::Map
1406 1538
1407PROTOTYPES: DISABLE 1539PROTOTYPES: DISABLE
1408 1540
1409CFPlus::Map 1541DC::Map
1410new (SV *class) 1542new (SV *class)
1411 CODE: 1543 CODE:
1412 New (0, RETVAL, 1, struct map); 1544 New (0, RETVAL, 1, struct map);
1413 RETVAL->x = 0; 1545 RETVAL->x = 0;
1414 RETVAL->y = 0; 1546 RETVAL->y = 0;
1422 RETVAL->row = 0; 1554 RETVAL->row = 0;
1423 OUTPUT: 1555 OUTPUT:
1424 RETVAL 1556 RETVAL
1425 1557
1426void 1558void
1427DESTROY (CFPlus::Map self) 1559DESTROY (DC::Map self)
1428 CODE: 1560 CODE:
1429{ 1561{
1430 map_clear (self); 1562 map_clear (self);
1431 Safefree (self->face2tile); 1563 Safefree (self->face2tile);
1432 Safefree (self->tex); 1564 Safefree (self->tex);
1433 Safefree (self); 1565 Safefree (self);
1434} 1566}
1435 1567
1436void 1568void
1437resize (CFPlus::Map self, int map_width, int map_height) 1569resize (DC::Map self, int map_width, int map_height)
1438 CODE: 1570 CODE:
1439 self->w = map_width; 1571 self->w = map_width;
1440 self->h = map_height; 1572 self->h = map_height;
1441 1573
1442void 1574void
1443clear (CFPlus::Map self) 1575clear (DC::Map self)
1444 CODE: 1576 CODE:
1445 map_clear (self); 1577 map_clear (self);
1446 1578
1447void 1579void
1448set_tileid (CFPlus::Map self, int face, int tile) 1580set_tileid (DC::Map self, int face, int tile)
1449 CODE: 1581 CODE:
1450{ 1582{
1451 need_facenum (self, face); self->face2tile [face] = tile; 1583 need_facenum (self, face); self->face2tile [face] = tile;
1452 need_texid (self, tile); 1584 need_texid (self, tile);
1453} 1585}
1454 1586
1455void 1587void
1456set_smooth (CFPlus::Map self, int face, int smooth, int level) 1588set_smooth (DC::Map self, int face, int smooth, int level)
1457 CODE: 1589 CODE:
1458{ 1590{
1459 tileid texid; 1591 tileid texid;
1460 maptex *tex; 1592 maptex *tex;
1461 1593
1474 tex->smoothtile = self->face2tile [smooth]; 1606 tex->smoothtile = self->face2tile [smooth];
1475 tex->smoothlevel = level; 1607 tex->smoothlevel = level;
1476} 1608}
1477 1609
1478void 1610void
1479set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1611set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1480 CODE: 1612 CODE:
1481{ 1613{
1482 need_texid (self, texid); 1614 need_texid (self, texid);
1483 1615
1484 { 1616 {
1504 // from transparent color bleeding and ugly wrapping effects. 1636 // from transparent color bleeding and ugly wrapping effects.
1505 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1637 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1506} 1638}
1507 1639
1508int 1640int
1509ox (CFPlus::Map self) 1641ox (DC::Map self)
1510 ALIAS: 1642 ALIAS:
1511 oy = 1 1643 oy = 1
1512 x = 2 1644 x = 2
1513 y = 3 1645 y = 3
1514 w = 4 1646 w = 4
1525 } 1657 }
1526 OUTPUT: 1658 OUTPUT:
1527 RETVAL 1659 RETVAL
1528 1660
1529void 1661void
1530scroll (CFPlus::Map self, int dx, int dy) 1662scroll (DC::Map self, int dx, int dy)
1531 CODE: 1663 CODE:
1532{ 1664{
1533 if (dx > 0) 1665 if (dx > 0)
1534 map_blank (self, self->x, self->y, dx, self->h); 1666 map_blank (self, self->x, self->y, dx, self->h);
1535 else if (dx < 0) 1667 else if (dx < 0)
1551 self->y += MAP_EXTEND_Y; 1683 self->y += MAP_EXTEND_Y;
1552 } 1684 }
1553} 1685}
1554 1686
1555SV * 1687SV *
1556map1a_update (CFPlus::Map self, SV *data_, int extmap) 1688map1a_update (DC::Map self, SV *data_, int extmap)
1557 CODE: 1689 CODE:
1558{ 1690{
1559 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1691 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1560 uint8_t *data_end = (uint8_t *)SvEND (data_); 1692 uint8_t *data_end = (uint8_t *)SvEND (data_);
1561 mapcell *cell; 1693 mapcell *cell;
1589 uint8_t ext, cmd; 1721 uint8_t ext, cmd;
1590 1722
1591 do 1723 do
1592 { 1724 {
1593 ext = *data++; 1725 ext = *data++;
1594 cmd = ext & 0x3f; 1726 cmd = ext & 0x7f;
1595 1727
1596 if (cmd < 4) 1728 if (cmd < 4)
1597 cell->darkness = 255 - ext * 64 + 1; 1729 cell->darkness = 255 - ext * 64 + 1;
1598 else if (cmd == 5) // health 1730 else if (cmd == 5) // health
1599 { 1731 {
1602 } 1734 }
1603 else if (cmd == 6) // monster width 1735 else if (cmd == 6) // monster width
1604 cell->stat_width = *data++ + 1; 1736 cell->stat_width = *data++ + 1;
1605 else if (cmd == 0x47) 1737 else if (cmd == 0x47)
1606 { 1738 {
1607 if (*data == 4) 1739 if (*data == 1) cell->player = data [1];
1608 ; // decode player count 1740 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1741 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1742 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1609 1743
1610 data += *data + 1; 1744 data += *data + 1;
1611 } 1745 }
1612 else if (cmd == 8) // cell flags 1746 else if (cmd == 8) // cell flags
1613 cell->flags = *data++; 1747 cell->flags = *data++;
1650} 1784}
1651 OUTPUT: 1785 OUTPUT:
1652 RETVAL 1786 RETVAL
1653 1787
1654SV * 1788SV *
1655mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1789mapmap (DC::Map self, int x0, int y0, int w, int h)
1656 CODE: 1790 CODE:
1657{ 1791{
1658 int x1, x; 1792 int x1, x;
1659 int y1, y; 1793 int y1, y;
1660 int z; 1794 int z;
1705} 1839}
1706 OUTPUT: 1840 OUTPUT:
1707 RETVAL 1841 RETVAL
1708 1842
1709void 1843void
1710draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1844draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1711 CODE: 1845 CODE:
1712{ 1846{
1847 int x, y, z;
1848
1713 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1849 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1714 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1850 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1715 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1851 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1716 smooth_key skey; 1852 smooth_key skey;
1717 int x, y, z; 1853 int pl_x, pl_y;
1718 int last_name; 1854 maptex pl_tex;
1855 rc_t *rc = rc_alloc ();
1856 rc_key_t key;
1857 rc_array_t *arr;
1858
1859 pl_tex.name = 0;
1719 1860
1720 // thats current max. sorry. 1861 // thats current max. sorry.
1721 if (sw > 255) sw = 255; 1862 if (sw > 255) sw = 255;
1722 if (sh > 255) sh = 255; 1863 if (sh > 255) sh = 255;
1723 1864
1724 // clear key, in case of extra padding 1865 // clear key, in case of extra padding
1725 memset (&skey, 0, sizeof (skey)); 1866 memset (&skey, 0, sizeof (skey));
1726 1867
1727 glColor4ub (255, 255, 255, 255); 1868 memset (&key, 0, sizeof (key));
1728 1869 key.r = 255;
1729 glEnable (GL_BLEND); 1870 key.g = 255;
1730 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1871 key.b = 255;
1731 glEnable (GL_TEXTURE_2D); 1872 key.a = 255;
1732 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1873 key.mode = GL_QUADS;
1733 1874 key.format = GL_T2F_V3F;
1734 glBegin (GL_QUADS);
1735
1736 last_name = -1; 1875 key.texname = -1;
1737 1876
1738 mx += self->x; 1877 mx += self->x;
1739 my += self->y; 1878 my += self->y;
1740 1879
1741 // first pass: determine smooth_max 1880 // first pass: determine smooth_max
1757 MAX (self->tex [cell->tile [0]].smoothlevel, 1896 MAX (self->tex [cell->tile [0]].smoothlevel,
1758 MAX (self->tex [cell->tile [1]].smoothlevel, 1897 MAX (self->tex [cell->tile [1]].smoothlevel,
1759 self->tex [cell->tile [2]].smoothlevel)); 1898 self->tex [cell->tile [2]].smoothlevel));
1760 } 1899 }
1761 } 1900 }
1901
1902 glEnable (GL_BLEND);
1903 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1904 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1762 1905
1763 for (z = 0; z <= 2; z++) 1906 for (z = 0; z <= 2; z++)
1764 { 1907 {
1765 memset (smooth_level, 0, sizeof (smooth_level)); 1908 memset (smooth_level, 0, sizeof (smooth_level));
1766 1909
1776 tileid tile = cell->tile [z]; 1919 tileid tile = cell->tile [z];
1777 1920
1778 if (tile) 1921 if (tile)
1779 { 1922 {
1780 maptex tex = self->tex [tile]; 1923 maptex tex = self->tex [tile];
1781 int px, py; 1924 int px = (x + 1) * T - tex.w;
1925 int py = (y + 1) * T - tex.h;
1782 1926
1783 // suppressing texture state switches here
1784 // is only moderately effective, but worth the extra effort
1785 if (last_name != tex.name) 1927 if (key.texname != tex.name)
1786 { 1928 {
1787 if (!tex.name) 1929 if (!tex.name)
1788 tex = self->tex [2]; /* missing, replace by noface */ 1930 tex = self->tex [2]; /* missing, replace by noface */
1789 1931
1790 glEnd (); 1932 key.texname = tex.name;
1791 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1933 arr = rc_array (rc, &key);
1792 glBegin (GL_QUADS);
1793 } 1934 }
1794 1935
1795 px = (x + 1) * T - tex.w; 1936 if (expect_false (cell->player == player) && expect_false (z == 2))
1796 py = (y + 1) * T - tex.h;
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1802
1803 if (cell->flags && z == 2)
1804 { 1937 {
1938 pl_x = px;
1939 pl_y = py;
1940 pl_tex = tex;
1941 continue;
1942 }
1943
1944 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1945 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1946 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1947 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1948
1949 if (expect_false (cell->flags) && expect_false (z == 2))
1950 {
1951 // overlays such as the speech bubble, probably more to come
1805 if (cell->flags & 1) 1952 if (cell->flags & 1)
1806 { 1953 {
1807 maptex tex = self->tex [1]; 1954 maptex tex = self->tex [1];
1808 int px = x * T + T * 2 / 32; 1955 int px = x * T + T * 2 / 32;
1809 int py = y * T - T * 6 / 32; 1956 int py = y * T - T * 6 / 32;
1810 1957
1958 if (tex.name)
1811 glEnd (); 1959 {
1812 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1960 if (key.texname != tex.name)
1961 {
1962 key.texname = tex.name;
1963 arr = rc_array (rc, &key);
1964 }
1965
1966 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1967 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1968 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1969 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1813 glBegin (GL_QUADS); 1970 }
1814
1815 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1816 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1817 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1818 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1819 } 1971 }
1820 } 1972 }
1821 1973
1822 // update smooth hash 1974 // update smooth hash
1823 if (tex.smoothtile) 1975 if (tex.smoothtile)
1859 } 2011 }
1860 } 2012 }
1861 } 2013 }
1862 } 2014 }
1863 2015
2016 rc_draw (rc);
2017 rc_clear (rc);
2018
1864 // go through all smoothlevels, lowest to highest, then draw. 2019 // go through all smoothlevels, lowest to highest, then draw.
1865 // this is basically counting sort 2020 // this is basically counting sort
1866 { 2021 {
1867 int w, b; 2022 int w, b;
1868 2023
2024 glEnable (GL_TEXTURE_2D);
2025 glBegin (GL_QUADS);
1869 for (w = 0; w < 256 / 32; ++w) 2026 for (w = 0; w < 256 / 32; ++w)
1870 { 2027 {
1871 uint32_t smask = smooth_level [w]; 2028 uint32_t smask = smooth_level [w];
1872 if (smask) 2029 if (smask)
1873 for (b = 0; b < 32; ++b) 2030 for (b = 0; b < 32; ++b)
1892 int border = bits & 15; 2049 int border = bits & 15;
1893 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2050 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1894 float dx = tex.s * .0625f; // 16 images/row 2051 float dx = tex.s * .0625f; // 16 images/row
1895 float dy = tex.t * .5f ; // 2 images/column 2052 float dy = tex.t * .5f ; // 2 images/column
1896 2053
1897 // this time naively avoiding texture state changes
1898 // save gobs of state changes.
1899 if (last_name != tex.name) 2054 if (tex.name)
1900 { 2055 {
2056 // this time avoiding texture state changes
2057 // save gobs of state changes.
1901 if (!tex.name) 2058 if (key.texname != tex.name)
1902 continue; // smoothing not yet available 2059 {
1903
1904 glEnd (); 2060 glEnd ();
1905 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2061 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1906 glBegin (GL_QUADS); 2062 glBegin (GL_QUADS);
1907 } 2063 }
1908 2064
1909 if (border) 2065 if (border)
1910 { 2066 {
1911 float ox = border * dx; 2067 float ox = border * dx;
1912 2068
1913 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2069 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1914 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2070 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1915 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2071 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1916 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2072 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1917 } 2073 }
1918 2074
1919 if (corner) 2075 if (corner)
1920 { 2076 {
1921 float ox = corner * dx; 2077 float ox = corner * dx;
1922 2078
1923 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2079 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1924 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2080 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1925 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2081 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1926 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2082 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2083 }
1927 } 2084 }
1928 } 2085 }
1929 } 2086 }
1930 } 2087 }
1931 } 2088 }
2089
2090 glEnd ();
2091 glDisable (GL_TEXTURE_2D);
2092 key.texname = -1;
1932 } 2093 }
1933 2094
1934 hv_clear (smooth); 2095 hv_clear (smooth);
1935 } 2096 }
1936 2097
1937 glEnd (); 2098 if (pl_tex.name)
2099 {
2100 maptex tex = pl_tex;
2101 int px = pl_x + pdx;
2102 int py = pl_y + pdy;
1938 2103
1939 glDisable (GL_TEXTURE_2D); 2104 key.texname = tex.name;
2105 arr = rc_array (rc, &key);
2106
2107 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2108 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2109 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2110 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2111
2112 rc_draw (rc);
2113 }
2114
1940 glDisable (GL_BLEND); 2115 glDisable (GL_BLEND);
2116 rc_free (rc);
1941 2117
1942 // top layer: overlays such as the health bar 2118 // top layer: overlays such as the health bar
1943 for (y = 0; y < sh; y++) 2119 for (y = 0; y < sh; y++)
1944 if (0 <= y + my && y + my < self->rows) 2120 if (0 <= y + my && y + my < self->rows)
1945 { 2121 {
1970 } 2146 }
1971 } 2147 }
1972} 2148}
1973 2149
1974void 2150void
1975draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2151draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1976 CODE: 2152 CODE:
1977{ 2153{
1978 static float color[16][3] = { 2154 static float color[16][3] = {
1979 { 0.00F, 0.00F, 0.00F }, 2155 { 0.00F, 0.00F, 0.00F },
1980 { 1.00F, 1.00F, 1.00F }, 2156 { 1.00F, 1.00F, 1.00F },
2030 glDisable (GL_BLEND); 2206 glDisable (GL_BLEND);
2031 glDisable (GL_TEXTURE_2D); 2207 glDisable (GL_TEXTURE_2D);
2032} 2208}
2033 2209
2034void 2210void
2035fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2211fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2036 PPCODE: 2212 PPCODE:
2037{ 2213{
2038 int x, y; 2214 int x, y;
2039 int sw1 = sw + 2; 2215 int sw1 = sw + 2;
2040 int sh1 = sh + 2; 2216 int sh1 = sh + 2;
2111 PUSHs (sv_2mortal (newSViv (sh3))); 2287 PUSHs (sv_2mortal (newSViv (sh3)));
2112 PUSHs (darkness3_sv); 2288 PUSHs (darkness3_sv);
2113} 2289}
2114 2290
2115SV * 2291SV *
2116get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2292get_rect (DC::Map self, int x0, int y0, int w, int h)
2117 CODE: 2293 CODE:
2118{ 2294{
2119 int x, y, x1, y1; 2295 int x, y, x1, y1;
2120 SV *data_sv = newSV (w * h * 7 + 5); 2296 SV *data_sv = newSV (w * h * 7 + 5);
2121 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2297 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2178 else 2354 else
2179 *data++ = 0; 2355 *data++ = 0;
2180 } 2356 }
2181 } 2357 }
2182 2358
2359 /* if size is w*h + 5 then no data has been found */
2360 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2361 {
2183 SvPOK_only (data_sv); 2362 SvPOK_only (data_sv);
2184 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2363 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2364 }
2365
2185 RETVAL = data_sv; 2366 RETVAL = data_sv;
2186} 2367}
2187 OUTPUT: 2368 OUTPUT:
2188 RETVAL 2369 RETVAL
2189 2370
2190void 2371void
2191set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2372set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2192 PPCODE: 2373 PPCODE:
2193{ 2374{
2194 int x, y, z; 2375 int x, y, z;
2195 int w, h; 2376 int w, h;
2196 int x1, y1; 2377 int x1, y1;
2378 STRLEN len;
2379 uint8_t *data, *end;
2380
2381 len = SvLEN (data_sv);
2382 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2383 data = SvPVbyte_nolen (data_sv);
2384 end = data + len + 8;
2385
2386 if (len < 5)
2387 XSRETURN_EMPTY;
2197 2388
2198 if (*data++ != 0) 2389 if (*data++ != 0)
2199 return; /* version mismatch */ 2390 XSRETURN_EMPTY; /* version mismatch */
2200 2391
2201 w = *data++ << 8; w |= *data++; 2392 w = *data++ << 8; w |= *data++;
2202 h = *data++ << 8; h |= *data++; 2393 h = *data++ << 8; h |= *data++;
2203 2394
2204 // we need to do this 'cause we don't keep an absolute coord system for rows 2395 // we need to do this 'cause we don't keep an absolute coord system for rows
2216 { 2407 {
2217 maprow *row = map_get_row (self, y); 2408 maprow *row = map_get_row (self, y);
2218 2409
2219 for (x = x0; x < x1; x++) 2410 for (x = x0; x < x1; x++)
2220 { 2411 {
2412 uint8_t flags;
2413
2414 if (data + 7 >= end)
2415 XSRETURN_EMPTY;
2416
2221 uint8_t flags = *data++; 2417 flags = *data++;
2222 2418
2223 if (flags) 2419 if (flags)
2224 { 2420 {
2225 mapcell *cell = row_get_cell (row, x); 2421 mapcell *cell = row_get_cell (row, x);
2226 tileid tile[3] = { 0, 0, 0 }; 2422 tileid tile[3] = { 0, 0, 0 };
2229 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2425 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2230 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2426 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2231 2427
2232 if (cell->darkness == 0) 2428 if (cell->darkness == 0)
2233 { 2429 {
2234 cell->darkness = 0; 2430 /*cell->darkness = 0;*/
2431 EXTEND (SP, 3);
2235 2432
2236 for (z = 0; z <= 2; z++) 2433 for (z = 0; z <= 2; z++)
2237 { 2434 {
2238 tileid t = tile [z]; 2435 tileid t = tile [z];
2239 2436
2240 if (t >= self->texs || (t && !self->tex [t].name)) 2437 if (t >= self->texs || (t && !self->tex [t].name))
2241 { 2438 {
2242 XPUSHs (sv_2mortal (newSViv (t))); 2439 PUSHs (sv_2mortal (newSViv (t)));
2243 need_texid (self, t); 2440 need_texid (self, t);
2244 } 2441 }
2245 2442
2246 cell->tile [z] = t; 2443 cell->tile [z] = t;
2247 } 2444 }
2249 } 2446 }
2250 } 2447 }
2251 } 2448 }
2252} 2449}
2253 2450
2254MODULE = CFPlus PACKAGE = CFPlus::RW 2451MODULE = Deliantra::Client PACKAGE = DC::RW
2255 2452
2256CFPlus::RW 2453DC::RW
2257new (SV *class, SV *data_sv) 2454new (SV *class, SV *data_sv)
2258 CODE: 2455 CODE:
2259{ 2456{
2260 STRLEN datalen; 2457 STRLEN datalen;
2261 char *data = SvPVbyte (data_sv, datalen); 2458 char *data = SvPVbyte (data_sv, datalen);
2263 RETVAL = SDL_RWFromConstMem (data, datalen); 2460 RETVAL = SDL_RWFromConstMem (data, datalen);
2264} 2461}
2265 OUTPUT: 2462 OUTPUT:
2266 RETVAL 2463 RETVAL
2267 2464
2268CFPlus::RW 2465DC::RW
2269new_from_file (SV *class, const char *path, const char *mode = "rb") 2466new_from_file (SV *class, const char *path, const char *mode = "rb")
2270 CODE: 2467 CODE:
2271 RETVAL = SDL_RWFromFile (path, mode); 2468 RETVAL = SDL_RWFromFile (path, mode);
2272 OUTPUT: 2469 OUTPUT:
2273 RETVAL 2470 RETVAL
2274 2471
2275# fails on win32: 2472# fails on win32:
2276# CFPlus.xs(2268) : error C2059: syntax error : '(' 2473# dc.xs(2268) : error C2059: syntax error : '('
2277#void 2474#void
2278#close (CFPlus::RW self) 2475#close (DC::RW self)
2279# CODE: 2476# CODE:
2280# (self->(close)) (self); 2477# (self->(close)) (self);
2281 2478
2282MODULE = CFPlus PACKAGE = CFPlus::Channel 2479MODULE = Deliantra::Client PACKAGE = DC::Channel
2283 2480
2284PROTOTYPES: DISABLE 2481PROTOTYPES: DISABLE
2285 2482
2286CFPlus::Channel 2483DC::Channel
2287find () 2484find ()
2288 CODE: 2485 CODE:
2289{ 2486{
2290 RETVAL = Mix_GroupAvailable (-1); 2487 RETVAL = Mix_GroupAvailable (-1);
2291 2488
2304} 2501}
2305 OUTPUT: 2502 OUTPUT:
2306 RETVAL 2503 RETVAL
2307 2504
2308void 2505void
2309halt (CFPlus::Channel self) 2506halt (DC::Channel self)
2310 CODE: 2507 CODE:
2311 Mix_HaltChannel (self); 2508 Mix_HaltChannel (self);
2312 2509
2313void 2510void
2314expire (CFPlus::Channel self, int ticks = -1) 2511expire (DC::Channel self, int ticks = -1)
2315 CODE: 2512 CODE:
2316 Mix_ExpireChannel (self, ticks); 2513 Mix_ExpireChannel (self, ticks);
2317 2514
2318void 2515void
2319fade_out (CFPlus::Channel self, int ticks = -1) 2516fade_out (DC::Channel self, int ticks = -1)
2320 CODE: 2517 CODE:
2321 Mix_FadeOutChannel (self, ticks); 2518 Mix_FadeOutChannel (self, ticks);
2322 2519
2323int 2520int
2324volume (CFPlus::Channel self, int volume) 2521volume (DC::Channel self, int volume)
2325 CODE: 2522 CODE:
2326 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2523 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2327 OUTPUT: 2524 OUTPUT:
2328 RETVAL 2525 RETVAL
2329 2526
2330void 2527void
2331unregister_all_effects (CFPlus::Channel self) 2528unregister_all_effects (DC::Channel self)
2332 CODE: 2529 CODE:
2333 Mix_UnregisterAllEffects (self); 2530 Mix_UnregisterAllEffects (self);
2334 2531
2335void 2532void
2336set_panning (CFPlus::Channel self, int left, int right) 2533set_panning (DC::Channel self, int left, int right)
2337 CODE: 2534 CODE:
2338 left = CLAMP (left , 0, 255); 2535 left = CLAMP (left , 0, 255);
2339 right = CLAMP (right, 0, 255); 2536 right = CLAMP (right, 0, 255);
2340 Mix_SetPanning (self, left, right); 2537 Mix_SetPanning (self, left, right);
2341 2538
2342void 2539void
2343set_distance (CFPlus::Channel self, int distance) 2540set_distance (DC::Channel self, int distance)
2344 CODE: 2541 CODE:
2345 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2542 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2346 2543
2347void 2544void
2348set_position (CFPlus::Channel self, int angle, int distance) 2545set_position (DC::Channel self, int angle, int distance)
2349 CODE: 2546 CODE:
2350 2547
2351void 2548void
2352set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2549set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2353 CODE: 2550 CODE:
2354{ 2551{
2355 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2552 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2356 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2553 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2357 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2554 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2358} 2555}
2359 2556
2360void 2557void
2361set_reverse_stereo (CFPlus::Channel self, int flip) 2558set_reverse_stereo (DC::Channel self, int flip)
2362 CODE: 2559 CODE:
2363 Mix_SetReverseStereo (self, flip); 2560 Mix_SetReverseStereo (self, flip);
2364 2561
2365MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2562MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2366 2563
2367PROTOTYPES: DISABLE 2564PROTOTYPES: DISABLE
2368 2565
2369CFPlus::MixChunk 2566DC::MixChunk
2370new (SV *class, CFPlus::RW rwops) 2567new (SV *class, DC::RW rwops)
2371 CODE: 2568 CODE:
2372 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2569 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2373 OUTPUT: 2570 OUTPUT:
2374 RETVAL 2571 RETVAL
2375 2572
2376void 2573void
2377DESTROY (CFPlus::MixChunk self) 2574DESTROY (DC::MixChunk self)
2378 CODE: 2575 CODE:
2379 Mix_FreeChunk (self); 2576 Mix_FreeChunk (self);
2380 2577
2381int 2578int
2382volume (CFPlus::MixChunk self, int volume = -1) 2579volume (DC::MixChunk self, int volume = -1)
2383 CODE: 2580 CODE:
2384 if (items > 1) 2581 if (items > 1)
2385 volume = CLAMP (volume, 0, 128); 2582 volume = CLAMP (volume, 0, 128);
2386 RETVAL = Mix_VolumeChunk (self, volume); 2583 RETVAL = Mix_VolumeChunk (self, volume);
2387 OUTPUT: 2584 OUTPUT:
2388 RETVAL 2585 RETVAL
2389 2586
2390CFPlus::Channel 2587DC::Channel
2391play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2588play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2392 CODE: 2589 CODE:
2393{ 2590{
2394 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2591 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2395 2592
2396 if (RETVAL < 0) 2593 if (RETVAL < 0)
2403 } 2600 }
2404} 2601}
2405 OUTPUT: 2602 OUTPUT:
2406 RETVAL 2603 RETVAL
2407 2604
2408MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2605MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2409 2606
2410int 2607int
2411volume (int volume = -1) 2608volume (int volume = -1)
2412 PROTOTYPE: ;$ 2609 PROTOTYPE: ;$
2413 CODE: 2610 CODE:
2425void 2622void
2426halt () 2623halt ()
2427 CODE: 2624 CODE:
2428 Mix_HaltMusic (); 2625 Mix_HaltMusic ();
2429 2626
2430CFPlus::MixMusic 2627DC::MixMusic
2431new (SV *class, CFPlus::RW rwops) 2628new (SV *class, DC::RW rwops)
2432 CODE: 2629 CODE:
2433 RETVAL = Mix_LoadMUS_RW (rwops); 2630 RETVAL = Mix_LoadMUS_RW (rwops);
2434 OUTPUT: 2631 OUTPUT:
2435 RETVAL 2632 RETVAL
2436 2633
2437void 2634void
2438DESTROY (CFPlus::MixMusic self) 2635DESTROY (DC::MixMusic self)
2439 CODE: 2636 CODE:
2440 Mix_FreeMusic (self); 2637 Mix_FreeMusic (self);
2441 2638
2442int 2639int
2443play (CFPlus::MixMusic self, int loops = -1) 2640play (DC::MixMusic self, int loops = -1)
2444 CODE: 2641 CODE:
2445 RETVAL = Mix_PlayMusic (self, loops); 2642 RETVAL = Mix_PlayMusic (self, loops);
2446 OUTPUT: 2643 OUTPUT:
2447 RETVAL 2644 RETVAL
2448 2645
2449void 2646void
2450fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2647fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2451 CODE: 2648 CODE:
2452 Mix_FadeInMusicPos (self, loops, ms, position); 2649 Mix_FadeInMusicPos (self, loops, ms, position);
2453 2650
2454MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2651MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2455 2652
2456PROTOTYPES: ENABLE 2653PROTOTYPES: ENABLE
2457 2654
2458BOOT: 2655BOOT:
2459{ 2656{
2460 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2657 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2461 static const struct { 2658 static const struct {
2462 const char *name; 2659 const char *name;
2463 IV iv; 2660 IV iv;
2464 } *civ, const_iv[] = { 2661 } *civ, const_iv[] = {
2465# define const_iv(name) { # name, (IV)name } 2662# define const_iv(name) { # name, (IV)name }
2500 const_iv (GL_INTENSITY), 2697 const_iv (GL_INTENSITY),
2501 const_iv (GL_LUMINANCE), 2698 const_iv (GL_LUMINANCE),
2502 const_iv (GL_LUMINANCE_ALPHA), 2699 const_iv (GL_LUMINANCE_ALPHA),
2503 const_iv (GL_FLOAT), 2700 const_iv (GL_FLOAT),
2504 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2701 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2702 const_iv (GL_COMPRESSED_ALPHA_ARB),
2703 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2704 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2705 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2706 const_iv (GL_COMPRESSED_RGB_ARB),
2707 const_iv (GL_COMPRESSED_RGBA_ARB),
2505 const_iv (GL_COMPILE), 2708 const_iv (GL_COMPILE),
2506 const_iv (GL_PROXY_TEXTURE_1D), 2709 const_iv (GL_PROXY_TEXTURE_1D),
2507 const_iv (GL_PROXY_TEXTURE_2D), 2710 const_iv (GL_PROXY_TEXTURE_2D),
2508 const_iv (GL_TEXTURE_1D), 2711 const_iv (GL_TEXTURE_1D),
2509 const_iv (GL_TEXTURE_2D), 2712 const_iv (GL_TEXTURE_2D),
2548 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2751 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2549 const_iv (GL_POINT_SMOOTH_HINT), 2752 const_iv (GL_POINT_SMOOTH_HINT),
2550 const_iv (GL_LINE_SMOOTH_HINT), 2753 const_iv (GL_LINE_SMOOTH_HINT),
2551 const_iv (GL_POLYGON_SMOOTH_HINT), 2754 const_iv (GL_POLYGON_SMOOTH_HINT),
2552 const_iv (GL_GENERATE_MIPMAP_HINT), 2755 const_iv (GL_GENERATE_MIPMAP_HINT),
2756 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2553 const_iv (GL_FASTEST), 2757 const_iv (GL_FASTEST),
2554 const_iv (GL_DONT_CARE), 2758 const_iv (GL_DONT_CARE),
2555 const_iv (GL_NICEST), 2759 const_iv (GL_NICEST),
2556 const_iv (GL_V2F), 2760 const_iv (GL_V2F),
2557 const_iv (GL_V3F), 2761 const_iv (GL_V3F),
2565 2769
2566 texture_av = newAV (); 2770 texture_av = newAV ();
2567 AvREAL_off (texture_av); 2771 AvREAL_off (texture_av);
2568} 2772}
2569 2773
2774void
2775disable_GL_EXT_blend_func_separate ()
2776 CODE:
2777 gl.BlendFuncSeparate = 0;
2778 gl.BlendFuncSeparateEXT = 0;
2779
2570char * 2780char *
2571gl_vendor () 2781gl_vendor ()
2572 CODE: 2782 CODE:
2573 RETVAL = (char *)glGetString (GL_VENDOR); 2783 RETVAL = (char *)glGetString (GL_VENDOR);
2574 OUTPUT: 2784 OUTPUT:
2695 2905
2696void glRect (float x1, float y1, float x2, float y2) 2906void glRect (float x1, float y1, float x2, float y2)
2697 CODE: 2907 CODE:
2698 glRectf (x1, y1, x2, y2); 2908 glRectf (x1, y1, x2, y2);
2699 2909
2910void glRect_lineloop (float x1, float y1, float x2, float y2)
2911 CODE:
2912 glBegin (GL_LINE_LOOP);
2913 glVertex2f (x1, y1);
2914 glVertex2f (x2, y1);
2915 glVertex2f (x2, y2);
2916 glVertex2f (x1, y2);
2917 glEnd ();
2918
2700PROTOTYPES: ENABLE 2919PROTOTYPES: ENABLE
2701 2920
2702void glBegin (int mode) 2921void glBegin (int mode)
2703 2922
2704void glEnd () 2923void glEnd ()
2736void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2955void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2737 CODE: 2956 CODE:
2738 if (gl.SeparableFilter2D) 2957 if (gl.SeparableFilter2D)
2739 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2958 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2740 2959
2741void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2960void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2742 2961
2743void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2962void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2744 2963
2745void glDrawPixels (int width, int height, int format, int type, char *pixels) 2964void glDrawPixels (int width, int height, int format, int type, char *pixels)
2746 2965
2772 2991
2773void glEndList () 2992void glEndList ()
2774 2993
2775void glCallList (int list) 2994void glCallList (int list)
2776 2995
2777MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2996MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2778 2997
2779PROTOTYPES: DISABLE 2998PROTOTYPES: DISABLE
2780 2999
2781void 3000void
2782find_widget (SV *self, NV x, NV y) 3001find_widget (SV *self, NV x, NV y)
2786 XPUSHs (self); 3005 XPUSHs (self);
2787} 3006}
2788 3007
2789BOOT: 3008BOOT:
2790{ 3009{
2791 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3010 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2792 3011
2793 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3012 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2794 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3013 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2795 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3014 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2796 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3015 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2797} 3016}
2798 3017
2799void 3018void
2800draw (SV *self) 3019draw (SV *self)
2801 CODE: 3020 CODE:
2805 NV x, y, w, h; 3024 NV x, y, w, h;
2806 SV *draw_x_sv = GvSV (draw_x_gv); 3025 SV *draw_x_sv = GvSV (draw_x_gv);
2807 SV *draw_y_sv = GvSV (draw_y_gv); 3026 SV *draw_y_sv = GvSV (draw_y_gv);
2808 SV *draw_w_sv = GvSV (draw_w_gv); 3027 SV *draw_w_sv = GvSV (draw_w_gv);
2809 SV *draw_h_sv = GvSV (draw_h_gv); 3028 SV *draw_h_sv = GvSV (draw_h_gv);
2810 SV *hover;
2811 double draw_x, draw_y, draw_w, draw_h; 3029 double draw_x, draw_y;
2812 3030
2813 if (!SvROK (self)) 3031 if (!SvROK (self))
2814 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3032 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2815 3033
2816 hv = (HV *)SvRV (self); 3034 hv = (HV *)SvRV (self);
2817 3035
2818 if (SvTYPE (hv) != SVt_PVHV) 3036 if (SvTYPE (hv) != SVt_PVHV)
2819 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3037 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2820 3038
2821 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3039 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2822 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3040 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2823 3041
2824 if (!h || !w) 3042 if (!h || !w)
2844 { 3062 {
2845 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3063 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2846 3064
2847 if (svp && SvTRUE (*svp)) 3065 if (svp && SvTRUE (*svp))
2848 { 3066 {
2849 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3067 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2850 glEnable (GL_BLEND); 3068 glEnable (GL_BLEND);
2851 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3069 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2852 glBegin (GL_QUADS); 3070 glBegin (GL_QUADS);
2853 glVertex2f (0, 0); 3071 glVertex2f (0, 0);
2854 glVertex2f (w, 0); 3072 glVertex2f (w, 0);
2857 glEnd (); 3075 glEnd ();
2858 glDisable (GL_BLEND); 3076 glDisable (GL_BLEND);
2859 } 3077 }
2860 } 3078 }
2861#if 0 3079#if 0
2862 if ($ENV{CFPLUS_DEBUG} & 1) { 3080 // draw borders, for debugging
2863 glPushMatrix; 3081 glPushMatrix ();
2864 glColor 1, 1, 0, 1; 3082 glColor4f (1., 1., 0., 1.);
2865 glTranslate 0.375, 0.375; 3083 glTranslatef (.5, .5, 0.);
2866 glBegin GL_LINE_LOOP; 3084 glBegin (GL_LINE_LOOP);
2867 glVertex 0 , 0; 3085 glVertex2f (0 , 0);
2868 glVertex $self->{w} - 1, 0; 3086 glVertex2f (w - 1, 0);
2869 glVertex $self->{w} - 1, $self->{h} - 1; 3087 glVertex2f (w - 1, h - 1);
2870 glVertex 0 , $self->{h} - 1; 3088 glVertex2f (0 , h - 1);
2871 glEnd; 3089 glEnd ();
2872 glPopMatrix; 3090 glPopMatrix ();
2873 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2874 }
2875#endif 3091#endif
2876 PUSHMARK (SP); 3092 PUSHMARK (SP);
2877 XPUSHs (self); 3093 XPUSHs (self);
2878 PUTBACK; 3094 PUTBACK;
2879 call_method ("_draw", G_VOID | G_DISCARD); 3095 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines