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.259 by root, Tue May 20 02:47:21 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>
58#define MAP_EXTEND_X 32 74#define MAP_EXTEND_X 32
59#define MAP_EXTEND_Y 512 75#define MAP_EXTEND_Y 512
60 76
61#define MIN_FONT_HEIGHT 10 77#define MIN_FONT_HEIGHT 10
62 78
79/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81
63#if 0 82#if 0
64# define PARACHUTE SDL_INIT_NOPARACHUTE 83# define PARACHUTE SDL_INIT_NOPARACHUTE
65#else 84#else
66# define PARACHUTE 0 85# define PARACHUTE 0
67#endif 86#endif
109 av_push (texture_av, (SV *)(size_t)name); 128 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 129 glDeleteTextures (1, &name);
111} 130}
112 131
113#include "texcache.c" 132#include "texcache.c"
133#include "rendercache.c"
114 134
115#include "pango-font.c" 135#include "pango-font.c"
116#include "pango-fontmap.c" 136#include "pango-fontmap.c"
117#include "pango-render.c" 137#include "pango-render.c"
118 138
119typedef IV CFPlus__Channel; 139typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 140typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 141typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 142typedef Mix_Music *DC__MixMusic;
123 143
124typedef PangoFontDescription *CFPlus__Font; 144typedef PangoFontDescription *DC__Font;
125 145
126static int 146static int
127shape_attr_p (PangoLayoutRun *run) 147shape_attr_p (PangoLayoutRun *run)
128{ 148{
129 GSList *attrs = run->item->analysis.extra_attrs; 149 GSList *attrs = run->item->analysis.extra_attrs;
143 163
144typedef struct cf_layout { 164typedef struct cf_layout {
145 PangoLayout *pl; 165 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 166 float r, g, b, a; // default color for rgba mode
147 int base_height; 167 int base_height;
148 CFPlus__Font font; 168 DC__Font font;
169 rc_t *rc;
149} *CFPlus__Layout; 170} *DC__Layout;
150 171
151static CFPlus__Font default_font; 172static DC__Font default_font;
152static PangoContext *opengl_context; 173static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 174static PangoFontMap *opengl_fontmap;
154 175
155static void 176static void
156substitute_func (FcPattern *pattern, gpointer data) 177substitute_func (FcPattern *pattern, gpointer data)
161#endif 182#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 183 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 184}
164 185
165static void 186static void
166layout_update_font (CFPlus__Layout self) 187layout_update_font (DC__Layout self)
167{ 188{
168 /* use a random scale factor to account for unknown descenders, 0.8 works 189 /* use a random scale factor to account for unknown descenders, 0.8 works
169 * reasonably well with bitstream vera 190 * reasonably well with dejavu/bistream fonts
170 */ 191 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 192 PangoFontDescription *font = self->font ? self->font : default_font;
172 193
173 pango_font_description_set_absolute_size (font, 194 pango_font_description_set_absolute_size (font,
174 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 195 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175 196
176 pango_layout_set_font_description (self->pl, font); 197 pango_layout_set_font_description (self->pl, font);
177} 198}
178 199
179static void 200static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 201layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 202{
182 PangoRectangle rect; 203 PangoRectangle rect;
183 204
184 // get_pixel_* wrongly rounds down 205 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 206 pango_layout_get_extents (self->pl, 0, &rect);
196 217
197typedef uint16_t tileid; 218typedef uint16_t tileid;
198typedef uint16_t faceid; 219typedef uint16_t faceid;
199 220
200typedef struct { 221typedef struct {
201 int name; 222 GLuint name;
202 int w, h; 223 int w, h;
203 float s, t; 224 float s, t;
204 uint8_t r, g, b, a; 225 uint8_t r, g, b, a;
205 tileid smoothtile; 226 tileid smoothtile;
206 uint8_t smoothlevel; 227 uint8_t smoothlevel;
224 int faces; tileid *face2tile; // [faceid] 245 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 246 int texs; maptex *tex; // [tileid]
226 247
227 int32_t rows; 248 int32_t rows;
228 maprow *row; 249 maprow *row;
229} *CFPlus__Map; 250} *DC__Map;
230 251
231static char * 252static char *
232prepend (char *ptr, int sze, int inc) 253prepend (char *ptr, int sze, int inc)
233{ 254{
234 char *p; 255 char *p;
272 self->texs *= 2; 293 self->texs *= 2;
273 } 294 }
274} 295}
275 296
276static maprow * 297static maprow *
277map_get_row (CFPlus__Map self, int y) 298map_get_row (DC__Map self, int y)
278{ 299{
279 if (0 > y) 300 if (0 > y)
280 { 301 {
281 int extend = - y + MAP_EXTEND_Y; 302 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 303 Prepend (maprow, self->row, self->rows, extend);
320 341
321 return row->col + (x - row->c0); 342 return row->col + (x - row->c0);
322} 343}
323 344
324static mapcell * 345static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 346map_get_cell (DC__Map self, int x, int y)
326{ 347{
327 return row_get_cell (map_get_row (self, y), x); 348 return row_get_cell (map_get_row (self, y), x);
328} 349}
329 350
330static void 351static void
331map_clear (CFPlus__Map self) 352map_clear (DC__Map self)
332{ 353{
333 int r; 354 int r;
334 355
335 for (r = 0; r < self->rows; r++) 356 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 357 Safefree (self->row[r].col);
344 self->row = 0; 365 self->row = 0;
345 self->rows = 0; 366 self->rows = 0;
346} 367}
347 368
348static void 369static void
349map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 370map_blank (DC__Map self, int x0, int y0, int w, int h)
350{ 371{
351 int x, y; 372 int x, y;
352 maprow *row; 373 maprow *row;
353 mapcell *cell; 374 mapcell *cell;
354 375
433 n |= n >> 16; 454 n |= n >> 16;
434 455
435 return n + 1; 456 return n + 1;
436} 457}
437 458
459static unsigned int
460popcount (unsigned int n)
461{
462 n -= (n >> 1) & 0x55555555U;
463 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
464 n = ((n >> 4) + n) & 0x0f0f0f0fU;
465 n *= 0x01010101U;
466
467 return n >> 24;
468}
469
438/* SDL should provide this, really. */ 470/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 471#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 472#define SDLK_MODIFIER_MAX 314
441 473
442/******************************************************************************/ 474/******************************************************************************/
480 return 0; 512 return 0;
481 513
482 return 1; 514 return 1;
483} 515}
484 516
485MODULE = CFPlus PACKAGE = CFPlus 517MODULE = Deliantra::Client PACKAGE = DC
486 518
487PROTOTYPES: ENABLE 519PROTOTYPES: ENABLE
488 520
489BOOT: 521BOOT:
490{ 522{
491 HV *stash = gv_stashpv ("CFPlus", 1); 523 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 524 static const struct {
493 const char *name; 525 const char *name;
494 IV iv; 526 IV iv;
495 } *civ, const_iv[] = { 527 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 528# define const_iv(name) { # name, (IV)name }
518 550
519 const_iv (SDL_APPINPUTFOCUS), 551 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 552 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 553 const_iv (SDL_APPACTIVE),
522 554
555 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 557 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 558 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 559 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 560 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 561 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 633 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 634 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 635 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 636 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 637 const_iv (KMOD_MODE),
638
639 const_iv (MIX_DEFAULT_FORMAT),
604# undef const_iv 640# undef const_iv
605 }; 641 };
606 642
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 662
627NV floor (NV x) 663NV floor (NV x)
628 664
629NV ceil (NV x) 665NV ceil (NV x)
630 666
667IV minpot (UV n)
668
669IV popcount (UV n)
670
631void 671void
632pango_init () 672pango_init ()
633 CODE: 673 CODE:
634{ 674{
635 opengl_fontmap = pango_opengl_font_map_new (); 675 opengl_fontmap = pango_opengl_font_map_new ();
636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 676 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); 677 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
678 /*pango_context_set_font_description (opengl_context, default_font);*/
679#if PANGO_VERSION_CHECK (1, 15, 2)
680 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif
638} 683}
639 684
640char * 685char *
641SDL_GetError () 686SDL_GetError ()
642 687
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 720
676 if (m && m != (SDL_Rect **)-1) 721 if (m && m != (SDL_Rect **)-1)
677 while (*m) 722 while (*m)
678 { 723 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 724 if ((*m)->w >= 800 && (*m)->h >= 480)
680 { 725 {
681 AV *av = newAV (); 726 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 727 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 728 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 729 av_push (av, newSViv (rgb));
708 753
709 if (RETVAL) 754 if (RETVAL)
710 { 755 {
711 av_clear (texture_av); 756 av_clear (texture_av);
712 757
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 758 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 759#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 760#include "glfunc.h"
716#undef GL_FUNC 761#undef GL_FUNC
717 } 762 }
718} 763}
725char * 770char *
726SDL_GetKeyName (int sym) 771SDL_GetKeyName (int sym)
727 772
728int 773int
729SDL_GetAppState () 774SDL_GetAppState ()
775
776int
777SDL_GetModState ()
730 778
731void 779void
732poll_events () 780poll_events ()
733 PPCODE: 781 PPCODE:
734{ 782{
744 { 792 {
745 case SDL_KEYDOWN: 793 case SDL_KEYDOWN:
746 case SDL_KEYUP: 794 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 795 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 796 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 797 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 */ 798 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); 799 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 800 break;
753 801
754 case SDL_ACTIVEEVENT: 802 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 803 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 821 x = ev.motion.x;
774 y = ev.motion.y; 822 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 823 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 824 }
777 825
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 827 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 828 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 829 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 830 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 831 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 832 }
785 break; 833 break;
786 834
787 case SDL_MOUSEBUTTONDOWN: 835 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 836 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 837 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 838
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 839 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 840 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 841 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 842 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 847 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 848 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 849 break;
802 } 850 }
803 851
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 852 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 853 }
806} 854}
807 855
808int 856int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 857Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 858 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 859 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 860 Mix_ChannelFinished (channel_finished);
813 861
814void 862void
863Mix_QuerySpec ()
864 PPCODE:
865{
866 int freq, channels;
867 Uint16 format;
868
869 if (Mix_QuerySpec (&freq, &format, &channels))
870 {
871 EXTEND (SP, 3);
872 PUSHs (sv_2mortal (newSViv (freq)));
873 PUSHs (sv_2mortal (newSViv (format)));
874 PUSHs (sv_2mortal (newSViv (channels)));
875 }
876}
877
878void
815Mix_CloseAudio () 879Mix_CloseAudio ()
816 880
817int 881int
818Mix_AllocateChannels (int numchans = -1) 882Mix_AllocateChannels (int numchans = -1)
883
884const char *
885Mix_GetError ()
819 886
820void 887void
821lowdelay (int fd, int val = 1) 888lowdelay (int fd, int val = 1)
822 CODE: 889 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 890 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
849 } 916 }
850 } 917 }
851#endif 918#endif
852} 919}
853 920
854void 921int
855add_font (char *file) 922add_font (char *file)
856 CODE: 923 CODE:
857 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 924 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
925 OUTPUT:
926 RETVAL
858 927
859void 928void
860load_image_inline (SV *image_) 929load_image_inline (SV *image_)
861 ALIAS: 930 ALIAS:
862 load_image_file = 1 931 load_image_file = 1
948void 1017void
949error (char *message) 1018error (char *message)
950 CODE: 1019 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1020 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1021#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1022 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1023#endif
955 1024
956void 1025void
957fatal (char *message) 1026fatal (char *message)
958 CODE: 1027 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1028 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1029#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1030 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1031#endif
963 _exit (1); 1032 _exit (1);
964 1033
965void 1034void
966_exit (int retval = 0) 1035_exit (int retval = 0)
978#if DEBUG 1047#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1048 VALGRIND_DO_LEAK_CHECK;
980#endif 1049#endif
981} 1050}
982 1051
983MODULE = CFPlus PACKAGE = CFPlus::Font 1052MODULE = Deliantra::Client PACKAGE = DC::Font
984 1053
985PROTOTYPES: DISABLE 1054PROTOTYPES: DISABLE
986 1055
987CFPlus::Font 1056DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1057new_from_file (SV *class, char *path, int id = 0)
989 CODE: 1058 CODE:
990{ 1059{
991 int count; 1060 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1061 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
995} 1064}
996 OUTPUT: 1065 OUTPUT:
997 RETVAL 1066 RETVAL
998 1067
999void 1068void
1000DESTROY (CFPlus::Font self) 1069DESTROY (DC::Font self)
1001 CODE: 1070 CODE:
1002 pango_font_description_free (self); 1071 pango_font_description_free (self);
1003 1072
1004void 1073void
1005make_default (CFPlus::Font self) 1074make_default (DC::Font self)
1006 PROTOTYPE: $ 1075 PROTOTYPE: $
1007 CODE: 1076 CODE:
1008 default_font = self; 1077 default_font = self;
1009 1078
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1079MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1080
1012PROTOTYPES: DISABLE 1081PROTOTYPES: DISABLE
1013 1082
1014void 1083void
1015reset_glyph_cache () 1084glyph_cache_backup ()
1016 PROTOTYPE: 1085 PROTOTYPE:
1017 CODE: 1086 CODE:
1087 tc_backup ();
1088
1089void
1090glyph_cache_restore ()
1091 PROTOTYPE:
1092 CODE:
1018 tc_clear (); 1093 tc_restore ();
1019 1094
1020CFPlus::Layout 1095DC::Layout
1021new (SV *class) 1096new (SV *class)
1022 CODE: 1097 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1098 New (0, RETVAL, 1, struct cf_layout);
1024 1099
1025 RETVAL->pl = pango_layout_new (opengl_context); 1100 RETVAL->pl = pango_layout_new (opengl_context);
1027 RETVAL->g = 1.; 1102 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1103 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1104 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1105 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1106 RETVAL->font = 0;
1107 RETVAL->rc = rc_alloc ();
1032 1108
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1109 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1110 layout_update_font (RETVAL);
1035 OUTPUT: 1111 OUTPUT:
1036 RETVAL 1112 RETVAL
1037 1113
1038void 1114void
1039DESTROY (CFPlus::Layout self) 1115DESTROY (DC::Layout self)
1040 CODE: 1116 CODE:
1041 g_object_unref (self->pl); 1117 g_object_unref (self->pl);
1118 rc_free (self->rc);
1042 Safefree (self); 1119 Safefree (self);
1043 1120
1044void 1121void
1045set_text (CFPlus::Layout self, SV *text_) 1122set_text (DC::Layout self, SV *text_)
1046 CODE: 1123 CODE:
1047{ 1124{
1048 STRLEN textlen; 1125 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1126 char *text = SvPVutf8 (text_, textlen);
1050 1127
1051 pango_layout_set_text (self->pl, text, textlen); 1128 pango_layout_set_text (self->pl, text, textlen);
1052} 1129}
1053 1130
1054void 1131void
1055set_markup (CFPlus::Layout self, SV *text_) 1132set_markup (DC::Layout self, SV *text_)
1056 CODE: 1133 CODE:
1057{ 1134{
1058 STRLEN textlen; 1135 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1136 char *text = SvPVutf8 (text_, textlen);
1060 1137
1061 pango_layout_set_markup (self->pl, text, textlen); 1138 pango_layout_set_markup (self->pl, text, textlen);
1062} 1139}
1063 1140
1064void 1141void
1065set_shapes (CFPlus::Layout self, ...) 1142set_shapes (DC::Layout self, ...)
1066 CODE: 1143 CODE:
1067{ 1144{
1068 PangoAttrList *attrs = 0; 1145 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1146 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1147 const char *pos = text;
1105 if (attrs) 1182 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1183 pango_layout_set_attributes (self->pl, attrs);
1107} 1184}
1108 1185
1109void 1186void
1110get_shapes (CFPlus::Layout self) 1187get_shapes (DC::Layout self)
1111 PPCODE: 1188 PPCODE:
1112{ 1189{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1190 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1191
1115 do 1192 do
1116 { 1193 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1194 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1195
1119 if (run && shape_attr_p (run)) 1196 if (run && shape_attr_p (run))
1120 { 1197 {
1121 PangoRectangle extents; 1198 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1199 pango_layout_iter_get_run_extents (iter, 0, &extents);
1130 1207
1131 pango_layout_iter_free (iter); 1208 pango_layout_iter_free (iter);
1132} 1209}
1133 1210
1134int 1211int
1135has_wrapped (CFPlus::Layout self) 1212has_wrapped (DC::Layout self)
1136 CODE: 1213 CODE:
1137{ 1214{
1138 int lines = 1; 1215 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1216 const char *text = pango_layout_get_text (self->pl);
1140 1217
1145} 1222}
1146 OUTPUT: 1223 OUTPUT:
1147 RETVAL 1224 RETVAL
1148 1225
1149SV * 1226SV *
1150get_text (CFPlus::Layout self) 1227get_text (DC::Layout self)
1151 CODE: 1228 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1229 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1230 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1231 OUTPUT:
1155 RETVAL 1232 RETVAL
1156 1233
1157void 1234void
1158set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1235set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1159 CODE: 1236 CODE:
1160 self->r = r; 1237 self->r = r;
1161 self->g = g; 1238 self->g = g;
1162 self->b = b; 1239 self->b = b;
1163 self->a = a; 1240 self->a = a;
1164 1241
1165void 1242void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1243set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1244 CODE:
1168 if (self->font != font) 1245 if (self->font != font)
1169 { 1246 {
1170 self->font = font; 1247 self->font = font;
1171 layout_update_font (self); 1248 layout_update_font (self);
1172 } 1249 }
1173 1250
1174void 1251void
1175set_height (CFPlus::Layout self, int base_height) 1252set_height (DC::Layout self, int base_height)
1176 CODE: 1253 CODE:
1177 if (self->base_height != base_height) 1254 if (self->base_height != base_height)
1178 { 1255 {
1179 self->base_height = base_height; 1256 self->base_height = base_height;
1180 layout_update_font (self); 1257 layout_update_font (self);
1181 } 1258 }
1182 1259
1183void 1260void
1184set_width (CFPlus::Layout self, int max_width = -1) 1261set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1262 CODE:
1186 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1263 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1187 1264
1188void 1265void
1189set_indent (CFPlus::Layout self, int indent) 1266set_indent (DC::Layout self, int indent)
1190 CODE: 1267 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1268 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1269
1193void 1270void
1194set_spacing (CFPlus::Layout self, int spacing) 1271set_spacing (DC::Layout self, int spacing)
1195 CODE: 1272 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1273 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1274
1198void 1275void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1276set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1277 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1278 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1279 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1280 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1281 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1282 : PANGO_ELLIPSIZE_NONE
1206 ); 1283 );
1207 1284
1208void 1285void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1286set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1287 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1288 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1289
1213void 1290void
1214size (CFPlus::Layout self) 1291size (DC::Layout self)
1215 PPCODE: 1292 PPCODE:
1216{ 1293{
1217 int w, h; 1294 int w, h;
1218 1295
1219 layout_get_pixel_size (self, &w, &h); 1296 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1299 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1300 PUSHs (sv_2mortal (newSViv (h)));
1224} 1301}
1225 1302
1226int 1303int
1227descent (CFPlus::Layout self) 1304descent (DC::Layout self)
1228 CODE: 1305 CODE:
1229{ 1306{
1230 PangoRectangle rect; 1307 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1308 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1309 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1310 RETVAL = PANGO_DESCENT (rect);
1234} 1311}
1235 OUTPUT: 1312 OUTPUT:
1236 RETVAL 1313 RETVAL
1237 1314
1238int 1315int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1316xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1317 CODE:
1241{ 1318{
1242 int index, trailing; 1319 int index, trailing;
1243 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1320 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1244 RETVAL = index + trailing; 1321 RETVAL = index + trailing;
1245} 1322}
1246 OUTPUT: 1323 OUTPUT:
1247 RETVAL 1324 RETVAL
1248 1325
1249void 1326void
1250cursor_pos (CFPlus::Layout self, int index) 1327cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1328 PPCODE:
1252{ 1329{
1253 PangoRectangle strong_pos; 1330 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1331 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1332
1256 EXTEND (SP, 3); 1333 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1334 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1335 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1336 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1337}
1261 1338
1262void 1339void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1340index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1341 PPCODE:
1265{ 1342{
1266 int line, x; 1343 int line, x;
1267 1344
1268 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1345 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1346#if !PANGO_VERSION_CHECK (1, 17, 3)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1347 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1348 --line;
1349#endif
1271 EXTEND (SP, 2); 1350 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1351 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1352 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1353}
1275 1354
1276void 1355void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1356line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1357 PPCODE:
1279{ 1358{
1280 PangoLayoutLine *lp; 1359 PangoLayoutLine *lp;
1281 int index, trailing; 1360 int index, trailing;
1282 1361
1283 if (line < 0) 1362 if (line < 0)
1284 XSRETURN_EMPTY; 1363 XSRETURN_EMPTY;
1285 1364
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1365 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1366 XSRETURN_EMPTY; /* do better */
1288 1367
1289 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1368 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1290 1369
1291 EXTEND (SP, 2); 1370 EXTEND (SP, 2);
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1376 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1377 }
1299} 1378}
1300 1379
1301void 1380void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1381render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1382 CODE:
1383 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1384 pango_opengl_render_layout_subpixel (
1305 self->pl, 1385 self->pl,
1386 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1387 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1388 self->r, self->g, self->b, self->a,
1308 flags 1389 flags
1309 ); 1390 );
1391 // we assume that context_change actually clears/frees stuff
1392 // and does not do any recomputation...
1393 pango_layout_context_changed (self->pl);
1310 1394
1311MODULE = CFPlus PACKAGE = CFPlus::Texture 1395void
1396draw (DC::Layout self)
1397 CODE:
1398{
1399 glEnable (GL_TEXTURE_2D);
1400 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1401 glEnable (GL_BLEND);
1402 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1403 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1404 glEnable (GL_ALPHA_TEST);
1405 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1406
1407 rc_draw (self->rc);
1408
1409 glDisable (GL_ALPHA_TEST);
1410 glDisable (GL_BLEND);
1411 glDisable (GL_TEXTURE_2D);
1412}
1413
1414MODULE = Deliantra::Client PACKAGE = DC::Texture
1312 1415
1313PROTOTYPES: ENABLE 1416PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1417
1317void 1418void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1419pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1420 CODE:
1320{ 1421{
1347 HV *hv = (HV *)SvRV (self); 1448 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1449 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1450 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1451 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1452
1453 if (name <= 0)
1454 XSRETURN_EMPTY;
1455
1352 if (items < 5) 1456 if (items < 5)
1353 { 1457 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1458 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1459 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1460 }
1394 RETVAL = width > 0; 1498 RETVAL = width > 0;
1395} 1499}
1396 OUTPUT: 1500 OUTPUT:
1397 RETVAL 1501 RETVAL
1398 1502
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1503MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1504
1401PROTOTYPES: DISABLE 1505PROTOTYPES: DISABLE
1402 1506
1403CFPlus::Map 1507DC::Map
1404new (SV *class) 1508new (SV *class)
1405 CODE: 1509 CODE:
1406 New (0, RETVAL, 1, struct map); 1510 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1511 RETVAL->x = 0;
1408 RETVAL->y = 0; 1512 RETVAL->y = 0;
1416 RETVAL->row = 0; 1520 RETVAL->row = 0;
1417 OUTPUT: 1521 OUTPUT:
1418 RETVAL 1522 RETVAL
1419 1523
1420void 1524void
1421DESTROY (CFPlus::Map self) 1525DESTROY (DC::Map self)
1422 CODE: 1526 CODE:
1423{ 1527{
1424 map_clear (self); 1528 map_clear (self);
1425 Safefree (self->face2tile); 1529 Safefree (self->face2tile);
1426 Safefree (self->tex); 1530 Safefree (self->tex);
1427 Safefree (self); 1531 Safefree (self);
1428} 1532}
1429 1533
1430void 1534void
1431resize (CFPlus::Map self, int map_width, int map_height) 1535resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1536 CODE:
1433 self->w = map_width; 1537 self->w = map_width;
1434 self->h = map_height; 1538 self->h = map_height;
1435 1539
1436void 1540void
1437clear (CFPlus::Map self) 1541clear (DC::Map self)
1438 CODE: 1542 CODE:
1439 map_clear (self); 1543 map_clear (self);
1440 1544
1441void 1545void
1442set_tileid (CFPlus::Map self, int face, int tile) 1546set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1547 CODE:
1444{ 1548{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1549 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1550 need_texid (self, tile);
1447} 1551}
1448 1552
1449void 1553void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1554set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1555 CODE:
1452{ 1556{
1453 tileid texid; 1557 tileid texid;
1454 maptex *tex; 1558 maptex *tex;
1455 1559
1468 tex->smoothtile = self->face2tile [smooth]; 1572 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1573 tex->smoothlevel = level;
1470} 1574}
1471 1575
1472void 1576void
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) 1577set_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: 1578 CODE:
1475{ 1579{
1476 need_texid (self, texid); 1580 need_texid (self, texid);
1477 1581
1478 { 1582 {
1498 // from transparent color bleeding and ugly wrapping effects. 1602 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1603 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1604}
1501 1605
1502int 1606int
1503ox (CFPlus::Map self) 1607ox (DC::Map self)
1504 ALIAS: 1608 ALIAS:
1505 oy = 1 1609 oy = 1
1506 x = 2 1610 x = 2
1507 y = 3 1611 y = 3
1508 w = 4 1612 w = 4
1519 } 1623 }
1520 OUTPUT: 1624 OUTPUT:
1521 RETVAL 1625 RETVAL
1522 1626
1523void 1627void
1524scroll (CFPlus::Map self, int dx, int dy) 1628scroll (DC::Map self, int dx, int dy)
1525 CODE: 1629 CODE:
1526{ 1630{
1527 if (dx > 0) 1631 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1632 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1633 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 1648 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1649 self->y += MAP_EXTEND_Y;
1546 } 1650 }
1547} 1651}
1548 1652
1549void 1653SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1654map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1655 CODE:
1552{ 1656{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1657 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1658 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1659 mapcell *cell;
1556 int x, y, flags; 1660 int x, y, z, flags;
1661 AV *missing = newAV ();
1662 RETVAL = newRV_noinc ((SV *)missing);
1557 1663
1558 while (data < data_end - 1) 1664 while (data < data_end - 1)
1559 { 1665 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1666 flags = (data [0] << 8) + data [1]; data += 2;
1561 1667
1612 } 1718 }
1613 else 1719 else
1614 cell->darkness = *data++ + 1; 1720 cell->darkness = *data++ + 1;
1615 } 1721 }
1616 1722
1723 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 1724 if (flags & (4 >> z))
1618 { 1725 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 1726 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 1727 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 1728 cell->tile [z] = self->face2tile [face];
1729
1730 if (cell->tile [z])
1731 {
1732 maptex *tex = self->tex + cell->tile [z];
1733 if (!tex->name)
1734 av_push (missing, newSViv (cell->tile [z]));
1735
1736 if (tex->smoothtile)
1737 {
1738 maptex *smooth = self->tex + tex->smoothtile;
1739 if (!smooth->name)
1740 av_push (missing, newSViv (tex->smoothtile));
1741 }
1742 }
1622 } 1743 }
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 } 1744 }
1638 else 1745 else
1639 cell->darkness = 0; 1746 cell->darkness = 0;
1640 } 1747 }
1641} 1748}
1749 OUTPUT:
1750 RETVAL
1642 1751
1643SV * 1752SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1753mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 1754 CODE:
1646{ 1755{
1647 int x1, x; 1756 int x1, x;
1648 int y1, y; 1757 int y1, y;
1649 int z; 1758 int z;
1694} 1803}
1695 OUTPUT: 1804 OUTPUT:
1696 RETVAL 1805 RETVAL
1697 1806
1698void 1807void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1808draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1700 CODE: 1809 CODE:
1701{ 1810{
1811 int x, y, z;
1812
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1814 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) 1815 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705 smooth_key skey; 1816 smooth_key skey;
1706 int x, y, z; 1817
1707 int last_name; 1818 rc_t *rc = rc_alloc ();
1819 rc_key_t key;
1820 rc_array_t *arr;
1708 1821
1709 // thats current max. sorry. 1822 // thats current max. sorry.
1710 if (sw > 255) sw = 255; 1823 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 1824 if (sh > 255) sh = 255;
1712 1825
1713 // clear key, in case of extra padding 1826 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 1827 memset (&skey, 0, sizeof (skey));
1715 1828
1716 glColor4ub (255, 255, 255, 255); 1829 memset (&key, 0, sizeof (key));
1717 1830 key.r = 255;
1718 glEnable (GL_BLEND); 1831 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1832 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 1833 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1834 key.mode = GL_QUADS;
1722 1835 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS); 1836 key.texname = -1;
1724
1725 last_name = 0;
1726 1837
1727 mx += self->x; 1838 mx += self->x;
1728 my += self->y; 1839 my += self->y;
1729 1840
1730 // first pass: determine smooth_max 1841 // first pass: determine smooth_max
1746 MAX (self->tex [cell->tile [0]].smoothlevel, 1857 MAX (self->tex [cell->tile [0]].smoothlevel,
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 1858 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 1859 self->tex [cell->tile [2]].smoothlevel));
1749 } 1860 }
1750 } 1861 }
1862
1863 glEnable (GL_BLEND);
1864 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1865 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1751 1866
1752 for (z = 0; z <= 2; z++) 1867 for (z = 0; z <= 2; z++)
1753 { 1868 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 1869 memset (smooth_level, 0, sizeof (smooth_level));
1755 1870
1765 tileid tile = cell->tile [z]; 1880 tileid tile = cell->tile [z];
1766 1881
1767 if (tile) 1882 if (tile)
1768 { 1883 {
1769 maptex tex = self->tex [tile]; 1884 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 1885 int px, py;
1771 int py = (y + 1) * T - tex.h;
1772 1886
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 1887 if (key.texname != tex.name)
1776 { 1888 {
1777 if (!tex.name) 1889 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 1890 tex = self->tex [2]; /* missing, replace by noface */
1779 1891
1780 glEnd (); 1892 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1893 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 1894 }
1784 1895
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1896 px = (x + 1) * T - tex.w;
1897 py = (y + 1) * T - tex.h;
1898
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1787 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1901 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1788 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1902 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1789 1903
1790 if (cell->flags && z == 2) 1904 if (cell->flags && z == 2)
1791 { 1905 {
1906 // overlays such as the speech bubble, probably more to come
1792 if (cell->flags & 1) 1907 if (cell->flags & 1)
1793 { 1908 {
1794 maptex tex = self->tex [1]; 1909 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32; 1910 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32; 1911 int py = y * T - T * 6 / 32;
1797 1912
1913 if (tex.name)
1798 glEnd (); 1914 {
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1915 if (key.texname != tex.name)
1916 {
1917 key.texname = tex.name;
1918 arr = rc_array (rc, &key);
1919 }
1920
1921 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1922 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1923 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1924 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1800 glBegin (GL_QUADS); 1925 }
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 } 1926 }
1807 } 1927 }
1808 1928
1809 // update smooth hash 1929 // update smooth hash
1810 if (tex.smoothtile) 1930 if (tex.smoothtile)
1846 } 1966 }
1847 } 1967 }
1848 } 1968 }
1849 } 1969 }
1850 1970
1971 rc_draw (rc);
1972 rc_clear (rc);
1973
1851 // go through all smoothlevels, lowest to highest, then draw. 1974 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 1975 // this is basically counting sort
1853 { 1976 {
1854 int w, b; 1977 int w, b;
1855 1978
1979 glEnable (GL_TEXTURE_2D);
1980 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 1981 for (w = 0; w < 256 / 32; ++w)
1857 { 1982 {
1858 uint32_t smask = smooth_level [w]; 1983 uint32_t smask = smooth_level [w];
1859 if (smask) 1984 if (smask)
1860 for (b = 0; b < 32; ++b) 1985 for (b = 0; b < 32; ++b)
1879 int border = bits & 15; 2004 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2005 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 2006 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 2007 float dy = tex.t * .5f ; // 2 images/column
1883 2008
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 2009 if (tex.name)
1887 { 2010 {
2011 // this time avoiding texture state changes
2012 // save gobs of state changes.
1888 if (!tex.name) 2013 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 2014 {
1890
1891 glEnd (); 2015 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2016 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2017 glBegin (GL_QUADS);
1894 } 2018 }
1895 2019
1896 if (border) 2020 if (border)
1897 { 2021 {
1898 float ox = border * dx; 2022 float ox = border * dx;
1899 2023
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2024 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2025 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2026 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2027 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2028 }
1905 2029
1906 if (corner) 2030 if (corner)
1907 { 2031 {
1908 float ox = corner * dx; 2032 float ox = corner * dx;
1909 2033
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2034 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2035 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2036 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2037 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2038 }
1914 } 2039 }
1915 } 2040 }
1916 } 2041 }
1917 } 2042 }
1918 } 2043 }
2044
2045 glEnd ();
2046 glDisable (GL_TEXTURE_2D);
2047 key.texname = -1;
1919 } 2048 }
1920 2049
1921 hv_clear (smooth); 2050 hv_clear (smooth);
1922 } 2051 }
1923 2052
1924 glEnd ();
1925
1926 glDisable (GL_TEXTURE_2D);
1927 glDisable (GL_BLEND); 2053 glDisable (GL_BLEND);
2054 rc_free (rc);
1928 2055
1929 // top layer: overlays such as the health bar 2056 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2057 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2058 if (0 <= y + my && y + my < self->rows)
1932 { 2059 {
1957 } 2084 }
1958 } 2085 }
1959} 2086}
1960 2087
1961void 2088void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2089draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1963 CODE: 2090 CODE:
1964{ 2091{
1965 static float color[16][3] = { 2092 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2093 { 0.00F, 0.00F, 0.00F },
1967 { 1.00F, 1.00F, 1.00F }, 2094 { 1.00F, 1.00F, 1.00F },
2017 glDisable (GL_BLEND); 2144 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2145 glDisable (GL_TEXTURE_2D);
2019} 2146}
2020 2147
2021void 2148void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2149fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2150 PPCODE:
2024{ 2151{
2025 int x, y; 2152 int x, y;
2026 int sw1 = sw + 2; 2153 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2154 int sh1 = sh + 2;
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2225 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2226 PUSHs (darkness3_sv);
2100} 2227}
2101 2228
2102SV * 2229SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2230get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2231 CODE:
2105{ 2232{
2106 int x, y, x1, y1; 2233 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2234 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2235 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2165 else 2292 else
2166 *data++ = 0; 2293 *data++ = 0;
2167 } 2294 }
2168 } 2295 }
2169 2296
2297 if (data - (uint8_t *)SvPVX (data_sv) == w * h + 5)
2298 {
2299 SvREFCNT_dec (data_sv);
2300 RETVAL = &PL_sv_undef;
2301 }
2302 else
2303 {
2170 SvPOK_only (data_sv); 2304 SvPOK_only (data_sv);
2171 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2305 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2172 RETVAL = data_sv; 2306 RETVAL = data_sv;
2307 }
2173} 2308}
2174 OUTPUT: 2309 OUTPUT:
2175 RETVAL 2310 RETVAL
2176 2311
2177void 2312void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2313set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2179 PPCODE: 2314 PPCODE:
2180{ 2315{
2181 int x, y, z; 2316 int x, y, z;
2182 int w, h; 2317 int w, h;
2183 int x1, y1; 2318 int x1, y1;
2319 STRLEN len;
2320 uint8_t *data, *end;
2321
2322 len = SvLEN (data_sv);
2323 SvGROW (data_sv, len + 7); // reserve at least 7+ bytes more
2324 data = SvPVbyte_nolen (data_sv);
2325 end = data + len + 7;
2326
2327 if (len < 5)
2328 XSRETURN_EMPTY;
2184 2329
2185 if (*data++ != 0) 2330 if (*data++ != 0)
2186 return; /* version mismatch */ 2331 XSRETURN_EMPTY; /* version mismatch */
2187 2332
2188 w = *data++ << 8; w |= *data++; 2333 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2334 h = *data++ << 8; h |= *data++;
2190 2335
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2336 // we need to do this 'cause we don't keep an absolute coord system for rows
2203 { 2348 {
2204 maprow *row = map_get_row (self, y); 2349 maprow *row = map_get_row (self, y);
2205 2350
2206 for (x = x0; x < x1; x++) 2351 for (x = x0; x < x1; x++)
2207 { 2352 {
2353 uint8_t flags;
2354
2355 if (data + 7 >= end)
2356 XSRETURN_EMPTY;
2357
2208 uint8_t flags = *data++; 2358 flags = *data++;
2209 2359
2210 if (flags) 2360 if (flags)
2211 { 2361 {
2212 mapcell *cell = row_get_cell (row, x); 2362 mapcell *cell = row_get_cell (row, x);
2213 tileid tile[3] = { 0, 0, 0 }; 2363 tileid tile[3] = { 0, 0, 0 };
2236 } 2386 }
2237 } 2387 }
2238 } 2388 }
2239} 2389}
2240 2390
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2391MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2392
2243CFPlus::RW 2393DC::RW
2244new (SV *class, SV *data_sv) 2394new (SV *class, SV *data_sv)
2245 CODE: 2395 CODE:
2246{ 2396{
2247 STRLEN datalen; 2397 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2398 char *data = SvPVbyte (data_sv, datalen);
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2400 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2401}
2252 OUTPUT: 2402 OUTPUT:
2253 RETVAL 2403 RETVAL
2254 2404
2255CFPlus::RW 2405DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2406new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2407 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2408 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2409 OUTPUT:
2260 RETVAL 2410 RETVAL
2261 2411
2412# fails on win32:
2413# dc.xs(2268) : error C2059: syntax error : '('
2262void 2414#void
2263close (CFPlus::RW self) 2415#close (DC::RW self)
2264 CODE: 2416# CODE:
2265 SDL_RWclose (self); 2417# (self->(close)) (self);
2266 2418
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2419MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2420
2269PROTOTYPES: DISABLE 2421PROTOTYPES: DISABLE
2270 2422
2423DC::Channel
2424find ()
2425 CODE:
2426{
2427 RETVAL = Mix_GroupAvailable (-1);
2428
2429 if (RETVAL < 0)
2430 {
2431 RETVAL = Mix_GroupOldest (-1);
2432
2433 if (RETVAL < 0)
2434 XSRETURN_UNDEF;
2435
2436 Mix_HaltChannel (RETVAL);
2437 }
2438
2439 Mix_UnregisterAllEffects (RETVAL);
2440 Mix_Volume (RETVAL, 128);
2441}
2442 OUTPUT:
2443 RETVAL
2444
2445void
2446halt (DC::Channel self)
2447 CODE:
2448 Mix_HaltChannel (self);
2449
2450void
2451expire (DC::Channel self, int ticks = -1)
2452 CODE:
2453 Mix_ExpireChannel (self, ticks);
2454
2455void
2456fade_out (DC::Channel self, int ticks = -1)
2457 CODE:
2458 Mix_FadeOutChannel (self, ticks);
2459
2271int 2460int
2272volume (CFPlus::Channel self, int volume) 2461volume (DC::Channel self, int volume)
2273 CODE: 2462 CODE:
2274 RETVAL = Mix_Volume (self, volume); 2463 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2275 OUTPUT: 2464 OUTPUT:
2276 RETVAL 2465 RETVAL
2277 2466
2278int 2467void
2279unregister_all_effects (CFPlus::Channel self) 2468unregister_all_effects (DC::Channel self)
2280 CODE: 2469 CODE:
2281 RETVAL = Mix_UnregisterAllEffects (self); 2470 Mix_UnregisterAllEffects (self);
2282 OUTPUT:
2283 RETVAL
2284 2471
2285int 2472void
2286set_panning (CFPlus::Channel self, int left, int right) 2473set_panning (DC::Channel self, int left, int right)
2287 CODE: 2474 CODE:
2475 left = CLAMP (left , 0, 255);
2476 right = CLAMP (right, 0, 255);
2288 RETVAL = Mix_SetPanning (self, left, right); 2477 Mix_SetPanning (self, left, right);
2289 OUTPUT:
2290 RETVAL
2291 2478
2292int 2479void
2293set_distance (CFPlus::Channel self, int distance) 2480set_distance (DC::Channel self, int distance)
2294 CODE: 2481 CODE:
2295 RETVAL = Mix_SetDistance (self, distance); 2482 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2296 OUTPUT:
2297 RETVAL
2298 2483
2299int 2484void
2300set_position (CFPlus::Channel self, int angle, int distance) 2485set_position (DC::Channel self, int angle, int distance)
2301 CODE: 2486 CODE:
2487
2488void
2489set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2490 CODE:
2491{
2492 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2493 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2302 RETVAL = Mix_SetPosition (self, angle, distance); 2494 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2303 OUTPUT: 2495}
2304 RETVAL
2305 2496
2306int 2497void
2307set_reverse_stereo (CFPlus::Channel self, int flip) 2498set_reverse_stereo (DC::Channel self, int flip)
2308 CODE: 2499 CODE:
2309 RETVAL = Mix_SetReverseStereo (self, flip); 2500 Mix_SetReverseStereo (self, flip);
2310 OUTPUT:
2311 RETVAL
2312 2501
2313MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2502MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2314 2503
2315PROTOTYPES: DISABLE 2504PROTOTYPES: DISABLE
2316 2505
2317CFPlus::MixChunk 2506DC::MixChunk
2318new (SV *class, CFPlus::RW rwops) 2507new (SV *class, DC::RW rwops)
2319 CODE: 2508 CODE:
2320 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2509 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2321 OUTPUT: 2510 OUTPUT:
2322 RETVAL 2511 RETVAL
2323 2512
2324void 2513void
2325DESTROY (CFPlus::MixChunk self) 2514DESTROY (DC::MixChunk self)
2326 CODE: 2515 CODE:
2327 Mix_FreeChunk (self); 2516 Mix_FreeChunk (self);
2328 2517
2329int 2518int
2330volume (CFPlus::MixChunk self, int volume = -1) 2519volume (DC::MixChunk self, int volume = -1)
2331 CODE: 2520 CODE:
2521 if (items > 1)
2522 volume = CLAMP (volume, 0, 128);
2332 RETVAL = Mix_VolumeChunk (self, volume); 2523 RETVAL = Mix_VolumeChunk (self, volume);
2333 OUTPUT: 2524 OUTPUT:
2334 RETVAL 2525 RETVAL
2335 2526
2336CFPlus::Channel 2527DC::Channel
2337play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2528play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2338 CODE: 2529 CODE:
2530{
2339 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2531 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2532
2533 if (RETVAL < 0)
2534 XSRETURN_UNDEF;
2535
2536 if (channel < 0)
2537 {
2340 Mix_UnregisterAllEffects (RETVAL); 2538 Mix_UnregisterAllEffects (RETVAL);
2539 Mix_Volume (RETVAL, 128);
2540 }
2541}
2341 OUTPUT: 2542 OUTPUT:
2342 RETVAL 2543 RETVAL
2343 2544
2344MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2545MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2345 2546
2346int 2547int
2347volume (int volume = -1) 2548volume (int volume = -1)
2348 PROTOTYPE: ;$ 2549 PROTOTYPE: ;$
2349 CODE: 2550 CODE:
2551 if (items > 0)
2552 volume = CLAMP (volume, 0, 128);
2350 RETVAL = Mix_VolumeMusic (volume); 2553 RETVAL = Mix_VolumeMusic (volume);
2351 OUTPUT: 2554 OUTPUT:
2352 RETVAL 2555 RETVAL
2353 2556
2354int 2557void
2355fade_out (int ms) 2558fade_out (int ms)
2356 CODE: 2559 CODE:
2357 RETVAL = Mix_FadeOutMusic (ms); 2560 Mix_FadeOutMusic (ms);
2358 OUTPUT:
2359 RETVAL
2360 2561
2361void 2562void
2362halt () 2563halt ()
2363 CODE: 2564 CODE:
2364 Mix_HaltMusic (); 2565 Mix_HaltMusic ();
2365 2566
2366CFPlus::MixMusic 2567DC::MixMusic
2367new (SV *class, CFPlus::RW rwops) 2568new (SV *class, DC::RW rwops)
2368 CODE: 2569 CODE:
2369 RETVAL = Mix_LoadMUS_RW (rwops); 2570 RETVAL = Mix_LoadMUS_RW (rwops);
2370 OUTPUT: 2571 OUTPUT:
2371 RETVAL 2572 RETVAL
2372 2573
2373void 2574void
2374DESTROY (CFPlus::MixMusic self) 2575DESTROY (DC::MixMusic self)
2375 CODE: 2576 CODE:
2376 Mix_FreeMusic (self); 2577 Mix_FreeMusic (self);
2377 2578
2378int 2579int
2379play (CFPlus::MixMusic self, int loops = -1) 2580play (DC::MixMusic self, int loops = -1)
2380 CODE: 2581 CODE:
2381 RETVAL = Mix_PlayMusic (self, loops); 2582 RETVAL = Mix_PlayMusic (self, loops);
2382 OUTPUT: 2583 OUTPUT:
2383 RETVAL 2584 RETVAL
2384 2585
2385int 2586void
2386fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2587fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2387 CODE: 2588 CODE:
2388 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2589 Mix_FadeInMusicPos (self, loops, ms, position);
2389 OUTPUT:
2390 RETVAL
2391 2590
2392MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2591MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2393 2592
2394PROTOTYPES: ENABLE 2593PROTOTYPES: ENABLE
2395 2594
2396BOOT: 2595BOOT:
2397{ 2596{
2398 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2597 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2399 static const struct { 2598 static const struct {
2400 const char *name; 2599 const char *name;
2401 IV iv; 2600 IV iv;
2402 } *civ, const_iv[] = { 2601 } *civ, const_iv[] = {
2403# define const_iv(name) { # name, (IV)name } 2602# define const_iv(name) { # name, (IV)name }
2438 const_iv (GL_INTENSITY), 2637 const_iv (GL_INTENSITY),
2439 const_iv (GL_LUMINANCE), 2638 const_iv (GL_LUMINANCE),
2440 const_iv (GL_LUMINANCE_ALPHA), 2639 const_iv (GL_LUMINANCE_ALPHA),
2441 const_iv (GL_FLOAT), 2640 const_iv (GL_FLOAT),
2442 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2641 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2642 const_iv (GL_COMPRESSED_ALPHA_ARB),
2643 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2644 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2645 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2646 const_iv (GL_COMPRESSED_RGB_ARB),
2647 const_iv (GL_COMPRESSED_RGBA_ARB),
2443 const_iv (GL_COMPILE), 2648 const_iv (GL_COMPILE),
2444 const_iv (GL_PROXY_TEXTURE_1D), 2649 const_iv (GL_PROXY_TEXTURE_1D),
2445 const_iv (GL_PROXY_TEXTURE_2D), 2650 const_iv (GL_PROXY_TEXTURE_2D),
2446 const_iv (GL_TEXTURE_1D), 2651 const_iv (GL_TEXTURE_1D),
2447 const_iv (GL_TEXTURE_2D), 2652 const_iv (GL_TEXTURE_2D),
2486 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2691 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2487 const_iv (GL_POINT_SMOOTH_HINT), 2692 const_iv (GL_POINT_SMOOTH_HINT),
2488 const_iv (GL_LINE_SMOOTH_HINT), 2693 const_iv (GL_LINE_SMOOTH_HINT),
2489 const_iv (GL_POLYGON_SMOOTH_HINT), 2694 const_iv (GL_POLYGON_SMOOTH_HINT),
2490 const_iv (GL_GENERATE_MIPMAP_HINT), 2695 const_iv (GL_GENERATE_MIPMAP_HINT),
2696 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2491 const_iv (GL_FASTEST), 2697 const_iv (GL_FASTEST),
2492 const_iv (GL_DONT_CARE), 2698 const_iv (GL_DONT_CARE),
2493 const_iv (GL_NICEST), 2699 const_iv (GL_NICEST),
2494 const_iv (GL_V2F), 2700 const_iv (GL_V2F),
2495 const_iv (GL_V3F), 2701 const_iv (GL_V3F),
2503 2709
2504 texture_av = newAV (); 2710 texture_av = newAV ();
2505 AvREAL_off (texture_av); 2711 AvREAL_off (texture_av);
2506} 2712}
2507 2713
2714void
2715disable_GL_EXT_blend_func_separate ()
2716 CODE:
2717 gl.BlendFuncSeparate = 0;
2718 gl.BlendFuncSeparateEXT = 0;
2719
2508char * 2720char *
2509gl_vendor () 2721gl_vendor ()
2510 CODE: 2722 CODE:
2511 RETVAL = (char *)glGetString (GL_VENDOR); 2723 RETVAL = (char *)glGetString (GL_VENDOR);
2512 OUTPUT: 2724 OUTPUT:
2633 2845
2634void glRect (float x1, float y1, float x2, float y2) 2846void glRect (float x1, float y1, float x2, float y2)
2635 CODE: 2847 CODE:
2636 glRectf (x1, y1, x2, y2); 2848 glRectf (x1, y1, x2, y2);
2637 2849
2850void glRect_lineloop (float x1, float y1, float x2, float y2)
2851 CODE:
2852 glBegin (GL_LINE_LOOP);
2853 glVertex2f (x1, y1);
2854 glVertex2f (x2, y1);
2855 glVertex2f (x2, y2);
2856 glVertex2f (x1, y2);
2857 glEnd ();
2858
2638PROTOTYPES: ENABLE 2859PROTOTYPES: ENABLE
2639 2860
2640void glBegin (int mode) 2861void glBegin (int mode)
2641 2862
2642void glEnd () 2863void glEnd ()
2674void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2895void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2675 CODE: 2896 CODE:
2676 if (gl.SeparableFilter2D) 2897 if (gl.SeparableFilter2D)
2677 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2898 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2678 2899
2679void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2900void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2680 2901
2681void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2902void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2682 2903
2683void glDrawPixels (int width, int height, int format, int type, char *pixels) 2904void glDrawPixels (int width, int height, int format, int type, char *pixels)
2684 2905
2710 2931
2711void glEndList () 2932void glEndList ()
2712 2933
2713void glCallList (int list) 2934void glCallList (int list)
2714 2935
2715MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2936MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2716 2937
2717PROTOTYPES: DISABLE 2938PROTOTYPES: DISABLE
2718 2939
2719void 2940void
2720find_widget (SV *self, NV x, NV y) 2941find_widget (SV *self, NV x, NV y)
2724 XPUSHs (self); 2945 XPUSHs (self);
2725} 2946}
2726 2947
2727BOOT: 2948BOOT:
2728{ 2949{
2729 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2950 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2730 2951
2731 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2952 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); 2953 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); 2954 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); 2955 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2735} 2956}
2736 2957
2737void 2958void
2738draw (SV *self) 2959draw (SV *self)
2739 CODE: 2960 CODE:
2743 NV x, y, w, h; 2964 NV x, y, w, h;
2744 SV *draw_x_sv = GvSV (draw_x_gv); 2965 SV *draw_x_sv = GvSV (draw_x_gv);
2745 SV *draw_y_sv = GvSV (draw_y_gv); 2966 SV *draw_y_sv = GvSV (draw_y_gv);
2746 SV *draw_w_sv = GvSV (draw_w_gv); 2967 SV *draw_w_sv = GvSV (draw_w_gv);
2747 SV *draw_h_sv = GvSV (draw_h_gv); 2968 SV *draw_h_sv = GvSV (draw_h_gv);
2748 SV *hover;
2749 double draw_x, draw_y, draw_w, draw_h; 2969 double draw_x, draw_y;
2750 2970
2751 if (!SvROK (self)) 2971 if (!SvROK (self))
2752 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2972 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2753 2973
2754 hv = (HV *)SvRV (self); 2974 hv = (HV *)SvRV (self);
2755 2975
2756 if (SvTYPE (hv) != SVt_PVHV) 2976 if (SvTYPE (hv) != SVt_PVHV)
2757 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2977 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2758 2978
2759 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2979 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.; 2980 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2761 2981
2762 if (!h || !w) 2982 if (!h || !w)
2782 { 3002 {
2783 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3003 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2784 3004
2785 if (svp && SvTRUE (*svp)) 3005 if (svp && SvTRUE (*svp))
2786 { 3006 {
2787 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3007 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2788 glEnable (GL_BLEND); 3008 glEnable (GL_BLEND);
2789 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3009 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2790 glBegin (GL_QUADS); 3010 glBegin (GL_QUADS);
2791 glVertex2f (0, 0); 3011 glVertex2f (0, 0);
2792 glVertex2f (w, 0); 3012 glVertex2f (w, 0);
2795 glEnd (); 3015 glEnd ();
2796 glDisable (GL_BLEND); 3016 glDisable (GL_BLEND);
2797 } 3017 }
2798 } 3018 }
2799#if 0 3019#if 0
2800 if ($ENV{CFPLUS_DEBUG} & 1) { 3020 // draw borders, for debugging
2801 glPushMatrix; 3021 glPushMatrix ();
2802 glColor 1, 1, 0, 1; 3022 glColor4f (1., 1., 0., 1.);
2803 glTranslate 0.375, 0.375; 3023 glTranslatef (.5, .5, 0.);
2804 glBegin GL_LINE_LOOP; 3024 glBegin (GL_LINE_LOOP);
2805 glVertex 0 , 0; 3025 glVertex2f (0 , 0);
2806 glVertex $self->{w} - 1, 0; 3026 glVertex2f (w - 1, 0);
2807 glVertex $self->{w} - 1, $self->{h} - 1; 3027 glVertex2f (w - 1, h - 1);
2808 glVertex 0 , $self->{h} - 1; 3028 glVertex2f (0 , h - 1);
2809 glEnd; 3029 glEnd ();
2810 glPopMatrix; 3030 glPopMatrix ();
2811 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2812 }
2813#endif 3031#endif
2814 PUSHMARK (SP); 3032 PUSHMARK (SP);
2815 XPUSHs (self); 3033 XPUSHs (self);
2816 PUTBACK; 3034 PUTBACK;
2817 call_method ("_draw", G_VOID | G_DISCARD); 3035 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines