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.209 by root, Sat Jul 21 22:54:52 2007 UTC vs.
Revision 1.263 by root, Fri Jul 18 21:18:42 2008 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
27#include <stdio.h> 32#include <stdio.h>
28#include <stdlib.h> 33#include <stdlib.h>
34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 36
30#include <SDL.h> 37#include <SDL.h>
31#include <SDL_thread.h> 38#include <SDL_thread.h>
32#include <SDL_endian.h> 39#include <SDL_endian.h>
33#include <SDL_image.h> 40#include <SDL_image.h>
38#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
39 46
40#include <glib/gmacros.h> 47#include <glib/gmacros.h>
41 48
42#include <pango/pango.h> 49#include <pango/pango.h>
50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
43 61
44#ifndef _WIN32 62#ifndef _WIN32
45# include <sys/types.h> 63# include <sys/types.h>
46# include <sys/socket.h> 64# include <sys/socket.h>
47# include <netinet/in.h> 65# include <netinet/in.h>
48# include <netinet/tcp.h> 66# include <netinet/tcp.h>
49# include <inttypes.h> 67# include <inttypes.h>
50#endif 68#endif
51 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
52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53 80
54#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
55 82
56#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
58 85
59#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
60 87
61#if 0 88/* mask out modifiers we are not interested in */
62# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
63#else
64# define PARACHUTE 0
65#endif
66 90
67static AV *texture_av; 91static AV *texture_av;
68 92
69static struct 93static struct
70{ 94{
107 av_push (texture_av, (SV *)(size_t)name); 131 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 132 glDeleteTextures (1, &name);
109} 133}
110 134
111#include "texcache.c" 135#include "texcache.c"
136#include "rendercache.c"
112 137
113#include "pango-font.c" 138#include "pango-font.c"
114#include "pango-fontmap.c" 139#include "pango-fontmap.c"
115#include "pango-render.c" 140#include "pango-render.c"
116 141
142typedef IV DC__Channel;
143typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 144typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 145typedef Mix_Music *DC__MixMusic;
119 146
120typedef PangoFontDescription *CFPlus__Font; 147typedef PangoFontDescription *DC__Font;
121 148
122static int 149static int
123shape_attr_p (PangoLayoutRun *run) 150shape_attr_p (PangoLayoutRun *run)
124{ 151{
125 GSList *attrs = run->item->analysis.extra_attrs; 152 GSList *attrs = run->item->analysis.extra_attrs;
139 166
140typedef struct cf_layout { 167typedef struct cf_layout {
141 PangoLayout *pl; 168 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 169 float r, g, b, a; // default color for rgba mode
143 int base_height; 170 int base_height;
144 CFPlus__Font font; 171 DC__Font font;
172 rc_t *rc;
145} *CFPlus__Layout; 173} *DC__Layout;
146 174
147static CFPlus__Font default_font; 175static DC__Font default_font;
148static PangoContext *opengl_context; 176static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
150 178
151static void 179static void
152substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
157#endif 185#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 187}
160 188
161static void 189static void
162layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
163{ 191{
164 /* 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
165 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
166 */ 194 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
168 196
169 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 199
172 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
173} 201}
174 202
175static void 203static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 205{
178 PangoRectangle rect; 206 PangoRectangle rect;
179 207
180 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
192 220
193typedef uint16_t tileid; 221typedef uint16_t tileid;
194typedef uint16_t faceid; 222typedef uint16_t faceid;
195 223
196typedef struct { 224typedef struct {
197 int name; 225 GLuint name;
198 int w, h; 226 int w, h;
199 float s, t; 227 float s, t;
200 uint8_t r, g, b, a; 228 uint8_t r, g, b, a;
201 tileid smoothtile; 229 tileid smoothtile;
202 uint8_t smoothlevel; 230 uint8_t smoothlevel;
220 int faces; tileid *face2tile; // [faceid] 248 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 249 int texs; maptex *tex; // [tileid]
222 250
223 int32_t rows; 251 int32_t rows;
224 maprow *row; 252 maprow *row;
225} *CFPlus__Map; 253} *DC__Map;
226 254
227static char * 255static char *
228prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
229{ 257{
230 char *p; 258 char *p;
268 self->texs *= 2; 296 self->texs *= 2;
269 } 297 }
270} 298}
271 299
272static maprow * 300static maprow *
273map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
274{ 302{
275 if (0 > y) 303 if (0 > y)
276 { 304 {
277 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
316 344
317 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
318} 346}
319 347
320static mapcell * 348static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
322{ 350{
323 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
324} 352}
325 353
326static void 354static void
327map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
328{ 356{
329 int r; 357 int r;
330 358
331 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
340 self->row = 0; 368 self->row = 0;
341 self->rows = 0; 369 self->rows = 0;
342} 370}
343 371
344static void 372static void
345map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 373map_blank (DC__Map self, int x0, int y0, int w, int h)
346{ 374{
347 int x, y; 375 int x, y;
348 maprow *row; 376 maprow *row;
349 mapcell *cell; 377 mapcell *cell;
350 378
429 n |= n >> 16; 457 n |= n >> 16;
430 458
431 return n + 1; 459 return n + 1;
432} 460}
433 461
462static unsigned int
463popcount (unsigned int n)
464{
465 n -= (n >> 1) & 0x55555555U;
466 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
467 n = ((n >> 4) + n) & 0x0f0f0f0fU;
468 n *= 0x01010101U;
469
470 return n >> 24;
471}
472
434/* SDL should provide this, really. */ 473/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 474#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 475#define SDLK_MODIFIER_MAX 314
437 476
438/******************************************************************************/ 477/******************************************************************************/
476 return 0; 515 return 0;
477 516
478 return 1; 517 return 1;
479} 518}
480 519
481MODULE = CFPlus PACKAGE = CFPlus 520MODULE = Deliantra::Client PACKAGE = DC
482 521
483PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
484 523
485BOOT: 524BOOT:
486{ 525{
487 HV *stash = gv_stashpv ("CFPlus", 1); 526 HV *stash = gv_stashpv ("DC", 1);
488 static const struct { 527 static const struct {
489 const char *name; 528 const char *name;
490 IV iv; 529 IV iv;
491 } *civ, const_iv[] = { 530 } *civ, const_iv[] = {
492# define const_iv(name) { # name, (IV)name } 531# define const_iv(name) { # name, (IV)name }
514 553
515 const_iv (SDL_APPINPUTFOCUS), 554 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS), 555 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE), 556 const_iv (SDL_APPACTIVE),
518 557
558 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST),
519 const_iv (SDLK_KP0), 560 const_iv (SDLK_KP0),
520 const_iv (SDLK_KP1), 561 const_iv (SDLK_KP1),
521 const_iv (SDLK_KP2), 562 const_iv (SDLK_KP2),
522 const_iv (SDLK_KP3), 563 const_iv (SDLK_KP3),
523 const_iv (SDLK_KP4), 564 const_iv (SDLK_KP4),
595 const_iv (KMOD_LMETA), 636 const_iv (KMOD_LMETA),
596 const_iv (KMOD_RMETA), 637 const_iv (KMOD_RMETA),
597 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
598 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
599 const_iv (KMOD_MODE), 640 const_iv (KMOD_MODE),
641
642 const_iv (MIX_DEFAULT_FORMAT),
643
644 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO),
647 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD),
600# undef const_iv 652# undef const_iv
601 }; 653 };
602 654
603 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 655 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 656 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
622 674
623NV floor (NV x) 675NV floor (NV x)
624 676
625NV ceil (NV x) 677NV ceil (NV x)
626 678
679IV minpot (UV n)
680
681IV popcount (UV n)
682
627void 683void
628pango_init () 684pango_init ()
629 CODE: 685 CODE:
630{ 686{
631 opengl_fontmap = pango_opengl_font_map_new (); 687 opengl_fontmap = pango_opengl_font_map_new ();
632 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 688 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
633 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 689 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
690 /*pango_context_set_font_description (opengl_context, default_font);*/
691#if PANGO_VERSION_CHECK (1, 15, 2)
692 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
693 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
694#endif
634} 695}
635 696
636char *
637SDL_GetError () 697char *SDL_GetError ()
638 698
639int 699int SDL_Init (U32 flags)
640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
641 700
642void 701int SDL_InitSubSystem (U32 flags)
702
703void SDL_QuitSubSystem (U32 flags)
704
643SDL_Quit () 705void SDL_Quit ()
644 706
645void 707void
646SDL_ListModes (int rgb, int alpha) 708SDL_ListModes (int rgb, int alpha)
647 PPCODE: 709 PPCODE:
648{ 710{
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 732 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 733
672 if (m && m != (SDL_Rect **)-1) 734 if (m && m != (SDL_Rect **)-1)
673 while (*m) 735 while (*m)
674 { 736 {
675 if ((*m)->w >= 640 && (*m)->h >= 480)
676 {
677 AV *av = newAV (); 737 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 738 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 739 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 740 av_push (av, newSViv (rgb));
681 av_push (av, newSViv (alpha)); 741 av_push (av, newSViv (alpha));
682 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 742 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
683 }
684 743
685 ++m; 744 ++m;
686 } 745 }
687} 746}
688 747
704 763
705 if (RETVAL) 764 if (RETVAL)
706 { 765 {
707 av_clear (texture_av); 766 av_clear (texture_av);
708 767
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 768 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 769#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
711#include "glfunc.h" 770#include "glfunc.h"
712#undef GL_FUNC 771#undef GL_FUNC
713 } 772 }
714} 773}
721char * 780char *
722SDL_GetKeyName (int sym) 781SDL_GetKeyName (int sym)
723 782
724int 783int
725SDL_GetAppState () 784SDL_GetAppState ()
785
786int
787SDL_GetModState ()
726 788
727void 789void
728poll_events () 790poll_events ()
729 PPCODE: 791 PPCODE:
730{ 792{
740 { 802 {
741 case SDL_KEYDOWN: 803 case SDL_KEYDOWN:
742 case SDL_KEYUP: 804 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 805 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 806 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 807 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
746 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 808 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
747 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 809 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 810 break;
749 811
750 case SDL_ACTIVEEVENT: 812 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 813 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
769 x = ev.motion.x; 831 x = ev.motion.x;
770 y = ev.motion.y; 832 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 833 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 834 }
773 835
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 836 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 837 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 838 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 839 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 840 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 841 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 842 }
781 break; 843 break;
782 844
783 case SDL_MOUSEBUTTONDOWN: 845 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 846 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 847 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 848
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 849 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 850 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 851 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 852 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 857 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 858 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 859 break;
798 } 860 }
799 861
800 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 862 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
801 } 863 }
802} 864}
803 865
804int 866int
805Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 867Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 868 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 869 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 870 Mix_ChannelFinished (channel_finished);
809 871
810void 872void
873Mix_QuerySpec ()
874 PPCODE:
875{
876 int freq, channels;
877 Uint16 format;
878
879 if (Mix_QuerySpec (&freq, &format, &channels))
880 {
881 EXTEND (SP, 3);
882 PUSHs (sv_2mortal (newSViv (freq)));
883 PUSHs (sv_2mortal (newSViv (format)));
884 PUSHs (sv_2mortal (newSViv (channels)));
885 }
886}
887
888void
811Mix_CloseAudio () 889Mix_CloseAudio ()
812 890
813int 891int
814Mix_AllocateChannels (int numchans = -1) 892Mix_AllocateChannels (int numchans = -1)
893
894const char *
895Mix_GetError ()
815 896
816void 897void
817lowdelay (int fd, int val = 1) 898lowdelay (int fd, int val = 1)
818 CODE: 899 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 900 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
845 } 926 }
846 } 927 }
847#endif 928#endif
848} 929}
849 930
850void 931int
851add_font (char *file) 932add_font (char *file)
852 CODE: 933 CODE:
853 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 934 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
935 OUTPUT:
936 RETVAL
854 937
855void 938void
856load_image_inline (SV *image_) 939load_image_inline (SV *image_)
857 ALIAS: 940 ALIAS:
858 load_image_file = 1 941 load_image_file = 1
861 STRLEN image_len; 944 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 945 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 946 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 947 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 948 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 949 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 950 : SDL_RWFromConstMem (image, image_len);
868 951
869 if (!rw) 952 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 953 croak ("load_image: %s", SDL_GetError ());
871 954
944void 1027void
945error (char *message) 1028error (char *message)
946 CODE: 1029 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1030 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1031#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1032 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1033#endif
951 1034
952void 1035void
953fatal (char *message) 1036fatal (char *message)
954 CODE: 1037 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1038 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1039#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1040 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1041#endif
959 _exit (1); 1042 _exit (1);
960 1043
961void 1044void
962_exit (int retval = 0) 1045_exit (int retval = 0)
974#if DEBUG 1057#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1058 VALGRIND_DO_LEAK_CHECK;
976#endif 1059#endif
977} 1060}
978 1061
979MODULE = CFPlus PACKAGE = CFPlus::Font 1062MODULE = Deliantra::Client PACKAGE = DC::Font
980 1063
981PROTOTYPES: DISABLE 1064PROTOTYPES: DISABLE
982 1065
983CFPlus::Font 1066DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1067new_from_file (SV *class, char *path, int id = 0)
985 CODE: 1068 CODE:
986{ 1069{
987 int count; 1070 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1071 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
991} 1074}
992 OUTPUT: 1075 OUTPUT:
993 RETVAL 1076 RETVAL
994 1077
995void 1078void
996DESTROY (CFPlus::Font self) 1079DESTROY (DC::Font self)
997 CODE: 1080 CODE:
998 pango_font_description_free (self); 1081 pango_font_description_free (self);
999 1082
1000void 1083void
1001make_default (CFPlus::Font self) 1084make_default (DC::Font self)
1002 PROTOTYPE: $ 1085 PROTOTYPE: $
1003 CODE: 1086 CODE:
1004 default_font = self; 1087 default_font = self;
1005 1088
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1089MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1090
1008PROTOTYPES: DISABLE 1091PROTOTYPES: DISABLE
1009 1092
1010void 1093void
1011reset_glyph_cache () 1094glyph_cache_backup ()
1012 PROTOTYPE: 1095 PROTOTYPE:
1013 CODE: 1096 CODE:
1097 tc_backup ();
1098
1099void
1100glyph_cache_restore ()
1101 PROTOTYPE:
1102 CODE:
1014 tc_clear (); 1103 tc_restore ();
1015 1104
1016CFPlus::Layout 1105DC::Layout
1017new (SV *class) 1106new (SV *class)
1018 CODE: 1107 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1108 New (0, RETVAL, 1, struct cf_layout);
1020 1109
1021 RETVAL->pl = pango_layout_new (opengl_context); 1110 RETVAL->pl = pango_layout_new (opengl_context);
1023 RETVAL->g = 1.; 1112 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1113 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1114 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1115 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1116 RETVAL->font = 0;
1117 RETVAL->rc = rc_alloc ();
1028 1118
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1119 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1120 layout_update_font (RETVAL);
1031 OUTPUT: 1121 OUTPUT:
1032 RETVAL 1122 RETVAL
1033 1123
1034void 1124void
1035DESTROY (CFPlus::Layout self) 1125DESTROY (DC::Layout self)
1036 CODE: 1126 CODE:
1037 g_object_unref (self->pl); 1127 g_object_unref (self->pl);
1128 rc_free (self->rc);
1038 Safefree (self); 1129 Safefree (self);
1039 1130
1040void 1131void
1041set_text (CFPlus::Layout self, SV *text_) 1132set_text (DC::Layout self, SV *text_)
1042 CODE: 1133 CODE:
1043{ 1134{
1044 STRLEN textlen; 1135 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1136 char *text = SvPVutf8 (text_, textlen);
1046 1137
1047 pango_layout_set_text (self->pl, text, textlen); 1138 pango_layout_set_text (self->pl, text, textlen);
1048} 1139}
1049 1140
1050void 1141void
1051set_markup (CFPlus::Layout self, SV *text_) 1142set_markup (DC::Layout self, SV *text_)
1052 CODE: 1143 CODE:
1053{ 1144{
1054 STRLEN textlen; 1145 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1146 char *text = SvPVutf8 (text_, textlen);
1056 1147
1057 pango_layout_set_markup (self->pl, text, textlen); 1148 pango_layout_set_markup (self->pl, text, textlen);
1058} 1149}
1059 1150
1060void 1151void
1061set_shapes (CFPlus::Layout self, ...) 1152set_shapes (DC::Layout self, ...)
1062 CODE: 1153 CODE:
1063{ 1154{
1064 PangoAttrList *attrs = 0; 1155 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1156 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1157 const char *pos = text;
1101 if (attrs) 1192 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1193 pango_layout_set_attributes (self->pl, attrs);
1103} 1194}
1104 1195
1105void 1196void
1106get_shapes (CFPlus::Layout self) 1197get_shapes (DC::Layout self)
1107 PPCODE: 1198 PPCODE:
1108{ 1199{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1200 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1201
1111 do 1202 do
1112 { 1203 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1204 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1205
1115 if (run && shape_attr_p (run)) 1206 if (run && shape_attr_p (run))
1116 { 1207 {
1117 PangoRectangle extents; 1208 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1209 pango_layout_iter_get_run_extents (iter, 0, &extents);
1126 1217
1127 pango_layout_iter_free (iter); 1218 pango_layout_iter_free (iter);
1128} 1219}
1129 1220
1130int 1221int
1131has_wrapped (CFPlus::Layout self) 1222has_wrapped (DC::Layout self)
1132 CODE: 1223 CODE:
1133{ 1224{
1134 int lines = 1; 1225 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1226 const char *text = pango_layout_get_text (self->pl);
1136 1227
1141} 1232}
1142 OUTPUT: 1233 OUTPUT:
1143 RETVAL 1234 RETVAL
1144 1235
1145SV * 1236SV *
1146get_text (CFPlus::Layout self) 1237get_text (DC::Layout self)
1147 CODE: 1238 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1239 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1240 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1241 OUTPUT:
1151 RETVAL 1242 RETVAL
1152 1243
1153void 1244void
1154set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1245set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1155 CODE: 1246 CODE:
1156 self->r = r; 1247 self->r = r;
1157 self->g = g; 1248 self->g = g;
1158 self->b = b; 1249 self->b = b;
1159 self->a = a; 1250 self->a = a;
1160 1251
1161void 1252void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1253set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1254 CODE:
1164 if (self->font != font) 1255 if (self->font != font)
1165 { 1256 {
1166 self->font = font; 1257 self->font = font;
1167 layout_update_font (self); 1258 layout_update_font (self);
1168 } 1259 }
1169 1260
1170void 1261void
1171set_height (CFPlus::Layout self, int base_height) 1262set_height (DC::Layout self, int base_height)
1172 CODE: 1263 CODE:
1173 if (self->base_height != base_height) 1264 if (self->base_height != base_height)
1174 { 1265 {
1175 self->base_height = base_height; 1266 self->base_height = base_height;
1176 layout_update_font (self); 1267 layout_update_font (self);
1177 } 1268 }
1178 1269
1179void 1270void
1180set_width (CFPlus::Layout self, int max_width = -1) 1271set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1272 CODE:
1182 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1273 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1183 1274
1184void 1275void
1185set_indent (CFPlus::Layout self, int indent) 1276set_indent (DC::Layout self, int indent)
1186 CODE: 1277 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1278 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1279
1189void 1280void
1190set_spacing (CFPlus::Layout self, int spacing) 1281set_spacing (DC::Layout self, int spacing)
1191 CODE: 1282 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1283 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1284
1194void 1285void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1286set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1287 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1288 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1289 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1290 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1291 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1292 : PANGO_ELLIPSIZE_NONE
1202 ); 1293 );
1203 1294
1204void 1295void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1296set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1297 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1298 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1299
1209void 1300void
1210size (CFPlus::Layout self) 1301size (DC::Layout self)
1211 PPCODE: 1302 PPCODE:
1212{ 1303{
1213 int w, h; 1304 int w, h;
1214 1305
1215 layout_get_pixel_size (self, &w, &h); 1306 layout_get_pixel_size (self, &w, &h);
1218 PUSHs (sv_2mortal (newSViv (w))); 1309 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1310 PUSHs (sv_2mortal (newSViv (h)));
1220} 1311}
1221 1312
1222int 1313int
1223descent (CFPlus::Layout self) 1314descent (DC::Layout self)
1224 CODE: 1315 CODE:
1225{ 1316{
1226 PangoRectangle rect; 1317 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1318 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1319 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1320 RETVAL = PANGO_DESCENT (rect);
1230} 1321}
1231 OUTPUT: 1322 OUTPUT:
1232 RETVAL 1323 RETVAL
1233 1324
1234int 1325int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1326xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1327 CODE:
1237{ 1328{
1238 int index, trailing; 1329 int index, trailing;
1239 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1330 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1240 RETVAL = index + trailing; 1331 RETVAL = index + trailing;
1241} 1332}
1242 OUTPUT: 1333 OUTPUT:
1243 RETVAL 1334 RETVAL
1244 1335
1245void 1336void
1246cursor_pos (CFPlus::Layout self, int index) 1337cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1338 PPCODE:
1248{ 1339{
1249 PangoRectangle strong_pos; 1340 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1341 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1342
1252 EXTEND (SP, 3); 1343 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1346 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1347}
1257 1348
1258void 1349void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1350index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1351 PPCODE:
1261{ 1352{
1262 int line, x; 1353 int line, x;
1263 1354
1264 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1355 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1356#if !PANGO_VERSION_CHECK (1, 17, 3)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1357 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1358 --line;
1359#endif
1267 EXTEND (SP, 2); 1360 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1361 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1362 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1363}
1271 1364
1272void 1365void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1366line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1367 PPCODE:
1275{ 1368{
1276 PangoLayoutLine *lp; 1369 PangoLayoutLine *lp;
1277 int index, trailing; 1370 int index, trailing;
1278 1371
1279 if (line < 0) 1372 if (line < 0)
1280 XSRETURN_EMPTY; 1373 XSRETURN_EMPTY;
1281 1374
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1375 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1376 XSRETURN_EMPTY; /* do better */
1284 1377
1285 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1378 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1286 1379
1287 EXTEND (SP, 2); 1380 EXTEND (SP, 2);
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1386 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1387 }
1295} 1388}
1296 1389
1297void 1390void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1391render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1392 CODE:
1393 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1394 pango_opengl_render_layout_subpixel (
1301 self->pl, 1395 self->pl,
1396 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1397 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1398 self->r, self->g, self->b, self->a,
1304 flags 1399 flags
1305 ); 1400 );
1401 // we assume that context_change actually clears/frees stuff
1402 // and does not do any recomputation...
1403 pango_layout_context_changed (self->pl);
1306 1404
1307MODULE = CFPlus PACKAGE = CFPlus::Texture 1405void
1406draw (DC::Layout self)
1407 CODE:
1408{
1409 glEnable (GL_TEXTURE_2D);
1410 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1411 glEnable (GL_BLEND);
1412 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1413 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1414 glEnable (GL_ALPHA_TEST);
1415 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1416
1417 rc_draw (self->rc);
1418
1419 glDisable (GL_ALPHA_TEST);
1420 glDisable (GL_BLEND);
1421 glDisable (GL_TEXTURE_2D);
1422}
1423
1424MODULE = Deliantra::Client PACKAGE = DC::Texture
1308 1425
1309PROTOTYPES: ENABLE 1426PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1427
1313void 1428void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1429pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1430 CODE:
1316{ 1431{
1343 HV *hv = (HV *)SvRV (self); 1458 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1459 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1460 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1461 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1462
1463 if (name <= 0)
1464 XSRETURN_EMPTY;
1465
1348 if (items < 5) 1466 if (items < 5)
1349 { 1467 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1468 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1469 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1470 }
1390 RETVAL = width > 0; 1508 RETVAL = width > 0;
1391} 1509}
1392 OUTPUT: 1510 OUTPUT:
1393 RETVAL 1511 RETVAL
1394 1512
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1513MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1514
1397PROTOTYPES: DISABLE 1515PROTOTYPES: DISABLE
1398 1516
1399CFPlus::Map 1517DC::Map
1400new (SV *class) 1518new (SV *class)
1401 CODE: 1519 CODE:
1402 New (0, RETVAL, 1, struct map); 1520 New (0, RETVAL, 1, struct map);
1403 RETVAL->x = 0; 1521 RETVAL->x = 0;
1404 RETVAL->y = 0; 1522 RETVAL->y = 0;
1412 RETVAL->row = 0; 1530 RETVAL->row = 0;
1413 OUTPUT: 1531 OUTPUT:
1414 RETVAL 1532 RETVAL
1415 1533
1416void 1534void
1417DESTROY (CFPlus::Map self) 1535DESTROY (DC::Map self)
1418 CODE: 1536 CODE:
1419{ 1537{
1420 map_clear (self); 1538 map_clear (self);
1421 Safefree (self->face2tile); 1539 Safefree (self->face2tile);
1422 Safefree (self->tex); 1540 Safefree (self->tex);
1423 Safefree (self); 1541 Safefree (self);
1424} 1542}
1425 1543
1426void 1544void
1427resize (CFPlus::Map self, int map_width, int map_height) 1545resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1546 CODE:
1429 self->w = map_width; 1547 self->w = map_width;
1430 self->h = map_height; 1548 self->h = map_height;
1431 1549
1432void 1550void
1433clear (CFPlus::Map self) 1551clear (DC::Map self)
1434 CODE: 1552 CODE:
1435 map_clear (self); 1553 map_clear (self);
1436 1554
1437void 1555void
1438set_tileid (CFPlus::Map self, int face, int tile) 1556set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1557 CODE:
1440{ 1558{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1559 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1560 need_texid (self, tile);
1443} 1561}
1444 1562
1445void 1563void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1564set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1565 CODE:
1448{ 1566{
1449 tileid texid; 1567 tileid texid;
1450 maptex *tex; 1568 maptex *tex;
1451 1569
1464 tex->smoothtile = self->face2tile [smooth]; 1582 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1583 tex->smoothlevel = level;
1466} 1584}
1467 1585
1468void 1586void
1469set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1587set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1470 CODE: 1588 CODE:
1471{ 1589{
1472 need_texid (self, texid); 1590 need_texid (self, texid);
1473 1591
1474 { 1592 {
1494 // from transparent color bleeding and ugly wrapping effects. 1612 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1613 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1614}
1497 1615
1498int 1616int
1499ox (CFPlus::Map self) 1617ox (DC::Map self)
1500 ALIAS: 1618 ALIAS:
1501 oy = 1 1619 oy = 1
1502 x = 2 1620 x = 2
1503 y = 3 1621 y = 3
1504 w = 4 1622 w = 4
1515 } 1633 }
1516 OUTPUT: 1634 OUTPUT:
1517 RETVAL 1635 RETVAL
1518 1636
1519void 1637void
1520scroll (CFPlus::Map self, int dx, int dy) 1638scroll (DC::Map self, int dx, int dy)
1521 CODE: 1639 CODE:
1522{ 1640{
1523 if (dx > 0) 1641 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 1642 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 1643 else if (dx < 0)
1540 self->rows += MAP_EXTEND_Y; 1658 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 1659 self->y += MAP_EXTEND_Y;
1542 } 1660 }
1543} 1661}
1544 1662
1545void 1663SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 1664map1a_update (DC::Map self, SV *data_, int extmap)
1547 CODE: 1665 CODE:
1548{ 1666{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1667 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 1668 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 1669 mapcell *cell;
1552 int x, y, flags; 1670 int x, y, z, flags;
1671 AV *missing = newAV ();
1672 RETVAL = newRV_noinc ((SV *)missing);
1553 1673
1554 while (data < data_end - 1) 1674 while (data < data_end - 1)
1555 { 1675 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 1676 flags = (data [0] << 8) + data [1]; data += 2;
1557 1677
1577 uint8_t ext, cmd; 1697 uint8_t ext, cmd;
1578 1698
1579 do 1699 do
1580 { 1700 {
1581 ext = *data++; 1701 ext = *data++;
1582 cmd = ext & 0x3f; 1702 cmd = ext & 0x7f;
1583 1703
1584 if (cmd < 4) 1704 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1; 1705 cell->darkness = 255 - ext * 64 + 1;
1586 else if (cmd == 5) // health 1706 else if (cmd == 5) // health
1587 { 1707 {
1590 } 1710 }
1591 else if (cmd == 6) // monster width 1711 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1; 1712 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47) 1713 else if (cmd == 0x47)
1594 { 1714 {
1595 if (*data == 4) 1715 if (*data == 1) cell->player = data [1];
1596 ; // decode player count 1716 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1717 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1718 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1597 1719
1598 data += *data + 1; 1720 data += *data + 1;
1599 } 1721 }
1600 else if (cmd == 8) // cell flags 1722 else if (cmd == 8) // cell flags
1601 cell->flags = *data++; 1723 cell->flags = *data++;
1608 } 1730 }
1609 else 1731 else
1610 cell->darkness = *data++ + 1; 1732 cell->darkness = *data++ + 1;
1611 } 1733 }
1612 1734
1735 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 1736 if (flags & (4 >> z))
1614 { 1737 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 1738 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 1739 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face]; 1740 cell->tile [z] = self->face2tile [face];
1741
1742 if (cell->tile [z])
1743 {
1744 maptex *tex = self->tex + cell->tile [z];
1745 if (!tex->name)
1746 av_push (missing, newSViv (cell->tile [z]));
1747
1748 if (tex->smoothtile)
1749 {
1750 maptex *smooth = self->tex + tex->smoothtile;
1751 if (!smooth->name)
1752 av_push (missing, newSViv (tex->smoothtile));
1753 }
1754 }
1618 } 1755 }
1619
1620 if (flags & 2)
1621 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [1] = self->face2tile [face];
1625 }
1626
1627 if (flags & 1)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [2] = self->face2tile [face];
1632 }
1633 } 1756 }
1634 else 1757 else
1635 cell->darkness = 0; 1758 cell->darkness = 0;
1636 } 1759 }
1637} 1760}
1761 OUTPUT:
1762 RETVAL
1638 1763
1639SV * 1764SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1765mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 1766 CODE:
1642{ 1767{
1643 int x1, x; 1768 int x1, x;
1644 int y1, y; 1769 int y1, y;
1645 int z; 1770 int z;
1690} 1815}
1691 OUTPUT: 1816 OUTPUT:
1692 RETVAL 1817 RETVAL
1693 1818
1694void 1819void
1695draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1820draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1696 CODE: 1821 CODE:
1697{ 1822{
1823 int x, y, z;
1824
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1825 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1826 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1700 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1827 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1701 smooth_key skey; 1828 smooth_key skey;
1702 int x, y, z; 1829 int pl_x, pl_y;
1703 int last_name; 1830 maptex pl_tex;
1831 rc_t *rc = rc_alloc ();
1832 rc_key_t key;
1833 rc_array_t *arr;
1834
1835 pl_tex.name = 0;
1704 1836
1705 // thats current max. sorry. 1837 // thats current max. sorry.
1706 if (sw > 255) sw = 255; 1838 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 1839 if (sh > 255) sh = 255;
1708 1840
1709 // clear key, in case of extra padding 1841 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 1842 memset (&skey, 0, sizeof (skey));
1711 1843
1712 glColor4ub (255, 255, 255, 255); 1844 memset (&key, 0, sizeof (key));
1713 1845 key.r = 255;
1714 glEnable (GL_BLEND); 1846 key.g = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1847 key.b = 255;
1716 glEnable (GL_TEXTURE_2D); 1848 key.a = 255;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1849 key.mode = GL_QUADS;
1718 1850 key.format = GL_T2F_V3F;
1719 glBegin (GL_QUADS); 1851 key.texname = -1;
1720
1721 last_name = 0;
1722 1852
1723 mx += self->x; 1853 mx += self->x;
1724 my += self->y; 1854 my += self->y;
1725 1855
1726 // first pass: determine smooth_max 1856 // first pass: determine smooth_max
1742 MAX (self->tex [cell->tile [0]].smoothlevel, 1872 MAX (self->tex [cell->tile [0]].smoothlevel,
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 1873 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 1874 self->tex [cell->tile [2]].smoothlevel));
1745 } 1875 }
1746 } 1876 }
1877
1878 glEnable (GL_BLEND);
1879 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1880 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1747 1881
1748 for (z = 0; z <= 2; z++) 1882 for (z = 0; z <= 2; z++)
1749 { 1883 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 1884 memset (smooth_level, 0, sizeof (smooth_level));
1751 1885
1764 { 1898 {
1765 maptex tex = self->tex [tile]; 1899 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 1900 int px = (x + 1) * T - tex.w;
1767 int py = (y + 1) * T - tex.h; 1901 int py = (y + 1) * T - tex.h;
1768 1902
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 1903 if (key.texname != tex.name)
1772 { 1904 {
1773 if (!tex.name) 1905 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 1906 tex = self->tex [2]; /* missing, replace by noface */
1775 1907
1776 glEnd (); 1908 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1909 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 1910 }
1780 1911
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1912 if (expect_false (cell->player == player) && expect_false (z == 2))
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1783 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1784 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1785
1786 if (cell->flags && z == 2)
1787 { 1913 {
1914 pl_x = px;
1915 pl_y = py;
1916 pl_tex = tex;
1917 continue;
1918 }
1919
1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1921 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1922 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1923 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1924
1925 if (expect_false (cell->flags) && expect_false (z == 2))
1926 {
1927 // overlays such as the speech bubble, probably more to come
1788 if (cell->flags & 1) 1928 if (cell->flags & 1)
1789 { 1929 {
1790 maptex tex = self->tex [1]; 1930 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32; 1931 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32; 1932 int py = y * T - T * 6 / 32;
1793 1933
1934 if (tex.name)
1794 glEnd (); 1935 {
1795 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1936 if (key.texname != tex.name)
1937 {
1938 key.texname = tex.name;
1939 arr = rc_array (rc, &key);
1940 }
1941
1942 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1943 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1944 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1945 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1796 glBegin (GL_QUADS); 1946 }
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1802 } 1947 }
1803 } 1948 }
1804 1949
1805 // update smooth hash 1950 // update smooth hash
1806 if (tex.smoothtile) 1951 if (tex.smoothtile)
1842 } 1987 }
1843 } 1988 }
1844 } 1989 }
1845 } 1990 }
1846 1991
1992 rc_draw (rc);
1993 rc_clear (rc);
1994
1847 // go through all smoothlevels, lowest to highest, then draw. 1995 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 1996 // this is basically counting sort
1849 { 1997 {
1850 int w, b; 1998 int w, b;
1851 1999
2000 glEnable (GL_TEXTURE_2D);
2001 glBegin (GL_QUADS);
1852 for (w = 0; w < 256 / 32; ++w) 2002 for (w = 0; w < 256 / 32; ++w)
1853 { 2003 {
1854 uint32_t smask = smooth_level [w]; 2004 uint32_t smask = smooth_level [w];
1855 if (smask) 2005 if (smask)
1856 for (b = 0; b < 32; ++b) 2006 for (b = 0; b < 32; ++b)
1875 int border = bits & 15; 2025 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2026 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row 2027 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column 2028 float dy = tex.t * .5f ; // 2 images/column
1879 2029
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name) 2030 if (tex.name)
1883 { 2031 {
2032 // this time avoiding texture state changes
2033 // save gobs of state changes.
1884 if (!tex.name) 2034 if (key.texname != tex.name)
1885 continue; // smoothing not yet available 2035 {
1886
1887 glEnd (); 2036 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2037 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2038 glBegin (GL_QUADS);
1890 } 2039 }
1891 2040
1892 if (border) 2041 if (border)
1893 { 2042 {
1894 float ox = border * dx; 2043 float ox = border * dx;
1895 2044
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2045 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2046 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2047 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2048 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1900 } 2049 }
1901 2050
1902 if (corner) 2051 if (corner)
1903 { 2052 {
1904 float ox = corner * dx; 2053 float ox = corner * dx;
1905 2054
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2055 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2056 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2057 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2058 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2059 }
1910 } 2060 }
1911 } 2061 }
1912 } 2062 }
1913 } 2063 }
1914 } 2064 }
2065
2066 glEnd ();
2067 glDisable (GL_TEXTURE_2D);
2068 key.texname = -1;
1915 } 2069 }
1916 2070
1917 hv_clear (smooth); 2071 hv_clear (smooth);
1918 } 2072 }
1919 2073
1920 glEnd (); 2074 if (pl_tex.name)
2075 {
2076 maptex tex = pl_tex;
2077 int px = pl_x + pdx;
2078 int py = pl_y + pdy;
1921 2079
1922 glDisable (GL_TEXTURE_2D); 2080 key.texname = tex.name;
2081 arr = rc_array (rc, &key);
2082
2083 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2084 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2085 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2086 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2087
2088 rc_draw (rc);
2089 }
2090
1923 glDisable (GL_BLEND); 2091 glDisable (GL_BLEND);
2092 rc_free (rc);
1924 2093
1925 // top layer: overlays such as the health bar 2094 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2095 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2096 if (0 <= y + my && y + my < self->rows)
1928 { 2097 {
1953 } 2122 }
1954 } 2123 }
1955} 2124}
1956 2125
1957void 2126void
1958draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2127draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1959 CODE: 2128 CODE:
1960{ 2129{
1961 static float color[16][3] = { 2130 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2131 { 0.00F, 0.00F, 0.00F },
1963 { 1.00F, 1.00F, 1.00F }, 2132 { 1.00F, 1.00F, 1.00F },
2013 glDisable (GL_BLEND); 2182 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2183 glDisable (GL_TEXTURE_2D);
2015} 2184}
2016 2185
2017void 2186void
2018fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2187fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2019 PPCODE: 2188 PPCODE:
2020{ 2189{
2021 int x, y; 2190 int x, y;
2022 int sw1 = sw + 2; 2191 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2192 int sh1 = sh + 2;
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2263 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2264 PUSHs (darkness3_sv);
2096} 2265}
2097 2266
2098SV * 2267SV *
2099get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2268get_rect (DC::Map self, int x0, int y0, int w, int h)
2100 CODE: 2269 CODE:
2101{ 2270{
2102 int x, y, x1, y1; 2271 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2272 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2273 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2161 else 2330 else
2162 *data++ = 0; 2331 *data++ = 0;
2163 } 2332 }
2164 } 2333 }
2165 2334
2335 /* if size is w*h + 5 then no data has been found */
2336 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2337 {
2166 SvPOK_only (data_sv); 2338 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2339 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2340 }
2341
2168 RETVAL = data_sv; 2342 RETVAL = data_sv;
2169} 2343}
2170 OUTPUT: 2344 OUTPUT:
2171 RETVAL 2345 RETVAL
2172 2346
2173void 2347void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2348set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2349 PPCODE:
2176{ 2350{
2177 int x, y, z; 2351 int x, y, z;
2178 int w, h; 2352 int w, h;
2179 int x1, y1; 2353 int x1, y1;
2354 STRLEN len;
2355 uint8_t *data, *end;
2356
2357 len = SvLEN (data_sv);
2358 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2359 data = SvPVbyte_nolen (data_sv);
2360 end = data + len + 8;
2361
2362 if (len < 5)
2363 XSRETURN_EMPTY;
2180 2364
2181 if (*data++ != 0) 2365 if (*data++ != 0)
2182 return; /* version mismatch */ 2366 XSRETURN_EMPTY; /* version mismatch */
2183 2367
2184 w = *data++ << 8; w |= *data++; 2368 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2369 h = *data++ << 8; h |= *data++;
2186 2370
2187 // we need to do this 'cause we don't keep an absolute coord system for rows 2371 // we need to do this 'cause we don't keep an absolute coord system for rows
2199 { 2383 {
2200 maprow *row = map_get_row (self, y); 2384 maprow *row = map_get_row (self, y);
2201 2385
2202 for (x = x0; x < x1; x++) 2386 for (x = x0; x < x1; x++)
2203 { 2387 {
2388 uint8_t flags;
2389
2390 if (data + 7 >= end)
2391 XSRETURN_EMPTY;
2392
2204 uint8_t flags = *data++; 2393 flags = *data++;
2205 2394
2206 if (flags) 2395 if (flags)
2207 { 2396 {
2208 mapcell *cell = row_get_cell (row, x); 2397 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2398 tileid tile[3] = { 0, 0, 0 };
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2401 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2402 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2403
2215 if (cell->darkness == 0) 2404 if (cell->darkness == 0)
2216 { 2405 {
2217 cell->darkness = 0; 2406 /*cell->darkness = 0;*/
2407 EXTEND (SP, 3);
2218 2408
2219 for (z = 0; z <= 2; z++) 2409 for (z = 0; z <= 2; z++)
2220 { 2410 {
2221 tileid t = tile [z]; 2411 tileid t = tile [z];
2222 2412
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2413 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2414 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2415 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2416 need_texid (self, t);
2227 } 2417 }
2228 2418
2229 cell->tile [z] = t; 2419 cell->tile [z] = t;
2230 } 2420 }
2232 } 2422 }
2233 } 2423 }
2234 } 2424 }
2235} 2425}
2236 2426
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2427MODULE = Deliantra::Client PACKAGE = DC::RW
2428
2429DC::RW
2430new (SV *class, SV *data_sv)
2431 CODE:
2432{
2433 STRLEN datalen;
2434 char *data = SvPVbyte (data_sv, datalen);
2435
2436 RETVAL = SDL_RWFromConstMem (data, datalen);
2437}
2438 OUTPUT:
2439 RETVAL
2440
2441DC::RW
2442new_from_file (SV *class, const char *path, const char *mode = "rb")
2443 CODE:
2444 RETVAL = SDL_RWFromFile (path, mode);
2445 OUTPUT:
2446 RETVAL
2447
2448# fails on win32:
2449# dc.xs(2268) : error C2059: syntax error : '('
2450#void
2451#close (DC::RW self)
2452# CODE:
2453# (self->(close)) (self);
2454
2455MODULE = Deliantra::Client PACKAGE = DC::Channel
2238 2456
2239PROTOTYPES: DISABLE 2457PROTOTYPES: DISABLE
2240 2458
2241CFPlus::MixChunk 2459DC::Channel
2242new_from_file (SV *class, char *path) 2460find ()
2243 CODE: 2461 CODE:
2244 RETVAL = Mix_LoadWAV (path); 2462{
2463 RETVAL = Mix_GroupAvailable (-1);
2464
2465 if (RETVAL < 0)
2466 {
2467 RETVAL = Mix_GroupOldest (-1);
2468
2469 if (RETVAL < 0)
2470 XSRETURN_UNDEF;
2471
2472 Mix_HaltChannel (RETVAL);
2473 }
2474
2475 Mix_UnregisterAllEffects (RETVAL);
2476 Mix_Volume (RETVAL, 128);
2477}
2245 OUTPUT: 2478 OUTPUT:
2246 RETVAL 2479 RETVAL
2247 2480
2248void 2481void
2482halt (DC::Channel self)
2483 CODE:
2484 Mix_HaltChannel (self);
2485
2486void
2487expire (DC::Channel self, int ticks = -1)
2488 CODE:
2489 Mix_ExpireChannel (self, ticks);
2490
2491void
2492fade_out (DC::Channel self, int ticks = -1)
2493 CODE:
2494 Mix_FadeOutChannel (self, ticks);
2495
2496int
2497volume (DC::Channel self, int volume)
2498 CODE:
2499 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2500 OUTPUT:
2501 RETVAL
2502
2503void
2504unregister_all_effects (DC::Channel self)
2505 CODE:
2506 Mix_UnregisterAllEffects (self);
2507
2508void
2509set_panning (DC::Channel self, int left, int right)
2510 CODE:
2511 left = CLAMP (left , 0, 255);
2512 right = CLAMP (right, 0, 255);
2513 Mix_SetPanning (self, left, right);
2514
2515void
2516set_distance (DC::Channel self, int distance)
2517 CODE:
2518 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2519
2520void
2521set_position (DC::Channel self, int angle, int distance)
2522 CODE:
2523
2524void
2525set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2526 CODE:
2527{
2528 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2529 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2530 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2531}
2532
2533void
2534set_reverse_stereo (DC::Channel self, int flip)
2535 CODE:
2536 Mix_SetReverseStereo (self, flip);
2537
2538MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2539
2540PROTOTYPES: DISABLE
2541
2542DC::MixChunk
2543new (SV *class, DC::RW rwops)
2544 CODE:
2545 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2546 OUTPUT:
2547 RETVAL
2548
2549void
2249DESTROY (CFPlus::MixChunk self) 2550DESTROY (DC::MixChunk self)
2250 CODE: 2551 CODE:
2251 Mix_FreeChunk (self); 2552 Mix_FreeChunk (self);
2252 2553
2253int 2554int
2254volume (CFPlus::MixChunk self, int volume = -1) 2555volume (DC::MixChunk self, int volume = -1)
2255 CODE: 2556 CODE:
2557 if (items > 1)
2558 volume = CLAMP (volume, 0, 128);
2256 RETVAL = Mix_VolumeChunk (self, volume); 2559 RETVAL = Mix_VolumeChunk (self, volume);
2257 OUTPUT: 2560 OUTPUT:
2258 RETVAL 2561 RETVAL
2259 2562
2260int 2563DC::Channel
2261play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2564play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2262 CODE: 2565 CODE:
2566{
2263 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2567 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2568
2569 if (RETVAL < 0)
2570 XSRETURN_UNDEF;
2571
2572 if (channel < 0)
2573 {
2574 Mix_UnregisterAllEffects (RETVAL);
2575 Mix_Volume (RETVAL, 128);
2576 }
2577}
2264 OUTPUT: 2578 OUTPUT:
2265 RETVAL 2579 RETVAL
2266 2580
2267MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2581MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2268 2582
2269int 2583int
2270volume (int volume = -1) 2584volume (int volume = -1)
2271 PROTOTYPE: ;$ 2585 PROTOTYPE: ;$
2272 CODE: 2586 CODE:
2587 if (items > 0)
2588 volume = CLAMP (volume, 0, 128);
2273 RETVAL = Mix_VolumeMusic (volume); 2589 RETVAL = Mix_VolumeMusic (volume);
2274 OUTPUT: 2590 OUTPUT:
2275 RETVAL 2591 RETVAL
2276 2592
2593void
2594fade_out (int ms)
2595 CODE:
2596 Mix_FadeOutMusic (ms);
2597
2598void
2599halt ()
2600 CODE:
2601 Mix_HaltMusic ();
2602
2603DC::MixMusic
2604new (SV *class, DC::RW rwops)
2605 CODE:
2606 RETVAL = Mix_LoadMUS_RW (rwops);
2607 OUTPUT:
2608 RETVAL
2609
2610void
2611DESTROY (DC::MixMusic self)
2612 CODE:
2613 Mix_FreeMusic (self);
2614
2277int 2615int
2278fade_out (int ms)
2279 CODE:
2280 RETVAL = Mix_FadeOutMusic (ms);
2281 OUTPUT:
2282 RETVAL
2283
2284CFPlus::MixMusic
2285new_from_file (SV *class, char *path)
2286 CODE:
2287 RETVAL = Mix_LoadMUS (path);
2288 OUTPUT:
2289 RETVAL
2290
2291void
2292DESTROY (CFPlus::MixMusic self)
2293 CODE:
2294 Mix_FreeMusic (self);
2295
2296int
2297play (CFPlus::MixMusic self, int loops = -1) 2616play (DC::MixMusic self, int loops = -1)
2298 CODE: 2617 CODE:
2299 RETVAL = Mix_PlayMusic (self, loops); 2618 RETVAL = Mix_PlayMusic (self, loops);
2300 OUTPUT: 2619 OUTPUT:
2301 RETVAL 2620 RETVAL
2302 2621
2303int 2622void
2304fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2623fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2305 CODE: 2624 CODE:
2306 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2625 Mix_FadeInMusicPos (self, loops, ms, position);
2307 OUTPUT:
2308 RETVAL
2309 2626
2310MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2627MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2311 2628
2312PROTOTYPES: ENABLE 2629PROTOTYPES: ENABLE
2313 2630
2314BOOT: 2631BOOT:
2315{ 2632{
2316 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2633 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2317 static const struct { 2634 static const struct {
2318 const char *name; 2635 const char *name;
2319 IV iv; 2636 IV iv;
2320 } *civ, const_iv[] = { 2637 } *civ, const_iv[] = {
2321# define const_iv(name) { # name, (IV)name } 2638# define const_iv(name) { # name, (IV)name }
2356 const_iv (GL_INTENSITY), 2673 const_iv (GL_INTENSITY),
2357 const_iv (GL_LUMINANCE), 2674 const_iv (GL_LUMINANCE),
2358 const_iv (GL_LUMINANCE_ALPHA), 2675 const_iv (GL_LUMINANCE_ALPHA),
2359 const_iv (GL_FLOAT), 2676 const_iv (GL_FLOAT),
2360 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2677 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2678 const_iv (GL_COMPRESSED_ALPHA_ARB),
2679 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2680 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2681 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2682 const_iv (GL_COMPRESSED_RGB_ARB),
2683 const_iv (GL_COMPRESSED_RGBA_ARB),
2361 const_iv (GL_COMPILE), 2684 const_iv (GL_COMPILE),
2362 const_iv (GL_PROXY_TEXTURE_1D), 2685 const_iv (GL_PROXY_TEXTURE_1D),
2363 const_iv (GL_PROXY_TEXTURE_2D), 2686 const_iv (GL_PROXY_TEXTURE_2D),
2364 const_iv (GL_TEXTURE_1D), 2687 const_iv (GL_TEXTURE_1D),
2365 const_iv (GL_TEXTURE_2D), 2688 const_iv (GL_TEXTURE_2D),
2404 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2727 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2405 const_iv (GL_POINT_SMOOTH_HINT), 2728 const_iv (GL_POINT_SMOOTH_HINT),
2406 const_iv (GL_LINE_SMOOTH_HINT), 2729 const_iv (GL_LINE_SMOOTH_HINT),
2407 const_iv (GL_POLYGON_SMOOTH_HINT), 2730 const_iv (GL_POLYGON_SMOOTH_HINT),
2408 const_iv (GL_GENERATE_MIPMAP_HINT), 2731 const_iv (GL_GENERATE_MIPMAP_HINT),
2732 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2409 const_iv (GL_FASTEST), 2733 const_iv (GL_FASTEST),
2410 const_iv (GL_DONT_CARE), 2734 const_iv (GL_DONT_CARE),
2411 const_iv (GL_NICEST), 2735 const_iv (GL_NICEST),
2412 const_iv (GL_V2F), 2736 const_iv (GL_V2F),
2413 const_iv (GL_V3F), 2737 const_iv (GL_V3F),
2421 2745
2422 texture_av = newAV (); 2746 texture_av = newAV ();
2423 AvREAL_off (texture_av); 2747 AvREAL_off (texture_av);
2424} 2748}
2425 2749
2750void
2751disable_GL_EXT_blend_func_separate ()
2752 CODE:
2753 gl.BlendFuncSeparate = 0;
2754 gl.BlendFuncSeparateEXT = 0;
2755
2426char * 2756char *
2427gl_vendor () 2757gl_vendor ()
2428 CODE: 2758 CODE:
2429 RETVAL = (char *)glGetString (GL_VENDOR); 2759 RETVAL = (char *)glGetString (GL_VENDOR);
2430 OUTPUT: 2760 OUTPUT:
2547 2877
2548void glTexCoord (float s, float t) 2878void glTexCoord (float s, float t)
2549 CODE: 2879 CODE:
2550 glTexCoord2f (s, t); 2880 glTexCoord2f (s, t);
2551 2881
2882void glRect (float x1, float y1, float x2, float y2)
2883 CODE:
2884 glRectf (x1, y1, x2, y2);
2885
2886void glRect_lineloop (float x1, float y1, float x2, float y2)
2887 CODE:
2888 glBegin (GL_LINE_LOOP);
2889 glVertex2f (x1, y1);
2890 glVertex2f (x2, y1);
2891 glVertex2f (x2, y2);
2892 glVertex2f (x1, y2);
2893 glEnd ();
2894
2552PROTOTYPES: ENABLE 2895PROTOTYPES: ENABLE
2553 2896
2554void glBegin (int mode) 2897void glBegin (int mode)
2555 2898
2556void glEnd () 2899void glEnd ()
2588void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2931void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2589 CODE: 2932 CODE:
2590 if (gl.SeparableFilter2D) 2933 if (gl.SeparableFilter2D)
2591 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2934 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2592 2935
2593void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2936void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2594 2937
2595void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2938void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2596 2939
2597void glDrawPixels (int width, int height, int format, int type, char *pixels) 2940void glDrawPixels (int width, int height, int format, int type, char *pixels)
2598 2941
2624 2967
2625void glEndList () 2968void glEndList ()
2626 2969
2627void glCallList (int list) 2970void glCallList (int list)
2628 2971
2629MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2972MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2630 2973
2631PROTOTYPES: DISABLE 2974PROTOTYPES: DISABLE
2632 2975
2633void 2976void
2634find_widget (SV *self, NV x, NV y) 2977find_widget (SV *self, NV x, NV y)
2638 XPUSHs (self); 2981 XPUSHs (self);
2639} 2982}
2640 2983
2641BOOT: 2984BOOT:
2642{ 2985{
2643 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2986 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2644 2987
2645 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2988 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2646 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2989 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2647 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2990 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2648 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2991 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2649} 2992}
2650 2993
2651void 2994void
2652draw (SV *self) 2995draw (SV *self)
2653 CODE: 2996 CODE:
2657 NV x, y, w, h; 3000 NV x, y, w, h;
2658 SV *draw_x_sv = GvSV (draw_x_gv); 3001 SV *draw_x_sv = GvSV (draw_x_gv);
2659 SV *draw_y_sv = GvSV (draw_y_gv); 3002 SV *draw_y_sv = GvSV (draw_y_gv);
2660 SV *draw_w_sv = GvSV (draw_w_gv); 3003 SV *draw_w_sv = GvSV (draw_w_gv);
2661 SV *draw_h_sv = GvSV (draw_h_gv); 3004 SV *draw_h_sv = GvSV (draw_h_gv);
2662 SV *hover;
2663 double draw_x, draw_y, draw_w, draw_h; 3005 double draw_x, draw_y;
2664 3006
2665 if (!SvROK (self)) 3007 if (!SvROK (self))
2666 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3008 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2667 3009
2668 hv = (HV *)SvRV (self); 3010 hv = (HV *)SvRV (self);
2669 3011
2670 if (SvTYPE (hv) != SVt_PVHV) 3012 if (SvTYPE (hv) != SVt_PVHV)
2671 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3013 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2672 3014
2673 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3015 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2674 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3016 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2675 3017
2676 if (!h || !w) 3018 if (!h || !w)
2696 { 3038 {
2697 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3039 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2698 3040
2699 if (svp && SvTRUE (*svp)) 3041 if (svp && SvTRUE (*svp))
2700 { 3042 {
2701 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3043 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2702 glEnable (GL_BLEND); 3044 glEnable (GL_BLEND);
2703 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3045 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2704 glBegin (GL_QUADS); 3046 glBegin (GL_QUADS);
2705 glVertex2f (0, 0); 3047 glVertex2f (0, 0);
2706 glVertex2f (w, 0); 3048 glVertex2f (w, 0);
2709 glEnd (); 3051 glEnd ();
2710 glDisable (GL_BLEND); 3052 glDisable (GL_BLEND);
2711 } 3053 }
2712 } 3054 }
2713#if 0 3055#if 0
2714 if ($ENV{CFPLUS_DEBUG} & 1) { 3056 // draw borders, for debugging
2715 glPushMatrix; 3057 glPushMatrix ();
2716 glColor 1, 1, 0, 1; 3058 glColor4f (1., 1., 0., 1.);
2717 glTranslate 0.375, 0.375; 3059 glTranslatef (.5, .5, 0.);
2718 glBegin GL_LINE_LOOP; 3060 glBegin (GL_LINE_LOOP);
2719 glVertex 0 , 0; 3061 glVertex2f (0 , 0);
2720 glVertex $self->{w} - 1, 0; 3062 glVertex2f (w - 1, 0);
2721 glVertex $self->{w} - 1, $self->{h} - 1; 3063 glVertex2f (w - 1, h - 1);
2722 glVertex 0 , $self->{h} - 1; 3064 glVertex2f (0 , h - 1);
2723 glEnd; 3065 glEnd ();
2724 glPopMatrix; 3066 glPopMatrix ();
2725 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2726 }
2727#endif 3067#endif
2728 PUSHMARK (SP); 3068 PUSHMARK (SP);
2729 XPUSHs (self); 3069 XPUSHs (self);
2730 PUTBACK; 3070 PUTBACK;
2731 call_method ("_draw", G_VOID | G_DISCARD); 3071 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines