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.267 by root, Sun Jul 20 02:55:36 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines