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