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.218 by root, Mon Aug 6 02:11:45 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 = 1024) 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);
861
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}
813 877
814void 878void
815Mix_CloseAudio () 879Mix_CloseAudio ()
816 880
817int 881int
852 } 916 }
853 } 917 }
854#endif 918#endif
855} 919}
856 920
857void 921int
858add_font (char *file) 922add_font (char *file)
859 CODE: 923 CODE:
860 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 924 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
925 OUTPUT:
926 RETVAL
861 927
862void 928void
863load_image_inline (SV *image_) 929load_image_inline (SV *image_)
864 ALIAS: 930 ALIAS:
865 load_image_file = 1 931 load_image_file = 1
951void 1017void
952error (char *message) 1018error (char *message)
953 CODE: 1019 CODE:
954 fprintf (stderr, "ERROR: %s\n", message); 1020 fprintf (stderr, "ERROR: %s\n", message);
955#ifdef _WIN32 1021#ifdef _WIN32
956 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1022 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957#endif 1023#endif
958 1024
959void 1025void
960fatal (char *message) 1026fatal (char *message)
961 CODE: 1027 CODE:
962 fprintf (stderr, "FATAL: %s\n", message); 1028 fprintf (stderr, "FATAL: %s\n", message);
963#ifdef _WIN32 1029#ifdef _WIN32
964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1030 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965#endif 1031#endif
966 _exit (1); 1032 _exit (1);
967 1033
968void 1034void
969_exit (int retval = 0) 1035_exit (int retval = 0)
981#if DEBUG 1047#if DEBUG
982 VALGRIND_DO_LEAK_CHECK; 1048 VALGRIND_DO_LEAK_CHECK;
983#endif 1049#endif
984} 1050}
985 1051
986MODULE = CFPlus PACKAGE = CFPlus::Font 1052MODULE = Deliantra::Client PACKAGE = DC::Font
987 1053
988PROTOTYPES: DISABLE 1054PROTOTYPES: DISABLE
989 1055
990CFPlus::Font 1056DC::Font
991new_from_file (SV *class, char *path, int id = 0) 1057new_from_file (SV *class, char *path, int id = 0)
992 CODE: 1058 CODE:
993{ 1059{
994 int count; 1060 int count;
995 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1061 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
998} 1064}
999 OUTPUT: 1065 OUTPUT:
1000 RETVAL 1066 RETVAL
1001 1067
1002void 1068void
1003DESTROY (CFPlus::Font self) 1069DESTROY (DC::Font self)
1004 CODE: 1070 CODE:
1005 pango_font_description_free (self); 1071 pango_font_description_free (self);
1006 1072
1007void 1073void
1008make_default (CFPlus::Font self) 1074make_default (DC::Font self)
1009 PROTOTYPE: $ 1075 PROTOTYPE: $
1010 CODE: 1076 CODE:
1011 default_font = self; 1077 default_font = self;
1012 1078
1013MODULE = CFPlus PACKAGE = CFPlus::Layout 1079MODULE = Deliantra::Client PACKAGE = DC::Layout
1014 1080
1015PROTOTYPES: DISABLE 1081PROTOTYPES: DISABLE
1016 1082
1017void 1083void
1018reset_glyph_cache () 1084glyph_cache_backup ()
1019 PROTOTYPE: 1085 PROTOTYPE:
1020 CODE: 1086 CODE:
1087 tc_backup ();
1088
1089void
1090glyph_cache_restore ()
1091 PROTOTYPE:
1092 CODE:
1021 tc_clear (); 1093 tc_restore ();
1022 1094
1023CFPlus::Layout 1095DC::Layout
1024new (SV *class) 1096new (SV *class)
1025 CODE: 1097 CODE:
1026 New (0, RETVAL, 1, struct cf_layout); 1098 New (0, RETVAL, 1, struct cf_layout);
1027 1099
1028 RETVAL->pl = pango_layout_new (opengl_context); 1100 RETVAL->pl = pango_layout_new (opengl_context);
1030 RETVAL->g = 1.; 1102 RETVAL->g = 1.;
1031 RETVAL->b = 1.; 1103 RETVAL->b = 1.;
1032 RETVAL->a = 1.; 1104 RETVAL->a = 1.;
1033 RETVAL->base_height = MIN_FONT_HEIGHT; 1105 RETVAL->base_height = MIN_FONT_HEIGHT;
1034 RETVAL->font = 0; 1106 RETVAL->font = 0;
1107 RETVAL->rc = rc_alloc ();
1035 1108
1036 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1109 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037 layout_update_font (RETVAL); 1110 layout_update_font (RETVAL);
1038 OUTPUT: 1111 OUTPUT:
1039 RETVAL 1112 RETVAL
1040 1113
1041void 1114void
1042DESTROY (CFPlus::Layout self) 1115DESTROY (DC::Layout self)
1043 CODE: 1116 CODE:
1044 g_object_unref (self->pl); 1117 g_object_unref (self->pl);
1118 rc_free (self->rc);
1045 Safefree (self); 1119 Safefree (self);
1046 1120
1047void 1121void
1048set_text (CFPlus::Layout self, SV *text_) 1122set_text (DC::Layout self, SV *text_)
1049 CODE: 1123 CODE:
1050{ 1124{
1051 STRLEN textlen; 1125 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1126 char *text = SvPVutf8 (text_, textlen);
1053 1127
1054 pango_layout_set_text (self->pl, text, textlen); 1128 pango_layout_set_text (self->pl, text, textlen);
1055} 1129}
1056 1130
1057void 1131void
1058set_markup (CFPlus::Layout self, SV *text_) 1132set_markup (DC::Layout self, SV *text_)
1059 CODE: 1133 CODE:
1060{ 1134{
1061 STRLEN textlen; 1135 STRLEN textlen;
1062 char *text = SvPVutf8 (text_, textlen); 1136 char *text = SvPVutf8 (text_, textlen);
1063 1137
1064 pango_layout_set_markup (self->pl, text, textlen); 1138 pango_layout_set_markup (self->pl, text, textlen);
1065} 1139}
1066 1140
1067void 1141void
1068set_shapes (CFPlus::Layout self, ...) 1142set_shapes (DC::Layout self, ...)
1069 CODE: 1143 CODE:
1070{ 1144{
1071 PangoAttrList *attrs = 0; 1145 PangoAttrList *attrs = 0;
1072 const char *text = pango_layout_get_text (self->pl); 1146 const char *text = pango_layout_get_text (self->pl);
1073 const char *pos = text; 1147 const char *pos = text;
1108 if (attrs) 1182 if (attrs)
1109 pango_layout_set_attributes (self->pl, attrs); 1183 pango_layout_set_attributes (self->pl, attrs);
1110} 1184}
1111 1185
1112void 1186void
1113get_shapes (CFPlus::Layout self) 1187get_shapes (DC::Layout self)
1114 PPCODE: 1188 PPCODE:
1115{ 1189{
1116 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1190 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117 1191
1118 do 1192 do
1119 { 1193 {
1120 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1194 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121 1195
1122 if (run && shape_attr_p (run)) 1196 if (run && shape_attr_p (run))
1123 { 1197 {
1124 PangoRectangle extents; 1198 PangoRectangle extents;
1125 pango_layout_iter_get_run_extents (iter, 0, &extents); 1199 pango_layout_iter_get_run_extents (iter, 0, &extents);
1133 1207
1134 pango_layout_iter_free (iter); 1208 pango_layout_iter_free (iter);
1135} 1209}
1136 1210
1137int 1211int
1138has_wrapped (CFPlus::Layout self) 1212has_wrapped (DC::Layout self)
1139 CODE: 1213 CODE:
1140{ 1214{
1141 int lines = 1; 1215 int lines = 1;
1142 const char *text = pango_layout_get_text (self->pl); 1216 const char *text = pango_layout_get_text (self->pl);
1143 1217
1148} 1222}
1149 OUTPUT: 1223 OUTPUT:
1150 RETVAL 1224 RETVAL
1151 1225
1152SV * 1226SV *
1153get_text (CFPlus::Layout self) 1227get_text (DC::Layout self)
1154 CODE: 1228 CODE:
1155 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1229 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156 sv_utf8_decode (RETVAL); 1230 sv_utf8_decode (RETVAL);
1157 OUTPUT: 1231 OUTPUT:
1158 RETVAL 1232 RETVAL
1159 1233
1160void 1234void
1161set_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.)
1162 CODE: 1236 CODE:
1163 self->r = r; 1237 self->r = r;
1164 self->g = g; 1238 self->g = g;
1165 self->b = b; 1239 self->b = b;
1166 self->a = a; 1240 self->a = a;
1167 1241
1168void 1242void
1169set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1243set_font (DC::Layout self, DC::Font font = 0)
1170 CODE: 1244 CODE:
1171 if (self->font != font) 1245 if (self->font != font)
1172 { 1246 {
1173 self->font = font; 1247 self->font = font;
1174 layout_update_font (self); 1248 layout_update_font (self);
1175 } 1249 }
1176 1250
1177void 1251void
1178set_height (CFPlus::Layout self, int base_height) 1252set_height (DC::Layout self, int base_height)
1179 CODE: 1253 CODE:
1180 if (self->base_height != base_height) 1254 if (self->base_height != base_height)
1181 { 1255 {
1182 self->base_height = base_height; 1256 self->base_height = base_height;
1183 layout_update_font (self); 1257 layout_update_font (self);
1184 } 1258 }
1185 1259
1186void 1260void
1187set_width (CFPlus::Layout self, int max_width = -1) 1261set_width (DC::Layout self, int max_width = -1)
1188 CODE: 1262 CODE:
1189 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);
1190 1264
1191void 1265void
1192set_indent (CFPlus::Layout self, int indent) 1266set_indent (DC::Layout self, int indent)
1193 CODE: 1267 CODE:
1194 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1268 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195 1269
1196void 1270void
1197set_spacing (CFPlus::Layout self, int spacing) 1271set_spacing (DC::Layout self, int spacing)
1198 CODE: 1272 CODE:
1199 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1273 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200 1274
1201void 1275void
1202set_ellipsise (CFPlus::Layout self, int ellipsise) 1276set_ellipsise (DC::Layout self, int ellipsise)
1203 CODE: 1277 CODE:
1204 pango_layout_set_ellipsize (self->pl, 1278 pango_layout_set_ellipsize (self->pl,
1205 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1279 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1280 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1281 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208 : PANGO_ELLIPSIZE_NONE 1282 : PANGO_ELLIPSIZE_NONE
1209 ); 1283 );
1210 1284
1211void 1285void
1212set_single_paragraph_mode (CFPlus::Layout self, int spm) 1286set_single_paragraph_mode (DC::Layout self, int spm)
1213 CODE: 1287 CODE:
1214 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1288 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215 1289
1216void 1290void
1217size (CFPlus::Layout self) 1291size (DC::Layout self)
1218 PPCODE: 1292 PPCODE:
1219{ 1293{
1220 int w, h; 1294 int w, h;
1221 1295
1222 layout_get_pixel_size (self, &w, &h); 1296 layout_get_pixel_size (self, &w, &h);
1225 PUSHs (sv_2mortal (newSViv (w))); 1299 PUSHs (sv_2mortal (newSViv (w)));
1226 PUSHs (sv_2mortal (newSViv (h))); 1300 PUSHs (sv_2mortal (newSViv (h)));
1227} 1301}
1228 1302
1229int 1303int
1230descent (CFPlus::Layout self) 1304descent (DC::Layout self)
1231 CODE: 1305 CODE:
1232{ 1306{
1233 PangoRectangle rect; 1307 PangoRectangle rect;
1234 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1308 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235 pango_layout_line_get_pixel_extents (line, 0, &rect); 1309 pango_layout_line_get_pixel_extents (line, 0, &rect);
1236 RETVAL = PANGO_DESCENT (rect); 1310 RETVAL = PANGO_DESCENT (rect);
1237} 1311}
1238 OUTPUT: 1312 OUTPUT:
1239 RETVAL 1313 RETVAL
1240 1314
1241int 1315int
1242xy_to_index (CFPlus::Layout self, int x, int y) 1316xy_to_index (DC::Layout self, int x, int y)
1243 CODE: 1317 CODE:
1244{ 1318{
1245 int index, trailing; 1319 int index, trailing;
1246 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);
1247 RETVAL = index + trailing; 1321 RETVAL = index + trailing;
1248} 1322}
1249 OUTPUT: 1323 OUTPUT:
1250 RETVAL 1324 RETVAL
1251 1325
1252void 1326void
1253cursor_pos (CFPlus::Layout self, int index) 1327cursor_pos (DC::Layout self, int index)
1254 PPCODE: 1328 PPCODE:
1255{ 1329{
1256 PangoRectangle strong_pos; 1330 PangoRectangle pos;
1257 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1331 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258 1332
1259 EXTEND (SP, 3); 1333 EXTEND (SP, 3);
1260 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1334 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1335 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1336 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263} 1337}
1264 1338
1265void 1339void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1340index_to_line_x (DC::Layout self, int index, int trailing = 0)
1267 PPCODE: 1341 PPCODE:
1268{ 1342{
1269 int line, x; 1343 int line, x;
1270 1344
1271 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)
1272 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1347 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273 1348 --line;
1349#endif
1274 EXTEND (SP, 2); 1350 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (newSViv (line - 1))); 1351 PUSHs (sv_2mortal (newSViv (line)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1352 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277} 1353}
1278 1354
1279void 1355void
1280line_x_to_index (CFPlus::Layout self, int line, int x) 1356line_x_to_index (DC::Layout self, int line, int x)
1281 PPCODE: 1357 PPCODE:
1282{ 1358{
1283 PangoLayoutLine *lp; 1359 PangoLayoutLine *lp;
1284 int index, trailing; 1360 int index, trailing;
1285 1361
1286 if (line < 0) 1362 if (line < 0)
1287 XSRETURN_EMPTY; 1363 XSRETURN_EMPTY;
1288 1364
1289 if (!(lp = pango_layout_get_line (self->pl, line))) 1365 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290 XSRETURN_EMPTY; /* do better */ 1366 XSRETURN_EMPTY; /* do better */
1291 1367
1292 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);
1293 1369
1294 EXTEND (SP, 2); 1370 EXTEND (SP, 2);
1300 PUSHs (sv_2mortal (newSViv (trailing))); 1376 PUSHs (sv_2mortal (newSViv (trailing)));
1301 } 1377 }
1302} 1378}
1303 1379
1304void 1380void
1305render (CFPlus::Layout self, float x, float y, int flags = 0) 1381render (DC::Layout self, float x, float y, int flags = 0)
1306 PPCODE: 1382 CODE:
1383 rc_clear (self->rc);
1307 pango_opengl_render_layout_subpixel ( 1384 pango_opengl_render_layout_subpixel (
1308 self->pl, 1385 self->pl,
1386 self->rc,
1309 x * PANGO_SCALE, y * PANGO_SCALE, 1387 x * PANGO_SCALE, y * PANGO_SCALE,
1310 self->r, self->g, self->b, self->a, 1388 self->r, self->g, self->b, self->a,
1311 flags 1389 flags
1312 ); 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);
1313 1394
1314MODULE = 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
1315 1415
1316PROTOTYPES: ENABLE 1416PROTOTYPES: ENABLE
1317
1318int minpot (int n)
1319 1417
1320void 1418void
1321pad (SV *data_, int ow, int oh, int nw, int nh) 1419pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE: 1420 CODE:
1323{ 1421{
1350 HV *hv = (HV *)SvRV (self); 1448 HV *hv = (HV *)SvRV (self);
1351 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1449 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1352 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1450 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1353 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1451 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1354 1452
1453 if (name <= 0)
1454 XSRETURN_EMPTY;
1455
1355 if (items < 5) 1456 if (items < 5)
1356 { 1457 {
1357 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1458 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1358 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1459 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1359 } 1460 }
1397 RETVAL = width > 0; 1498 RETVAL = width > 0;
1398} 1499}
1399 OUTPUT: 1500 OUTPUT:
1400 RETVAL 1501 RETVAL
1401 1502
1402MODULE = CFPlus PACKAGE = CFPlus::Map 1503MODULE = Deliantra::Client PACKAGE = DC::Map
1403 1504
1404PROTOTYPES: DISABLE 1505PROTOTYPES: DISABLE
1405 1506
1406CFPlus::Map 1507DC::Map
1407new (SV *class) 1508new (SV *class)
1408 CODE: 1509 CODE:
1409 New (0, RETVAL, 1, struct map); 1510 New (0, RETVAL, 1, struct map);
1410 RETVAL->x = 0; 1511 RETVAL->x = 0;
1411 RETVAL->y = 0; 1512 RETVAL->y = 0;
1419 RETVAL->row = 0; 1520 RETVAL->row = 0;
1420 OUTPUT: 1521 OUTPUT:
1421 RETVAL 1522 RETVAL
1422 1523
1423void 1524void
1424DESTROY (CFPlus::Map self) 1525DESTROY (DC::Map self)
1425 CODE: 1526 CODE:
1426{ 1527{
1427 map_clear (self); 1528 map_clear (self);
1428 Safefree (self->face2tile); 1529 Safefree (self->face2tile);
1429 Safefree (self->tex); 1530 Safefree (self->tex);
1430 Safefree (self); 1531 Safefree (self);
1431} 1532}
1432 1533
1433void 1534void
1434resize (CFPlus::Map self, int map_width, int map_height) 1535resize (DC::Map self, int map_width, int map_height)
1435 CODE: 1536 CODE:
1436 self->w = map_width; 1537 self->w = map_width;
1437 self->h = map_height; 1538 self->h = map_height;
1438 1539
1439void 1540void
1440clear (CFPlus::Map self) 1541clear (DC::Map self)
1441 CODE: 1542 CODE:
1442 map_clear (self); 1543 map_clear (self);
1443 1544
1444void 1545void
1445set_tileid (CFPlus::Map self, int face, int tile) 1546set_tileid (DC::Map self, int face, int tile)
1446 CODE: 1547 CODE:
1447{ 1548{
1448 need_facenum (self, face); self->face2tile [face] = tile; 1549 need_facenum (self, face); self->face2tile [face] = tile;
1449 need_texid (self, tile); 1550 need_texid (self, tile);
1450} 1551}
1451 1552
1452void 1553void
1453set_smooth (CFPlus::Map self, int face, int smooth, int level) 1554set_smooth (DC::Map self, int face, int smooth, int level)
1454 CODE: 1555 CODE:
1455{ 1556{
1456 tileid texid; 1557 tileid texid;
1457 maptex *tex; 1558 maptex *tex;
1458 1559
1471 tex->smoothtile = self->face2tile [smooth]; 1572 tex->smoothtile = self->face2tile [smooth];
1472 tex->smoothlevel = level; 1573 tex->smoothlevel = level;
1473} 1574}
1474 1575
1475void 1576void
1476set_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)
1477 CODE: 1578 CODE:
1478{ 1579{
1479 need_texid (self, texid); 1580 need_texid (self, texid);
1480 1581
1481 { 1582 {
1501 // from transparent color bleeding and ugly wrapping effects. 1602 // from transparent color bleeding and ugly wrapping effects.
1502 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1603 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1503} 1604}
1504 1605
1505int 1606int
1506ox (CFPlus::Map self) 1607ox (DC::Map self)
1507 ALIAS: 1608 ALIAS:
1508 oy = 1 1609 oy = 1
1509 x = 2 1610 x = 2
1510 y = 3 1611 y = 3
1511 w = 4 1612 w = 4
1522 } 1623 }
1523 OUTPUT: 1624 OUTPUT:
1524 RETVAL 1625 RETVAL
1525 1626
1526void 1627void
1527scroll (CFPlus::Map self, int dx, int dy) 1628scroll (DC::Map self, int dx, int dy)
1528 CODE: 1629 CODE:
1529{ 1630{
1530 if (dx > 0) 1631 if (dx > 0)
1531 map_blank (self, self->x, self->y, dx, self->h); 1632 map_blank (self, self->x, self->y, dx, self->h);
1532 else if (dx < 0) 1633 else if (dx < 0)
1547 self->rows += MAP_EXTEND_Y; 1648 self->rows += MAP_EXTEND_Y;
1548 self->y += MAP_EXTEND_Y; 1649 self->y += MAP_EXTEND_Y;
1549 } 1650 }
1550} 1651}
1551 1652
1552void 1653SV *
1553map1a_update (CFPlus::Map self, SV *data_, int extmap) 1654map1a_update (DC::Map self, SV *data_, int extmap)
1554 CODE: 1655 CODE:
1555{ 1656{
1556 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1657 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1557 uint8_t *data_end = (uint8_t *)SvEND (data_); 1658 uint8_t *data_end = (uint8_t *)SvEND (data_);
1558 mapcell *cell; 1659 mapcell *cell;
1559 int x, y, flags; 1660 int x, y, z, flags;
1661 AV *missing = newAV ();
1662 RETVAL = newRV_noinc ((SV *)missing);
1560 1663
1561 while (data < data_end - 1) 1664 while (data < data_end - 1)
1562 { 1665 {
1563 flags = (data [0] << 8) + data [1]; data += 2; 1666 flags = (data [0] << 8) + data [1]; data += 2;
1564 1667
1615 } 1718 }
1616 else 1719 else
1617 cell->darkness = *data++ + 1; 1720 cell->darkness = *data++ + 1;
1618 } 1721 }
1619 1722
1723 for (z = 0; z <= 2; ++z)
1620 if (flags & 4) 1724 if (flags & (4 >> z))
1621 { 1725 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2; 1726 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face); 1727 need_facenum (self, face);
1624 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 }
1625 } 1743 }
1626
1627 if (flags & 2)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [1] = self->face2tile [face];
1632 }
1633
1634 if (flags & 1)
1635 {
1636 faceid face = (data [0] << 8) + data [1]; data += 2;
1637 need_facenum (self, face);
1638 cell->tile [2] = self->face2tile [face];
1639 }
1640 } 1744 }
1641 else 1745 else
1642 cell->darkness = 0; 1746 cell->darkness = 0;
1643 } 1747 }
1644} 1748}
1749 OUTPUT:
1750 RETVAL
1645 1751
1646SV * 1752SV *
1647mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1753mapmap (DC::Map self, int x0, int y0, int w, int h)
1648 CODE: 1754 CODE:
1649{ 1755{
1650 int x1, x; 1756 int x1, x;
1651 int y1, y; 1757 int y1, y;
1652 int z; 1758 int z;
1697} 1803}
1698 OUTPUT: 1804 OUTPUT:
1699 RETVAL 1805 RETVAL
1700 1806
1701void 1807void
1702draw (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)
1703 CODE: 1809 CODE:
1704{ 1810{
1811 int x, y, z;
1812
1705 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1706 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
1707 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)
1708 smooth_key skey; 1816 smooth_key skey;
1709 int x, y, z; 1817
1710 int last_name; 1818 rc_t *rc = rc_alloc ();
1819 rc_key_t key;
1820 rc_array_t *arr;
1711 1821
1712 // thats current max. sorry. 1822 // thats current max. sorry.
1713 if (sw > 255) sw = 255; 1823 if (sw > 255) sw = 255;
1714 if (sh > 255) sh = 255; 1824 if (sh > 255) sh = 255;
1715 1825
1716 // clear key, in case of extra padding 1826 // clear key, in case of extra padding
1717 memset (&skey, 0, sizeof (skey)); 1827 memset (&skey, 0, sizeof (skey));
1718 1828
1719 glColor4ub (255, 255, 255, 255); 1829 memset (&key, 0, sizeof (key));
1720 1830 key.r = 255;
1721 glEnable (GL_BLEND); 1831 key.g = 255;
1722 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1832 key.b = 255;
1723 glEnable (GL_TEXTURE_2D); 1833 key.a = 255;
1724 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1834 key.mode = GL_QUADS;
1725 1835 key.format = GL_T2F_V3F;
1726 glBegin (GL_QUADS); 1836 key.texname = -1;
1727
1728 last_name = 0;
1729 1837
1730 mx += self->x; 1838 mx += self->x;
1731 my += self->y; 1839 my += self->y;
1732 1840
1733 // first pass: determine smooth_max 1841 // first pass: determine smooth_max
1749 MAX (self->tex [cell->tile [0]].smoothlevel, 1857 MAX (self->tex [cell->tile [0]].smoothlevel,
1750 MAX (self->tex [cell->tile [1]].smoothlevel, 1858 MAX (self->tex [cell->tile [1]].smoothlevel,
1751 self->tex [cell->tile [2]].smoothlevel)); 1859 self->tex [cell->tile [2]].smoothlevel));
1752 } 1860 }
1753 } 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);
1754 1866
1755 for (z = 0; z <= 2; z++) 1867 for (z = 0; z <= 2; z++)
1756 { 1868 {
1757 memset (smooth_level, 0, sizeof (smooth_level)); 1869 memset (smooth_level, 0, sizeof (smooth_level));
1758 1870
1768 tileid tile = cell->tile [z]; 1880 tileid tile = cell->tile [z];
1769 1881
1770 if (tile) 1882 if (tile)
1771 { 1883 {
1772 maptex tex = self->tex [tile]; 1884 maptex tex = self->tex [tile];
1773 int px = (x + 1) * T - tex.w; 1885 int px, py;
1774 int py = (y + 1) * T - tex.h;
1775 1886
1776 // suppressing texture state switches here
1777 // is only moderately effective, but worth the extra effort
1778 if (last_name != tex.name) 1887 if (key.texname != tex.name)
1779 { 1888 {
1780 if (!tex.name) 1889 if (!tex.name)
1781 tex = self->tex [2]; /* missing, replace by noface */ 1890 tex = self->tex [2]; /* missing, replace by noface */
1782 1891
1783 glEnd (); 1892 key.texname = tex.name;
1784 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1893 arr = rc_array (rc, &key);
1785 glBegin (GL_QUADS);
1786 } 1894 }
1787 1895
1788 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);
1789 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1790 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);
1791 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1902 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1792 1903
1793 if (cell->flags && z == 2) 1904 if (cell->flags && z == 2)
1794 { 1905 {
1906 // overlays such as the speech bubble, probably more to come
1795 if (cell->flags & 1) 1907 if (cell->flags & 1)
1796 { 1908 {
1797 maptex tex = self->tex [1]; 1909 maptex tex = self->tex [1];
1798 int px = x * T + T * 2 / 32; 1910 int px = x * T + T * 2 / 32;
1799 int py = y * T - T * 6 / 32; 1911 int py = y * T - T * 6 / 32;
1800 1912
1913 if (tex.name)
1801 glEnd (); 1914 {
1802 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);
1803 glBegin (GL_QUADS); 1925 }
1804
1805 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1806 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1807 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1808 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1809 } 1926 }
1810 } 1927 }
1811 1928
1812 // update smooth hash 1929 // update smooth hash
1813 if (tex.smoothtile) 1930 if (tex.smoothtile)
1849 } 1966 }
1850 } 1967 }
1851 } 1968 }
1852 } 1969 }
1853 1970
1971 rc_draw (rc);
1972 rc_clear (rc);
1973
1854 // go through all smoothlevels, lowest to highest, then draw. 1974 // go through all smoothlevels, lowest to highest, then draw.
1855 // this is basically counting sort 1975 // this is basically counting sort
1856 { 1976 {
1857 int w, b; 1977 int w, b;
1858 1978
1979 glEnable (GL_TEXTURE_2D);
1980 glBegin (GL_QUADS);
1859 for (w = 0; w < 256 / 32; ++w) 1981 for (w = 0; w < 256 / 32; ++w)
1860 { 1982 {
1861 uint32_t smask = smooth_level [w]; 1983 uint32_t smask = smooth_level [w];
1862 if (smask) 1984 if (smask)
1863 for (b = 0; b < 32; ++b) 1985 for (b = 0; b < 32; ++b)
1882 int border = bits & 15; 2004 int border = bits & 15;
1883 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2005 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884 float dx = tex.s * .0625f; // 16 images/row 2006 float dx = tex.s * .0625f; // 16 images/row
1885 float dy = tex.t * .5f ; // 2 images/column 2007 float dy = tex.t * .5f ; // 2 images/column
1886 2008
1887 // this time naively avoiding texture state changes
1888 // save gobs of state changes.
1889 if (last_name != tex.name) 2009 if (tex.name)
1890 { 2010 {
2011 // this time avoiding texture state changes
2012 // save gobs of state changes.
1891 if (!tex.name) 2013 if (key.texname != tex.name)
1892 continue; // smoothing not yet available 2014 {
1893
1894 glEnd (); 2015 glEnd ();
1895 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2016 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1896 glBegin (GL_QUADS); 2017 glBegin (GL_QUADS);
1897 } 2018 }
1898 2019
1899 if (border) 2020 if (border)
1900 { 2021 {
1901 float ox = border * dx; 2022 float ox = border * dx;
1902 2023
1903 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2024 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1904 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2025 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1905 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2026 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1906 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2027 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1907 } 2028 }
1908 2029
1909 if (corner) 2030 if (corner)
1910 { 2031 {
1911 float ox = corner * dx; 2032 float ox = corner * dx;
1912 2033
1913 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2034 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1914 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2035 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1915 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2036 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1916 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2037 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2038 }
1917 } 2039 }
1918 } 2040 }
1919 } 2041 }
1920 } 2042 }
1921 } 2043 }
2044
2045 glEnd ();
2046 glDisable (GL_TEXTURE_2D);
2047 key.texname = -1;
1922 } 2048 }
1923 2049
1924 hv_clear (smooth); 2050 hv_clear (smooth);
1925 } 2051 }
1926 2052
1927 glEnd ();
1928
1929 glDisable (GL_TEXTURE_2D);
1930 glDisable (GL_BLEND); 2053 glDisable (GL_BLEND);
2054 rc_free (rc);
1931 2055
1932 // top layer: overlays such as the health bar 2056 // top layer: overlays such as the health bar
1933 for (y = 0; y < sh; y++) 2057 for (y = 0; y < sh; y++)
1934 if (0 <= y + my && y + my < self->rows) 2058 if (0 <= y + my && y + my < self->rows)
1935 { 2059 {
1960 } 2084 }
1961 } 2085 }
1962} 2086}
1963 2087
1964void 2088void
1965draw_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)
1966 CODE: 2090 CODE:
1967{ 2091{
1968 static float color[16][3] = { 2092 static float color[16][3] = {
1969 { 0.00F, 0.00F, 0.00F }, 2093 { 0.00F, 0.00F, 0.00F },
1970 { 1.00F, 1.00F, 1.00F }, 2094 { 1.00F, 1.00F, 1.00F },
2020 glDisable (GL_BLEND); 2144 glDisable (GL_BLEND);
2021 glDisable (GL_TEXTURE_2D); 2145 glDisable (GL_TEXTURE_2D);
2022} 2146}
2023 2147
2024void 2148void
2025fow_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)
2026 PPCODE: 2150 PPCODE:
2027{ 2151{
2028 int x, y; 2152 int x, y;
2029 int sw1 = sw + 2; 2153 int sw1 = sw + 2;
2030 int sh1 = sh + 2; 2154 int sh1 = sh + 2;
2101 PUSHs (sv_2mortal (newSViv (sh3))); 2225 PUSHs (sv_2mortal (newSViv (sh3)));
2102 PUSHs (darkness3_sv); 2226 PUSHs (darkness3_sv);
2103} 2227}
2104 2228
2105SV * 2229SV *
2106get_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)
2107 CODE: 2231 CODE:
2108{ 2232{
2109 int x, y, x1, y1; 2233 int x, y, x1, y1;
2110 SV *data_sv = newSV (w * h * 7 + 5); 2234 SV *data_sv = newSV (w * h * 7 + 5);
2111 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2235 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2168 else 2292 else
2169 *data++ = 0; 2293 *data++ = 0;
2170 } 2294 }
2171 } 2295 }
2172 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 {
2173 SvPOK_only (data_sv); 2304 SvPOK_only (data_sv);
2174 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2305 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2175 RETVAL = data_sv; 2306 RETVAL = data_sv;
2307 }
2176} 2308}
2177 OUTPUT: 2309 OUTPUT:
2178 RETVAL 2310 RETVAL
2179 2311
2180void 2312void
2181set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2313set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2182 PPCODE: 2314 PPCODE:
2183{ 2315{
2184 int x, y, z; 2316 int x, y, z;
2185 int w, h; 2317 int w, h;
2186 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;
2187 2329
2188 if (*data++ != 0) 2330 if (*data++ != 0)
2189 return; /* version mismatch */ 2331 XSRETURN_EMPTY; /* version mismatch */
2190 2332
2191 w = *data++ << 8; w |= *data++; 2333 w = *data++ << 8; w |= *data++;
2192 h = *data++ << 8; h |= *data++; 2334 h = *data++ << 8; h |= *data++;
2193 2335
2194 // 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
2206 { 2348 {
2207 maprow *row = map_get_row (self, y); 2349 maprow *row = map_get_row (self, y);
2208 2350
2209 for (x = x0; x < x1; x++) 2351 for (x = x0; x < x1; x++)
2210 { 2352 {
2353 uint8_t flags;
2354
2355 if (data + 7 >= end)
2356 XSRETURN_EMPTY;
2357
2211 uint8_t flags = *data++; 2358 flags = *data++;
2212 2359
2213 if (flags) 2360 if (flags)
2214 { 2361 {
2215 mapcell *cell = row_get_cell (row, x); 2362 mapcell *cell = row_get_cell (row, x);
2216 tileid tile[3] = { 0, 0, 0 }; 2363 tileid tile[3] = { 0, 0, 0 };
2239 } 2386 }
2240 } 2387 }
2241 } 2388 }
2242} 2389}
2243 2390
2244MODULE = CFPlus PACKAGE = CFPlus::RW 2391MODULE = Deliantra::Client PACKAGE = DC::RW
2245 2392
2246CFPlus::RW 2393DC::RW
2247new (SV *class, SV *data_sv) 2394new (SV *class, SV *data_sv)
2248 CODE: 2395 CODE:
2249{ 2396{
2250 STRLEN datalen; 2397 STRLEN datalen;
2251 char *data = SvPVbyte (data_sv, datalen); 2398 char *data = SvPVbyte (data_sv, datalen);
2253 RETVAL = SDL_RWFromConstMem (data, datalen); 2400 RETVAL = SDL_RWFromConstMem (data, datalen);
2254} 2401}
2255 OUTPUT: 2402 OUTPUT:
2256 RETVAL 2403 RETVAL
2257 2404
2258CFPlus::RW 2405DC::RW
2259new_from_file (SV *class, const char *path, const char *mode = "rb") 2406new_from_file (SV *class, const char *path, const char *mode = "rb")
2260 CODE: 2407 CODE:
2261 RETVAL = SDL_RWFromFile (path, mode); 2408 RETVAL = SDL_RWFromFile (path, mode);
2262 OUTPUT: 2409 OUTPUT:
2263 RETVAL 2410 RETVAL
2264 2411
2265# fails on win32: 2412# fails on win32:
2266# CFPlus.xs(2268) : error C2059: syntax error : '(' 2413# dc.xs(2268) : error C2059: syntax error : '('
2267#void 2414#void
2268#close (CFPlus::RW self) 2415#close (DC::RW self)
2269# CODE: 2416# CODE:
2270# (self->(close)) (self); 2417# (self->(close)) (self);
2271 2418
2272MODULE = CFPlus PACKAGE = CFPlus::Channel 2419MODULE = Deliantra::Client PACKAGE = DC::Channel
2273 2420
2274PROTOTYPES: DISABLE 2421PROTOTYPES: DISABLE
2275 2422
2276CFPlus::Channel 2423DC::Channel
2277find () 2424find ()
2278 CODE: 2425 CODE:
2279{ 2426{
2280 RETVAL = Mix_GroupAvailable (-1); 2427 RETVAL = Mix_GroupAvailable (-1);
2281 2428
2294} 2441}
2295 OUTPUT: 2442 OUTPUT:
2296 RETVAL 2443 RETVAL
2297 2444
2298void 2445void
2299halt (CFPlus::Channel self) 2446halt (DC::Channel self)
2300 CODE: 2447 CODE:
2301 Mix_HaltChannel (self); 2448 Mix_HaltChannel (self);
2302 2449
2303void 2450void
2304expire (CFPlus::Channel self, int ticks = -1) 2451expire (DC::Channel self, int ticks = -1)
2305 CODE: 2452 CODE:
2306 Mix_ExpireChannel (self, ticks); 2453 Mix_ExpireChannel (self, ticks);
2307 2454
2308void 2455void
2309fade_out (CFPlus::Channel self, int ticks = -1) 2456fade_out (DC::Channel self, int ticks = -1)
2310 CODE: 2457 CODE:
2311 Mix_FadeOutChannel (self, ticks); 2458 Mix_FadeOutChannel (self, ticks);
2312 2459
2313int 2460int
2314volume (CFPlus::Channel self, int volume) 2461volume (DC::Channel self, int volume)
2315 CODE: 2462 CODE:
2316 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2463 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2317 OUTPUT: 2464 OUTPUT:
2318 RETVAL 2465 RETVAL
2319 2466
2320void 2467void
2321unregister_all_effects (CFPlus::Channel self) 2468unregister_all_effects (DC::Channel self)
2322 CODE: 2469 CODE:
2323 Mix_UnregisterAllEffects (self); 2470 Mix_UnregisterAllEffects (self);
2324 2471
2325void 2472void
2326set_panning (CFPlus::Channel self, int left, int right) 2473set_panning (DC::Channel self, int left, int right)
2327 CODE: 2474 CODE:
2328 left = CLAMP (left , 0, 255); 2475 left = CLAMP (left , 0, 255);
2329 right = CLAMP (right, 0, 255); 2476 right = CLAMP (right, 0, 255);
2330 Mix_SetPanning (self, left, right); 2477 Mix_SetPanning (self, left, right);
2331 2478
2332void 2479void
2333set_distance (CFPlus::Channel self, int distance) 2480set_distance (DC::Channel self, int distance)
2334 CODE: 2481 CODE:
2335 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2482 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2336 2483
2337void 2484void
2338set_position (CFPlus::Channel self, int angle, int distance) 2485set_position (DC::Channel self, int angle, int distance)
2339 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);
2340 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2494 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2495}
2341 2496
2342void 2497void
2343set_reverse_stereo (CFPlus::Channel self, int flip) 2498set_reverse_stereo (DC::Channel self, int flip)
2344 CODE: 2499 CODE:
2345 Mix_SetReverseStereo (self, flip); 2500 Mix_SetReverseStereo (self, flip);
2346 2501
2347MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2502MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2348 2503
2349PROTOTYPES: DISABLE 2504PROTOTYPES: DISABLE
2350 2505
2351CFPlus::MixChunk 2506DC::MixChunk
2352new (SV *class, CFPlus::RW rwops) 2507new (SV *class, DC::RW rwops)
2353 CODE: 2508 CODE:
2354 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2509 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2355 OUTPUT: 2510 OUTPUT:
2356 RETVAL 2511 RETVAL
2357 2512
2358void 2513void
2359DESTROY (CFPlus::MixChunk self) 2514DESTROY (DC::MixChunk self)
2360 CODE: 2515 CODE:
2361 Mix_FreeChunk (self); 2516 Mix_FreeChunk (self);
2362 2517
2363int 2518int
2364volume (CFPlus::MixChunk self, int volume = -1) 2519volume (DC::MixChunk self, int volume = -1)
2365 CODE: 2520 CODE:
2366 if (items > 1) 2521 if (items > 1)
2367 volume = CLAMP (volume, 0, 128); 2522 volume = CLAMP (volume, 0, 128);
2368 RETVAL = Mix_VolumeChunk (self, volume); 2523 RETVAL = Mix_VolumeChunk (self, volume);
2369 OUTPUT: 2524 OUTPUT:
2370 RETVAL 2525 RETVAL
2371 2526
2372CFPlus::Channel 2527DC::Channel
2373play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2528play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2374 CODE: 2529 CODE:
2375{ 2530{
2376 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2531 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2377 2532
2378 if (RETVAL < 0) 2533 if (RETVAL < 0)
2385 } 2540 }
2386} 2541}
2387 OUTPUT: 2542 OUTPUT:
2388 RETVAL 2543 RETVAL
2389 2544
2390MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2545MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2391 2546
2392int 2547int
2393volume (int volume = -1) 2548volume (int volume = -1)
2394 PROTOTYPE: ;$ 2549 PROTOTYPE: ;$
2395 CODE: 2550 CODE:
2407void 2562void
2408halt () 2563halt ()
2409 CODE: 2564 CODE:
2410 Mix_HaltMusic (); 2565 Mix_HaltMusic ();
2411 2566
2412CFPlus::MixMusic 2567DC::MixMusic
2413new (SV *class, CFPlus::RW rwops) 2568new (SV *class, DC::RW rwops)
2414 CODE: 2569 CODE:
2415 RETVAL = Mix_LoadMUS_RW (rwops); 2570 RETVAL = Mix_LoadMUS_RW (rwops);
2416 OUTPUT: 2571 OUTPUT:
2417 RETVAL 2572 RETVAL
2418 2573
2419void 2574void
2420DESTROY (CFPlus::MixMusic self) 2575DESTROY (DC::MixMusic self)
2421 CODE: 2576 CODE:
2422 Mix_FreeMusic (self); 2577 Mix_FreeMusic (self);
2423 2578
2424int 2579int
2425play (CFPlus::MixMusic self, int loops = -1) 2580play (DC::MixMusic self, int loops = -1)
2426 CODE: 2581 CODE:
2427 RETVAL = Mix_PlayMusic (self, loops); 2582 RETVAL = Mix_PlayMusic (self, loops);
2428 OUTPUT: 2583 OUTPUT:
2429 RETVAL 2584 RETVAL
2430 2585
2431void 2586void
2432fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2587fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2433 CODE: 2588 CODE:
2434 Mix_FadeInMusicPos (self, loops, ms, position); 2589 Mix_FadeInMusicPos (self, loops, ms, position);
2435 2590
2436MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2591MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2437 2592
2438PROTOTYPES: ENABLE 2593PROTOTYPES: ENABLE
2439 2594
2440BOOT: 2595BOOT:
2441{ 2596{
2442 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2597 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2443 static const struct { 2598 static const struct {
2444 const char *name; 2599 const char *name;
2445 IV iv; 2600 IV iv;
2446 } *civ, const_iv[] = { 2601 } *civ, const_iv[] = {
2447# define const_iv(name) { # name, (IV)name } 2602# define const_iv(name) { # name, (IV)name }
2482 const_iv (GL_INTENSITY), 2637 const_iv (GL_INTENSITY),
2483 const_iv (GL_LUMINANCE), 2638 const_iv (GL_LUMINANCE),
2484 const_iv (GL_LUMINANCE_ALPHA), 2639 const_iv (GL_LUMINANCE_ALPHA),
2485 const_iv (GL_FLOAT), 2640 const_iv (GL_FLOAT),
2486 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),
2487 const_iv (GL_COMPILE), 2648 const_iv (GL_COMPILE),
2488 const_iv (GL_PROXY_TEXTURE_1D), 2649 const_iv (GL_PROXY_TEXTURE_1D),
2489 const_iv (GL_PROXY_TEXTURE_2D), 2650 const_iv (GL_PROXY_TEXTURE_2D),
2490 const_iv (GL_TEXTURE_1D), 2651 const_iv (GL_TEXTURE_1D),
2491 const_iv (GL_TEXTURE_2D), 2652 const_iv (GL_TEXTURE_2D),
2530 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2691 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2531 const_iv (GL_POINT_SMOOTH_HINT), 2692 const_iv (GL_POINT_SMOOTH_HINT),
2532 const_iv (GL_LINE_SMOOTH_HINT), 2693 const_iv (GL_LINE_SMOOTH_HINT),
2533 const_iv (GL_POLYGON_SMOOTH_HINT), 2694 const_iv (GL_POLYGON_SMOOTH_HINT),
2534 const_iv (GL_GENERATE_MIPMAP_HINT), 2695 const_iv (GL_GENERATE_MIPMAP_HINT),
2696 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2535 const_iv (GL_FASTEST), 2697 const_iv (GL_FASTEST),
2536 const_iv (GL_DONT_CARE), 2698 const_iv (GL_DONT_CARE),
2537 const_iv (GL_NICEST), 2699 const_iv (GL_NICEST),
2538 const_iv (GL_V2F), 2700 const_iv (GL_V2F),
2539 const_iv (GL_V3F), 2701 const_iv (GL_V3F),
2547 2709
2548 texture_av = newAV (); 2710 texture_av = newAV ();
2549 AvREAL_off (texture_av); 2711 AvREAL_off (texture_av);
2550} 2712}
2551 2713
2714void
2715disable_GL_EXT_blend_func_separate ()
2716 CODE:
2717 gl.BlendFuncSeparate = 0;
2718 gl.BlendFuncSeparateEXT = 0;
2719
2552char * 2720char *
2553gl_vendor () 2721gl_vendor ()
2554 CODE: 2722 CODE:
2555 RETVAL = (char *)glGetString (GL_VENDOR); 2723 RETVAL = (char *)glGetString (GL_VENDOR);
2556 OUTPUT: 2724 OUTPUT:
2677 2845
2678void glRect (float x1, float y1, float x2, float y2) 2846void glRect (float x1, float y1, float x2, float y2)
2679 CODE: 2847 CODE:
2680 glRectf (x1, y1, x2, y2); 2848 glRectf (x1, y1, x2, y2);
2681 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
2682PROTOTYPES: ENABLE 2859PROTOTYPES: ENABLE
2683 2860
2684void glBegin (int mode) 2861void glBegin (int mode)
2685 2862
2686void glEnd () 2863void glEnd ()
2718void 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)
2719 CODE: 2896 CODE:
2720 if (gl.SeparableFilter2D) 2897 if (gl.SeparableFilter2D)
2721 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2898 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2722 2899
2723void 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)
2724 2901
2725void 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)
2726 2903
2727void glDrawPixels (int width, int height, int format, int type, char *pixels) 2904void glDrawPixels (int width, int height, int format, int type, char *pixels)
2728 2905
2754 2931
2755void glEndList () 2932void glEndList ()
2756 2933
2757void glCallList (int list) 2934void glCallList (int list)
2758 2935
2759MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2936MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2760 2937
2761PROTOTYPES: DISABLE 2938PROTOTYPES: DISABLE
2762 2939
2763void 2940void
2764find_widget (SV *self, NV x, NV y) 2941find_widget (SV *self, NV x, NV y)
2768 XPUSHs (self); 2945 XPUSHs (self);
2769} 2946}
2770 2947
2771BOOT: 2948BOOT:
2772{ 2949{
2773 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2950 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2774 2951
2775 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);
2776 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);
2777 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);
2778 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);
2779} 2956}
2780 2957
2781void 2958void
2782draw (SV *self) 2959draw (SV *self)
2783 CODE: 2960 CODE:
2787 NV x, y, w, h; 2964 NV x, y, w, h;
2788 SV *draw_x_sv = GvSV (draw_x_gv); 2965 SV *draw_x_sv = GvSV (draw_x_gv);
2789 SV *draw_y_sv = GvSV (draw_y_gv); 2966 SV *draw_y_sv = GvSV (draw_y_gv);
2790 SV *draw_w_sv = GvSV (draw_w_gv); 2967 SV *draw_w_sv = GvSV (draw_w_gv);
2791 SV *draw_h_sv = GvSV (draw_h_gv); 2968 SV *draw_h_sv = GvSV (draw_h_gv);
2792 SV *hover;
2793 double draw_x, draw_y, draw_w, draw_h; 2969 double draw_x, draw_y;
2794 2970
2795 if (!SvROK (self)) 2971 if (!SvROK (self))
2796 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2972 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2797 2973
2798 hv = (HV *)SvRV (self); 2974 hv = (HV *)SvRV (self);
2799 2975
2800 if (SvTYPE (hv) != SVt_PVHV) 2976 if (SvTYPE (hv) != SVt_PVHV)
2801 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2977 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2802 2978
2803 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.;
2804 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.;
2805 2981
2806 if (!h || !w) 2982 if (!h || !w)
2826 { 3002 {
2827 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3003 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2828 3004
2829 if (svp && SvTRUE (*svp)) 3005 if (svp && SvTRUE (*svp))
2830 { 3006 {
2831 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);
2832 glEnable (GL_BLEND); 3008 glEnable (GL_BLEND);
2833 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3009 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2834 glBegin (GL_QUADS); 3010 glBegin (GL_QUADS);
2835 glVertex2f (0, 0); 3011 glVertex2f (0, 0);
2836 glVertex2f (w, 0); 3012 glVertex2f (w, 0);
2839 glEnd (); 3015 glEnd ();
2840 glDisable (GL_BLEND); 3016 glDisable (GL_BLEND);
2841 } 3017 }
2842 } 3018 }
2843#if 0 3019#if 0
2844 if ($ENV{CFPLUS_DEBUG} & 1) { 3020 // draw borders, for debugging
2845 glPushMatrix; 3021 glPushMatrix ();
2846 glColor 1, 1, 0, 1; 3022 glColor4f (1., 1., 0., 1.);
2847 glTranslate 0.375, 0.375; 3023 glTranslatef (.5, .5, 0.);
2848 glBegin GL_LINE_LOOP; 3024 glBegin (GL_LINE_LOOP);
2849 glVertex 0 , 0; 3025 glVertex2f (0 , 0);
2850 glVertex $self->{w} - 1, 0; 3026 glVertex2f (w - 1, 0);
2851 glVertex $self->{w} - 1, $self->{h} - 1; 3027 glVertex2f (w - 1, h - 1);
2852 glVertex 0 , $self->{h} - 1; 3028 glVertex2f (0 , h - 1);
2853 glEnd; 3029 glEnd ();
2854 glPopMatrix; 3030 glPopMatrix ();
2855 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2856 }
2857#endif 3031#endif
2858 PUSHMARK (SP); 3032 PUSHMARK (SP);
2859 XPUSHs (self); 3033 XPUSHs (self);
2860 PUTBACK; 3034 PUTBACK;
2861 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