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.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.268 by root, Sun Jul 20 02:57:43 2008 UTC

46 46
47#include <glib/gmacros.h> 47#include <glib/gmacros.h>
48 48
49#include <pango/pango.h> 49#include <pango/pango.h>
50 50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
61
51#ifndef _WIN32 62#ifndef _WIN32
52# include <sys/types.h> 63# include <sys/types.h>
53# include <sys/socket.h> 64# include <sys/socket.h>
54# include <netinet/in.h> 65# include <netinet/in.h>
55# include <netinet/tcp.h> 66# include <netinet/tcp.h>
56# include <inttypes.h> 67# include <inttypes.h>
57#endif 68#endif
58 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 80
61#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
62 82
63#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
65 85
66#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
67 87
68#if 0 88/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else
71# define PARACHUTE 0
72#endif
73 90
74static AV *texture_av; 91static AV *texture_av;
75 92
76static struct 93static struct
77{ 94{
114 av_push (texture_av, (SV *)(size_t)name); 131 av_push (texture_av, (SV *)(size_t)name);
115 glDeleteTextures (1, &name); 132 glDeleteTextures (1, &name);
116} 133}
117 134
118#include "texcache.c" 135#include "texcache.c"
136#include "rendercache.c"
119 137
120#include "pango-font.c" 138#include "pango-font.c"
121#include "pango-fontmap.c" 139#include "pango-fontmap.c"
122#include "pango-render.c" 140#include "pango-render.c"
123 141
124typedef IV CFPlus__Channel; 142typedef IV DC__Channel;
125typedef SDL_RWops *CFPlus__RW; 143typedef SDL_RWops *DC__RW;
126typedef Mix_Chunk *CFPlus__MixChunk; 144typedef Mix_Chunk *DC__MixChunk;
127typedef Mix_Music *CFPlus__MixMusic; 145typedef Mix_Music *DC__MixMusic;
128 146
129typedef PangoFontDescription *CFPlus__Font; 147typedef PangoFontDescription *DC__Font;
130 148
131static int 149static int
132shape_attr_p (PangoLayoutRun *run) 150shape_attr_p (PangoLayoutRun *run)
133{ 151{
134 GSList *attrs = run->item->analysis.extra_attrs; 152 GSList *attrs = run->item->analysis.extra_attrs;
148 166
149typedef struct cf_layout { 167typedef struct cf_layout {
150 PangoLayout *pl; 168 PangoLayout *pl;
151 float r, g, b, a; // default color for rgba mode 169 float r, g, b, a; // default color for rgba mode
152 int base_height; 170 int base_height;
153 CFPlus__Font font; 171 DC__Font font;
172 rc_t *rc;
154} *CFPlus__Layout; 173} *DC__Layout;
155 174
156static CFPlus__Font default_font; 175static DC__Font default_font;
157static PangoContext *opengl_context; 176static PangoContext *opengl_context;
158static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
159 178
160static void 179static void
161substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
166#endif 185#endif
167 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
168} 187}
169 188
170static void 189static void
171layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
172{ 191{
173 /* 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
174 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
175 */ 194 */
176 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
177 196
178 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
179 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
180 199
181 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
182} 201}
183 202
184static void 203static void
185layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
186{ 205{
187 PangoRectangle rect; 206 PangoRectangle rect;
188 207
189 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
190 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
201 220
202typedef uint16_t tileid; 221typedef uint16_t tileid;
203typedef uint16_t faceid; 222typedef uint16_t faceid;
204 223
205typedef struct { 224typedef struct {
206 int name; 225 GLuint name;
207 int w, h; 226 int w, h;
208 float s, t; 227 float s, t;
209 uint8_t r, g, b, a; 228 uint8_t r, g, b, a;
210 tileid smoothtile; 229 tileid smoothtile;
211 uint8_t smoothlevel; 230 uint8_t smoothlevel;
229 int faces; tileid *face2tile; // [faceid] 248 int faces; tileid *face2tile; // [faceid]
230 int texs; maptex *tex; // [tileid] 249 int texs; maptex *tex; // [tileid]
231 250
232 int32_t rows; 251 int32_t rows;
233 maprow *row; 252 maprow *row;
234} *CFPlus__Map; 253} *DC__Map;
235 254
236static char * 255static char *
237prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
238{ 257{
239 char *p; 258 char *p;
277 self->texs *= 2; 296 self->texs *= 2;
278 } 297 }
279} 298}
280 299
281static maprow * 300static maprow *
282map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
283{ 302{
284 if (0 > y) 303 if (0 > y)
285 { 304 {
286 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
287 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
325 344
326 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
327} 346}
328 347
329static mapcell * 348static mapcell *
330map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
331{ 350{
332 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
333} 352}
334 353
335static void 354static void
336map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
337{ 356{
338 int r; 357 int r;
339 358
340 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
341 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
348 self->oy = 0; 367 self->oy = 0;
349 self->row = 0; 368 self->row = 0;
350 self->rows = 0; 369 self->rows = 0;
351} 370}
352 371
372#define CELL_CLEAR(cell) \
373 do { \
374 if ((cell)->player) \
375 (cell)->tile [2] = 0; \
376 (cell)->darkness = 0; \
377 (cell)->stat_hp = 0; \
378 (cell)->flags = 0; \
379 (cell)->player = 0; \
380 } while (0)
381
353static void 382static void
354map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 383map_blank (DC__Map self, int x0, int y0, int w, int h)
355{ 384{
356 int x, y; 385 int x, y;
357 maprow *row; 386 maprow *row;
358 mapcell *cell; 387 mapcell *cell;
359 388
371 if (x >= row->c1) 400 if (x >= row->c1)
372 break; 401 break;
373 402
374 cell = row->col + x - row->c0; 403 cell = row->col + x - row->c0;
375 404
376 cell->darkness = 0; 405 CELL_CLEAR (cell);
377 cell->stat_hp = 0;
378 cell->flags = 0;
379 cell->player = 0;
380 } 406 }
381 } 407 }
382} 408}
383 409
384typedef struct { 410typedef struct {
438 n |= n >> 16; 464 n |= n >> 16;
439 465
440 return n + 1; 466 return n + 1;
441} 467}
442 468
469static unsigned int
470popcount (unsigned int n)
471{
472 n -= (n >> 1) & 0x55555555U;
473 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
474 n = ((n >> 4) + n) & 0x0f0f0f0fU;
475 n *= 0x01010101U;
476
477 return n >> 24;
478}
479
443/* SDL should provide this, really. */ 480/* SDL should provide this, really. */
444#define SDLK_MODIFIER_MIN 300 481#define SDLK_MODIFIER_MIN 300
445#define SDLK_MODIFIER_MAX 314 482#define SDLK_MODIFIER_MAX 314
446 483
447/******************************************************************************/ 484/******************************************************************************/
485 return 0; 522 return 0;
486 523
487 return 1; 524 return 1;
488} 525}
489 526
490MODULE = CFPlus PACKAGE = CFPlus 527MODULE = Deliantra::Client PACKAGE = DC
491 528
492PROTOTYPES: ENABLE 529PROTOTYPES: ENABLE
493 530
494BOOT: 531BOOT:
495{ 532{
496 HV *stash = gv_stashpv ("CFPlus", 1); 533 HV *stash = gv_stashpv ("DC", 1);
497 static const struct { 534 static const struct {
498 const char *name; 535 const char *name;
499 IV iv; 536 IV iv;
500 } *civ, const_iv[] = { 537 } *civ, const_iv[] = {
501# define const_iv(name) { # name, (IV)name } 538# define const_iv(name) { # name, (IV)name }
523 560
524 const_iv (SDL_APPINPUTFOCUS), 561 const_iv (SDL_APPINPUTFOCUS),
525 const_iv (SDL_APPMOUSEFOCUS), 562 const_iv (SDL_APPMOUSEFOCUS),
526 const_iv (SDL_APPACTIVE), 563 const_iv (SDL_APPACTIVE),
527 564
565 const_iv (SDLK_FIRST),
566 const_iv (SDLK_LAST),
528 const_iv (SDLK_KP0), 567 const_iv (SDLK_KP0),
529 const_iv (SDLK_KP1), 568 const_iv (SDLK_KP1),
530 const_iv (SDLK_KP2), 569 const_iv (SDLK_KP2),
531 const_iv (SDLK_KP3), 570 const_iv (SDLK_KP3),
532 const_iv (SDLK_KP4), 571 const_iv (SDLK_KP4),
604 const_iv (KMOD_LMETA), 643 const_iv (KMOD_LMETA),
605 const_iv (KMOD_RMETA), 644 const_iv (KMOD_RMETA),
606 const_iv (KMOD_NUM), 645 const_iv (KMOD_NUM),
607 const_iv (KMOD_CAPS), 646 const_iv (KMOD_CAPS),
608 const_iv (KMOD_MODE), 647 const_iv (KMOD_MODE),
648
649 const_iv (MIX_DEFAULT_FORMAT),
650
651 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO),
654 const_iv (SDL_INIT_CDROM),
655 const_iv (SDL_INIT_JOYSTICK),
656 const_iv (SDL_INIT_EVERYTHING),
657 const_iv (SDL_INIT_NOPARACHUTE),
658 const_iv (SDL_INIT_EVENTTHREAD),
659
660 const_iv (SDL_GL_RED_SIZE),
661 const_iv (SDL_GL_GREEN_SIZE),
662 const_iv (SDL_GL_BLUE_SIZE),
663 const_iv (SDL_GL_ALPHA_SIZE),
664 const_iv (SDL_GL_DOUBLEBUFFER),
665 const_iv (SDL_GL_BUFFER_SIZE),
666 const_iv (SDL_GL_DEPTH_SIZE),
667 const_iv (SDL_GL_STENCIL_SIZE),
668 const_iv (SDL_GL_ACCUM_RED_SIZE),
669 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
670 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
671 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
672 const_iv (SDL_GL_STEREO),
673 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
674 const_iv (SDL_GL_MULTISAMPLESAMPLES),
675 const_iv (SDL_GL_ACCELERATED_VISUAL),
676 const_iv (SDL_GL_SWAP_CONTROL)
609# undef const_iv 677# undef const_iv
610 }; 678 };
611 679
612 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 680 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 681 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
631 699
632NV floor (NV x) 700NV floor (NV x)
633 701
634NV ceil (NV x) 702NV ceil (NV x)
635 703
704IV minpot (UV n)
705
706IV popcount (UV n)
707
636void 708void
637pango_init () 709pango_init ()
638 CODE: 710 CODE:
639{ 711{
640 opengl_fontmap = pango_opengl_font_map_new (); 712 opengl_fontmap = pango_opengl_font_map_new ();
641 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 713 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
642 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 714 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
715 /*pango_context_set_font_description (opengl_context, default_font);*/
716#if PANGO_VERSION_CHECK (1, 15, 2)
717 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
718 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
719#endif
643} 720}
644 721
645char *
646SDL_GetError () 722char *SDL_GetError ()
647 723
648int 724int SDL_Init (U32 flags)
649SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
650 725
651void 726int SDL_InitSubSystem (U32 flags)
727
728void SDL_QuitSubSystem (U32 flags)
729
652SDL_Quit () 730void SDL_Quit ()
731
732int SDL_GL_SetAttribute (int attr, int value)
733
734int SDL_GL_GetAttribute (int attr)
735 CODE:
736 if (SDL_GL_GetAttribute (attr, &RETVAL))
737 XSRETURN_UNDEF;
738 OUTPUT:
739 RETVAL
653 740
654void 741void
655SDL_ListModes (int rgb, int alpha) 742SDL_ListModes (int rgb, int alpha)
656 PPCODE: 743 PPCODE:
657{ 744{
669 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 756 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 757 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 758 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
672 759
673 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 760 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
674#if SDL_VERSION_ATLEAST(1,2,10)
675 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
676 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 761 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
677#endif
678 762
679 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 763 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
680 764
681 if (m && m != (SDL_Rect **)-1) 765 if (m && m != (SDL_Rect **)-1)
682 while (*m) 766 while (*m)
683 { 767 {
684 if ((*m)->w >= 640 && (*m)->h >= 480) 768 if ((*m)->w >= 400 && (*m)->h >= 300)
685 { 769 {
686 AV *av = newAV (); 770 AV *av = newAV ();
687 av_push (av, newSViv ((*m)->w)); 771 av_push (av, newSViv ((*m)->w));
688 av_push (av, newSViv ((*m)->h)); 772 av_push (av, newSViv ((*m)->h));
689 av_push (av, newSViv (rgb)); 773 av_push (av, newSViv (rgb));
713 797
714 if (RETVAL) 798 if (RETVAL)
715 { 799 {
716 av_clear (texture_av); 800 av_clear (texture_av);
717 801
718 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 802 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
719#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 803#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
720#include "glfunc.h" 804#include "glfunc.h"
721#undef GL_FUNC 805#undef GL_FUNC
722 } 806 }
723} 807}
730char * 814char *
731SDL_GetKeyName (int sym) 815SDL_GetKeyName (int sym)
732 816
733int 817int
734SDL_GetAppState () 818SDL_GetAppState ()
819
820int
821SDL_GetModState ()
735 822
736void 823void
737poll_events () 824poll_events ()
738 PPCODE: 825 PPCODE:
739{ 826{
749 { 836 {
750 case SDL_KEYDOWN: 837 case SDL_KEYDOWN:
751 case SDL_KEYUP: 838 case SDL_KEYUP:
752 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 839 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
753 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 840 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
754 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 841 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
755 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 842 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
756 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 843 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
757 break; 844 break;
758 845
759 case SDL_ACTIVEEVENT: 846 case SDL_ACTIVEEVENT:
760 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 847 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
778 x = ev.motion.x; 865 x = ev.motion.x;
779 y = ev.motion.y; 866 y = ev.motion.y;
780 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 867 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
781 } 868 }
782 869
783 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 870 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
784 hv_store (hv, "state", 5, newSViv (state), 0); 871 hv_store (hv, "state", 5, newSViv (state), 0);
785 hv_store (hv, "x", 1, newSViv (x), 0); 872 hv_store (hv, "x", 1, newSViv (x), 0);
786 hv_store (hv, "y", 1, newSViv (y), 0); 873 hv_store (hv, "y", 1, newSViv (y), 0);
787 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 874 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
788 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 875 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
789 } 876 }
790 break; 877 break;
791 878
792 case SDL_MOUSEBUTTONDOWN: 879 case SDL_MOUSEBUTTONDOWN:
793 case SDL_MOUSEBUTTONUP: 880 case SDL_MOUSEBUTTONUP:
794 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 881 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
795 882
796 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 883 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
797 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 884 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
798 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 885 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
799 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 886 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
804 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 891 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
805 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 892 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
806 break; 893 break;
807 } 894 }
808 895
809 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 896 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
810 } 897 }
811} 898}
812 899
813int 900int
814Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 901Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
815 POSTCALL: 902 POSTCALL:
816 Mix_HookMusicFinished (music_finished); 903 Mix_HookMusicFinished (music_finished);
817 Mix_ChannelFinished (channel_finished); 904 Mix_ChannelFinished (channel_finished);
905
906void
907Mix_QuerySpec ()
908 PPCODE:
909{
910 int freq, channels;
911 Uint16 format;
912
913 if (Mix_QuerySpec (&freq, &format, &channels))
914 {
915 EXTEND (SP, 3);
916 PUSHs (sv_2mortal (newSViv (freq)));
917 PUSHs (sv_2mortal (newSViv (format)));
918 PUSHs (sv_2mortal (newSViv (channels)));
919 }
920}
818 921
819void 922void
820Mix_CloseAudio () 923Mix_CloseAudio ()
821 924
822int 925int
857 } 960 }
858 } 961 }
859#endif 962#endif
860} 963}
861 964
862void 965int
863add_font (char *file) 966add_font (char *file)
864 CODE: 967 CODE:
865 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 968 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
969 OUTPUT:
970 RETVAL
866 971
867void 972void
868load_image_inline (SV *image_) 973load_image_inline (SV *image_)
869 ALIAS: 974 ALIAS:
870 load_image_file = 1 975 load_image_file = 1
956void 1061void
957error (char *message) 1062error (char *message)
958 CODE: 1063 CODE:
959 fprintf (stderr, "ERROR: %s\n", message); 1064 fprintf (stderr, "ERROR: %s\n", message);
960#ifdef _WIN32 1065#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1066 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
962#endif 1067#endif
963 1068
964void 1069void
965fatal (char *message) 1070fatal (char *message)
966 CODE: 1071 CODE:
967 fprintf (stderr, "FATAL: %s\n", message); 1072 fprintf (stderr, "FATAL: %s\n", message);
968#ifdef _WIN32 1073#ifdef _WIN32
969 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1074 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
970#endif 1075#endif
971 _exit (1); 1076 _exit (1);
972 1077
973void 1078void
974_exit (int retval = 0) 1079_exit (int retval = 0)
986#if DEBUG 1091#if DEBUG
987 VALGRIND_DO_LEAK_CHECK; 1092 VALGRIND_DO_LEAK_CHECK;
988#endif 1093#endif
989} 1094}
990 1095
991MODULE = CFPlus PACKAGE = CFPlus::Font 1096MODULE = Deliantra::Client PACKAGE = DC::Font
992 1097
993PROTOTYPES: DISABLE 1098PROTOTYPES: DISABLE
994 1099
995CFPlus::Font 1100DC::Font
996new_from_file (SV *class, char *path, int id = 0) 1101new_from_file (SV *class, char *path, int id = 0)
997 CODE: 1102 CODE:
998{ 1103{
999 int count; 1104 int count;
1000 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1105 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1003} 1108}
1004 OUTPUT: 1109 OUTPUT:
1005 RETVAL 1110 RETVAL
1006 1111
1007void 1112void
1008DESTROY (CFPlus::Font self) 1113DESTROY (DC::Font self)
1009 CODE: 1114 CODE:
1010 pango_font_description_free (self); 1115 pango_font_description_free (self);
1011 1116
1012void 1117void
1013make_default (CFPlus::Font self) 1118make_default (DC::Font self)
1014 PROTOTYPE: $ 1119 PROTOTYPE: $
1015 CODE: 1120 CODE:
1016 default_font = self; 1121 default_font = self;
1017 1122
1018MODULE = CFPlus PACKAGE = CFPlus::Layout 1123MODULE = Deliantra::Client PACKAGE = DC::Layout
1019 1124
1020PROTOTYPES: DISABLE 1125PROTOTYPES: DISABLE
1021 1126
1022void 1127void
1023reset_glyph_cache () 1128glyph_cache_backup ()
1024 PROTOTYPE: 1129 PROTOTYPE:
1025 CODE: 1130 CODE:
1131 tc_backup ();
1132
1133void
1134glyph_cache_restore ()
1135 PROTOTYPE:
1136 CODE:
1026 tc_clear (); 1137 tc_restore ();
1027 1138
1028CFPlus::Layout 1139DC::Layout
1029new (SV *class) 1140new (SV *class)
1030 CODE: 1141 CODE:
1031 New (0, RETVAL, 1, struct cf_layout); 1142 New (0, RETVAL, 1, struct cf_layout);
1032 1143
1033 RETVAL->pl = pango_layout_new (opengl_context); 1144 RETVAL->pl = pango_layout_new (opengl_context);
1035 RETVAL->g = 1.; 1146 RETVAL->g = 1.;
1036 RETVAL->b = 1.; 1147 RETVAL->b = 1.;
1037 RETVAL->a = 1.; 1148 RETVAL->a = 1.;
1038 RETVAL->base_height = MIN_FONT_HEIGHT; 1149 RETVAL->base_height = MIN_FONT_HEIGHT;
1039 RETVAL->font = 0; 1150 RETVAL->font = 0;
1151 RETVAL->rc = rc_alloc ();
1040 1152
1041 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1153 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1042 layout_update_font (RETVAL); 1154 layout_update_font (RETVAL);
1043 OUTPUT: 1155 OUTPUT:
1044 RETVAL 1156 RETVAL
1045 1157
1046void 1158void
1047DESTROY (CFPlus::Layout self) 1159DESTROY (DC::Layout self)
1048 CODE: 1160 CODE:
1049 g_object_unref (self->pl); 1161 g_object_unref (self->pl);
1162 rc_free (self->rc);
1050 Safefree (self); 1163 Safefree (self);
1051 1164
1052void 1165void
1053set_text (CFPlus::Layout self, SV *text_) 1166set_text (DC::Layout self, SV *text_)
1054 CODE: 1167 CODE:
1055{ 1168{
1056 STRLEN textlen; 1169 STRLEN textlen;
1057 char *text = SvPVutf8 (text_, textlen); 1170 char *text = SvPVutf8 (text_, textlen);
1058 1171
1059 pango_layout_set_text (self->pl, text, textlen); 1172 pango_layout_set_text (self->pl, text, textlen);
1060} 1173}
1061 1174
1062void 1175void
1063set_markup (CFPlus::Layout self, SV *text_) 1176set_markup (DC::Layout self, SV *text_)
1064 CODE: 1177 CODE:
1065{ 1178{
1066 STRLEN textlen; 1179 STRLEN textlen;
1067 char *text = SvPVutf8 (text_, textlen); 1180 char *text = SvPVutf8 (text_, textlen);
1068 1181
1069 pango_layout_set_markup (self->pl, text, textlen); 1182 pango_layout_set_markup (self->pl, text, textlen);
1070} 1183}
1071 1184
1072void 1185void
1073set_shapes (CFPlus::Layout self, ...) 1186set_shapes (DC::Layout self, ...)
1074 CODE: 1187 CODE:
1075{ 1188{
1076 PangoAttrList *attrs = 0; 1189 PangoAttrList *attrs = 0;
1077 const char *text = pango_layout_get_text (self->pl); 1190 const char *text = pango_layout_get_text (self->pl);
1078 const char *pos = text; 1191 const char *pos = text;
1113 if (attrs) 1226 if (attrs)
1114 pango_layout_set_attributes (self->pl, attrs); 1227 pango_layout_set_attributes (self->pl, attrs);
1115} 1228}
1116 1229
1117void 1230void
1118get_shapes (CFPlus::Layout self) 1231get_shapes (DC::Layout self)
1119 PPCODE: 1232 PPCODE:
1120{ 1233{
1121 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1234 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1122 1235
1123 do 1236 do
1124 { 1237 {
1125 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1238 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1126 1239
1127 if (run && shape_attr_p (run)) 1240 if (run && shape_attr_p (run))
1128 { 1241 {
1129 PangoRectangle extents; 1242 PangoRectangle extents;
1130 pango_layout_iter_get_run_extents (iter, 0, &extents); 1243 pango_layout_iter_get_run_extents (iter, 0, &extents);
1138 1251
1139 pango_layout_iter_free (iter); 1252 pango_layout_iter_free (iter);
1140} 1253}
1141 1254
1142int 1255int
1143has_wrapped (CFPlus::Layout self) 1256has_wrapped (DC::Layout self)
1144 CODE: 1257 CODE:
1145{ 1258{
1146 int lines = 1; 1259 int lines = 1;
1147 const char *text = pango_layout_get_text (self->pl); 1260 const char *text = pango_layout_get_text (self->pl);
1148 1261
1153} 1266}
1154 OUTPUT: 1267 OUTPUT:
1155 RETVAL 1268 RETVAL
1156 1269
1157SV * 1270SV *
1158get_text (CFPlus::Layout self) 1271get_text (DC::Layout self)
1159 CODE: 1272 CODE:
1160 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1273 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1161 sv_utf8_decode (RETVAL); 1274 sv_utf8_decode (RETVAL);
1162 OUTPUT: 1275 OUTPUT:
1163 RETVAL 1276 RETVAL
1164 1277
1165void 1278void
1166set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1279set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1167 CODE: 1280 CODE:
1168 self->r = r; 1281 self->r = r;
1169 self->g = g; 1282 self->g = g;
1170 self->b = b; 1283 self->b = b;
1171 self->a = a; 1284 self->a = a;
1172 1285
1173void 1286void
1174set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1287set_font (DC::Layout self, DC::Font font = 0)
1175 CODE: 1288 CODE:
1176 if (self->font != font) 1289 if (self->font != font)
1177 { 1290 {
1178 self->font = font; 1291 self->font = font;
1179 layout_update_font (self); 1292 layout_update_font (self);
1180 } 1293 }
1181 1294
1182void 1295void
1183set_height (CFPlus::Layout self, int base_height) 1296set_height (DC::Layout self, int base_height)
1184 CODE: 1297 CODE:
1185 if (self->base_height != base_height) 1298 if (self->base_height != base_height)
1186 { 1299 {
1187 self->base_height = base_height; 1300 self->base_height = base_height;
1188 layout_update_font (self); 1301 layout_update_font (self);
1189 } 1302 }
1190 1303
1191void 1304void
1192set_width (CFPlus::Layout self, int max_width = -1) 1305set_width (DC::Layout self, int max_width = -1)
1193 CODE: 1306 CODE:
1194 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1307 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1195 1308
1196void 1309void
1197set_indent (CFPlus::Layout self, int indent) 1310set_indent (DC::Layout self, int indent)
1198 CODE: 1311 CODE:
1199 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1312 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1200 1313
1201void 1314void
1202set_spacing (CFPlus::Layout self, int spacing) 1315set_spacing (DC::Layout self, int spacing)
1203 CODE: 1316 CODE:
1204 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1317 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1205 1318
1206void 1319void
1207set_ellipsise (CFPlus::Layout self, int ellipsise) 1320set_ellipsise (DC::Layout self, int ellipsise)
1208 CODE: 1321 CODE:
1209 pango_layout_set_ellipsize (self->pl, 1322 pango_layout_set_ellipsize (self->pl,
1210 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1323 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1211 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1324 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1212 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1325 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1213 : PANGO_ELLIPSIZE_NONE 1326 : PANGO_ELLIPSIZE_NONE
1214 ); 1327 );
1215 1328
1216void 1329void
1217set_single_paragraph_mode (CFPlus::Layout self, int spm) 1330set_single_paragraph_mode (DC::Layout self, int spm)
1218 CODE: 1331 CODE:
1219 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1332 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1220 1333
1221void 1334void
1222size (CFPlus::Layout self) 1335size (DC::Layout self)
1223 PPCODE: 1336 PPCODE:
1224{ 1337{
1225 int w, h; 1338 int w, h;
1226 1339
1227 layout_get_pixel_size (self, &w, &h); 1340 layout_get_pixel_size (self, &w, &h);
1230 PUSHs (sv_2mortal (newSViv (w))); 1343 PUSHs (sv_2mortal (newSViv (w)));
1231 PUSHs (sv_2mortal (newSViv (h))); 1344 PUSHs (sv_2mortal (newSViv (h)));
1232} 1345}
1233 1346
1234int 1347int
1235descent (CFPlus::Layout self) 1348descent (DC::Layout self)
1236 CODE: 1349 CODE:
1237{ 1350{
1238 PangoRectangle rect; 1351 PangoRectangle rect;
1239 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1352 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1240 pango_layout_line_get_pixel_extents (line, 0, &rect); 1353 pango_layout_line_get_pixel_extents (line, 0, &rect);
1241 RETVAL = PANGO_DESCENT (rect); 1354 RETVAL = PANGO_DESCENT (rect);
1242} 1355}
1243 OUTPUT: 1356 OUTPUT:
1244 RETVAL 1357 RETVAL
1245 1358
1246int 1359int
1247xy_to_index (CFPlus::Layout self, int x, int y) 1360xy_to_index (DC::Layout self, int x, int y)
1248 CODE: 1361 CODE:
1249{ 1362{
1250 int index, trailing; 1363 int index, trailing;
1251 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1364 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1252 RETVAL = index + trailing; 1365 RETVAL = index + trailing;
1253} 1366}
1254 OUTPUT: 1367 OUTPUT:
1255 RETVAL 1368 RETVAL
1256 1369
1257void 1370void
1258cursor_pos (CFPlus::Layout self, int index) 1371cursor_pos (DC::Layout self, int index)
1259 PPCODE: 1372 PPCODE:
1260{ 1373{
1261 PangoRectangle strong_pos; 1374 PangoRectangle pos;
1262 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1375 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1263 1376
1264 EXTEND (SP, 3); 1377 EXTEND (SP, 3);
1265 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1378 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1266 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1379 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1380 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1268} 1381}
1269 1382
1270void 1383void
1271index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1384index_to_line_x (DC::Layout self, int index, int trailing = 0)
1272 PPCODE: 1385 PPCODE:
1273{ 1386{
1274 int line, x; 1387 int line, x;
1275 1388
1276 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1389 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1390#if !PANGO_VERSION_CHECK (1, 17, 3)
1277 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1391 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1278 1392 --line;
1393#endif
1279 EXTEND (SP, 2); 1394 EXTEND (SP, 2);
1280 PUSHs (sv_2mortal (newSViv (line - 1))); 1395 PUSHs (sv_2mortal (newSViv (line)));
1281 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1396 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1282} 1397}
1283 1398
1284void 1399void
1285line_x_to_index (CFPlus::Layout self, int line, int x) 1400line_x_to_index (DC::Layout self, int line, int x)
1286 PPCODE: 1401 PPCODE:
1287{ 1402{
1288 PangoLayoutLine *lp; 1403 PangoLayoutLine *lp;
1289 int index, trailing; 1404 int index, trailing;
1290 1405
1291 if (line < 0) 1406 if (line < 0)
1292 XSRETURN_EMPTY; 1407 XSRETURN_EMPTY;
1293 1408
1294 if (!(lp = pango_layout_get_line (self->pl, line))) 1409 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1295 XSRETURN_EMPTY; /* do better */ 1410 XSRETURN_EMPTY; /* do better */
1296 1411
1297 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1412 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1298 1413
1299 EXTEND (SP, 2); 1414 EXTEND (SP, 2);
1305 PUSHs (sv_2mortal (newSViv (trailing))); 1420 PUSHs (sv_2mortal (newSViv (trailing)));
1306 } 1421 }
1307} 1422}
1308 1423
1309void 1424void
1310render (CFPlus::Layout self, float x, float y, int flags = 0) 1425render (DC::Layout self, float x, float y, int flags = 0)
1311 PPCODE: 1426 CODE:
1427 rc_clear (self->rc);
1312 pango_opengl_render_layout_subpixel ( 1428 pango_opengl_render_layout_subpixel (
1313 self->pl, 1429 self->pl,
1430 self->rc,
1314 x * PANGO_SCALE, y * PANGO_SCALE, 1431 x * PANGO_SCALE, y * PANGO_SCALE,
1315 self->r, self->g, self->b, self->a, 1432 self->r, self->g, self->b, self->a,
1316 flags 1433 flags
1317 ); 1434 );
1435 // we assume that context_change actually clears/frees stuff
1436 // and does not do any recomputation...
1437 pango_layout_context_changed (self->pl);
1318 1438
1319MODULE = CFPlus PACKAGE = CFPlus::Texture 1439void
1440draw (DC::Layout self)
1441 CODE:
1442{
1443 glEnable (GL_TEXTURE_2D);
1444 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1445 glEnable (GL_BLEND);
1446 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1447 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1448 glEnable (GL_ALPHA_TEST);
1449 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1450
1451 rc_draw (self->rc);
1452
1453 glDisable (GL_ALPHA_TEST);
1454 glDisable (GL_BLEND);
1455 glDisable (GL_TEXTURE_2D);
1456}
1457
1458MODULE = Deliantra::Client PACKAGE = DC::Texture
1320 1459
1321PROTOTYPES: ENABLE 1460PROTOTYPES: ENABLE
1322
1323int minpot (int n)
1324 1461
1325void 1462void
1326pad (SV *data_, int ow, int oh, int nw, int nh) 1463pad (SV *data_, int ow, int oh, int nw, int nh)
1327 CODE: 1464 CODE:
1328{ 1465{
1405 RETVAL = width > 0; 1542 RETVAL = width > 0;
1406} 1543}
1407 OUTPUT: 1544 OUTPUT:
1408 RETVAL 1545 RETVAL
1409 1546
1410MODULE = CFPlus PACKAGE = CFPlus::Map 1547MODULE = Deliantra::Client PACKAGE = DC::Map
1411 1548
1412PROTOTYPES: DISABLE 1549PROTOTYPES: DISABLE
1413 1550
1414CFPlus::Map 1551DC::Map
1415new (SV *class) 1552new (SV *class)
1416 CODE: 1553 CODE:
1417 New (0, RETVAL, 1, struct map); 1554 New (0, RETVAL, 1, struct map);
1418 RETVAL->x = 0; 1555 RETVAL->x = 0;
1419 RETVAL->y = 0; 1556 RETVAL->y = 0;
1427 RETVAL->row = 0; 1564 RETVAL->row = 0;
1428 OUTPUT: 1565 OUTPUT:
1429 RETVAL 1566 RETVAL
1430 1567
1431void 1568void
1432DESTROY (CFPlus::Map self) 1569DESTROY (DC::Map self)
1433 CODE: 1570 CODE:
1434{ 1571{
1435 map_clear (self); 1572 map_clear (self);
1436 Safefree (self->face2tile); 1573 Safefree (self->face2tile);
1437 Safefree (self->tex); 1574 Safefree (self->tex);
1438 Safefree (self); 1575 Safefree (self);
1439} 1576}
1440 1577
1441void 1578void
1442resize (CFPlus::Map self, int map_width, int map_height) 1579resize (DC::Map self, int map_width, int map_height)
1443 CODE: 1580 CODE:
1444 self->w = map_width; 1581 self->w = map_width;
1445 self->h = map_height; 1582 self->h = map_height;
1446 1583
1447void 1584void
1448clear (CFPlus::Map self) 1585clear (DC::Map self)
1449 CODE: 1586 CODE:
1450 map_clear (self); 1587 map_clear (self);
1451 1588
1452void 1589void
1453set_tileid (CFPlus::Map self, int face, int tile) 1590set_tileid (DC::Map self, int face, int tile)
1454 CODE: 1591 CODE:
1455{ 1592{
1456 need_facenum (self, face); self->face2tile [face] = tile; 1593 need_facenum (self, face); self->face2tile [face] = tile;
1457 need_texid (self, tile); 1594 need_texid (self, tile);
1458} 1595}
1459 1596
1460void 1597void
1461set_smooth (CFPlus::Map self, int face, int smooth, int level) 1598set_smooth (DC::Map self, int face, int smooth, int level)
1462 CODE: 1599 CODE:
1463{ 1600{
1464 tileid texid; 1601 tileid texid;
1465 maptex *tex; 1602 maptex *tex;
1466 1603
1479 tex->smoothtile = self->face2tile [smooth]; 1616 tex->smoothtile = self->face2tile [smooth];
1480 tex->smoothlevel = level; 1617 tex->smoothlevel = level;
1481} 1618}
1482 1619
1483void 1620void
1484set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1621set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1485 CODE: 1622 CODE:
1486{ 1623{
1487 need_texid (self, texid); 1624 need_texid (self, texid);
1488 1625
1489 { 1626 {
1509 // from transparent color bleeding and ugly wrapping effects. 1646 // from transparent color bleeding and ugly wrapping effects.
1510 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1647 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1511} 1648}
1512 1649
1513int 1650int
1514ox (CFPlus::Map self) 1651ox (DC::Map self)
1515 ALIAS: 1652 ALIAS:
1516 oy = 1 1653 oy = 1
1517 x = 2 1654 x = 2
1518 y = 3 1655 y = 3
1519 w = 4 1656 w = 4
1530 } 1667 }
1531 OUTPUT: 1668 OUTPUT:
1532 RETVAL 1669 RETVAL
1533 1670
1534void 1671void
1535scroll (CFPlus::Map self, int dx, int dy) 1672scroll (DC::Map self, int dx, int dy)
1536 CODE: 1673 CODE:
1537{ 1674{
1538 if (dx > 0) 1675 if (dx > 0)
1539 map_blank (self, self->x, self->y, dx, self->h); 1676 map_blank (self, self->x, self->y, dx, self->h);
1540 else if (dx < 0) 1677 else if (dx < 0)
1556 self->y += MAP_EXTEND_Y; 1693 self->y += MAP_EXTEND_Y;
1557 } 1694 }
1558} 1695}
1559 1696
1560SV * 1697SV *
1561map1a_update (CFPlus::Map self, SV *data_, int extmap) 1698map1a_update (DC::Map self, SV *data_, int extmap)
1562 CODE: 1699 CODE:
1563{ 1700{
1564 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1701 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1565 uint8_t *data_end = (uint8_t *)SvEND (data_); 1702 uint8_t *data_end = (uint8_t *)SvEND (data_);
1566 mapcell *cell; 1703 mapcell *cell;
1594 uint8_t ext, cmd; 1731 uint8_t ext, cmd;
1595 1732
1596 do 1733 do
1597 { 1734 {
1598 ext = *data++; 1735 ext = *data++;
1599 cmd = ext & 0x3f; 1736 cmd = ext & 0x7f;
1600 1737
1601 if (cmd < 4) 1738 if (cmd < 4)
1602 cell->darkness = 255 - ext * 64 + 1; 1739 cell->darkness = 255 - ext * 64 + 1;
1603 else if (cmd == 5) // health 1740 else if (cmd == 5) // health
1604 { 1741 {
1607 } 1744 }
1608 else if (cmd == 6) // monster width 1745 else if (cmd == 6) // monster width
1609 cell->stat_width = *data++ + 1; 1746 cell->stat_width = *data++ + 1;
1610 else if (cmd == 0x47) 1747 else if (cmd == 0x47)
1611 { 1748 {
1612 if (*data == 4) 1749 if (*data == 1) cell->player = data [1];
1613 ; // decode player count 1750 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1751 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1752 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1614 1753
1615 data += *data + 1; 1754 data += *data + 1;
1616 } 1755 }
1617 else if (cmd == 8) // cell flags 1756 else if (cmd == 8) // cell flags
1618 cell->flags = *data++; 1757 cell->flags = *data++;
1648 } 1787 }
1649 } 1788 }
1650 } 1789 }
1651 } 1790 }
1652 else 1791 else
1653 cell->darkness = 0; 1792 CELL_CLEAR (cell);
1654 } 1793 }
1655} 1794}
1656 OUTPUT: 1795 OUTPUT:
1657 RETVAL 1796 RETVAL
1658 1797
1659SV * 1798SV *
1660mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1799mapmap (DC::Map self, int x0, int y0, int w, int h)
1661 CODE: 1800 CODE:
1662{ 1801{
1663 int x1, x; 1802 int x1, x;
1664 int y1, y; 1803 int y1, y;
1665 int z; 1804 int z;
1710} 1849}
1711 OUTPUT: 1850 OUTPUT:
1712 RETVAL 1851 RETVAL
1713 1852
1714void 1853void
1715draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1854draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1716 CODE: 1855 CODE:
1717{ 1856{
1857 int x, y, z;
1858
1718 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1859 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1719 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1860 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1720 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1861 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1721 smooth_key skey; 1862 smooth_key skey;
1722 int x, y, z; 1863 int pl_x, pl_y;
1723 int last_name; 1864 maptex pl_tex;
1865 rc_t *rc = rc_alloc ();
1866 rc_key_t key;
1867 rc_array_t *arr;
1868
1869 pl_tex.name = 0;
1724 1870
1725 // thats current max. sorry. 1871 // thats current max. sorry.
1726 if (sw > 255) sw = 255; 1872 if (sw > 255) sw = 255;
1727 if (sh > 255) sh = 255; 1873 if (sh > 255) sh = 255;
1728 1874
1729 // clear key, in case of extra padding 1875 // clear key, in case of extra padding
1730 memset (&skey, 0, sizeof (skey)); 1876 memset (&skey, 0, sizeof (skey));
1731 1877
1732 glColor4ub (255, 255, 255, 255); 1878 memset (&key, 0, sizeof (key));
1733 1879 key.r = 255;
1734 glEnable (GL_BLEND); 1880 key.g = 255;
1735 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1881 key.b = 255;
1736 glEnable (GL_TEXTURE_2D); 1882 key.a = 255;
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1883 key.mode = GL_QUADS;
1738 1884 key.format = GL_T2F_V3F;
1739 glBegin (GL_QUADS);
1740
1741 last_name = -1; 1885 key.texname = -1;
1742 1886
1743 mx += self->x; 1887 mx += self->x;
1744 my += self->y; 1888 my += self->y;
1745 1889
1746 // first pass: determine smooth_max 1890 // first pass: determine smooth_max
1762 MAX (self->tex [cell->tile [0]].smoothlevel, 1906 MAX (self->tex [cell->tile [0]].smoothlevel,
1763 MAX (self->tex [cell->tile [1]].smoothlevel, 1907 MAX (self->tex [cell->tile [1]].smoothlevel,
1764 self->tex [cell->tile [2]].smoothlevel)); 1908 self->tex [cell->tile [2]].smoothlevel));
1765 } 1909 }
1766 } 1910 }
1911
1912 glEnable (GL_BLEND);
1913 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1914 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1767 1915
1768 for (z = 0; z <= 2; z++) 1916 for (z = 0; z <= 2; z++)
1769 { 1917 {
1770 memset (smooth_level, 0, sizeof (smooth_level)); 1918 memset (smooth_level, 0, sizeof (smooth_level));
1771 1919
1781 tileid tile = cell->tile [z]; 1929 tileid tile = cell->tile [z];
1782 1930
1783 if (tile) 1931 if (tile)
1784 { 1932 {
1785 maptex tex = self->tex [tile]; 1933 maptex tex = self->tex [tile];
1786 int px, py; 1934 int px = (x + 1) * T - tex.w;
1935 int py = (y + 1) * T - tex.h;
1787 1936
1788 // suppressing texture state switches here
1789 // is only moderately effective, but worth the extra effort
1790 if (last_name != tex.name) 1937 if (key.texname != tex.name)
1791 { 1938 {
1792 if (!tex.name) 1939 if (!tex.name)
1793 tex = self->tex [2]; /* missing, replace by noface */ 1940 tex = self->tex [2]; /* missing, replace by noface */
1794 1941
1795 glEnd (); 1942 key.texname = tex.name;
1796 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1943 arr = rc_array (rc, &key);
1797 glBegin (GL_QUADS);
1798 } 1944 }
1799 1945
1800 px = (x + 1) * T - tex.w; 1946 if (expect_false (cell->player == player) && expect_false (z == 2))
1801 py = (y + 1) * T - tex.h;
1802
1803 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1804 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1805 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1806 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1807
1808 if (cell->flags && z == 2)
1809 { 1947 {
1948 pl_x = px;
1949 pl_y = py;
1950 pl_tex = tex;
1951 continue;
1952 }
1953
1954 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1955 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1956 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1957 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1958
1959 if (expect_false (cell->flags) && expect_false (z == 2))
1960 {
1961 // overlays such as the speech bubble, probably more to come
1810 if (cell->flags & 1) 1962 if (cell->flags & 1)
1811 { 1963 {
1812 maptex tex = self->tex [1]; 1964 maptex tex = self->tex [1];
1813 int px = x * T + T * 2 / 32; 1965 int px = x * T + T * 2 / 32;
1814 int py = y * T - T * 6 / 32; 1966 int py = y * T - T * 6 / 32;
1815 1967
1968 if (tex.name)
1816 glEnd (); 1969 {
1817 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1970 if (key.texname != tex.name)
1971 {
1972 key.texname = tex.name;
1973 arr = rc_array (rc, &key);
1974 }
1975
1976 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1977 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1978 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1979 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1818 glBegin (GL_QUADS); 1980 }
1819
1820 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1821 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1822 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1823 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1824 } 1981 }
1825 } 1982 }
1826 1983
1827 // update smooth hash 1984 // update smooth hash
1828 if (tex.smoothtile) 1985 if (tex.smoothtile)
1864 } 2021 }
1865 } 2022 }
1866 } 2023 }
1867 } 2024 }
1868 2025
2026 rc_draw (rc);
2027 rc_clear (rc);
2028
1869 // go through all smoothlevels, lowest to highest, then draw. 2029 // go through all smoothlevels, lowest to highest, then draw.
1870 // this is basically counting sort 2030 // this is basically counting sort
1871 { 2031 {
1872 int w, b; 2032 int w, b;
1873 2033
2034 glEnable (GL_TEXTURE_2D);
2035 glBegin (GL_QUADS);
1874 for (w = 0; w < 256 / 32; ++w) 2036 for (w = 0; w < 256 / 32; ++w)
1875 { 2037 {
1876 uint32_t smask = smooth_level [w]; 2038 uint32_t smask = smooth_level [w];
1877 if (smask) 2039 if (smask)
1878 for (b = 0; b < 32; ++b) 2040 for (b = 0; b < 32; ++b)
1897 int border = bits & 15; 2059 int border = bits & 15;
1898 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2060 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1899 float dx = tex.s * .0625f; // 16 images/row 2061 float dx = tex.s * .0625f; // 16 images/row
1900 float dy = tex.t * .5f ; // 2 images/column 2062 float dy = tex.t * .5f ; // 2 images/column
1901 2063
1902 // this time naively avoiding texture state changes
1903 // save gobs of state changes.
1904 if (last_name != tex.name) 2064 if (tex.name)
1905 { 2065 {
2066 // this time avoiding texture state changes
2067 // save gobs of state changes.
1906 if (!tex.name) 2068 if (key.texname != tex.name)
1907 continue; // smoothing not yet available 2069 {
1908
1909 glEnd (); 2070 glEnd ();
1910 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2071 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1911 glBegin (GL_QUADS); 2072 glBegin (GL_QUADS);
1912 } 2073 }
1913 2074
1914 if (border) 2075 if (border)
1915 { 2076 {
1916 float ox = border * dx; 2077 float ox = border * dx;
1917 2078
1918 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2079 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1919 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2080 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1920 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2081 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1921 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2082 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1922 } 2083 }
1923 2084
1924 if (corner) 2085 if (corner)
1925 { 2086 {
1926 float ox = corner * dx; 2087 float ox = corner * dx;
1927 2088
1928 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2089 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1929 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2090 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1930 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2091 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1931 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2092 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2093 }
1932 } 2094 }
1933 } 2095 }
1934 } 2096 }
1935 } 2097 }
1936 } 2098 }
2099
2100 glEnd ();
2101 glDisable (GL_TEXTURE_2D);
2102 key.texname = -1;
1937 } 2103 }
1938 2104
1939 hv_clear (smooth); 2105 hv_clear (smooth);
1940 } 2106 }
1941 2107
1942 glEnd (); 2108 if (pl_tex.name)
2109 {
2110 maptex tex = pl_tex;
2111 int px = pl_x + sdx;
2112 int py = pl_y + sdy;
1943 2113
1944 glDisable (GL_TEXTURE_2D); 2114 key.texname = tex.name;
2115 arr = rc_array (rc, &key);
2116
2117 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2118 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2119 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2120 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2121
2122 rc_draw (rc);
2123 }
2124
1945 glDisable (GL_BLEND); 2125 glDisable (GL_BLEND);
2126 rc_free (rc);
1946 2127
1947 // top layer: overlays such as the health bar 2128 // top layer: overlays such as the health bar
1948 for (y = 0; y < sh; y++) 2129 for (y = 0; y < sh; y++)
1949 if (0 <= y + my && y + my < self->rows) 2130 if (0 <= y + my && y + my < self->rows)
1950 { 2131 {
1975 } 2156 }
1976 } 2157 }
1977} 2158}
1978 2159
1979void 2160void
1980draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2161draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1981 CODE: 2162 CODE:
1982{ 2163{
1983 static float color[16][3] = { 2164 static float color[16][3] = {
1984 { 0.00F, 0.00F, 0.00F }, 2165 { 0.00F, 0.00F, 0.00F },
1985 { 1.00F, 1.00F, 1.00F }, 2166 { 1.00F, 1.00F, 1.00F },
2035 glDisable (GL_BLEND); 2216 glDisable (GL_BLEND);
2036 glDisable (GL_TEXTURE_2D); 2217 glDisable (GL_TEXTURE_2D);
2037} 2218}
2038 2219
2039void 2220void
2040fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2221fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2041 PPCODE: 2222 PPCODE:
2042{ 2223{
2043 int x, y; 2224 int x, y;
2044 int sw1 = sw + 2; 2225 int sw1 = sw + 2;
2045 int sh1 = sh + 2; 2226 int sh1 = sh + 2;
2116 PUSHs (sv_2mortal (newSViv (sh3))); 2297 PUSHs (sv_2mortal (newSViv (sh3)));
2117 PUSHs (darkness3_sv); 2298 PUSHs (darkness3_sv);
2118} 2299}
2119 2300
2120SV * 2301SV *
2121get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2302get_rect (DC::Map self, int x0, int y0, int w, int h)
2122 CODE: 2303 CODE:
2123{ 2304{
2124 int x, y, x1, y1; 2305 int x, y, x1, y1;
2125 SV *data_sv = newSV (w * h * 7 + 5); 2306 SV *data_sv = newSV (w * h * 7 + 5);
2126 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2307 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2183 else 2364 else
2184 *data++ = 0; 2365 *data++ = 0;
2185 } 2366 }
2186 } 2367 }
2187 2368
2369 /* if size is w*h + 5 then no data has been found */
2370 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2371 {
2188 SvPOK_only (data_sv); 2372 SvPOK_only (data_sv);
2189 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2373 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2374 }
2375
2190 RETVAL = data_sv; 2376 RETVAL = data_sv;
2191} 2377}
2192 OUTPUT: 2378 OUTPUT:
2193 RETVAL 2379 RETVAL
2194 2380
2195void 2381void
2196set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2382set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2197 PPCODE: 2383 PPCODE:
2198{ 2384{
2199 int x, y, z; 2385 int x, y, z;
2200 int w, h; 2386 int w, h;
2201 int x1, y1; 2387 int x1, y1;
2388 STRLEN len;
2389 uint8_t *data, *end;
2390
2391 len = SvLEN (data_sv);
2392 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2393 data = SvPVbyte_nolen (data_sv);
2394 end = data + len + 8;
2395
2396 if (len < 5)
2397 XSRETURN_EMPTY;
2202 2398
2203 if (*data++ != 0) 2399 if (*data++ != 0)
2204 return; /* version mismatch */ 2400 XSRETURN_EMPTY; /* version mismatch */
2205 2401
2206 w = *data++ << 8; w |= *data++; 2402 w = *data++ << 8; w |= *data++;
2207 h = *data++ << 8; h |= *data++; 2403 h = *data++ << 8; h |= *data++;
2208 2404
2209 // we need to do this 'cause we don't keep an absolute coord system for rows 2405 // we need to do this 'cause we don't keep an absolute coord system for rows
2221 { 2417 {
2222 maprow *row = map_get_row (self, y); 2418 maprow *row = map_get_row (self, y);
2223 2419
2224 for (x = x0; x < x1; x++) 2420 for (x = x0; x < x1; x++)
2225 { 2421 {
2422 uint8_t flags;
2423
2424 if (data + 7 >= end)
2425 XSRETURN_EMPTY;
2426
2226 uint8_t flags = *data++; 2427 flags = *data++;
2227 2428
2228 if (flags) 2429 if (flags)
2229 { 2430 {
2230 mapcell *cell = row_get_cell (row, x); 2431 mapcell *cell = row_get_cell (row, x);
2231 tileid tile[3] = { 0, 0, 0 }; 2432 tileid tile[3] = { 0, 0, 0 };
2234 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2435 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2235 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2436 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2236 2437
2237 if (cell->darkness == 0) 2438 if (cell->darkness == 0)
2238 { 2439 {
2239 cell->darkness = 0; 2440 /*cell->darkness = 0;*/
2441 EXTEND (SP, 3);
2240 2442
2241 for (z = 0; z <= 2; z++) 2443 for (z = 0; z <= 2; z++)
2242 { 2444 {
2243 tileid t = tile [z]; 2445 tileid t = tile [z];
2244 2446
2245 if (t >= self->texs || (t && !self->tex [t].name)) 2447 if (t >= self->texs || (t && !self->tex [t].name))
2246 { 2448 {
2247 XPUSHs (sv_2mortal (newSViv (t))); 2449 PUSHs (sv_2mortal (newSViv (t)));
2248 need_texid (self, t); 2450 need_texid (self, t);
2249 } 2451 }
2250 2452
2251 cell->tile [z] = t; 2453 cell->tile [z] = t;
2252 } 2454 }
2254 } 2456 }
2255 } 2457 }
2256 } 2458 }
2257} 2459}
2258 2460
2259MODULE = CFPlus PACKAGE = CFPlus::RW 2461MODULE = Deliantra::Client PACKAGE = DC::RW
2260 2462
2261CFPlus::RW 2463DC::RW
2262new (SV *class, SV *data_sv) 2464new (SV *class, SV *data_sv)
2263 CODE: 2465 CODE:
2264{ 2466{
2265 STRLEN datalen; 2467 STRLEN datalen;
2266 char *data = SvPVbyte (data_sv, datalen); 2468 char *data = SvPVbyte (data_sv, datalen);
2268 RETVAL = SDL_RWFromConstMem (data, datalen); 2470 RETVAL = SDL_RWFromConstMem (data, datalen);
2269} 2471}
2270 OUTPUT: 2472 OUTPUT:
2271 RETVAL 2473 RETVAL
2272 2474
2273CFPlus::RW 2475DC::RW
2274new_from_file (SV *class, const char *path, const char *mode = "rb") 2476new_from_file (SV *class, const char *path, const char *mode = "rb")
2275 CODE: 2477 CODE:
2276 RETVAL = SDL_RWFromFile (path, mode); 2478 RETVAL = SDL_RWFromFile (path, mode);
2277 OUTPUT: 2479 OUTPUT:
2278 RETVAL 2480 RETVAL
2279 2481
2280# fails on win32: 2482# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '(' 2483# dc.xs(2268) : error C2059: syntax error : '('
2282#void 2484#void
2283#close (CFPlus::RW self) 2485#close (DC::RW self)
2284# CODE: 2486# CODE:
2285# (self->(close)) (self); 2487# (self->(close)) (self);
2286 2488
2287MODULE = CFPlus PACKAGE = CFPlus::Channel 2489MODULE = Deliantra::Client PACKAGE = DC::Channel
2288 2490
2289PROTOTYPES: DISABLE 2491PROTOTYPES: DISABLE
2290 2492
2291CFPlus::Channel 2493DC::Channel
2292find () 2494find ()
2293 CODE: 2495 CODE:
2294{ 2496{
2295 RETVAL = Mix_GroupAvailable (-1); 2497 RETVAL = Mix_GroupAvailable (-1);
2296 2498
2309} 2511}
2310 OUTPUT: 2512 OUTPUT:
2311 RETVAL 2513 RETVAL
2312 2514
2313void 2515void
2314halt (CFPlus::Channel self) 2516halt (DC::Channel self)
2315 CODE: 2517 CODE:
2316 Mix_HaltChannel (self); 2518 Mix_HaltChannel (self);
2317 2519
2318void 2520void
2319expire (CFPlus::Channel self, int ticks = -1) 2521expire (DC::Channel self, int ticks = -1)
2320 CODE: 2522 CODE:
2321 Mix_ExpireChannel (self, ticks); 2523 Mix_ExpireChannel (self, ticks);
2322 2524
2323void 2525void
2324fade_out (CFPlus::Channel self, int ticks = -1) 2526fade_out (DC::Channel self, int ticks = -1)
2325 CODE: 2527 CODE:
2326 Mix_FadeOutChannel (self, ticks); 2528 Mix_FadeOutChannel (self, ticks);
2327 2529
2328int 2530int
2329volume (CFPlus::Channel self, int volume) 2531volume (DC::Channel self, int volume)
2330 CODE: 2532 CODE:
2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2533 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332 OUTPUT: 2534 OUTPUT:
2333 RETVAL 2535 RETVAL
2334 2536
2335void 2537void
2336unregister_all_effects (CFPlus::Channel self) 2538unregister_all_effects (DC::Channel self)
2337 CODE: 2539 CODE:
2338 Mix_UnregisterAllEffects (self); 2540 Mix_UnregisterAllEffects (self);
2339 2541
2340void 2542void
2341set_panning (CFPlus::Channel self, int left, int right) 2543set_panning (DC::Channel self, int left, int right)
2342 CODE: 2544 CODE:
2343 left = CLAMP (left , 0, 255); 2545 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255); 2546 right = CLAMP (right, 0, 255);
2345 Mix_SetPanning (self, left, right); 2547 Mix_SetPanning (self, left, right);
2346 2548
2347void 2549void
2348set_distance (CFPlus::Channel self, int distance) 2550set_distance (DC::Channel self, int distance)
2349 CODE: 2551 CODE:
2350 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2552 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351 2553
2352void 2554void
2353set_position (CFPlus::Channel self, int angle, int distance) 2555set_position (DC::Channel self, int angle, int distance)
2354 CODE: 2556 CODE:
2355 2557
2356void 2558void
2357set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2559set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358 CODE: 2560 CODE:
2359{ 2561{
2360 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2562 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2563 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2362 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2564 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363} 2565}
2364 2566
2365void 2567void
2366set_reverse_stereo (CFPlus::Channel self, int flip) 2568set_reverse_stereo (DC::Channel self, int flip)
2367 CODE: 2569 CODE:
2368 Mix_SetReverseStereo (self, flip); 2570 Mix_SetReverseStereo (self, flip);
2369 2571
2370MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2572MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371 2573
2372PROTOTYPES: DISABLE 2574PROTOTYPES: DISABLE
2373 2575
2374CFPlus::MixChunk 2576DC::MixChunk
2375new (SV *class, CFPlus::RW rwops) 2577new (SV *class, DC::RW rwops)
2376 CODE: 2578 CODE:
2377 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2579 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378 OUTPUT: 2580 OUTPUT:
2379 RETVAL 2581 RETVAL
2380 2582
2381void 2583void
2382DESTROY (CFPlus::MixChunk self) 2584DESTROY (DC::MixChunk self)
2383 CODE: 2585 CODE:
2384 Mix_FreeChunk (self); 2586 Mix_FreeChunk (self);
2385 2587
2386int 2588int
2387volume (CFPlus::MixChunk self, int volume = -1) 2589volume (DC::MixChunk self, int volume = -1)
2388 CODE: 2590 CODE:
2389 if (items > 1) 2591 if (items > 1)
2390 volume = CLAMP (volume, 0, 128); 2592 volume = CLAMP (volume, 0, 128);
2391 RETVAL = Mix_VolumeChunk (self, volume); 2593 RETVAL = Mix_VolumeChunk (self, volume);
2392 OUTPUT: 2594 OUTPUT:
2393 RETVAL 2595 RETVAL
2394 2596
2395CFPlus::Channel 2597DC::Channel
2396play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2598play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2397 CODE: 2599 CODE:
2398{ 2600{
2399 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2601 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400 2602
2401 if (RETVAL < 0) 2603 if (RETVAL < 0)
2408 } 2610 }
2409} 2611}
2410 OUTPUT: 2612 OUTPUT:
2411 RETVAL 2613 RETVAL
2412 2614
2413MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2615MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2414 2616
2415int 2617int
2416volume (int volume = -1) 2618volume (int volume = -1)
2417 PROTOTYPE: ;$ 2619 PROTOTYPE: ;$
2418 CODE: 2620 CODE:
2430void 2632void
2431halt () 2633halt ()
2432 CODE: 2634 CODE:
2433 Mix_HaltMusic (); 2635 Mix_HaltMusic ();
2434 2636
2435CFPlus::MixMusic 2637DC::MixMusic
2436new (SV *class, CFPlus::RW rwops) 2638new (SV *class, DC::RW rwops)
2437 CODE: 2639 CODE:
2438 RETVAL = Mix_LoadMUS_RW (rwops); 2640 RETVAL = Mix_LoadMUS_RW (rwops);
2439 OUTPUT: 2641 OUTPUT:
2440 RETVAL 2642 RETVAL
2441 2643
2442void 2644void
2443DESTROY (CFPlus::MixMusic self) 2645DESTROY (DC::MixMusic self)
2444 CODE: 2646 CODE:
2445 Mix_FreeMusic (self); 2647 Mix_FreeMusic (self);
2446 2648
2447int 2649int
2448play (CFPlus::MixMusic self, int loops = -1) 2650play (DC::MixMusic self, int loops = -1)
2449 CODE: 2651 CODE:
2450 RETVAL = Mix_PlayMusic (self, loops); 2652 RETVAL = Mix_PlayMusic (self, loops);
2451 OUTPUT: 2653 OUTPUT:
2452 RETVAL 2654 RETVAL
2453 2655
2454void 2656void
2455fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2657fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456 CODE: 2658 CODE:
2457 Mix_FadeInMusicPos (self, loops, ms, position); 2659 Mix_FadeInMusicPos (self, loops, ms, position);
2458 2660
2459MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2661MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460 2662
2461PROTOTYPES: ENABLE 2663PROTOTYPES: ENABLE
2462 2664
2463BOOT: 2665BOOT:
2464{ 2666{
2465 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2667 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466 static const struct { 2668 static const struct {
2467 const char *name; 2669 const char *name;
2468 IV iv; 2670 IV iv;
2469 } *civ, const_iv[] = { 2671 } *civ, const_iv[] = {
2470# define const_iv(name) { # name, (IV)name } 2672# define const_iv(name) { # name, (IV)name }
2505 const_iv (GL_INTENSITY), 2707 const_iv (GL_INTENSITY),
2506 const_iv (GL_LUMINANCE), 2708 const_iv (GL_LUMINANCE),
2507 const_iv (GL_LUMINANCE_ALPHA), 2709 const_iv (GL_LUMINANCE_ALPHA),
2508 const_iv (GL_FLOAT), 2710 const_iv (GL_FLOAT),
2509 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2711 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2712 const_iv (GL_COMPRESSED_ALPHA_ARB),
2713 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2714 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2715 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2716 const_iv (GL_COMPRESSED_RGB_ARB),
2717 const_iv (GL_COMPRESSED_RGBA_ARB),
2510 const_iv (GL_COMPILE), 2718 const_iv (GL_COMPILE),
2511 const_iv (GL_PROXY_TEXTURE_1D), 2719 const_iv (GL_PROXY_TEXTURE_1D),
2512 const_iv (GL_PROXY_TEXTURE_2D), 2720 const_iv (GL_PROXY_TEXTURE_2D),
2513 const_iv (GL_TEXTURE_1D), 2721 const_iv (GL_TEXTURE_1D),
2514 const_iv (GL_TEXTURE_2D), 2722 const_iv (GL_TEXTURE_2D),
2553 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2761 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554 const_iv (GL_POINT_SMOOTH_HINT), 2762 const_iv (GL_POINT_SMOOTH_HINT),
2555 const_iv (GL_LINE_SMOOTH_HINT), 2763 const_iv (GL_LINE_SMOOTH_HINT),
2556 const_iv (GL_POLYGON_SMOOTH_HINT), 2764 const_iv (GL_POLYGON_SMOOTH_HINT),
2557 const_iv (GL_GENERATE_MIPMAP_HINT), 2765 const_iv (GL_GENERATE_MIPMAP_HINT),
2766 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558 const_iv (GL_FASTEST), 2767 const_iv (GL_FASTEST),
2559 const_iv (GL_DONT_CARE), 2768 const_iv (GL_DONT_CARE),
2560 const_iv (GL_NICEST), 2769 const_iv (GL_NICEST),
2561 const_iv (GL_V2F), 2770 const_iv (GL_V2F),
2562 const_iv (GL_V3F), 2771 const_iv (GL_V3F),
2570 2779
2571 texture_av = newAV (); 2780 texture_av = newAV ();
2572 AvREAL_off (texture_av); 2781 AvREAL_off (texture_av);
2573} 2782}
2574 2783
2784void
2785disable_GL_EXT_blend_func_separate ()
2786 CODE:
2787 gl.BlendFuncSeparate = 0;
2788 gl.BlendFuncSeparateEXT = 0;
2789
2575char * 2790char *
2576gl_vendor () 2791gl_vendor ()
2577 CODE: 2792 CODE:
2578 RETVAL = (char *)glGetString (GL_VENDOR); 2793 RETVAL = (char *)glGetString (GL_VENDOR);
2579 OUTPUT: 2794 OUTPUT:
2700 2915
2701void glRect (float x1, float y1, float x2, float y2) 2916void glRect (float x1, float y1, float x2, float y2)
2702 CODE: 2917 CODE:
2703 glRectf (x1, y1, x2, y2); 2918 glRectf (x1, y1, x2, y2);
2704 2919
2920void glRect_lineloop (float x1, float y1, float x2, float y2)
2921 CODE:
2922 glBegin (GL_LINE_LOOP);
2923 glVertex2f (x1, y1);
2924 glVertex2f (x2, y1);
2925 glVertex2f (x2, y2);
2926 glVertex2f (x1, y2);
2927 glEnd ();
2928
2705PROTOTYPES: ENABLE 2929PROTOTYPES: ENABLE
2706 2930
2707void glBegin (int mode) 2931void glBegin (int mode)
2708 2932
2709void glEnd () 2933void glEnd ()
2741void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2965void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2742 CODE: 2966 CODE:
2743 if (gl.SeparableFilter2D) 2967 if (gl.SeparableFilter2D)
2744 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2968 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745 2969
2746void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2970void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2747 2971
2748void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2972void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2749 2973
2750void glDrawPixels (int width, int height, int format, int type, char *pixels) 2974void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751 2975
2777 3001
2778void glEndList () 3002void glEndList ()
2779 3003
2780void glCallList (int list) 3004void glCallList (int list)
2781 3005
2782MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3006MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2783 3007
2784PROTOTYPES: DISABLE 3008PROTOTYPES: DISABLE
2785 3009
2786void 3010void
2787find_widget (SV *self, NV x, NV y) 3011find_widget (SV *self, NV x, NV y)
2791 XPUSHs (self); 3015 XPUSHs (self);
2792} 3016}
2793 3017
2794BOOT: 3018BOOT:
2795{ 3019{
2796 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3020 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797 3021
2798 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3022 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2799 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3023 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2800 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3024 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2801 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3025 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2802} 3026}
2803 3027
2804void 3028void
2805draw (SV *self) 3029draw (SV *self)
2806 CODE: 3030 CODE:
2810 NV x, y, w, h; 3034 NV x, y, w, h;
2811 SV *draw_x_sv = GvSV (draw_x_gv); 3035 SV *draw_x_sv = GvSV (draw_x_gv);
2812 SV *draw_y_sv = GvSV (draw_y_gv); 3036 SV *draw_y_sv = GvSV (draw_y_gv);
2813 SV *draw_w_sv = GvSV (draw_w_gv); 3037 SV *draw_w_sv = GvSV (draw_w_gv);
2814 SV *draw_h_sv = GvSV (draw_h_gv); 3038 SV *draw_h_sv = GvSV (draw_h_gv);
2815 SV *hover;
2816 double draw_x, draw_y, draw_w, draw_h; 3039 double draw_x, draw_y;
2817 3040
2818 if (!SvROK (self)) 3041 if (!SvROK (self))
2819 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3042 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820 3043
2821 hv = (HV *)SvRV (self); 3044 hv = (HV *)SvRV (self);
2822 3045
2823 if (SvTYPE (hv) != SVt_PVHV) 3046 if (SvTYPE (hv) != SVt_PVHV)
2824 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3047 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825 3048
2826 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3049 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2827 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3050 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2828 3051
2829 if (!h || !w) 3052 if (!h || !w)
2849 { 3072 {
2850 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3073 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851 3074
2852 if (svp && SvTRUE (*svp)) 3075 if (svp && SvTRUE (*svp))
2853 { 3076 {
2854 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3077 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2855 glEnable (GL_BLEND); 3078 glEnable (GL_BLEND);
2856 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3079 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857 glBegin (GL_QUADS); 3080 glBegin (GL_QUADS);
2858 glVertex2f (0, 0); 3081 glVertex2f (0, 0);
2859 glVertex2f (w, 0); 3082 glVertex2f (w, 0);
2862 glEnd (); 3085 glEnd ();
2863 glDisable (GL_BLEND); 3086 glDisable (GL_BLEND);
2864 } 3087 }
2865 } 3088 }
2866#if 0 3089#if 0
2867 if ($ENV{CFPLUS_DEBUG} & 1) { 3090 // draw borders, for debugging
2868 glPushMatrix; 3091 glPushMatrix ();
2869 glColor 1, 1, 0, 1; 3092 glColor4f (1., 1., 0., 1.);
2870 glTranslate 0.375, 0.375; 3093 glTranslatef (.5, .5, 0.);
2871 glBegin GL_LINE_LOOP; 3094 glBegin (GL_LINE_LOOP);
2872 glVertex 0 , 0; 3095 glVertex2f (0 , 0);
2873 glVertex $self->{w} - 1, 0; 3096 glVertex2f (w - 1, 0);
2874 glVertex $self->{w} - 1, $self->{h} - 1; 3097 glVertex2f (w - 1, h - 1);
2875 glVertex 0 , $self->{h} - 1; 3098 glVertex2f (0 , h - 1);
2876 glEnd; 3099 glEnd ();
2877 glPopMatrix; 3100 glPopMatrix ();
2878 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879 }
2880#endif 3101#endif
2881 PUSHMARK (SP); 3102 PUSHMARK (SP);
2882 XPUSHs (self); 3103 XPUSHs (self);
2883 PUTBACK; 3104 PUTBACK;
2884 call_method ("_draw", G_VOID | G_DISCARD); 3105 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines