ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.259 by root, Tue May 20 02:47:21 2008 UTC

46 46
47#include <glib/gmacros.h> 47#include <glib/gmacros.h>
48 48
49#include <pango/pango.h> 49#include <pango/pango.h>
50 50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
61
51#ifndef _WIN32 62#ifndef _WIN32
52# include <sys/types.h> 63# include <sys/types.h>
53# include <sys/socket.h> 64# include <sys/socket.h>
54# include <netinet/in.h> 65# include <netinet/in.h>
55# include <netinet/tcp.h> 66# include <netinet/tcp.h>
63#define MAP_EXTEND_X 32 74#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 75#define MAP_EXTEND_Y 512
65 76
66#define MIN_FONT_HEIGHT 10 77#define MIN_FONT_HEIGHT 10
67 78
79/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81
68#if 0 82#if 0
69# define PARACHUTE SDL_INIT_NOPARACHUTE 83# define PARACHUTE SDL_INIT_NOPARACHUTE
70#else 84#else
71# define PARACHUTE 0 85# define PARACHUTE 0
72#endif 86#endif
114 av_push (texture_av, (SV *)(size_t)name); 128 av_push (texture_av, (SV *)(size_t)name);
115 glDeleteTextures (1, &name); 129 glDeleteTextures (1, &name);
116} 130}
117 131
118#include "texcache.c" 132#include "texcache.c"
133#include "rendercache.c"
119 134
120#include "pango-font.c" 135#include "pango-font.c"
121#include "pango-fontmap.c" 136#include "pango-fontmap.c"
122#include "pango-render.c" 137#include "pango-render.c"
123 138
124typedef IV CFPlus__Channel; 139typedef IV DC__Channel;
125typedef SDL_RWops *CFPlus__RW; 140typedef SDL_RWops *DC__RW;
126typedef Mix_Chunk *CFPlus__MixChunk; 141typedef Mix_Chunk *DC__MixChunk;
127typedef Mix_Music *CFPlus__MixMusic; 142typedef Mix_Music *DC__MixMusic;
128 143
129typedef PangoFontDescription *CFPlus__Font; 144typedef PangoFontDescription *DC__Font;
130 145
131static int 146static int
132shape_attr_p (PangoLayoutRun *run) 147shape_attr_p (PangoLayoutRun *run)
133{ 148{
134 GSList *attrs = run->item->analysis.extra_attrs; 149 GSList *attrs = run->item->analysis.extra_attrs;
148 163
149typedef struct cf_layout { 164typedef struct cf_layout {
150 PangoLayout *pl; 165 PangoLayout *pl;
151 float r, g, b, a; // default color for rgba mode 166 float r, g, b, a; // default color for rgba mode
152 int base_height; 167 int base_height;
153 CFPlus__Font font; 168 DC__Font font;
169 rc_t *rc;
154} *CFPlus__Layout; 170} *DC__Layout;
155 171
156static CFPlus__Font default_font; 172static DC__Font default_font;
157static PangoContext *opengl_context; 173static PangoContext *opengl_context;
158static PangoFontMap *opengl_fontmap; 174static PangoFontMap *opengl_fontmap;
159 175
160static void 176static void
161substitute_func (FcPattern *pattern, gpointer data) 177substitute_func (FcPattern *pattern, gpointer data)
166#endif 182#endif
167 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 183 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
168} 184}
169 185
170static void 186static void
171layout_update_font (CFPlus__Layout self) 187layout_update_font (DC__Layout self)
172{ 188{
173 /* 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
174 * reasonably well with bitstream vera 190 * reasonably well with dejavu/bistream fonts
175 */ 191 */
176 PangoFontDescription *font = self->font ? self->font : default_font; 192 PangoFontDescription *font = self->font ? self->font : default_font;
177 193
178 pango_font_description_set_absolute_size (font, 194 pango_font_description_set_absolute_size (font,
179 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 195 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
180 196
181 pango_layout_set_font_description (self->pl, font); 197 pango_layout_set_font_description (self->pl, font);
182} 198}
183 199
184static void 200static void
185layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 201layout_get_pixel_size (DC__Layout self, int *w, int *h)
186{ 202{
187 PangoRectangle rect; 203 PangoRectangle rect;
188 204
189 // get_pixel_* wrongly rounds down 205 // get_pixel_* wrongly rounds down
190 pango_layout_get_extents (self->pl, 0, &rect); 206 pango_layout_get_extents (self->pl, 0, &rect);
201 217
202typedef uint16_t tileid; 218typedef uint16_t tileid;
203typedef uint16_t faceid; 219typedef uint16_t faceid;
204 220
205typedef struct { 221typedef struct {
206 int name; 222 GLuint name;
207 int w, h; 223 int w, h;
208 float s, t; 224 float s, t;
209 uint8_t r, g, b, a; 225 uint8_t r, g, b, a;
210 tileid smoothtile; 226 tileid smoothtile;
211 uint8_t smoothlevel; 227 uint8_t smoothlevel;
229 int faces; tileid *face2tile; // [faceid] 245 int faces; tileid *face2tile; // [faceid]
230 int texs; maptex *tex; // [tileid] 246 int texs; maptex *tex; // [tileid]
231 247
232 int32_t rows; 248 int32_t rows;
233 maprow *row; 249 maprow *row;
234} *CFPlus__Map; 250} *DC__Map;
235 251
236static char * 252static char *
237prepend (char *ptr, int sze, int inc) 253prepend (char *ptr, int sze, int inc)
238{ 254{
239 char *p; 255 char *p;
277 self->texs *= 2; 293 self->texs *= 2;
278 } 294 }
279} 295}
280 296
281static maprow * 297static maprow *
282map_get_row (CFPlus__Map self, int y) 298map_get_row (DC__Map self, int y)
283{ 299{
284 if (0 > y) 300 if (0 > y)
285 { 301 {
286 int extend = - y + MAP_EXTEND_Y; 302 int extend = - y + MAP_EXTEND_Y;
287 Prepend (maprow, self->row, self->rows, extend); 303 Prepend (maprow, self->row, self->rows, extend);
325 341
326 return row->col + (x - row->c0); 342 return row->col + (x - row->c0);
327} 343}
328 344
329static mapcell * 345static mapcell *
330map_get_cell (CFPlus__Map self, int x, int y) 346map_get_cell (DC__Map self, int x, int y)
331{ 347{
332 return row_get_cell (map_get_row (self, y), x); 348 return row_get_cell (map_get_row (self, y), x);
333} 349}
334 350
335static void 351static void
336map_clear (CFPlus__Map self) 352map_clear (DC__Map self)
337{ 353{
338 int r; 354 int r;
339 355
340 for (r = 0; r < self->rows; r++) 356 for (r = 0; r < self->rows; r++)
341 Safefree (self->row[r].col); 357 Safefree (self->row[r].col);
349 self->row = 0; 365 self->row = 0;
350 self->rows = 0; 366 self->rows = 0;
351} 367}
352 368
353static void 369static void
354map_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)
355{ 371{
356 int x, y; 372 int x, y;
357 maprow *row; 373 maprow *row;
358 mapcell *cell; 374 mapcell *cell;
359 375
438 n |= n >> 16; 454 n |= n >> 16;
439 455
440 return n + 1; 456 return n + 1;
441} 457}
442 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
443/* SDL should provide this, really. */ 470/* SDL should provide this, really. */
444#define SDLK_MODIFIER_MIN 300 471#define SDLK_MODIFIER_MIN 300
445#define SDLK_MODIFIER_MAX 314 472#define SDLK_MODIFIER_MAX 314
446 473
447/******************************************************************************/ 474/******************************************************************************/
485 return 0; 512 return 0;
486 513
487 return 1; 514 return 1;
488} 515}
489 516
490MODULE = CFPlus PACKAGE = CFPlus 517MODULE = Deliantra::Client PACKAGE = DC
491 518
492PROTOTYPES: ENABLE 519PROTOTYPES: ENABLE
493 520
494BOOT: 521BOOT:
495{ 522{
496 HV *stash = gv_stashpv ("CFPlus", 1); 523 HV *stash = gv_stashpv ("DC", 1);
497 static const struct { 524 static const struct {
498 const char *name; 525 const char *name;
499 IV iv; 526 IV iv;
500 } *civ, const_iv[] = { 527 } *civ, const_iv[] = {
501# define const_iv(name) { # name, (IV)name } 528# define const_iv(name) { # name, (IV)name }
523 550
524 const_iv (SDL_APPINPUTFOCUS), 551 const_iv (SDL_APPINPUTFOCUS),
525 const_iv (SDL_APPMOUSEFOCUS), 552 const_iv (SDL_APPMOUSEFOCUS),
526 const_iv (SDL_APPACTIVE), 553 const_iv (SDL_APPACTIVE),
527 554
555 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST),
528 const_iv (SDLK_KP0), 557 const_iv (SDLK_KP0),
529 const_iv (SDLK_KP1), 558 const_iv (SDLK_KP1),
530 const_iv (SDLK_KP2), 559 const_iv (SDLK_KP2),
531 const_iv (SDLK_KP3), 560 const_iv (SDLK_KP3),
532 const_iv (SDLK_KP4), 561 const_iv (SDLK_KP4),
604 const_iv (KMOD_LMETA), 633 const_iv (KMOD_LMETA),
605 const_iv (KMOD_RMETA), 634 const_iv (KMOD_RMETA),
606 const_iv (KMOD_NUM), 635 const_iv (KMOD_NUM),
607 const_iv (KMOD_CAPS), 636 const_iv (KMOD_CAPS),
608 const_iv (KMOD_MODE), 637 const_iv (KMOD_MODE),
638
639 const_iv (MIX_DEFAULT_FORMAT),
609# undef const_iv 640# undef const_iv
610 }; 641 };
611 642
612 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; )
613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
631 662
632NV floor (NV x) 663NV floor (NV x)
633 664
634NV ceil (NV x) 665NV ceil (NV x)
635 666
667IV minpot (UV n)
668
669IV popcount (UV n)
670
636void 671void
637pango_init () 672pango_init ()
638 CODE: 673 CODE:
639{ 674{
640 opengl_fontmap = pango_opengl_font_map_new (); 675 opengl_fontmap = pango_opengl_font_map_new ();
641 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);
642 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
643} 683}
644 684
645char * 685char *
646SDL_GetError () 686SDL_GetError ()
647 687
679 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
680 720
681 if (m && m != (SDL_Rect **)-1) 721 if (m && m != (SDL_Rect **)-1)
682 while (*m) 722 while (*m)
683 { 723 {
684 if ((*m)->w >= 640 && (*m)->h >= 480) 724 if ((*m)->w >= 800 && (*m)->h >= 480)
685 { 725 {
686 AV *av = newAV (); 726 AV *av = newAV ();
687 av_push (av, newSViv ((*m)->w)); 727 av_push (av, newSViv ((*m)->w));
688 av_push (av, newSViv ((*m)->h)); 728 av_push (av, newSViv ((*m)->h));
689 av_push (av, newSViv (rgb)); 729 av_push (av, newSViv (rgb));
713 753
714 if (RETVAL) 754 if (RETVAL)
715 { 755 {
716 av_clear (texture_av); 756 av_clear (texture_av);
717 757
718 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 758 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
719#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);
720#include "glfunc.h" 760#include "glfunc.h"
721#undef GL_FUNC 761#undef GL_FUNC
722 } 762 }
723} 763}
730char * 770char *
731SDL_GetKeyName (int sym) 771SDL_GetKeyName (int sym)
732 772
733int 773int
734SDL_GetAppState () 774SDL_GetAppState ()
775
776int
777SDL_GetModState ()
735 778
736void 779void
737poll_events () 780poll_events ()
738 PPCODE: 781 PPCODE:
739{ 782{
749 { 792 {
750 case SDL_KEYDOWN: 793 case SDL_KEYDOWN:
751 case SDL_KEYUP: 794 case SDL_KEYUP:
752 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 795 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
753 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 796 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
754 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);
755 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 */
756 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 799 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
757 break; 800 break;
758 801
759 case SDL_ACTIVEEVENT: 802 case SDL_ACTIVEEVENT:
760 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 803 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
778 x = ev.motion.x; 821 x = ev.motion.x;
779 y = ev.motion.y; 822 y = ev.motion.y;
780 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 823 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
781 } 824 }
782 825
783 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
784 hv_store (hv, "state", 5, newSViv (state), 0); 827 hv_store (hv, "state", 5, newSViv (state), 0);
785 hv_store (hv, "x", 1, newSViv (x), 0); 828 hv_store (hv, "x", 1, newSViv (x), 0);
786 hv_store (hv, "y", 1, newSViv (y), 0); 829 hv_store (hv, "y", 1, newSViv (y), 0);
787 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 830 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
788 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 831 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
789 } 832 }
790 break; 833 break;
791 834
792 case SDL_MOUSEBUTTONDOWN: 835 case SDL_MOUSEBUTTONDOWN:
793 case SDL_MOUSEBUTTONUP: 836 case SDL_MOUSEBUTTONUP:
794 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 837 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
795 838
796 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 839 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
797 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 840 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
798 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 841 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
799 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 842 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
804 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 847 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
805 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 848 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
806 break; 849 break;
807 } 850 }
808 851
809 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))));
810 } 853 }
811} 854}
812 855
813int 856int
814Mix_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)
815 POSTCALL: 858 POSTCALL:
816 Mix_HookMusicFinished (music_finished); 859 Mix_HookMusicFinished (music_finished);
817 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}
818 877
819void 878void
820Mix_CloseAudio () 879Mix_CloseAudio ()
821 880
822int 881int
857 } 916 }
858 } 917 }
859#endif 918#endif
860} 919}
861 920
862void 921int
863add_font (char *file) 922add_font (char *file)
864 CODE: 923 CODE:
865 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 924 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
925 OUTPUT:
926 RETVAL
866 927
867void 928void
868load_image_inline (SV *image_) 929load_image_inline (SV *image_)
869 ALIAS: 930 ALIAS:
870 load_image_file = 1 931 load_image_file = 1
956void 1017void
957error (char *message) 1018error (char *message)
958 CODE: 1019 CODE:
959 fprintf (stderr, "ERROR: %s\n", message); 1020 fprintf (stderr, "ERROR: %s\n", message);
960#ifdef _WIN32 1021#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1022 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
962#endif 1023#endif
963 1024
964void 1025void
965fatal (char *message) 1026fatal (char *message)
966 CODE: 1027 CODE:
967 fprintf (stderr, "FATAL: %s\n", message); 1028 fprintf (stderr, "FATAL: %s\n", message);
968#ifdef _WIN32 1029#ifdef _WIN32
969 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1030 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
970#endif 1031#endif
971 _exit (1); 1032 _exit (1);
972 1033
973void 1034void
974_exit (int retval = 0) 1035_exit (int retval = 0)
986#if DEBUG 1047#if DEBUG
987 VALGRIND_DO_LEAK_CHECK; 1048 VALGRIND_DO_LEAK_CHECK;
988#endif 1049#endif
989} 1050}
990 1051
991MODULE = CFPlus PACKAGE = CFPlus::Font 1052MODULE = Deliantra::Client PACKAGE = DC::Font
992 1053
993PROTOTYPES: DISABLE 1054PROTOTYPES: DISABLE
994 1055
995CFPlus::Font 1056DC::Font
996new_from_file (SV *class, char *path, int id = 0) 1057new_from_file (SV *class, char *path, int id = 0)
997 CODE: 1058 CODE:
998{ 1059{
999 int count; 1060 int count;
1000 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1061 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1003} 1064}
1004 OUTPUT: 1065 OUTPUT:
1005 RETVAL 1066 RETVAL
1006 1067
1007void 1068void
1008DESTROY (CFPlus::Font self) 1069DESTROY (DC::Font self)
1009 CODE: 1070 CODE:
1010 pango_font_description_free (self); 1071 pango_font_description_free (self);
1011 1072
1012void 1073void
1013make_default (CFPlus::Font self) 1074make_default (DC::Font self)
1014 PROTOTYPE: $ 1075 PROTOTYPE: $
1015 CODE: 1076 CODE:
1016 default_font = self; 1077 default_font = self;
1017 1078
1018MODULE = CFPlus PACKAGE = CFPlus::Layout 1079MODULE = Deliantra::Client PACKAGE = DC::Layout
1019 1080
1020PROTOTYPES: DISABLE 1081PROTOTYPES: DISABLE
1021 1082
1022void 1083void
1023reset_glyph_cache () 1084glyph_cache_backup ()
1024 PROTOTYPE: 1085 PROTOTYPE:
1025 CODE: 1086 CODE:
1087 tc_backup ();
1088
1089void
1090glyph_cache_restore ()
1091 PROTOTYPE:
1092 CODE:
1026 tc_clear (); 1093 tc_restore ();
1027 1094
1028CFPlus::Layout 1095DC::Layout
1029new (SV *class) 1096new (SV *class)
1030 CODE: 1097 CODE:
1031 New (0, RETVAL, 1, struct cf_layout); 1098 New (0, RETVAL, 1, struct cf_layout);
1032 1099
1033 RETVAL->pl = pango_layout_new (opengl_context); 1100 RETVAL->pl = pango_layout_new (opengl_context);
1035 RETVAL->g = 1.; 1102 RETVAL->g = 1.;
1036 RETVAL->b = 1.; 1103 RETVAL->b = 1.;
1037 RETVAL->a = 1.; 1104 RETVAL->a = 1.;
1038 RETVAL->base_height = MIN_FONT_HEIGHT; 1105 RETVAL->base_height = MIN_FONT_HEIGHT;
1039 RETVAL->font = 0; 1106 RETVAL->font = 0;
1107 RETVAL->rc = rc_alloc ();
1040 1108
1041 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1109 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1042 layout_update_font (RETVAL); 1110 layout_update_font (RETVAL);
1043 OUTPUT: 1111 OUTPUT:
1044 RETVAL 1112 RETVAL
1045 1113
1046void 1114void
1047DESTROY (CFPlus::Layout self) 1115DESTROY (DC::Layout self)
1048 CODE: 1116 CODE:
1049 g_object_unref (self->pl); 1117 g_object_unref (self->pl);
1118 rc_free (self->rc);
1050 Safefree (self); 1119 Safefree (self);
1051 1120
1052void 1121void
1053set_text (CFPlus::Layout self, SV *text_) 1122set_text (DC::Layout self, SV *text_)
1054 CODE: 1123 CODE:
1055{ 1124{
1056 STRLEN textlen; 1125 STRLEN textlen;
1057 char *text = SvPVutf8 (text_, textlen); 1126 char *text = SvPVutf8 (text_, textlen);
1058 1127
1059 pango_layout_set_text (self->pl, text, textlen); 1128 pango_layout_set_text (self->pl, text, textlen);
1060} 1129}
1061 1130
1062void 1131void
1063set_markup (CFPlus::Layout self, SV *text_) 1132set_markup (DC::Layout self, SV *text_)
1064 CODE: 1133 CODE:
1065{ 1134{
1066 STRLEN textlen; 1135 STRLEN textlen;
1067 char *text = SvPVutf8 (text_, textlen); 1136 char *text = SvPVutf8 (text_, textlen);
1068 1137
1069 pango_layout_set_markup (self->pl, text, textlen); 1138 pango_layout_set_markup (self->pl, text, textlen);
1070} 1139}
1071 1140
1072void 1141void
1073set_shapes (CFPlus::Layout self, ...) 1142set_shapes (DC::Layout self, ...)
1074 CODE: 1143 CODE:
1075{ 1144{
1076 PangoAttrList *attrs = 0; 1145 PangoAttrList *attrs = 0;
1077 const char *text = pango_layout_get_text (self->pl); 1146 const char *text = pango_layout_get_text (self->pl);
1078 const char *pos = text; 1147 const char *pos = text;
1113 if (attrs) 1182 if (attrs)
1114 pango_layout_set_attributes (self->pl, attrs); 1183 pango_layout_set_attributes (self->pl, attrs);
1115} 1184}
1116 1185
1117void 1186void
1118get_shapes (CFPlus::Layout self) 1187get_shapes (DC::Layout self)
1119 PPCODE: 1188 PPCODE:
1120{ 1189{
1121 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1190 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1122 1191
1123 do 1192 do
1124 { 1193 {
1125 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1194 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1126 1195
1127 if (run && shape_attr_p (run)) 1196 if (run && shape_attr_p (run))
1128 { 1197 {
1129 PangoRectangle extents; 1198 PangoRectangle extents;
1130 pango_layout_iter_get_run_extents (iter, 0, &extents); 1199 pango_layout_iter_get_run_extents (iter, 0, &extents);
1138 1207
1139 pango_layout_iter_free (iter); 1208 pango_layout_iter_free (iter);
1140} 1209}
1141 1210
1142int 1211int
1143has_wrapped (CFPlus::Layout self) 1212has_wrapped (DC::Layout self)
1144 CODE: 1213 CODE:
1145{ 1214{
1146 int lines = 1; 1215 int lines = 1;
1147 const char *text = pango_layout_get_text (self->pl); 1216 const char *text = pango_layout_get_text (self->pl);
1148 1217
1153} 1222}
1154 OUTPUT: 1223 OUTPUT:
1155 RETVAL 1224 RETVAL
1156 1225
1157SV * 1226SV *
1158get_text (CFPlus::Layout self) 1227get_text (DC::Layout self)
1159 CODE: 1228 CODE:
1160 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1229 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1161 sv_utf8_decode (RETVAL); 1230 sv_utf8_decode (RETVAL);
1162 OUTPUT: 1231 OUTPUT:
1163 RETVAL 1232 RETVAL
1164 1233
1165void 1234void
1166set_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.)
1167 CODE: 1236 CODE:
1168 self->r = r; 1237 self->r = r;
1169 self->g = g; 1238 self->g = g;
1170 self->b = b; 1239 self->b = b;
1171 self->a = a; 1240 self->a = a;
1172 1241
1173void 1242void
1174set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1243set_font (DC::Layout self, DC::Font font = 0)
1175 CODE: 1244 CODE:
1176 if (self->font != font) 1245 if (self->font != font)
1177 { 1246 {
1178 self->font = font; 1247 self->font = font;
1179 layout_update_font (self); 1248 layout_update_font (self);
1180 } 1249 }
1181 1250
1182void 1251void
1183set_height (CFPlus::Layout self, int base_height) 1252set_height (DC::Layout self, int base_height)
1184 CODE: 1253 CODE:
1185 if (self->base_height != base_height) 1254 if (self->base_height != base_height)
1186 { 1255 {
1187 self->base_height = base_height; 1256 self->base_height = base_height;
1188 layout_update_font (self); 1257 layout_update_font (self);
1189 } 1258 }
1190 1259
1191void 1260void
1192set_width (CFPlus::Layout self, int max_width = -1) 1261set_width (DC::Layout self, int max_width = -1)
1193 CODE: 1262 CODE:
1194 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);
1195 1264
1196void 1265void
1197set_indent (CFPlus::Layout self, int indent) 1266set_indent (DC::Layout self, int indent)
1198 CODE: 1267 CODE:
1199 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1268 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1200 1269
1201void 1270void
1202set_spacing (CFPlus::Layout self, int spacing) 1271set_spacing (DC::Layout self, int spacing)
1203 CODE: 1272 CODE:
1204 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1273 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1205 1274
1206void 1275void
1207set_ellipsise (CFPlus::Layout self, int ellipsise) 1276set_ellipsise (DC::Layout self, int ellipsise)
1208 CODE: 1277 CODE:
1209 pango_layout_set_ellipsize (self->pl, 1278 pango_layout_set_ellipsize (self->pl,
1210 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1279 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1211 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1280 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1212 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1281 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1213 : PANGO_ELLIPSIZE_NONE 1282 : PANGO_ELLIPSIZE_NONE
1214 ); 1283 );
1215 1284
1216void 1285void
1217set_single_paragraph_mode (CFPlus::Layout self, int spm) 1286set_single_paragraph_mode (DC::Layout self, int spm)
1218 CODE: 1287 CODE:
1219 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1288 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1220 1289
1221void 1290void
1222size (CFPlus::Layout self) 1291size (DC::Layout self)
1223 PPCODE: 1292 PPCODE:
1224{ 1293{
1225 int w, h; 1294 int w, h;
1226 1295
1227 layout_get_pixel_size (self, &w, &h); 1296 layout_get_pixel_size (self, &w, &h);
1230 PUSHs (sv_2mortal (newSViv (w))); 1299 PUSHs (sv_2mortal (newSViv (w)));
1231 PUSHs (sv_2mortal (newSViv (h))); 1300 PUSHs (sv_2mortal (newSViv (h)));
1232} 1301}
1233 1302
1234int 1303int
1235descent (CFPlus::Layout self) 1304descent (DC::Layout self)
1236 CODE: 1305 CODE:
1237{ 1306{
1238 PangoRectangle rect; 1307 PangoRectangle rect;
1239 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1308 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1240 pango_layout_line_get_pixel_extents (line, 0, &rect); 1309 pango_layout_line_get_pixel_extents (line, 0, &rect);
1241 RETVAL = PANGO_DESCENT (rect); 1310 RETVAL = PANGO_DESCENT (rect);
1242} 1311}
1243 OUTPUT: 1312 OUTPUT:
1244 RETVAL 1313 RETVAL
1245 1314
1246int 1315int
1247xy_to_index (CFPlus::Layout self, int x, int y) 1316xy_to_index (DC::Layout self, int x, int y)
1248 CODE: 1317 CODE:
1249{ 1318{
1250 int index, trailing; 1319 int index, trailing;
1251 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);
1252 RETVAL = index + trailing; 1321 RETVAL = index + trailing;
1253} 1322}
1254 OUTPUT: 1323 OUTPUT:
1255 RETVAL 1324 RETVAL
1256 1325
1257void 1326void
1258cursor_pos (CFPlus::Layout self, int index) 1327cursor_pos (DC::Layout self, int index)
1259 PPCODE: 1328 PPCODE:
1260{ 1329{
1261 PangoRectangle strong_pos; 1330 PangoRectangle pos;
1262 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1331 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1263 1332
1264 EXTEND (SP, 3); 1333 EXTEND (SP, 3);
1265 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1334 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1266 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1335 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1336 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1268} 1337}
1269 1338
1270void 1339void
1271index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1340index_to_line_x (DC::Layout self, int index, int trailing = 0)
1272 PPCODE: 1341 PPCODE:
1273{ 1342{
1274 int line, x; 1343 int line, x;
1275 1344
1276 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)
1277 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1347 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1278 1348 --line;
1349#endif
1279 EXTEND (SP, 2); 1350 EXTEND (SP, 2);
1280 PUSHs (sv_2mortal (newSViv (line - 1))); 1351 PUSHs (sv_2mortal (newSViv (line)));
1281 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1352 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1282} 1353}
1283 1354
1284void 1355void
1285line_x_to_index (CFPlus::Layout self, int line, int x) 1356line_x_to_index (DC::Layout self, int line, int x)
1286 PPCODE: 1357 PPCODE:
1287{ 1358{
1288 PangoLayoutLine *lp; 1359 PangoLayoutLine *lp;
1289 int index, trailing; 1360 int index, trailing;
1290 1361
1291 if (line < 0) 1362 if (line < 0)
1292 XSRETURN_EMPTY; 1363 XSRETURN_EMPTY;
1293 1364
1294 if (!(lp = pango_layout_get_line (self->pl, line))) 1365 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1295 XSRETURN_EMPTY; /* do better */ 1366 XSRETURN_EMPTY; /* do better */
1296 1367
1297 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);
1298 1369
1299 EXTEND (SP, 2); 1370 EXTEND (SP, 2);
1305 PUSHs (sv_2mortal (newSViv (trailing))); 1376 PUSHs (sv_2mortal (newSViv (trailing)));
1306 } 1377 }
1307} 1378}
1308 1379
1309void 1380void
1310render (CFPlus::Layout self, float x, float y, int flags = 0) 1381render (DC::Layout self, float x, float y, int flags = 0)
1311 PPCODE: 1382 CODE:
1383 rc_clear (self->rc);
1312 pango_opengl_render_layout_subpixel ( 1384 pango_opengl_render_layout_subpixel (
1313 self->pl, 1385 self->pl,
1386 self->rc,
1314 x * PANGO_SCALE, y * PANGO_SCALE, 1387 x * PANGO_SCALE, y * PANGO_SCALE,
1315 self->r, self->g, self->b, self->a, 1388 self->r, self->g, self->b, self->a,
1316 flags 1389 flags
1317 ); 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);
1318 1394
1319MODULE = 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
1320 1415
1321PROTOTYPES: ENABLE 1416PROTOTYPES: ENABLE
1322
1323int minpot (int n)
1324 1417
1325void 1418void
1326pad (SV *data_, int ow, int oh, int nw, int nh) 1419pad (SV *data_, int ow, int oh, int nw, int nh)
1327 CODE: 1420 CODE:
1328{ 1421{
1405 RETVAL = width > 0; 1498 RETVAL = width > 0;
1406} 1499}
1407 OUTPUT: 1500 OUTPUT:
1408 RETVAL 1501 RETVAL
1409 1502
1410MODULE = CFPlus PACKAGE = CFPlus::Map 1503MODULE = Deliantra::Client PACKAGE = DC::Map
1411 1504
1412PROTOTYPES: DISABLE 1505PROTOTYPES: DISABLE
1413 1506
1414CFPlus::Map 1507DC::Map
1415new (SV *class) 1508new (SV *class)
1416 CODE: 1509 CODE:
1417 New (0, RETVAL, 1, struct map); 1510 New (0, RETVAL, 1, struct map);
1418 RETVAL->x = 0; 1511 RETVAL->x = 0;
1419 RETVAL->y = 0; 1512 RETVAL->y = 0;
1427 RETVAL->row = 0; 1520 RETVAL->row = 0;
1428 OUTPUT: 1521 OUTPUT:
1429 RETVAL 1522 RETVAL
1430 1523
1431void 1524void
1432DESTROY (CFPlus::Map self) 1525DESTROY (DC::Map self)
1433 CODE: 1526 CODE:
1434{ 1527{
1435 map_clear (self); 1528 map_clear (self);
1436 Safefree (self->face2tile); 1529 Safefree (self->face2tile);
1437 Safefree (self->tex); 1530 Safefree (self->tex);
1438 Safefree (self); 1531 Safefree (self);
1439} 1532}
1440 1533
1441void 1534void
1442resize (CFPlus::Map self, int map_width, int map_height) 1535resize (DC::Map self, int map_width, int map_height)
1443 CODE: 1536 CODE:
1444 self->w = map_width; 1537 self->w = map_width;
1445 self->h = map_height; 1538 self->h = map_height;
1446 1539
1447void 1540void
1448clear (CFPlus::Map self) 1541clear (DC::Map self)
1449 CODE: 1542 CODE:
1450 map_clear (self); 1543 map_clear (self);
1451 1544
1452void 1545void
1453set_tileid (CFPlus::Map self, int face, int tile) 1546set_tileid (DC::Map self, int face, int tile)
1454 CODE: 1547 CODE:
1455{ 1548{
1456 need_facenum (self, face); self->face2tile [face] = tile; 1549 need_facenum (self, face); self->face2tile [face] = tile;
1457 need_texid (self, tile); 1550 need_texid (self, tile);
1458} 1551}
1459 1552
1460void 1553void
1461set_smooth (CFPlus::Map self, int face, int smooth, int level) 1554set_smooth (DC::Map self, int face, int smooth, int level)
1462 CODE: 1555 CODE:
1463{ 1556{
1464 tileid texid; 1557 tileid texid;
1465 maptex *tex; 1558 maptex *tex;
1466 1559
1479 tex->smoothtile = self->face2tile [smooth]; 1572 tex->smoothtile = self->face2tile [smooth];
1480 tex->smoothlevel = level; 1573 tex->smoothlevel = level;
1481} 1574}
1482 1575
1483void 1576void
1484set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 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)
1485 CODE: 1578 CODE:
1486{ 1579{
1487 need_texid (self, texid); 1580 need_texid (self, texid);
1488 1581
1489 { 1582 {
1509 // from transparent color bleeding and ugly wrapping effects. 1602 // from transparent color bleeding and ugly wrapping effects.
1510 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1603 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1511} 1604}
1512 1605
1513int 1606int
1514ox (CFPlus::Map self) 1607ox (DC::Map self)
1515 ALIAS: 1608 ALIAS:
1516 oy = 1 1609 oy = 1
1517 x = 2 1610 x = 2
1518 y = 3 1611 y = 3
1519 w = 4 1612 w = 4
1530 } 1623 }
1531 OUTPUT: 1624 OUTPUT:
1532 RETVAL 1625 RETVAL
1533 1626
1534void 1627void
1535scroll (CFPlus::Map self, int dx, int dy) 1628scroll (DC::Map self, int dx, int dy)
1536 CODE: 1629 CODE:
1537{ 1630{
1538 if (dx > 0) 1631 if (dx > 0)
1539 map_blank (self, self->x, self->y, dx, self->h); 1632 map_blank (self, self->x, self->y, dx, self->h);
1540 else if (dx < 0) 1633 else if (dx < 0)
1556 self->y += MAP_EXTEND_Y; 1649 self->y += MAP_EXTEND_Y;
1557 } 1650 }
1558} 1651}
1559 1652
1560SV * 1653SV *
1561map1a_update (CFPlus::Map self, SV *data_, int extmap) 1654map1a_update (DC::Map self, SV *data_, int extmap)
1562 CODE: 1655 CODE:
1563{ 1656{
1564 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1657 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1565 uint8_t *data_end = (uint8_t *)SvEND (data_); 1658 uint8_t *data_end = (uint8_t *)SvEND (data_);
1566 mapcell *cell; 1659 mapcell *cell;
1655} 1748}
1656 OUTPUT: 1749 OUTPUT:
1657 RETVAL 1750 RETVAL
1658 1751
1659SV * 1752SV *
1660mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1753mapmap (DC::Map self, int x0, int y0, int w, int h)
1661 CODE: 1754 CODE:
1662{ 1755{
1663 int x1, x; 1756 int x1, x;
1664 int y1, y; 1757 int y1, y;
1665 int z; 1758 int z;
1710} 1803}
1711 OUTPUT: 1804 OUTPUT:
1712 RETVAL 1805 RETVAL
1713 1806
1714void 1807void
1715draw (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)
1716 CODE: 1809 CODE:
1717{ 1810{
1811 int x, y, z;
1812
1718 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1719 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
1720 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)
1721 smooth_key skey; 1816 smooth_key skey;
1722 int x, y, z; 1817
1723 int last_name; 1818 rc_t *rc = rc_alloc ();
1819 rc_key_t key;
1820 rc_array_t *arr;
1724 1821
1725 // thats current max. sorry. 1822 // thats current max. sorry.
1726 if (sw > 255) sw = 255; 1823 if (sw > 255) sw = 255;
1727 if (sh > 255) sh = 255; 1824 if (sh > 255) sh = 255;
1728 1825
1729 // clear key, in case of extra padding 1826 // clear key, in case of extra padding
1730 memset (&skey, 0, sizeof (skey)); 1827 memset (&skey, 0, sizeof (skey));
1731 1828
1732 glColor4ub (255, 255, 255, 255); 1829 memset (&key, 0, sizeof (key));
1733 1830 key.r = 255;
1734 glEnable (GL_BLEND); 1831 key.g = 255;
1735 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1832 key.b = 255;
1736 glEnable (GL_TEXTURE_2D); 1833 key.a = 255;
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1834 key.mode = GL_QUADS;
1738 1835 key.format = GL_T2F_V3F;
1739 glBegin (GL_QUADS);
1740
1741 last_name = -1; 1836 key.texname = -1;
1742 1837
1743 mx += self->x; 1838 mx += self->x;
1744 my += self->y; 1839 my += self->y;
1745 1840
1746 // first pass: determine smooth_max 1841 // first pass: determine smooth_max
1762 MAX (self->tex [cell->tile [0]].smoothlevel, 1857 MAX (self->tex [cell->tile [0]].smoothlevel,
1763 MAX (self->tex [cell->tile [1]].smoothlevel, 1858 MAX (self->tex [cell->tile [1]].smoothlevel,
1764 self->tex [cell->tile [2]].smoothlevel)); 1859 self->tex [cell->tile [2]].smoothlevel));
1765 } 1860 }
1766 } 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);
1767 1866
1768 for (z = 0; z <= 2; z++) 1867 for (z = 0; z <= 2; z++)
1769 { 1868 {
1770 memset (smooth_level, 0, sizeof (smooth_level)); 1869 memset (smooth_level, 0, sizeof (smooth_level));
1771 1870
1783 if (tile) 1882 if (tile)
1784 { 1883 {
1785 maptex tex = self->tex [tile]; 1884 maptex tex = self->tex [tile];
1786 int px, py; 1885 int px, py;
1787 1886
1788 // suppressing texture state switches here
1789 // is only moderately effective, but worth the extra effort
1790 if (last_name != tex.name) 1887 if (key.texname != tex.name)
1791 { 1888 {
1792 if (!tex.name) 1889 if (!tex.name)
1793 tex = self->tex [2]; /* missing, replace by noface */ 1890 tex = self->tex [2]; /* missing, replace by noface */
1794 1891
1795 glEnd (); 1892 key.texname = tex.name;
1796 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1893 arr = rc_array (rc, &key);
1797 glBegin (GL_QUADS);
1798 } 1894 }
1799 1895
1800 px = (x + 1) * T - tex.w; 1896 px = (x + 1) * T - tex.w;
1801 py = (y + 1) * T - tex.h; 1897 py = (y + 1) * T - tex.h;
1802 1898
1803 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1804 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1805 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);
1806 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1902 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1807 1903
1808 if (cell->flags && z == 2) 1904 if (cell->flags && z == 2)
1809 { 1905 {
1906 // overlays such as the speech bubble, probably more to come
1810 if (cell->flags & 1) 1907 if (cell->flags & 1)
1811 { 1908 {
1812 maptex tex = self->tex [1]; 1909 maptex tex = self->tex [1];
1813 int px = x * T + T * 2 / 32; 1910 int px = x * T + T * 2 / 32;
1814 int py = y * T - T * 6 / 32; 1911 int py = y * T - T * 6 / 32;
1815 1912
1913 if (tex.name)
1816 glEnd (); 1914 {
1817 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);
1818 glBegin (GL_QUADS); 1925 }
1819
1820 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1821 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1822 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1823 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1824 } 1926 }
1825 } 1927 }
1826 1928
1827 // update smooth hash 1929 // update smooth hash
1828 if (tex.smoothtile) 1930 if (tex.smoothtile)
1864 } 1966 }
1865 } 1967 }
1866 } 1968 }
1867 } 1969 }
1868 1970
1971 rc_draw (rc);
1972 rc_clear (rc);
1973
1869 // go through all smoothlevels, lowest to highest, then draw. 1974 // go through all smoothlevels, lowest to highest, then draw.
1870 // this is basically counting sort 1975 // this is basically counting sort
1871 { 1976 {
1872 int w, b; 1977 int w, b;
1873 1978
1979 glEnable (GL_TEXTURE_2D);
1980 glBegin (GL_QUADS);
1874 for (w = 0; w < 256 / 32; ++w) 1981 for (w = 0; w < 256 / 32; ++w)
1875 { 1982 {
1876 uint32_t smask = smooth_level [w]; 1983 uint32_t smask = smooth_level [w];
1877 if (smask) 1984 if (smask)
1878 for (b = 0; b < 32; ++b) 1985 for (b = 0; b < 32; ++b)
1897 int border = bits & 15; 2004 int border = bits & 15;
1898 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2005 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1899 float dx = tex.s * .0625f; // 16 images/row 2006 float dx = tex.s * .0625f; // 16 images/row
1900 float dy = tex.t * .5f ; // 2 images/column 2007 float dy = tex.t * .5f ; // 2 images/column
1901 2008
1902 // this time naively avoiding texture state changes
1903 // save gobs of state changes.
1904 if (last_name != tex.name) 2009 if (tex.name)
1905 { 2010 {
2011 // this time avoiding texture state changes
2012 // save gobs of state changes.
1906 if (!tex.name) 2013 if (key.texname != tex.name)
1907 continue; // smoothing not yet available 2014 {
1908
1909 glEnd (); 2015 glEnd ();
1910 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2016 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1911 glBegin (GL_QUADS); 2017 glBegin (GL_QUADS);
1912 } 2018 }
1913 2019
1914 if (border) 2020 if (border)
1915 { 2021 {
1916 float ox = border * dx; 2022 float ox = border * dx;
1917 2023
1918 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2024 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1919 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2025 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1920 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2026 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1921 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2027 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1922 } 2028 }
1923 2029
1924 if (corner) 2030 if (corner)
1925 { 2031 {
1926 float ox = corner * dx; 2032 float ox = corner * dx;
1927 2033
1928 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2034 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1929 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2035 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1930 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2036 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1931 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2037 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2038 }
1932 } 2039 }
1933 } 2040 }
1934 } 2041 }
1935 } 2042 }
1936 } 2043 }
2044
2045 glEnd ();
2046 glDisable (GL_TEXTURE_2D);
2047 key.texname = -1;
1937 } 2048 }
1938 2049
1939 hv_clear (smooth); 2050 hv_clear (smooth);
1940 } 2051 }
1941 2052
1942 glEnd ();
1943
1944 glDisable (GL_TEXTURE_2D);
1945 glDisable (GL_BLEND); 2053 glDisable (GL_BLEND);
2054 rc_free (rc);
1946 2055
1947 // top layer: overlays such as the health bar 2056 // top layer: overlays such as the health bar
1948 for (y = 0; y < sh; y++) 2057 for (y = 0; y < sh; y++)
1949 if (0 <= y + my && y + my < self->rows) 2058 if (0 <= y + my && y + my < self->rows)
1950 { 2059 {
1975 } 2084 }
1976 } 2085 }
1977} 2086}
1978 2087
1979void 2088void
1980draw_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)
1981 CODE: 2090 CODE:
1982{ 2091{
1983 static float color[16][3] = { 2092 static float color[16][3] = {
1984 { 0.00F, 0.00F, 0.00F }, 2093 { 0.00F, 0.00F, 0.00F },
1985 { 1.00F, 1.00F, 1.00F }, 2094 { 1.00F, 1.00F, 1.00F },
2035 glDisable (GL_BLEND); 2144 glDisable (GL_BLEND);
2036 glDisable (GL_TEXTURE_2D); 2145 glDisable (GL_TEXTURE_2D);
2037} 2146}
2038 2147
2039void 2148void
2040fow_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)
2041 PPCODE: 2150 PPCODE:
2042{ 2151{
2043 int x, y; 2152 int x, y;
2044 int sw1 = sw + 2; 2153 int sw1 = sw + 2;
2045 int sh1 = sh + 2; 2154 int sh1 = sh + 2;
2116 PUSHs (sv_2mortal (newSViv (sh3))); 2225 PUSHs (sv_2mortal (newSViv (sh3)));
2117 PUSHs (darkness3_sv); 2226 PUSHs (darkness3_sv);
2118} 2227}
2119 2228
2120SV * 2229SV *
2121get_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)
2122 CODE: 2231 CODE:
2123{ 2232{
2124 int x, y, x1, y1; 2233 int x, y, x1, y1;
2125 SV *data_sv = newSV (w * h * 7 + 5); 2234 SV *data_sv = newSV (w * h * 7 + 5);
2126 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2235 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2183 else 2292 else
2184 *data++ = 0; 2293 *data++ = 0;
2185 } 2294 }
2186 } 2295 }
2187 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 {
2188 SvPOK_only (data_sv); 2304 SvPOK_only (data_sv);
2189 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2305 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2190 RETVAL = data_sv; 2306 RETVAL = data_sv;
2307 }
2191} 2308}
2192 OUTPUT: 2309 OUTPUT:
2193 RETVAL 2310 RETVAL
2194 2311
2195void 2312void
2196set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2313set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2197 PPCODE: 2314 PPCODE:
2198{ 2315{
2199 int x, y, z; 2316 int x, y, z;
2200 int w, h; 2317 int w, h;
2201 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;
2202 2329
2203 if (*data++ != 0) 2330 if (*data++ != 0)
2204 return; /* version mismatch */ 2331 XSRETURN_EMPTY; /* version mismatch */
2205 2332
2206 w = *data++ << 8; w |= *data++; 2333 w = *data++ << 8; w |= *data++;
2207 h = *data++ << 8; h |= *data++; 2334 h = *data++ << 8; h |= *data++;
2208 2335
2209 // 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
2221 { 2348 {
2222 maprow *row = map_get_row (self, y); 2349 maprow *row = map_get_row (self, y);
2223 2350
2224 for (x = x0; x < x1; x++) 2351 for (x = x0; x < x1; x++)
2225 { 2352 {
2353 uint8_t flags;
2354
2355 if (data + 7 >= end)
2356 XSRETURN_EMPTY;
2357
2226 uint8_t flags = *data++; 2358 flags = *data++;
2227 2359
2228 if (flags) 2360 if (flags)
2229 { 2361 {
2230 mapcell *cell = row_get_cell (row, x); 2362 mapcell *cell = row_get_cell (row, x);
2231 tileid tile[3] = { 0, 0, 0 }; 2363 tileid tile[3] = { 0, 0, 0 };
2254 } 2386 }
2255 } 2387 }
2256 } 2388 }
2257} 2389}
2258 2390
2259MODULE = CFPlus PACKAGE = CFPlus::RW 2391MODULE = Deliantra::Client PACKAGE = DC::RW
2260 2392
2261CFPlus::RW 2393DC::RW
2262new (SV *class, SV *data_sv) 2394new (SV *class, SV *data_sv)
2263 CODE: 2395 CODE:
2264{ 2396{
2265 STRLEN datalen; 2397 STRLEN datalen;
2266 char *data = SvPVbyte (data_sv, datalen); 2398 char *data = SvPVbyte (data_sv, datalen);
2268 RETVAL = SDL_RWFromConstMem (data, datalen); 2400 RETVAL = SDL_RWFromConstMem (data, datalen);
2269} 2401}
2270 OUTPUT: 2402 OUTPUT:
2271 RETVAL 2403 RETVAL
2272 2404
2273CFPlus::RW 2405DC::RW
2274new_from_file (SV *class, const char *path, const char *mode = "rb") 2406new_from_file (SV *class, const char *path, const char *mode = "rb")
2275 CODE: 2407 CODE:
2276 RETVAL = SDL_RWFromFile (path, mode); 2408 RETVAL = SDL_RWFromFile (path, mode);
2277 OUTPUT: 2409 OUTPUT:
2278 RETVAL 2410 RETVAL
2279 2411
2280# fails on win32: 2412# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '(' 2413# dc.xs(2268) : error C2059: syntax error : '('
2282#void 2414#void
2283#close (CFPlus::RW self) 2415#close (DC::RW self)
2284# CODE: 2416# CODE:
2285# (self->(close)) (self); 2417# (self->(close)) (self);
2286 2418
2287MODULE = CFPlus PACKAGE = CFPlus::Channel 2419MODULE = Deliantra::Client PACKAGE = DC::Channel
2288 2420
2289PROTOTYPES: DISABLE 2421PROTOTYPES: DISABLE
2290 2422
2291CFPlus::Channel 2423DC::Channel
2292find () 2424find ()
2293 CODE: 2425 CODE:
2294{ 2426{
2295 RETVAL = Mix_GroupAvailable (-1); 2427 RETVAL = Mix_GroupAvailable (-1);
2296 2428
2309} 2441}
2310 OUTPUT: 2442 OUTPUT:
2311 RETVAL 2443 RETVAL
2312 2444
2313void 2445void
2314halt (CFPlus::Channel self) 2446halt (DC::Channel self)
2315 CODE: 2447 CODE:
2316 Mix_HaltChannel (self); 2448 Mix_HaltChannel (self);
2317 2449
2318void 2450void
2319expire (CFPlus::Channel self, int ticks = -1) 2451expire (DC::Channel self, int ticks = -1)
2320 CODE: 2452 CODE:
2321 Mix_ExpireChannel (self, ticks); 2453 Mix_ExpireChannel (self, ticks);
2322 2454
2323void 2455void
2324fade_out (CFPlus::Channel self, int ticks = -1) 2456fade_out (DC::Channel self, int ticks = -1)
2325 CODE: 2457 CODE:
2326 Mix_FadeOutChannel (self, ticks); 2458 Mix_FadeOutChannel (self, ticks);
2327 2459
2328int 2460int
2329volume (CFPlus::Channel self, int volume) 2461volume (DC::Channel self, int volume)
2330 CODE: 2462 CODE:
2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2463 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332 OUTPUT: 2464 OUTPUT:
2333 RETVAL 2465 RETVAL
2334 2466
2335void 2467void
2336unregister_all_effects (CFPlus::Channel self) 2468unregister_all_effects (DC::Channel self)
2337 CODE: 2469 CODE:
2338 Mix_UnregisterAllEffects (self); 2470 Mix_UnregisterAllEffects (self);
2339 2471
2340void 2472void
2341set_panning (CFPlus::Channel self, int left, int right) 2473set_panning (DC::Channel self, int left, int right)
2342 CODE: 2474 CODE:
2343 left = CLAMP (left , 0, 255); 2475 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255); 2476 right = CLAMP (right, 0, 255);
2345 Mix_SetPanning (self, left, right); 2477 Mix_SetPanning (self, left, right);
2346 2478
2347void 2479void
2348set_distance (CFPlus::Channel self, int distance) 2480set_distance (DC::Channel self, int distance)
2349 CODE: 2481 CODE:
2350 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2482 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351 2483
2352void 2484void
2353set_position (CFPlus::Channel self, int angle, int distance) 2485set_position (DC::Channel self, int angle, int distance)
2354 CODE: 2486 CODE:
2355 2487
2356void 2488void
2357set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2489set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358 CODE: 2490 CODE:
2359{ 2491{
2360 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2492 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2493 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2362 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2494 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363} 2495}
2364 2496
2365void 2497void
2366set_reverse_stereo (CFPlus::Channel self, int flip) 2498set_reverse_stereo (DC::Channel self, int flip)
2367 CODE: 2499 CODE:
2368 Mix_SetReverseStereo (self, flip); 2500 Mix_SetReverseStereo (self, flip);
2369 2501
2370MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2502MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371 2503
2372PROTOTYPES: DISABLE 2504PROTOTYPES: DISABLE
2373 2505
2374CFPlus::MixChunk 2506DC::MixChunk
2375new (SV *class, CFPlus::RW rwops) 2507new (SV *class, DC::RW rwops)
2376 CODE: 2508 CODE:
2377 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2509 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378 OUTPUT: 2510 OUTPUT:
2379 RETVAL 2511 RETVAL
2380 2512
2381void 2513void
2382DESTROY (CFPlus::MixChunk self) 2514DESTROY (DC::MixChunk self)
2383 CODE: 2515 CODE:
2384 Mix_FreeChunk (self); 2516 Mix_FreeChunk (self);
2385 2517
2386int 2518int
2387volume (CFPlus::MixChunk self, int volume = -1) 2519volume (DC::MixChunk self, int volume = -1)
2388 CODE: 2520 CODE:
2389 if (items > 1) 2521 if (items > 1)
2390 volume = CLAMP (volume, 0, 128); 2522 volume = CLAMP (volume, 0, 128);
2391 RETVAL = Mix_VolumeChunk (self, volume); 2523 RETVAL = Mix_VolumeChunk (self, volume);
2392 OUTPUT: 2524 OUTPUT:
2393 RETVAL 2525 RETVAL
2394 2526
2395CFPlus::Channel 2527DC::Channel
2396play (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)
2397 CODE: 2529 CODE:
2398{ 2530{
2399 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2531 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400 2532
2401 if (RETVAL < 0) 2533 if (RETVAL < 0)
2408 } 2540 }
2409} 2541}
2410 OUTPUT: 2542 OUTPUT:
2411 RETVAL 2543 RETVAL
2412 2544
2413MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2545MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2414 2546
2415int 2547int
2416volume (int volume = -1) 2548volume (int volume = -1)
2417 PROTOTYPE: ;$ 2549 PROTOTYPE: ;$
2418 CODE: 2550 CODE:
2430void 2562void
2431halt () 2563halt ()
2432 CODE: 2564 CODE:
2433 Mix_HaltMusic (); 2565 Mix_HaltMusic ();
2434 2566
2435CFPlus::MixMusic 2567DC::MixMusic
2436new (SV *class, CFPlus::RW rwops) 2568new (SV *class, DC::RW rwops)
2437 CODE: 2569 CODE:
2438 RETVAL = Mix_LoadMUS_RW (rwops); 2570 RETVAL = Mix_LoadMUS_RW (rwops);
2439 OUTPUT: 2571 OUTPUT:
2440 RETVAL 2572 RETVAL
2441 2573
2442void 2574void
2443DESTROY (CFPlus::MixMusic self) 2575DESTROY (DC::MixMusic self)
2444 CODE: 2576 CODE:
2445 Mix_FreeMusic (self); 2577 Mix_FreeMusic (self);
2446 2578
2447int 2579int
2448play (CFPlus::MixMusic self, int loops = -1) 2580play (DC::MixMusic self, int loops = -1)
2449 CODE: 2581 CODE:
2450 RETVAL = Mix_PlayMusic (self, loops); 2582 RETVAL = Mix_PlayMusic (self, loops);
2451 OUTPUT: 2583 OUTPUT:
2452 RETVAL 2584 RETVAL
2453 2585
2454void 2586void
2455fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2587fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456 CODE: 2588 CODE:
2457 Mix_FadeInMusicPos (self, loops, ms, position); 2589 Mix_FadeInMusicPos (self, loops, ms, position);
2458 2590
2459MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2591MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460 2592
2461PROTOTYPES: ENABLE 2593PROTOTYPES: ENABLE
2462 2594
2463BOOT: 2595BOOT:
2464{ 2596{
2465 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2597 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466 static const struct { 2598 static const struct {
2467 const char *name; 2599 const char *name;
2468 IV iv; 2600 IV iv;
2469 } *civ, const_iv[] = { 2601 } *civ, const_iv[] = {
2470# define const_iv(name) { # name, (IV)name } 2602# define const_iv(name) { # name, (IV)name }
2505 const_iv (GL_INTENSITY), 2637 const_iv (GL_INTENSITY),
2506 const_iv (GL_LUMINANCE), 2638 const_iv (GL_LUMINANCE),
2507 const_iv (GL_LUMINANCE_ALPHA), 2639 const_iv (GL_LUMINANCE_ALPHA),
2508 const_iv (GL_FLOAT), 2640 const_iv (GL_FLOAT),
2509 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),
2510 const_iv (GL_COMPILE), 2648 const_iv (GL_COMPILE),
2511 const_iv (GL_PROXY_TEXTURE_1D), 2649 const_iv (GL_PROXY_TEXTURE_1D),
2512 const_iv (GL_PROXY_TEXTURE_2D), 2650 const_iv (GL_PROXY_TEXTURE_2D),
2513 const_iv (GL_TEXTURE_1D), 2651 const_iv (GL_TEXTURE_1D),
2514 const_iv (GL_TEXTURE_2D), 2652 const_iv (GL_TEXTURE_2D),
2553 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2691 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554 const_iv (GL_POINT_SMOOTH_HINT), 2692 const_iv (GL_POINT_SMOOTH_HINT),
2555 const_iv (GL_LINE_SMOOTH_HINT), 2693 const_iv (GL_LINE_SMOOTH_HINT),
2556 const_iv (GL_POLYGON_SMOOTH_HINT), 2694 const_iv (GL_POLYGON_SMOOTH_HINT),
2557 const_iv (GL_GENERATE_MIPMAP_HINT), 2695 const_iv (GL_GENERATE_MIPMAP_HINT),
2696 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558 const_iv (GL_FASTEST), 2697 const_iv (GL_FASTEST),
2559 const_iv (GL_DONT_CARE), 2698 const_iv (GL_DONT_CARE),
2560 const_iv (GL_NICEST), 2699 const_iv (GL_NICEST),
2561 const_iv (GL_V2F), 2700 const_iv (GL_V2F),
2562 const_iv (GL_V3F), 2701 const_iv (GL_V3F),
2570 2709
2571 texture_av = newAV (); 2710 texture_av = newAV ();
2572 AvREAL_off (texture_av); 2711 AvREAL_off (texture_av);
2573} 2712}
2574 2713
2714void
2715disable_GL_EXT_blend_func_separate ()
2716 CODE:
2717 gl.BlendFuncSeparate = 0;
2718 gl.BlendFuncSeparateEXT = 0;
2719
2575char * 2720char *
2576gl_vendor () 2721gl_vendor ()
2577 CODE: 2722 CODE:
2578 RETVAL = (char *)glGetString (GL_VENDOR); 2723 RETVAL = (char *)glGetString (GL_VENDOR);
2579 OUTPUT: 2724 OUTPUT:
2700 2845
2701void glRect (float x1, float y1, float x2, float y2) 2846void glRect (float x1, float y1, float x2, float y2)
2702 CODE: 2847 CODE:
2703 glRectf (x1, y1, x2, y2); 2848 glRectf (x1, y1, x2, y2);
2704 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
2705PROTOTYPES: ENABLE 2859PROTOTYPES: ENABLE
2706 2860
2707void glBegin (int mode) 2861void glBegin (int mode)
2708 2862
2709void glEnd () 2863void glEnd ()
2741void 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)
2742 CODE: 2896 CODE:
2743 if (gl.SeparableFilter2D) 2897 if (gl.SeparableFilter2D)
2744 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2898 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745 2899
2746void 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)
2747 2901
2748void 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)
2749 2903
2750void glDrawPixels (int width, int height, int format, int type, char *pixels) 2904void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751 2905
2777 2931
2778void glEndList () 2932void glEndList ()
2779 2933
2780void glCallList (int list) 2934void glCallList (int list)
2781 2935
2782MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2936MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2783 2937
2784PROTOTYPES: DISABLE 2938PROTOTYPES: DISABLE
2785 2939
2786void 2940void
2787find_widget (SV *self, NV x, NV y) 2941find_widget (SV *self, NV x, NV y)
2791 XPUSHs (self); 2945 XPUSHs (self);
2792} 2946}
2793 2947
2794BOOT: 2948BOOT:
2795{ 2949{
2796 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2950 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797 2951
2798 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);
2799 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);
2800 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);
2801 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);
2802} 2956}
2803 2957
2804void 2958void
2805draw (SV *self) 2959draw (SV *self)
2806 CODE: 2960 CODE:
2810 NV x, y, w, h; 2964 NV x, y, w, h;
2811 SV *draw_x_sv = GvSV (draw_x_gv); 2965 SV *draw_x_sv = GvSV (draw_x_gv);
2812 SV *draw_y_sv = GvSV (draw_y_gv); 2966 SV *draw_y_sv = GvSV (draw_y_gv);
2813 SV *draw_w_sv = GvSV (draw_w_gv); 2967 SV *draw_w_sv = GvSV (draw_w_gv);
2814 SV *draw_h_sv = GvSV (draw_h_gv); 2968 SV *draw_h_sv = GvSV (draw_h_gv);
2815 SV *hover;
2816 double draw_x, draw_y, draw_w, draw_h; 2969 double draw_x, draw_y;
2817 2970
2818 if (!SvROK (self)) 2971 if (!SvROK (self))
2819 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2972 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820 2973
2821 hv = (HV *)SvRV (self); 2974 hv = (HV *)SvRV (self);
2822 2975
2823 if (SvTYPE (hv) != SVt_PVHV) 2976 if (SvTYPE (hv) != SVt_PVHV)
2824 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2977 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825 2978
2826 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.;
2827 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.;
2828 2981
2829 if (!h || !w) 2982 if (!h || !w)
2849 { 3002 {
2850 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3003 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851 3004
2852 if (svp && SvTRUE (*svp)) 3005 if (svp && SvTRUE (*svp))
2853 { 3006 {
2854 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);
2855 glEnable (GL_BLEND); 3008 glEnable (GL_BLEND);
2856 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3009 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857 glBegin (GL_QUADS); 3010 glBegin (GL_QUADS);
2858 glVertex2f (0, 0); 3011 glVertex2f (0, 0);
2859 glVertex2f (w, 0); 3012 glVertex2f (w, 0);
2862 glEnd (); 3015 glEnd ();
2863 glDisable (GL_BLEND); 3016 glDisable (GL_BLEND);
2864 } 3017 }
2865 } 3018 }
2866#if 0 3019#if 0
2867 if ($ENV{CFPLUS_DEBUG} & 1) { 3020 // draw borders, for debugging
2868 glPushMatrix; 3021 glPushMatrix ();
2869 glColor 1, 1, 0, 1; 3022 glColor4f (1., 1., 0., 1.);
2870 glTranslate 0.375, 0.375; 3023 glTranslatef (.5, .5, 0.);
2871 glBegin GL_LINE_LOOP; 3024 glBegin (GL_LINE_LOOP);
2872 glVertex 0 , 0; 3025 glVertex2f (0 , 0);
2873 glVertex $self->{w} - 1, 0; 3026 glVertex2f (w - 1, 0);
2874 glVertex $self->{w} - 1, $self->{h} - 1; 3027 glVertex2f (w - 1, h - 1);
2875 glVertex 0 , $self->{h} - 1; 3028 glVertex2f (0 , h - 1);
2876 glEnd; 3029 glEnd ();
2877 glPopMatrix; 3030 glPopMatrix ();
2878 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879 }
2880#endif 3031#endif
2881 PUSHMARK (SP); 3032 PUSHMARK (SP);
2882 XPUSHs (self); 3033 XPUSHs (self);
2883 PUTBACK; 3034 PUTBACK;
2884 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