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.270 by root, Sun Jul 20 15:05:13 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),
677
678 const_iv (FOW_DARKNESS)
609# undef const_iv 679# undef const_iv
610 }; 680 };
611 681
612 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 682 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
631 701
632NV floor (NV x) 702NV floor (NV x)
633 703
634NV ceil (NV x) 704NV ceil (NV x)
635 705
706NV ceilabs (NV x)
707 CODE:
708 RETVAL = x < 0. ? - ceil (-x) : ceil (x);
709 OUTPUT:
710 RETVAL
711
712IV minpot (UV n)
713
714IV popcount (UV n)
715
636void 716void
637pango_init () 717pango_init ()
638 CODE: 718 CODE:
639{ 719{
640 opengl_fontmap = pango_opengl_font_map_new (); 720 opengl_fontmap = pango_opengl_font_map_new ();
641 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 721 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); 722 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
723 /*pango_context_set_font_description (opengl_context, default_font);*/
724#if PANGO_VERSION_CHECK (1, 15, 2)
725 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
726 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
727#endif
643} 728}
644 729
645char *
646SDL_GetError () 730char *SDL_GetError ()
647 731
648int 732int SDL_Init (U32 flags)
649SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
650 733
651void 734int SDL_InitSubSystem (U32 flags)
735
736void SDL_QuitSubSystem (U32 flags)
737
652SDL_Quit () 738void SDL_Quit ()
739
740int SDL_GL_SetAttribute (int attr, int value)
741
742int SDL_GL_GetAttribute (int attr)
743 CODE:
744 if (SDL_GL_GetAttribute (attr, &RETVAL))
745 XSRETURN_UNDEF;
746 OUTPUT:
747 RETVAL
653 748
654void 749void
655SDL_ListModes (int rgb, int alpha) 750SDL_ListModes (int rgb, int alpha)
656 PPCODE: 751 PPCODE:
657{ 752{
669 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 764 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 765 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 766 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
672 767
673 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 768 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); 769 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
677#endif
678 770
679 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 771 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
680 772
681 if (m && m != (SDL_Rect **)-1) 773 if (m && m != (SDL_Rect **)-1)
682 while (*m) 774 while (*m)
683 { 775 {
684 if ((*m)->w >= 640 && (*m)->h >= 480) 776 if ((*m)->w >= 400 && (*m)->h >= 300)
685 { 777 {
686 AV *av = newAV (); 778 AV *av = newAV ();
687 av_push (av, newSViv ((*m)->w)); 779 av_push (av, newSViv ((*m)->w));
688 av_push (av, newSViv ((*m)->h)); 780 av_push (av, newSViv ((*m)->h));
689 av_push (av, newSViv (rgb)); 781 av_push (av, newSViv (rgb));
713 805
714 if (RETVAL) 806 if (RETVAL)
715 { 807 {
716 av_clear (texture_av); 808 av_clear (texture_av);
717 809
718 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 810 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
719#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 811#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
720#include "glfunc.h" 812#include "glfunc.h"
721#undef GL_FUNC 813#undef GL_FUNC
722 } 814 }
723} 815}
730char * 822char *
731SDL_GetKeyName (int sym) 823SDL_GetKeyName (int sym)
732 824
733int 825int
734SDL_GetAppState () 826SDL_GetAppState ()
827
828int
829SDL_GetModState ()
735 830
736void 831void
737poll_events () 832poll_events ()
738 PPCODE: 833 PPCODE:
739{ 834{
749 { 844 {
750 case SDL_KEYDOWN: 845 case SDL_KEYDOWN:
751 case SDL_KEYUP: 846 case SDL_KEYUP:
752 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 847 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
753 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 848 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
754 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 849 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 */ 850 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); 851 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
757 break; 852 break;
758 853
759 case SDL_ACTIVEEVENT: 854 case SDL_ACTIVEEVENT:
760 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 855 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
778 x = ev.motion.x; 873 x = ev.motion.x;
779 y = ev.motion.y; 874 y = ev.motion.y;
780 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 875 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
781 } 876 }
782 877
783 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 878 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
784 hv_store (hv, "state", 5, newSViv (state), 0); 879 hv_store (hv, "state", 5, newSViv (state), 0);
785 hv_store (hv, "x", 1, newSViv (x), 0); 880 hv_store (hv, "x", 1, newSViv (x), 0);
786 hv_store (hv, "y", 1, newSViv (y), 0); 881 hv_store (hv, "y", 1, newSViv (y), 0);
787 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 882 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
788 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 883 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
789 } 884 }
790 break; 885 break;
791 886
792 case SDL_MOUSEBUTTONDOWN: 887 case SDL_MOUSEBUTTONDOWN:
793 case SDL_MOUSEBUTTONUP: 888 case SDL_MOUSEBUTTONUP:
794 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 889 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
795 890
796 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 891 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
797 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 892 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
798 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 893 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
799 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 894 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
804 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 899 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
805 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 900 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
806 break; 901 break;
807 } 902 }
808 903
809 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 904 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
810 } 905 }
811} 906}
812 907
813int 908int
814Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 909Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
815 POSTCALL: 910 POSTCALL:
816 Mix_HookMusicFinished (music_finished); 911 Mix_HookMusicFinished (music_finished);
817 Mix_ChannelFinished (channel_finished); 912 Mix_ChannelFinished (channel_finished);
913
914void
915Mix_QuerySpec ()
916 PPCODE:
917{
918 int freq, channels;
919 Uint16 format;
920
921 if (Mix_QuerySpec (&freq, &format, &channels))
922 {
923 EXTEND (SP, 3);
924 PUSHs (sv_2mortal (newSViv (freq)));
925 PUSHs (sv_2mortal (newSViv (format)));
926 PUSHs (sv_2mortal (newSViv (channels)));
927 }
928}
818 929
819void 930void
820Mix_CloseAudio () 931Mix_CloseAudio ()
821 932
822int 933int
857 } 968 }
858 } 969 }
859#endif 970#endif
860} 971}
861 972
862void 973int
863add_font (char *file) 974add_font (char *file)
864 CODE: 975 CODE:
865 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 976 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
977 OUTPUT:
978 RETVAL
866 979
867void 980void
868load_image_inline (SV *image_) 981load_image_inline (SV *image_)
869 ALIAS: 982 ALIAS:
870 load_image_file = 1 983 load_image_file = 1
956void 1069void
957error (char *message) 1070error (char *message)
958 CODE: 1071 CODE:
959 fprintf (stderr, "ERROR: %s\n", message); 1072 fprintf (stderr, "ERROR: %s\n", message);
960#ifdef _WIN32 1073#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1074 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
962#endif 1075#endif
963 1076
964void 1077void
965fatal (char *message) 1078fatal (char *message)
966 CODE: 1079 CODE:
967 fprintf (stderr, "FATAL: %s\n", message); 1080 fprintf (stderr, "FATAL: %s\n", message);
968#ifdef _WIN32 1081#ifdef _WIN32
969 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1082 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
970#endif 1083#endif
971 _exit (1); 1084 _exit (1);
972 1085
973void 1086void
974_exit (int retval = 0) 1087_exit (int retval = 0)
986#if DEBUG 1099#if DEBUG
987 VALGRIND_DO_LEAK_CHECK; 1100 VALGRIND_DO_LEAK_CHECK;
988#endif 1101#endif
989} 1102}
990 1103
991MODULE = CFPlus PACKAGE = CFPlus::Font 1104MODULE = Deliantra::Client PACKAGE = DC::Font
992 1105
993PROTOTYPES: DISABLE 1106PROTOTYPES: DISABLE
994 1107
995CFPlus::Font 1108DC::Font
996new_from_file (SV *class, char *path, int id = 0) 1109new_from_file (SV *class, char *path, int id = 0)
997 CODE: 1110 CODE:
998{ 1111{
999 int count; 1112 int count;
1000 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1113 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1003} 1116}
1004 OUTPUT: 1117 OUTPUT:
1005 RETVAL 1118 RETVAL
1006 1119
1007void 1120void
1008DESTROY (CFPlus::Font self) 1121DESTROY (DC::Font self)
1009 CODE: 1122 CODE:
1010 pango_font_description_free (self); 1123 pango_font_description_free (self);
1011 1124
1012void 1125void
1013make_default (CFPlus::Font self) 1126make_default (DC::Font self)
1014 PROTOTYPE: $ 1127 PROTOTYPE: $
1015 CODE: 1128 CODE:
1016 default_font = self; 1129 default_font = self;
1017 1130
1018MODULE = CFPlus PACKAGE = CFPlus::Layout 1131MODULE = Deliantra::Client PACKAGE = DC::Layout
1019 1132
1020PROTOTYPES: DISABLE 1133PROTOTYPES: DISABLE
1021 1134
1022void 1135void
1023reset_glyph_cache () 1136glyph_cache_backup ()
1024 PROTOTYPE: 1137 PROTOTYPE:
1025 CODE: 1138 CODE:
1139 tc_backup ();
1140
1141void
1142glyph_cache_restore ()
1143 PROTOTYPE:
1144 CODE:
1026 tc_clear (); 1145 tc_restore ();
1027 1146
1028CFPlus::Layout 1147DC::Layout
1029new (SV *class) 1148new (SV *class)
1030 CODE: 1149 CODE:
1031 New (0, RETVAL, 1, struct cf_layout); 1150 New (0, RETVAL, 1, struct cf_layout);
1032 1151
1033 RETVAL->pl = pango_layout_new (opengl_context); 1152 RETVAL->pl = pango_layout_new (opengl_context);
1035 RETVAL->g = 1.; 1154 RETVAL->g = 1.;
1036 RETVAL->b = 1.; 1155 RETVAL->b = 1.;
1037 RETVAL->a = 1.; 1156 RETVAL->a = 1.;
1038 RETVAL->base_height = MIN_FONT_HEIGHT; 1157 RETVAL->base_height = MIN_FONT_HEIGHT;
1039 RETVAL->font = 0; 1158 RETVAL->font = 0;
1159 RETVAL->rc = rc_alloc ();
1040 1160
1041 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1161 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1042 layout_update_font (RETVAL); 1162 layout_update_font (RETVAL);
1043 OUTPUT: 1163 OUTPUT:
1044 RETVAL 1164 RETVAL
1045 1165
1046void 1166void
1047DESTROY (CFPlus::Layout self) 1167DESTROY (DC::Layout self)
1048 CODE: 1168 CODE:
1049 g_object_unref (self->pl); 1169 g_object_unref (self->pl);
1170 rc_free (self->rc);
1050 Safefree (self); 1171 Safefree (self);
1051 1172
1052void 1173void
1053set_text (CFPlus::Layout self, SV *text_) 1174set_text (DC::Layout self, SV *text_)
1054 CODE: 1175 CODE:
1055{ 1176{
1056 STRLEN textlen; 1177 STRLEN textlen;
1057 char *text = SvPVutf8 (text_, textlen); 1178 char *text = SvPVutf8 (text_, textlen);
1058 1179
1059 pango_layout_set_text (self->pl, text, textlen); 1180 pango_layout_set_text (self->pl, text, textlen);
1060} 1181}
1061 1182
1062void 1183void
1063set_markup (CFPlus::Layout self, SV *text_) 1184set_markup (DC::Layout self, SV *text_)
1064 CODE: 1185 CODE:
1065{ 1186{
1066 STRLEN textlen; 1187 STRLEN textlen;
1067 char *text = SvPVutf8 (text_, textlen); 1188 char *text = SvPVutf8 (text_, textlen);
1068 1189
1069 pango_layout_set_markup (self->pl, text, textlen); 1190 pango_layout_set_markup (self->pl, text, textlen);
1070} 1191}
1071 1192
1072void 1193void
1073set_shapes (CFPlus::Layout self, ...) 1194set_shapes (DC::Layout self, ...)
1074 CODE: 1195 CODE:
1075{ 1196{
1076 PangoAttrList *attrs = 0; 1197 PangoAttrList *attrs = 0;
1077 const char *text = pango_layout_get_text (self->pl); 1198 const char *text = pango_layout_get_text (self->pl);
1078 const char *pos = text; 1199 const char *pos = text;
1113 if (attrs) 1234 if (attrs)
1114 pango_layout_set_attributes (self->pl, attrs); 1235 pango_layout_set_attributes (self->pl, attrs);
1115} 1236}
1116 1237
1117void 1238void
1118get_shapes (CFPlus::Layout self) 1239get_shapes (DC::Layout self)
1119 PPCODE: 1240 PPCODE:
1120{ 1241{
1121 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1242 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1122 1243
1123 do 1244 do
1124 { 1245 {
1125 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1246 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1126 1247
1127 if (run && shape_attr_p (run)) 1248 if (run && shape_attr_p (run))
1128 { 1249 {
1129 PangoRectangle extents; 1250 PangoRectangle extents;
1130 pango_layout_iter_get_run_extents (iter, 0, &extents); 1251 pango_layout_iter_get_run_extents (iter, 0, &extents);
1138 1259
1139 pango_layout_iter_free (iter); 1260 pango_layout_iter_free (iter);
1140} 1261}
1141 1262
1142int 1263int
1143has_wrapped (CFPlus::Layout self) 1264has_wrapped (DC::Layout self)
1144 CODE: 1265 CODE:
1145{ 1266{
1146 int lines = 1; 1267 int lines = 1;
1147 const char *text = pango_layout_get_text (self->pl); 1268 const char *text = pango_layout_get_text (self->pl);
1148 1269
1153} 1274}
1154 OUTPUT: 1275 OUTPUT:
1155 RETVAL 1276 RETVAL
1156 1277
1157SV * 1278SV *
1158get_text (CFPlus::Layout self) 1279get_text (DC::Layout self)
1159 CODE: 1280 CODE:
1160 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1281 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1161 sv_utf8_decode (RETVAL); 1282 sv_utf8_decode (RETVAL);
1162 OUTPUT: 1283 OUTPUT:
1163 RETVAL 1284 RETVAL
1164 1285
1165void 1286void
1166set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1287set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1167 CODE: 1288 CODE:
1168 self->r = r; 1289 self->r = r;
1169 self->g = g; 1290 self->g = g;
1170 self->b = b; 1291 self->b = b;
1171 self->a = a; 1292 self->a = a;
1172 1293
1173void 1294void
1174set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1295set_font (DC::Layout self, DC::Font font = 0)
1175 CODE: 1296 CODE:
1176 if (self->font != font) 1297 if (self->font != font)
1177 { 1298 {
1178 self->font = font; 1299 self->font = font;
1179 layout_update_font (self); 1300 layout_update_font (self);
1180 } 1301 }
1181 1302
1182void 1303void
1183set_height (CFPlus::Layout self, int base_height) 1304set_height (DC::Layout self, int base_height)
1184 CODE: 1305 CODE:
1185 if (self->base_height != base_height) 1306 if (self->base_height != base_height)
1186 { 1307 {
1187 self->base_height = base_height; 1308 self->base_height = base_height;
1188 layout_update_font (self); 1309 layout_update_font (self);
1189 } 1310 }
1190 1311
1191void 1312void
1192set_width (CFPlus::Layout self, int max_width = -1) 1313set_width (DC::Layout self, int max_width = -1)
1193 CODE: 1314 CODE:
1194 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1315 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1195 1316
1196void 1317void
1197set_indent (CFPlus::Layout self, int indent) 1318set_indent (DC::Layout self, int indent)
1198 CODE: 1319 CODE:
1199 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1320 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1200 1321
1201void 1322void
1202set_spacing (CFPlus::Layout self, int spacing) 1323set_spacing (DC::Layout self, int spacing)
1203 CODE: 1324 CODE:
1204 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1325 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1205 1326
1206void 1327void
1207set_ellipsise (CFPlus::Layout self, int ellipsise) 1328set_ellipsise (DC::Layout self, int ellipsise)
1208 CODE: 1329 CODE:
1209 pango_layout_set_ellipsize (self->pl, 1330 pango_layout_set_ellipsize (self->pl,
1210 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1331 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1211 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1332 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1212 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1333 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1213 : PANGO_ELLIPSIZE_NONE 1334 : PANGO_ELLIPSIZE_NONE
1214 ); 1335 );
1215 1336
1216void 1337void
1217set_single_paragraph_mode (CFPlus::Layout self, int spm) 1338set_single_paragraph_mode (DC::Layout self, int spm)
1218 CODE: 1339 CODE:
1219 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1340 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1220 1341
1221void 1342void
1222size (CFPlus::Layout self) 1343size (DC::Layout self)
1223 PPCODE: 1344 PPCODE:
1224{ 1345{
1225 int w, h; 1346 int w, h;
1226 1347
1227 layout_get_pixel_size (self, &w, &h); 1348 layout_get_pixel_size (self, &w, &h);
1230 PUSHs (sv_2mortal (newSViv (w))); 1351 PUSHs (sv_2mortal (newSViv (w)));
1231 PUSHs (sv_2mortal (newSViv (h))); 1352 PUSHs (sv_2mortal (newSViv (h)));
1232} 1353}
1233 1354
1234int 1355int
1235descent (CFPlus::Layout self) 1356descent (DC::Layout self)
1236 CODE: 1357 CODE:
1237{ 1358{
1238 PangoRectangle rect; 1359 PangoRectangle rect;
1239 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1360 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1240 pango_layout_line_get_pixel_extents (line, 0, &rect); 1361 pango_layout_line_get_pixel_extents (line, 0, &rect);
1241 RETVAL = PANGO_DESCENT (rect); 1362 RETVAL = PANGO_DESCENT (rect);
1242} 1363}
1243 OUTPUT: 1364 OUTPUT:
1244 RETVAL 1365 RETVAL
1245 1366
1246int 1367int
1247xy_to_index (CFPlus::Layout self, int x, int y) 1368xy_to_index (DC::Layout self, int x, int y)
1248 CODE: 1369 CODE:
1249{ 1370{
1250 int index, trailing; 1371 int index, trailing;
1251 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1372 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1252 RETVAL = index + trailing; 1373 RETVAL = index + trailing;
1253} 1374}
1254 OUTPUT: 1375 OUTPUT:
1255 RETVAL 1376 RETVAL
1256 1377
1257void 1378void
1258cursor_pos (CFPlus::Layout self, int index) 1379cursor_pos (DC::Layout self, int index)
1259 PPCODE: 1380 PPCODE:
1260{ 1381{
1261 PangoRectangle strong_pos; 1382 PangoRectangle pos;
1262 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1383 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1263 1384
1264 EXTEND (SP, 3); 1385 EXTEND (SP, 3);
1265 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1386 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1266 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1387 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1388 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1268} 1389}
1269 1390
1270void 1391void
1271index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1392index_to_line_x (DC::Layout self, int index, int trailing = 0)
1272 PPCODE: 1393 PPCODE:
1273{ 1394{
1274 int line, x; 1395 int line, x;
1275 1396
1276 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1397 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1398#if !PANGO_VERSION_CHECK (1, 17, 3)
1277 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1399 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1278 1400 --line;
1401#endif
1279 EXTEND (SP, 2); 1402 EXTEND (SP, 2);
1280 PUSHs (sv_2mortal (newSViv (line - 1))); 1403 PUSHs (sv_2mortal (newSViv (line)));
1281 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1404 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1282} 1405}
1283 1406
1284void 1407void
1285line_x_to_index (CFPlus::Layout self, int line, int x) 1408line_x_to_index (DC::Layout self, int line, int x)
1286 PPCODE: 1409 PPCODE:
1287{ 1410{
1288 PangoLayoutLine *lp; 1411 PangoLayoutLine *lp;
1289 int index, trailing; 1412 int index, trailing;
1290 1413
1291 if (line < 0) 1414 if (line < 0)
1292 XSRETURN_EMPTY; 1415 XSRETURN_EMPTY;
1293 1416
1294 if (!(lp = pango_layout_get_line (self->pl, line))) 1417 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1295 XSRETURN_EMPTY; /* do better */ 1418 XSRETURN_EMPTY; /* do better */
1296 1419
1297 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1420 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1298 1421
1299 EXTEND (SP, 2); 1422 EXTEND (SP, 2);
1305 PUSHs (sv_2mortal (newSViv (trailing))); 1428 PUSHs (sv_2mortal (newSViv (trailing)));
1306 } 1429 }
1307} 1430}
1308 1431
1309void 1432void
1310render (CFPlus::Layout self, float x, float y, int flags = 0) 1433render (DC::Layout self, float x, float y, int flags = 0)
1311 PPCODE: 1434 CODE:
1435 rc_clear (self->rc);
1312 pango_opengl_render_layout_subpixel ( 1436 pango_opengl_render_layout_subpixel (
1313 self->pl, 1437 self->pl,
1438 self->rc,
1314 x * PANGO_SCALE, y * PANGO_SCALE, 1439 x * PANGO_SCALE, y * PANGO_SCALE,
1315 self->r, self->g, self->b, self->a, 1440 self->r, self->g, self->b, self->a,
1316 flags 1441 flags
1317 ); 1442 );
1443 // we assume that context_change actually clears/frees stuff
1444 // and does not do any recomputation...
1445 pango_layout_context_changed (self->pl);
1318 1446
1319MODULE = CFPlus PACKAGE = CFPlus::Texture 1447void
1448draw (DC::Layout self)
1449 CODE:
1450{
1451 glEnable (GL_TEXTURE_2D);
1452 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1453 glEnable (GL_BLEND);
1454 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1455 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1456 glEnable (GL_ALPHA_TEST);
1457 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1458
1459 rc_draw (self->rc);
1460
1461 glDisable (GL_ALPHA_TEST);
1462 glDisable (GL_BLEND);
1463 glDisable (GL_TEXTURE_2D);
1464}
1465
1466MODULE = Deliantra::Client PACKAGE = DC::Texture
1320 1467
1321PROTOTYPES: ENABLE 1468PROTOTYPES: ENABLE
1322
1323int minpot (int n)
1324 1469
1325void 1470void
1326pad (SV *data_, int ow, int oh, int nw, int nh) 1471pad (SV *data_, int ow, int oh, int nw, int nh)
1327 CODE: 1472 CODE:
1328{ 1473{
1405 RETVAL = width > 0; 1550 RETVAL = width > 0;
1406} 1551}
1407 OUTPUT: 1552 OUTPUT:
1408 RETVAL 1553 RETVAL
1409 1554
1410MODULE = CFPlus PACKAGE = CFPlus::Map 1555MODULE = Deliantra::Client PACKAGE = DC::Map
1411 1556
1412PROTOTYPES: DISABLE 1557PROTOTYPES: DISABLE
1413 1558
1414CFPlus::Map 1559DC::Map
1415new (SV *class) 1560new (SV *class)
1416 CODE: 1561 CODE:
1417 New (0, RETVAL, 1, struct map); 1562 New (0, RETVAL, 1, struct map);
1418 RETVAL->x = 0; 1563 RETVAL->x = 0;
1419 RETVAL->y = 0; 1564 RETVAL->y = 0;
1427 RETVAL->row = 0; 1572 RETVAL->row = 0;
1428 OUTPUT: 1573 OUTPUT:
1429 RETVAL 1574 RETVAL
1430 1575
1431void 1576void
1432DESTROY (CFPlus::Map self) 1577DESTROY (DC::Map self)
1433 CODE: 1578 CODE:
1434{ 1579{
1435 map_clear (self); 1580 map_clear (self);
1436 Safefree (self->face2tile); 1581 Safefree (self->face2tile);
1437 Safefree (self->tex); 1582 Safefree (self->tex);
1438 Safefree (self); 1583 Safefree (self);
1439} 1584}
1440 1585
1441void 1586void
1442resize (CFPlus::Map self, int map_width, int map_height) 1587resize (DC::Map self, int map_width, int map_height)
1443 CODE: 1588 CODE:
1444 self->w = map_width; 1589 self->w = map_width;
1445 self->h = map_height; 1590 self->h = map_height;
1446 1591
1447void 1592void
1448clear (CFPlus::Map self) 1593clear (DC::Map self)
1449 CODE: 1594 CODE:
1450 map_clear (self); 1595 map_clear (self);
1451 1596
1452void 1597void
1453set_tileid (CFPlus::Map self, int face, int tile) 1598set_tileid (DC::Map self, int face, int tile)
1454 CODE: 1599 CODE:
1455{ 1600{
1456 need_facenum (self, face); self->face2tile [face] = tile; 1601 need_facenum (self, face); self->face2tile [face] = tile;
1457 need_texid (self, tile); 1602 need_texid (self, tile);
1458} 1603}
1459 1604
1460void 1605void
1461set_smooth (CFPlus::Map self, int face, int smooth, int level) 1606set_smooth (DC::Map self, int face, int smooth, int level)
1462 CODE: 1607 CODE:
1463{ 1608{
1464 tileid texid; 1609 tileid texid;
1465 maptex *tex; 1610 maptex *tex;
1466 1611
1479 tex->smoothtile = self->face2tile [smooth]; 1624 tex->smoothtile = self->face2tile [smooth];
1480 tex->smoothlevel = level; 1625 tex->smoothlevel = level;
1481} 1626}
1482 1627
1483void 1628void
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) 1629set_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: 1630 CODE:
1486{ 1631{
1487 need_texid (self, texid); 1632 need_texid (self, texid);
1488 1633
1489 { 1634 {
1509 // from transparent color bleeding and ugly wrapping effects. 1654 // from transparent color bleeding and ugly wrapping effects.
1510 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1655 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1511} 1656}
1512 1657
1513int 1658int
1514ox (CFPlus::Map self) 1659ox (DC::Map self)
1515 ALIAS: 1660 ALIAS:
1516 oy = 1 1661 oy = 1
1517 x = 2 1662 x = 2
1518 y = 3 1663 y = 3
1519 w = 4 1664 w = 4
1530 } 1675 }
1531 OUTPUT: 1676 OUTPUT:
1532 RETVAL 1677 RETVAL
1533 1678
1534void 1679void
1535scroll (CFPlus::Map self, int dx, int dy) 1680scroll (DC::Map self, int dx, int dy)
1536 CODE: 1681 CODE:
1537{ 1682{
1538 if (dx > 0) 1683 if (dx > 0)
1539 map_blank (self, self->x, self->y, dx, self->h); 1684 map_blank (self, self->x, self->y, dx, self->h);
1540 else if (dx < 0) 1685 else if (dx < 0)
1556 self->y += MAP_EXTEND_Y; 1701 self->y += MAP_EXTEND_Y;
1557 } 1702 }
1558} 1703}
1559 1704
1560SV * 1705SV *
1561map1a_update (CFPlus::Map self, SV *data_, int extmap) 1706map1a_update (DC::Map self, SV *data_, int extmap)
1562 CODE: 1707 CODE:
1563{ 1708{
1564 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1709 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1565 uint8_t *data_end = (uint8_t *)SvEND (data_); 1710 uint8_t *data_end = (uint8_t *)SvEND (data_);
1566 mapcell *cell; 1711 mapcell *cell;
1594 uint8_t ext, cmd; 1739 uint8_t ext, cmd;
1595 1740
1596 do 1741 do
1597 { 1742 {
1598 ext = *data++; 1743 ext = *data++;
1599 cmd = ext & 0x3f; 1744 cmd = ext & 0x7f;
1600 1745
1601 if (cmd < 4) 1746 if (cmd < 4)
1602 cell->darkness = 255 - ext * 64 + 1; 1747 cell->darkness = 255 - ext * 64 + 1;
1603 else if (cmd == 5) // health 1748 else if (cmd == 5) // health
1604 { 1749 {
1607 } 1752 }
1608 else if (cmd == 6) // monster width 1753 else if (cmd == 6) // monster width
1609 cell->stat_width = *data++ + 1; 1754 cell->stat_width = *data++ + 1;
1610 else if (cmd == 0x47) 1755 else if (cmd == 0x47)
1611 { 1756 {
1612 if (*data == 4) 1757 if (*data == 1) cell->player = data [1];
1613 ; // decode player count 1758 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1759 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1760 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1614 1761
1615 data += *data + 1; 1762 data += *data + 1;
1616 } 1763 }
1617 else if (cmd == 8) // cell flags 1764 else if (cmd == 8) // cell flags
1618 cell->flags = *data++; 1765 cell->flags = *data++;
1648 } 1795 }
1649 } 1796 }
1650 } 1797 }
1651 } 1798 }
1652 else 1799 else
1653 cell->darkness = 0; 1800 CELL_CLEAR (cell);
1654 } 1801 }
1655} 1802}
1656 OUTPUT: 1803 OUTPUT:
1657 RETVAL 1804 RETVAL
1658 1805
1659SV * 1806SV *
1660mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1807mapmap (DC::Map self, int x0, int y0, int w, int h)
1661 CODE: 1808 CODE:
1662{ 1809{
1663 int x1, x; 1810 int x1, x;
1664 int y1, y; 1811 int y1, y;
1665 int z; 1812 int z;
1710} 1857}
1711 OUTPUT: 1858 OUTPUT:
1712 RETVAL 1859 RETVAL
1713 1860
1714void 1861void
1715draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1862draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1716 CODE: 1863 CODE:
1717{ 1864{
1865 int x, y, z;
1866
1718 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1867 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1719 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1868 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) 1869 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1721 smooth_key skey; 1870 smooth_key skey;
1722 int x, y, z; 1871 int pl_x, pl_y;
1723 int last_name; 1872 maptex pl_tex;
1873 rc_t *rc = rc_alloc ();
1874 rc_key_t key;
1875 rc_array_t *arr;
1876
1877 pl_tex.name = 0;
1724 1878
1725 // thats current max. sorry. 1879 // thats current max. sorry.
1726 if (sw > 255) sw = 255; 1880 if (sw > 255) sw = 255;
1727 if (sh > 255) sh = 255; 1881 if (sh > 255) sh = 255;
1728 1882
1729 // clear key, in case of extra padding 1883 // clear key, in case of extra padding
1730 memset (&skey, 0, sizeof (skey)); 1884 memset (&skey, 0, sizeof (skey));
1731 1885
1732 glColor4ub (255, 255, 255, 255); 1886 memset (&key, 0, sizeof (key));
1733 1887 key.r = 255;
1734 glEnable (GL_BLEND); 1888 key.g = 255;
1735 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1889 key.b = 255;
1736 glEnable (GL_TEXTURE_2D); 1890 key.a = 255;
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1891 key.mode = GL_QUADS;
1738 1892 key.format = GL_T2F_V3F;
1739 glBegin (GL_QUADS);
1740
1741 last_name = -1; 1893 key.texname = -1;
1742 1894
1743 mx += self->x; 1895 mx += self->x;
1744 my += self->y; 1896 my += self->y;
1745 1897
1746 // first pass: determine smooth_max 1898 // first pass: determine smooth_max
1762 MAX (self->tex [cell->tile [0]].smoothlevel, 1914 MAX (self->tex [cell->tile [0]].smoothlevel,
1763 MAX (self->tex [cell->tile [1]].smoothlevel, 1915 MAX (self->tex [cell->tile [1]].smoothlevel,
1764 self->tex [cell->tile [2]].smoothlevel)); 1916 self->tex [cell->tile [2]].smoothlevel));
1765 } 1917 }
1766 } 1918 }
1919
1920 glEnable (GL_BLEND);
1921 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1922 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1767 1923
1768 for (z = 0; z <= 2; z++) 1924 for (z = 0; z <= 2; z++)
1769 { 1925 {
1770 memset (smooth_level, 0, sizeof (smooth_level)); 1926 memset (smooth_level, 0, sizeof (smooth_level));
1771 1927
1781 tileid tile = cell->tile [z]; 1937 tileid tile = cell->tile [z];
1782 1938
1783 if (tile) 1939 if (tile)
1784 { 1940 {
1785 maptex tex = self->tex [tile]; 1941 maptex tex = self->tex [tile];
1786 int px, py; 1942 int px = (x + 1) * T - tex.w;
1943 int py = (y + 1) * T - tex.h;
1787 1944
1788 // suppressing texture state switches here
1789 // is only moderately effective, but worth the extra effort
1790 if (last_name != tex.name) 1945 if (key.texname != tex.name)
1791 { 1946 {
1792 if (!tex.name) 1947 if (!tex.name)
1793 tex = self->tex [2]; /* missing, replace by noface */ 1948 tex = self->tex [2]; /* missing, replace by noface */
1794 1949
1795 glEnd (); 1950 key.texname = tex.name;
1796 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1951 arr = rc_array (rc, &key);
1797 glBegin (GL_QUADS);
1798 } 1952 }
1799 1953
1800 px = (x + 1) * T - tex.w; 1954 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 { 1955 {
1956 pl_x = px;
1957 pl_y = py;
1958 pl_tex = tex;
1959 continue;
1960 }
1961
1962 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1963 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1964 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1965 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1966
1967 if (expect_false (cell->flags) && expect_false (z == 2))
1968 {
1969 // overlays such as the speech bubble, probably more to come
1810 if (cell->flags & 1) 1970 if (cell->flags & 1)
1811 { 1971 {
1812 maptex tex = self->tex [1]; 1972 maptex tex = self->tex [1];
1813 int px = x * T + T * 2 / 32; 1973 int px = x * T + T * 2 / 32;
1814 int py = y * T - T * 6 / 32; 1974 int py = y * T - T * 6 / 32;
1815 1975
1976 if (tex.name)
1816 glEnd (); 1977 {
1817 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1978 if (key.texname != tex.name)
1979 {
1980 key.texname = tex.name;
1981 arr = rc_array (rc, &key);
1982 }
1983
1984 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1985 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1986 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1987 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1818 glBegin (GL_QUADS); 1988 }
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 } 1989 }
1825 } 1990 }
1826 1991
1827 // update smooth hash 1992 // update smooth hash
1828 if (tex.smoothtile) 1993 if (tex.smoothtile)
1864 } 2029 }
1865 } 2030 }
1866 } 2031 }
1867 } 2032 }
1868 2033
2034 rc_draw (rc);
2035 rc_clear (rc);
2036
1869 // go through all smoothlevels, lowest to highest, then draw. 2037 // go through all smoothlevels, lowest to highest, then draw.
1870 // this is basically counting sort 2038 // this is basically counting sort
1871 { 2039 {
1872 int w, b; 2040 int w, b;
1873 2041
2042 glEnable (GL_TEXTURE_2D);
2043 glBegin (GL_QUADS);
1874 for (w = 0; w < 256 / 32; ++w) 2044 for (w = 0; w < 256 / 32; ++w)
1875 { 2045 {
1876 uint32_t smask = smooth_level [w]; 2046 uint32_t smask = smooth_level [w];
1877 if (smask) 2047 if (smask)
1878 for (b = 0; b < 32; ++b) 2048 for (b = 0; b < 32; ++b)
1897 int border = bits & 15; 2067 int border = bits & 15;
1898 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2068 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1899 float dx = tex.s * .0625f; // 16 images/row 2069 float dx = tex.s * .0625f; // 16 images/row
1900 float dy = tex.t * .5f ; // 2 images/column 2070 float dy = tex.t * .5f ; // 2 images/column
1901 2071
1902 // this time naively avoiding texture state changes
1903 // save gobs of state changes.
1904 if (last_name != tex.name) 2072 if (tex.name)
1905 { 2073 {
2074 // this time avoiding texture state changes
2075 // save gobs of state changes.
1906 if (!tex.name) 2076 if (key.texname != tex.name)
1907 continue; // smoothing not yet available 2077 {
1908
1909 glEnd (); 2078 glEnd ();
1910 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2079 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1911 glBegin (GL_QUADS); 2080 glBegin (GL_QUADS);
1912 } 2081 }
1913 2082
1914 if (border) 2083 if (border)
1915 { 2084 {
1916 float ox = border * dx; 2085 float ox = border * dx;
1917 2086
1918 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2087 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1919 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2088 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1920 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2089 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1921 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2090 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1922 } 2091 }
1923 2092
1924 if (corner) 2093 if (corner)
1925 { 2094 {
1926 float ox = corner * dx; 2095 float ox = corner * dx;
1927 2096
1928 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2097 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1929 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2098 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1930 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2099 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1931 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2100 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2101 }
1932 } 2102 }
1933 } 2103 }
1934 } 2104 }
1935 } 2105 }
1936 } 2106 }
2107
2108 glEnd ();
2109 glDisable (GL_TEXTURE_2D);
2110 key.texname = -1;
1937 } 2111 }
1938 2112
1939 hv_clear (smooth); 2113 hv_clear (smooth);
1940 } 2114 }
1941 2115
1942 glEnd (); 2116 if (pl_tex.name)
2117 {
2118 maptex tex = pl_tex;
2119 int px = pl_x + sdx;
2120 int py = pl_y + sdy;
1943 2121
1944 glDisable (GL_TEXTURE_2D); 2122 key.texname = tex.name;
2123 arr = rc_array (rc, &key);
2124
2125 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2126 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2127 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2128 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2129
2130 rc_draw (rc);
2131 }
2132
1945 glDisable (GL_BLEND); 2133 glDisable (GL_BLEND);
2134 rc_free (rc);
1946 2135
1947 // top layer: overlays such as the health bar 2136 // top layer: overlays such as the health bar
1948 for (y = 0; y < sh; y++) 2137 for (y = 0; y < sh; y++)
1949 if (0 <= y + my && y + my < self->rows) 2138 if (0 <= y + my && y + my < self->rows)
1950 { 2139 {
1975 } 2164 }
1976 } 2165 }
1977} 2166}
1978 2167
1979void 2168void
1980draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2169draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1981 CODE: 2170 CODE:
1982{ 2171{
1983 static float color[16][3] = { 2172 static float color[16][3] = {
1984 { 0.00F, 0.00F, 0.00F }, 2173 { 0.00F, 0.00F, 0.00F },
1985 { 1.00F, 1.00F, 1.00F }, 2174 { 1.00F, 1.00F, 1.00F },
2035 glDisable (GL_BLEND); 2224 glDisable (GL_BLEND);
2036 glDisable (GL_TEXTURE_2D); 2225 glDisable (GL_TEXTURE_2D);
2037} 2226}
2038 2227
2039void 2228void
2040fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2229fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2041 PPCODE: 2230 PPCODE:
2042{ 2231{
2043 int x, y; 2232 int x, y;
2044 int sw1 = sw + 2; 2233 int sw1 = sw + 2;
2045 int sh1 = sh + 2; 2234 int sh1 = sh + 2;
2053 SvCUR_set (darkness3_sv, sw34 * sh3); 2242 SvCUR_set (darkness3_sv, sw34 * sh3);
2054 2243
2055 mx += self->x - 1; 2244 mx += self->x - 1;
2056 my += self->y - 1; 2245 my += self->y - 1;
2057 2246
2058 memset (darkness1, 255, sw1 * sh1); 2247 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2059 2248
2060 for (y = 0; y < sh1; y++) 2249 for (y = 0; y < sh1; y++)
2061 if (0 <= y + my && y + my < self->rows) 2250 if (0 <= y + my && y + my < self->rows)
2062 { 2251 {
2063 maprow *row = self->row + (y + my); 2252 maprow *row = self->row + (y + my);
2116 PUSHs (sv_2mortal (newSViv (sh3))); 2305 PUSHs (sv_2mortal (newSViv (sh3)));
2117 PUSHs (darkness3_sv); 2306 PUSHs (darkness3_sv);
2118} 2307}
2119 2308
2120SV * 2309SV *
2121get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2310get_rect (DC::Map self, int x0, int y0, int w, int h)
2122 CODE: 2311 CODE:
2123{ 2312{
2124 int x, y, x1, y1; 2313 int x, y, x1, y1;
2125 SV *data_sv = newSV (w * h * 7 + 5); 2314 SV *data_sv = newSV (w * h * 7 + 5);
2126 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2315 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2183 else 2372 else
2184 *data++ = 0; 2373 *data++ = 0;
2185 } 2374 }
2186 } 2375 }
2187 2376
2377 /* if size is w*h + 5 then no data has been found */
2378 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2379 {
2188 SvPOK_only (data_sv); 2380 SvPOK_only (data_sv);
2189 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2381 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2382 }
2383
2190 RETVAL = data_sv; 2384 RETVAL = data_sv;
2191} 2385}
2192 OUTPUT: 2386 OUTPUT:
2193 RETVAL 2387 RETVAL
2194 2388
2195void 2389void
2196set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2390set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2197 PPCODE: 2391 PPCODE:
2198{ 2392{
2199 int x, y, z; 2393 int x, y, z;
2200 int w, h; 2394 int w, h;
2201 int x1, y1; 2395 int x1, y1;
2396 STRLEN len;
2397 uint8_t *data, *end;
2398
2399 len = SvLEN (data_sv);
2400 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2401 data = SvPVbyte_nolen (data_sv);
2402 end = data + len + 8;
2403
2404 if (len < 5)
2405 XSRETURN_EMPTY;
2202 2406
2203 if (*data++ != 0) 2407 if (*data++ != 0)
2204 return; /* version mismatch */ 2408 XSRETURN_EMPTY; /* version mismatch */
2205 2409
2206 w = *data++ << 8; w |= *data++; 2410 w = *data++ << 8; w |= *data++;
2207 h = *data++ << 8; h |= *data++; 2411 h = *data++ << 8; h |= *data++;
2208 2412
2209 // we need to do this 'cause we don't keep an absolute coord system for rows 2413 // we need to do this 'cause we don't keep an absolute coord system for rows
2221 { 2425 {
2222 maprow *row = map_get_row (self, y); 2426 maprow *row = map_get_row (self, y);
2223 2427
2224 for (x = x0; x < x1; x++) 2428 for (x = x0; x < x1; x++)
2225 { 2429 {
2430 uint8_t flags;
2431
2432 if (data + 7 >= end)
2433 XSRETURN_EMPTY;
2434
2226 uint8_t flags = *data++; 2435 flags = *data++;
2227 2436
2228 if (flags) 2437 if (flags)
2229 { 2438 {
2230 mapcell *cell = row_get_cell (row, x); 2439 mapcell *cell = row_get_cell (row, x);
2231 tileid tile[3] = { 0, 0, 0 }; 2440 tileid tile[3] = { 0, 0, 0 };
2234 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2443 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2235 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2444 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2236 2445
2237 if (cell->darkness == 0) 2446 if (cell->darkness == 0)
2238 { 2447 {
2239 cell->darkness = 0; 2448 /*cell->darkness = 0;*/
2449 EXTEND (SP, 3);
2240 2450
2241 for (z = 0; z <= 2; z++) 2451 for (z = 0; z <= 2; z++)
2242 { 2452 {
2243 tileid t = tile [z]; 2453 tileid t = tile [z];
2244 2454
2245 if (t >= self->texs || (t && !self->tex [t].name)) 2455 if (t >= self->texs || (t && !self->tex [t].name))
2246 { 2456 {
2247 XPUSHs (sv_2mortal (newSViv (t))); 2457 PUSHs (sv_2mortal (newSViv (t)));
2248 need_texid (self, t); 2458 need_texid (self, t);
2249 } 2459 }
2250 2460
2251 cell->tile [z] = t; 2461 cell->tile [z] = t;
2252 } 2462 }
2254 } 2464 }
2255 } 2465 }
2256 } 2466 }
2257} 2467}
2258 2468
2259MODULE = CFPlus PACKAGE = CFPlus::RW 2469MODULE = Deliantra::Client PACKAGE = DC::RW
2260 2470
2261CFPlus::RW 2471DC::RW
2262new (SV *class, SV *data_sv) 2472new (SV *class, SV *data_sv)
2263 CODE: 2473 CODE:
2264{ 2474{
2265 STRLEN datalen; 2475 STRLEN datalen;
2266 char *data = SvPVbyte (data_sv, datalen); 2476 char *data = SvPVbyte (data_sv, datalen);
2268 RETVAL = SDL_RWFromConstMem (data, datalen); 2478 RETVAL = SDL_RWFromConstMem (data, datalen);
2269} 2479}
2270 OUTPUT: 2480 OUTPUT:
2271 RETVAL 2481 RETVAL
2272 2482
2273CFPlus::RW 2483DC::RW
2274new_from_file (SV *class, const char *path, const char *mode = "rb") 2484new_from_file (SV *class, const char *path, const char *mode = "rb")
2275 CODE: 2485 CODE:
2276 RETVAL = SDL_RWFromFile (path, mode); 2486 RETVAL = SDL_RWFromFile (path, mode);
2277 OUTPUT: 2487 OUTPUT:
2278 RETVAL 2488 RETVAL
2279 2489
2280# fails on win32: 2490# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '(' 2491# dc.xs(2268) : error C2059: syntax error : '('
2282#void 2492#void
2283#close (CFPlus::RW self) 2493#close (DC::RW self)
2284# CODE: 2494# CODE:
2285# (self->(close)) (self); 2495# (self->(close)) (self);
2286 2496
2287MODULE = CFPlus PACKAGE = CFPlus::Channel 2497MODULE = Deliantra::Client PACKAGE = DC::Channel
2288 2498
2289PROTOTYPES: DISABLE 2499PROTOTYPES: DISABLE
2290 2500
2291CFPlus::Channel 2501DC::Channel
2292find () 2502find ()
2293 CODE: 2503 CODE:
2294{ 2504{
2295 RETVAL = Mix_GroupAvailable (-1); 2505 RETVAL = Mix_GroupAvailable (-1);
2296 2506
2309} 2519}
2310 OUTPUT: 2520 OUTPUT:
2311 RETVAL 2521 RETVAL
2312 2522
2313void 2523void
2314halt (CFPlus::Channel self) 2524halt (DC::Channel self)
2315 CODE: 2525 CODE:
2316 Mix_HaltChannel (self); 2526 Mix_HaltChannel (self);
2317 2527
2318void 2528void
2319expire (CFPlus::Channel self, int ticks = -1) 2529expire (DC::Channel self, int ticks = -1)
2320 CODE: 2530 CODE:
2321 Mix_ExpireChannel (self, ticks); 2531 Mix_ExpireChannel (self, ticks);
2322 2532
2323void 2533void
2324fade_out (CFPlus::Channel self, int ticks = -1) 2534fade_out (DC::Channel self, int ticks = -1)
2325 CODE: 2535 CODE:
2326 Mix_FadeOutChannel (self, ticks); 2536 Mix_FadeOutChannel (self, ticks);
2327 2537
2328int 2538int
2329volume (CFPlus::Channel self, int volume) 2539volume (DC::Channel self, int volume)
2330 CODE: 2540 CODE:
2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2541 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332 OUTPUT: 2542 OUTPUT:
2333 RETVAL 2543 RETVAL
2334 2544
2335void 2545void
2336unregister_all_effects (CFPlus::Channel self) 2546unregister_all_effects (DC::Channel self)
2337 CODE: 2547 CODE:
2338 Mix_UnregisterAllEffects (self); 2548 Mix_UnregisterAllEffects (self);
2339 2549
2340void 2550void
2341set_panning (CFPlus::Channel self, int left, int right) 2551set_panning (DC::Channel self, int left, int right)
2342 CODE: 2552 CODE:
2343 left = CLAMP (left , 0, 255); 2553 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255); 2554 right = CLAMP (right, 0, 255);
2345 Mix_SetPanning (self, left, right); 2555 Mix_SetPanning (self, left, right);
2346 2556
2347void 2557void
2348set_distance (CFPlus::Channel self, int distance) 2558set_distance (DC::Channel self, int distance)
2349 CODE: 2559 CODE:
2350 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2560 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351 2561
2352void 2562void
2353set_position (CFPlus::Channel self, int angle, int distance) 2563set_position (DC::Channel self, int angle, int distance)
2354 CODE: 2564 CODE:
2355 2565
2356void 2566void
2357set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2567set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358 CODE: 2568 CODE:
2359{ 2569{
2360 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2570 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); 2571 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2362 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2572 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363} 2573}
2364 2574
2365void 2575void
2366set_reverse_stereo (CFPlus::Channel self, int flip) 2576set_reverse_stereo (DC::Channel self, int flip)
2367 CODE: 2577 CODE:
2368 Mix_SetReverseStereo (self, flip); 2578 Mix_SetReverseStereo (self, flip);
2369 2579
2370MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2580MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371 2581
2372PROTOTYPES: DISABLE 2582PROTOTYPES: DISABLE
2373 2583
2374CFPlus::MixChunk 2584DC::MixChunk
2375new (SV *class, CFPlus::RW rwops) 2585new (SV *class, DC::RW rwops)
2376 CODE: 2586 CODE:
2377 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2587 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378 OUTPUT: 2588 OUTPUT:
2379 RETVAL 2589 RETVAL
2380 2590
2381void 2591void
2382DESTROY (CFPlus::MixChunk self) 2592DESTROY (DC::MixChunk self)
2383 CODE: 2593 CODE:
2384 Mix_FreeChunk (self); 2594 Mix_FreeChunk (self);
2385 2595
2386int 2596int
2387volume (CFPlus::MixChunk self, int volume = -1) 2597volume (DC::MixChunk self, int volume = -1)
2388 CODE: 2598 CODE:
2389 if (items > 1) 2599 if (items > 1)
2390 volume = CLAMP (volume, 0, 128); 2600 volume = CLAMP (volume, 0, 128);
2391 RETVAL = Mix_VolumeChunk (self, volume); 2601 RETVAL = Mix_VolumeChunk (self, volume);
2392 OUTPUT: 2602 OUTPUT:
2393 RETVAL 2603 RETVAL
2394 2604
2395CFPlus::Channel 2605DC::Channel
2396play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2606play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2397 CODE: 2607 CODE:
2398{ 2608{
2399 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2609 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400 2610
2401 if (RETVAL < 0) 2611 if (RETVAL < 0)
2408 } 2618 }
2409} 2619}
2410 OUTPUT: 2620 OUTPUT:
2411 RETVAL 2621 RETVAL
2412 2622
2413MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2623MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2414 2624
2415int 2625int
2416volume (int volume = -1) 2626volume (int volume = -1)
2417 PROTOTYPE: ;$ 2627 PROTOTYPE: ;$
2418 CODE: 2628 CODE:
2430void 2640void
2431halt () 2641halt ()
2432 CODE: 2642 CODE:
2433 Mix_HaltMusic (); 2643 Mix_HaltMusic ();
2434 2644
2435CFPlus::MixMusic 2645DC::MixMusic
2436new (SV *class, CFPlus::RW rwops) 2646new (SV *class, DC::RW rwops)
2437 CODE: 2647 CODE:
2438 RETVAL = Mix_LoadMUS_RW (rwops); 2648 RETVAL = Mix_LoadMUS_RW (rwops);
2439 OUTPUT: 2649 OUTPUT:
2440 RETVAL 2650 RETVAL
2441 2651
2442void 2652void
2443DESTROY (CFPlus::MixMusic self) 2653DESTROY (DC::MixMusic self)
2444 CODE: 2654 CODE:
2445 Mix_FreeMusic (self); 2655 Mix_FreeMusic (self);
2446 2656
2447int 2657int
2448play (CFPlus::MixMusic self, int loops = -1) 2658play (DC::MixMusic self, int loops = -1)
2449 CODE: 2659 CODE:
2450 RETVAL = Mix_PlayMusic (self, loops); 2660 RETVAL = Mix_PlayMusic (self, loops);
2451 OUTPUT: 2661 OUTPUT:
2452 RETVAL 2662 RETVAL
2453 2663
2454void 2664void
2455fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2665fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456 CODE: 2666 CODE:
2457 Mix_FadeInMusicPos (self, loops, ms, position); 2667 Mix_FadeInMusicPos (self, loops, ms, position);
2458 2668
2459MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2669MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460 2670
2461PROTOTYPES: ENABLE 2671PROTOTYPES: ENABLE
2462 2672
2463BOOT: 2673BOOT:
2464{ 2674{
2465 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2675 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466 static const struct { 2676 static const struct {
2467 const char *name; 2677 const char *name;
2468 IV iv; 2678 IV iv;
2469 } *civ, const_iv[] = { 2679 } *civ, const_iv[] = {
2470# define const_iv(name) { # name, (IV)name } 2680# define const_iv(name) { # name, (IV)name }
2505 const_iv (GL_INTENSITY), 2715 const_iv (GL_INTENSITY),
2506 const_iv (GL_LUMINANCE), 2716 const_iv (GL_LUMINANCE),
2507 const_iv (GL_LUMINANCE_ALPHA), 2717 const_iv (GL_LUMINANCE_ALPHA),
2508 const_iv (GL_FLOAT), 2718 const_iv (GL_FLOAT),
2509 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2719 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2720 const_iv (GL_COMPRESSED_ALPHA_ARB),
2721 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2722 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2723 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2724 const_iv (GL_COMPRESSED_RGB_ARB),
2725 const_iv (GL_COMPRESSED_RGBA_ARB),
2510 const_iv (GL_COMPILE), 2726 const_iv (GL_COMPILE),
2511 const_iv (GL_PROXY_TEXTURE_1D), 2727 const_iv (GL_PROXY_TEXTURE_1D),
2512 const_iv (GL_PROXY_TEXTURE_2D), 2728 const_iv (GL_PROXY_TEXTURE_2D),
2513 const_iv (GL_TEXTURE_1D), 2729 const_iv (GL_TEXTURE_1D),
2514 const_iv (GL_TEXTURE_2D), 2730 const_iv (GL_TEXTURE_2D),
2553 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2769 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554 const_iv (GL_POINT_SMOOTH_HINT), 2770 const_iv (GL_POINT_SMOOTH_HINT),
2555 const_iv (GL_LINE_SMOOTH_HINT), 2771 const_iv (GL_LINE_SMOOTH_HINT),
2556 const_iv (GL_POLYGON_SMOOTH_HINT), 2772 const_iv (GL_POLYGON_SMOOTH_HINT),
2557 const_iv (GL_GENERATE_MIPMAP_HINT), 2773 const_iv (GL_GENERATE_MIPMAP_HINT),
2774 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558 const_iv (GL_FASTEST), 2775 const_iv (GL_FASTEST),
2559 const_iv (GL_DONT_CARE), 2776 const_iv (GL_DONT_CARE),
2560 const_iv (GL_NICEST), 2777 const_iv (GL_NICEST),
2561 const_iv (GL_V2F), 2778 const_iv (GL_V2F),
2562 const_iv (GL_V3F), 2779 const_iv (GL_V3F),
2570 2787
2571 texture_av = newAV (); 2788 texture_av = newAV ();
2572 AvREAL_off (texture_av); 2789 AvREAL_off (texture_av);
2573} 2790}
2574 2791
2792void
2793disable_GL_EXT_blend_func_separate ()
2794 CODE:
2795 gl.BlendFuncSeparate = 0;
2796 gl.BlendFuncSeparateEXT = 0;
2797
2575char * 2798char *
2576gl_vendor () 2799gl_vendor ()
2577 CODE: 2800 CODE:
2578 RETVAL = (char *)glGetString (GL_VENDOR); 2801 RETVAL = (char *)glGetString (GL_VENDOR);
2579 OUTPUT: 2802 OUTPUT:
2700 2923
2701void glRect (float x1, float y1, float x2, float y2) 2924void glRect (float x1, float y1, float x2, float y2)
2702 CODE: 2925 CODE:
2703 glRectf (x1, y1, x2, y2); 2926 glRectf (x1, y1, x2, y2);
2704 2927
2928void glRect_lineloop (float x1, float y1, float x2, float y2)
2929 CODE:
2930 glBegin (GL_LINE_LOOP);
2931 glVertex2f (x1, y1);
2932 glVertex2f (x2, y1);
2933 glVertex2f (x2, y2);
2934 glVertex2f (x1, y2);
2935 glEnd ();
2936
2705PROTOTYPES: ENABLE 2937PROTOTYPES: ENABLE
2706 2938
2707void glBegin (int mode) 2939void glBegin (int mode)
2708 2940
2709void glEnd () 2941void glEnd ()
2741void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2973void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2742 CODE: 2974 CODE:
2743 if (gl.SeparableFilter2D) 2975 if (gl.SeparableFilter2D)
2744 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2976 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745 2977
2746void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2978void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2747 2979
2748void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2980void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2749 2981
2750void glDrawPixels (int width, int height, int format, int type, char *pixels) 2982void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751 2983
2777 3009
2778void glEndList () 3010void glEndList ()
2779 3011
2780void glCallList (int list) 3012void glCallList (int list)
2781 3013
2782MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3014MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2783 3015
2784PROTOTYPES: DISABLE 3016PROTOTYPES: DISABLE
2785 3017
2786void 3018void
2787find_widget (SV *self, NV x, NV y) 3019find_widget (SV *self, NV x, NV y)
2791 XPUSHs (self); 3023 XPUSHs (self);
2792} 3024}
2793 3025
2794BOOT: 3026BOOT:
2795{ 3027{
2796 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3028 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797 3029
2798 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3030 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); 3031 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); 3032 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); 3033 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2802} 3034}
2803 3035
2804void 3036void
2805draw (SV *self) 3037draw (SV *self)
2806 CODE: 3038 CODE:
2810 NV x, y, w, h; 3042 NV x, y, w, h;
2811 SV *draw_x_sv = GvSV (draw_x_gv); 3043 SV *draw_x_sv = GvSV (draw_x_gv);
2812 SV *draw_y_sv = GvSV (draw_y_gv); 3044 SV *draw_y_sv = GvSV (draw_y_gv);
2813 SV *draw_w_sv = GvSV (draw_w_gv); 3045 SV *draw_w_sv = GvSV (draw_w_gv);
2814 SV *draw_h_sv = GvSV (draw_h_gv); 3046 SV *draw_h_sv = GvSV (draw_h_gv);
2815 SV *hover;
2816 double draw_x, draw_y, draw_w, draw_h; 3047 double draw_x, draw_y;
2817 3048
2818 if (!SvROK (self)) 3049 if (!SvROK (self))
2819 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3050 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820 3051
2821 hv = (HV *)SvRV (self); 3052 hv = (HV *)SvRV (self);
2822 3053
2823 if (SvTYPE (hv) != SVt_PVHV) 3054 if (SvTYPE (hv) != SVt_PVHV)
2824 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3055 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825 3056
2826 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3057 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.; 3058 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2828 3059
2829 if (!h || !w) 3060 if (!h || !w)
2849 { 3080 {
2850 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3081 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851 3082
2852 if (svp && SvTRUE (*svp)) 3083 if (svp && SvTRUE (*svp))
2853 { 3084 {
2854 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3085 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2855 glEnable (GL_BLEND); 3086 glEnable (GL_BLEND);
2856 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3087 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857 glBegin (GL_QUADS); 3088 glBegin (GL_QUADS);
2858 glVertex2f (0, 0); 3089 glVertex2f (0, 0);
2859 glVertex2f (w, 0); 3090 glVertex2f (w, 0);
2862 glEnd (); 3093 glEnd ();
2863 glDisable (GL_BLEND); 3094 glDisable (GL_BLEND);
2864 } 3095 }
2865 } 3096 }
2866#if 0 3097#if 0
2867 if ($ENV{CFPLUS_DEBUG} & 1) { 3098 // draw borders, for debugging
2868 glPushMatrix; 3099 glPushMatrix ();
2869 glColor 1, 1, 0, 1; 3100 glColor4f (1., 1., 0., 1.);
2870 glTranslate 0.375, 0.375; 3101 glTranslatef (.5, .5, 0.);
2871 glBegin GL_LINE_LOOP; 3102 glBegin (GL_LINE_LOOP);
2872 glVertex 0 , 0; 3103 glVertex2f (0 , 0);
2873 glVertex $self->{w} - 1, 0; 3104 glVertex2f (w - 1, 0);
2874 glVertex $self->{w} - 1, $self->{h} - 1; 3105 glVertex2f (w - 1, h - 1);
2875 glVertex 0 , $self->{h} - 1; 3106 glVertex2f (0 , h - 1);
2876 glEnd; 3107 glEnd ();
2877 glPopMatrix; 3108 glPopMatrix ();
2878 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879 }
2880#endif 3109#endif
2881 PUSHMARK (SP); 3110 PUSHMARK (SP);
2882 XPUSHs (self); 3111 XPUSHs (self);
2883 PUTBACK; 3112 PUTBACK;
2884 call_method ("_draw", G_VOID | G_DISCARD); 3113 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines