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.213 by root, Sun Jul 29 04:14:45 2007 UTC vs.
Revision 1.254 by root, Sun Jan 6 18:12:20 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_readonly
57# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly
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 bitstream vera
170 */ 191 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 192 PangoFontDescription *font = self->font ? self->font : default_font;
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#if PANGO_VERSION_CHECK (1, 15, 2)
679 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
681#endif
638} 682}
639 683
640char * 684char *
641SDL_GetError () 685SDL_GetError ()
642 686
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 718 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 719
676 if (m && m != (SDL_Rect **)-1) 720 if (m && m != (SDL_Rect **)-1)
677 while (*m) 721 while (*m)
678 { 722 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 723 if ((*m)->w >= 800 && (*m)->h >= 480)
680 { 724 {
681 AV *av = newAV (); 725 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 726 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 727 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 728 av_push (av, newSViv (rgb));
708 752
709 if (RETVAL) 753 if (RETVAL)
710 { 754 {
711 av_clear (texture_av); 755 av_clear (texture_av);
712 756
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 757 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 758#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 759#include "glfunc.h"
716#undef GL_FUNC 760#undef GL_FUNC
717 } 761 }
718} 762}
744 { 788 {
745 case SDL_KEYDOWN: 789 case SDL_KEYDOWN:
746 case SDL_KEYUP: 790 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 791 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 792 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 793 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 */ 794 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); 795 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 796 break;
753 797
754 case SDL_ACTIVEEVENT: 798 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 799 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 817 x = ev.motion.x;
774 y = ev.motion.y; 818 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 819 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 820 }
777 821
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 822 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 823 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 824 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 825 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 826 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 827 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 828 }
785 break; 829 break;
786 830
787 case SDL_MOUSEBUTTONDOWN: 831 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 832 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 833 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 834
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 835 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 836 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 837 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 838 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 843 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 844 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 845 break;
802 } 846 }
803 847
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 848 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 849 }
806} 850}
807 851
808int 852int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 853Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 854 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 855 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 856 Mix_ChannelFinished (channel_finished);
813 857
814void 858void
859Mix_QuerySpec ()
860 PPCODE:
861{
862 int freq, channels;
863 Uint16 format;
864
865 if (Mix_QuerySpec (&freq, &format, &channels))
866 {
867 EXTEND (SP, 3);
868 PUSHs (sv_2mortal (newSViv (freq)));
869 PUSHs (sv_2mortal (newSViv (format)));
870 PUSHs (sv_2mortal (newSViv (channels)));
871 }
872}
873
874void
815Mix_CloseAudio () 875Mix_CloseAudio ()
816 876
817int 877int
818Mix_AllocateChannels (int numchans = -1) 878Mix_AllocateChannels (int numchans = -1)
879
880const char *
881Mix_GetError ()
819 882
820void 883void
821lowdelay (int fd, int val = 1) 884lowdelay (int fd, int val = 1)
822 CODE: 885 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 886 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
948void 1011void
949error (char *message) 1012error (char *message)
950 CODE: 1013 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1014 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1015#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1016 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1017#endif
955 1018
956void 1019void
957fatal (char *message) 1020fatal (char *message)
958 CODE: 1021 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1022 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1023#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1024 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1025#endif
963 _exit (1); 1026 _exit (1);
964 1027
965void 1028void
966_exit (int retval = 0) 1029_exit (int retval = 0)
978#if DEBUG 1041#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1042 VALGRIND_DO_LEAK_CHECK;
980#endif 1043#endif
981} 1044}
982 1045
983MODULE = CFPlus PACKAGE = CFPlus::Font 1046MODULE = Deliantra::Client PACKAGE = DC::Font
984 1047
985PROTOTYPES: DISABLE 1048PROTOTYPES: DISABLE
986 1049
987CFPlus::Font 1050DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1051new_from_file (SV *class, char *path, int id = 0)
989 CODE: 1052 CODE:
990{ 1053{
991 int count; 1054 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1055 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
995} 1058}
996 OUTPUT: 1059 OUTPUT:
997 RETVAL 1060 RETVAL
998 1061
999void 1062void
1000DESTROY (CFPlus::Font self) 1063DESTROY (DC::Font self)
1001 CODE: 1064 CODE:
1002 pango_font_description_free (self); 1065 pango_font_description_free (self);
1003 1066
1004void 1067void
1005make_default (CFPlus::Font self) 1068make_default (DC::Font self)
1006 PROTOTYPE: $ 1069 PROTOTYPE: $
1007 CODE: 1070 CODE:
1008 default_font = self; 1071 default_font = self;
1009 1072
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1073MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1074
1012PROTOTYPES: DISABLE 1075PROTOTYPES: DISABLE
1013 1076
1014void 1077void
1015reset_glyph_cache () 1078glyph_cache_backup ()
1016 PROTOTYPE: 1079 PROTOTYPE:
1017 CODE: 1080 CODE:
1081 tc_backup ();
1082
1083void
1084glyph_cache_restore ()
1085 PROTOTYPE:
1086 CODE:
1018 tc_clear (); 1087 tc_restore ();
1019 1088
1020CFPlus::Layout 1089DC::Layout
1021new (SV *class) 1090new (SV *class)
1022 CODE: 1091 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1092 New (0, RETVAL, 1, struct cf_layout);
1024 1093
1025 RETVAL->pl = pango_layout_new (opengl_context); 1094 RETVAL->pl = pango_layout_new (opengl_context);
1027 RETVAL->g = 1.; 1096 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1097 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1098 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1099 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1100 RETVAL->font = 0;
1101 RETVAL->rc = rc_alloc ();
1032 1102
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1103 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1104 layout_update_font (RETVAL);
1035 OUTPUT: 1105 OUTPUT:
1036 RETVAL 1106 RETVAL
1037 1107
1038void 1108void
1039DESTROY (CFPlus::Layout self) 1109DESTROY (DC::Layout self)
1040 CODE: 1110 CODE:
1041 g_object_unref (self->pl); 1111 g_object_unref (self->pl);
1112 rc_free (self->rc);
1042 Safefree (self); 1113 Safefree (self);
1043 1114
1044void 1115void
1045set_text (CFPlus::Layout self, SV *text_) 1116set_text (DC::Layout self, SV *text_)
1046 CODE: 1117 CODE:
1047{ 1118{
1048 STRLEN textlen; 1119 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1120 char *text = SvPVutf8 (text_, textlen);
1050 1121
1051 pango_layout_set_text (self->pl, text, textlen); 1122 pango_layout_set_text (self->pl, text, textlen);
1052} 1123}
1053 1124
1054void 1125void
1055set_markup (CFPlus::Layout self, SV *text_) 1126set_markup (DC::Layout self, SV *text_)
1056 CODE: 1127 CODE:
1057{ 1128{
1058 STRLEN textlen; 1129 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1130 char *text = SvPVutf8 (text_, textlen);
1060 1131
1061 pango_layout_set_markup (self->pl, text, textlen); 1132 pango_layout_set_markup (self->pl, text, textlen);
1062} 1133}
1063 1134
1064void 1135void
1065set_shapes (CFPlus::Layout self, ...) 1136set_shapes (DC::Layout self, ...)
1066 CODE: 1137 CODE:
1067{ 1138{
1068 PangoAttrList *attrs = 0; 1139 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1140 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1141 const char *pos = text;
1105 if (attrs) 1176 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1177 pango_layout_set_attributes (self->pl, attrs);
1107} 1178}
1108 1179
1109void 1180void
1110get_shapes (CFPlus::Layout self) 1181get_shapes (DC::Layout self)
1111 PPCODE: 1182 PPCODE:
1112{ 1183{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1184 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1185
1115 do 1186 do
1116 { 1187 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1188 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1189
1119 if (run && shape_attr_p (run)) 1190 if (run && shape_attr_p (run))
1120 { 1191 {
1121 PangoRectangle extents; 1192 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1193 pango_layout_iter_get_run_extents (iter, 0, &extents);
1130 1201
1131 pango_layout_iter_free (iter); 1202 pango_layout_iter_free (iter);
1132} 1203}
1133 1204
1134int 1205int
1135has_wrapped (CFPlus::Layout self) 1206has_wrapped (DC::Layout self)
1136 CODE: 1207 CODE:
1137{ 1208{
1138 int lines = 1; 1209 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1210 const char *text = pango_layout_get_text (self->pl);
1140 1211
1145} 1216}
1146 OUTPUT: 1217 OUTPUT:
1147 RETVAL 1218 RETVAL
1148 1219
1149SV * 1220SV *
1150get_text (CFPlus::Layout self) 1221get_text (DC::Layout self)
1151 CODE: 1222 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1223 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1224 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1225 OUTPUT:
1155 RETVAL 1226 RETVAL
1156 1227
1157void 1228void
1158set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1229set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1159 CODE: 1230 CODE:
1160 self->r = r; 1231 self->r = r;
1161 self->g = g; 1232 self->g = g;
1162 self->b = b; 1233 self->b = b;
1163 self->a = a; 1234 self->a = a;
1164 1235
1165void 1236void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1237set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1238 CODE:
1168 if (self->font != font) 1239 if (self->font != font)
1169 { 1240 {
1170 self->font = font; 1241 self->font = font;
1171 layout_update_font (self); 1242 layout_update_font (self);
1172 } 1243 }
1173 1244
1174void 1245void
1175set_height (CFPlus::Layout self, int base_height) 1246set_height (DC::Layout self, int base_height)
1176 CODE: 1247 CODE:
1177 if (self->base_height != base_height) 1248 if (self->base_height != base_height)
1178 { 1249 {
1179 self->base_height = base_height; 1250 self->base_height = base_height;
1180 layout_update_font (self); 1251 layout_update_font (self);
1181 } 1252 }
1182 1253
1183void 1254void
1184set_width (CFPlus::Layout self, int max_width = -1) 1255set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1256 CODE:
1186 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1257 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1187 1258
1188void 1259void
1189set_indent (CFPlus::Layout self, int indent) 1260set_indent (DC::Layout self, int indent)
1190 CODE: 1261 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1262 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1263
1193void 1264void
1194set_spacing (CFPlus::Layout self, int spacing) 1265set_spacing (DC::Layout self, int spacing)
1195 CODE: 1266 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1267 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1268
1198void 1269void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1270set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1271 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1272 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1273 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1274 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1275 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1276 : PANGO_ELLIPSIZE_NONE
1206 ); 1277 );
1207 1278
1208void 1279void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1280set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1281 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1282 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1283
1213void 1284void
1214size (CFPlus::Layout self) 1285size (DC::Layout self)
1215 PPCODE: 1286 PPCODE:
1216{ 1287{
1217 int w, h; 1288 int w, h;
1218 1289
1219 layout_get_pixel_size (self, &w, &h); 1290 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1293 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1294 PUSHs (sv_2mortal (newSViv (h)));
1224} 1295}
1225 1296
1226int 1297int
1227descent (CFPlus::Layout self) 1298descent (DC::Layout self)
1228 CODE: 1299 CODE:
1229{ 1300{
1230 PangoRectangle rect; 1301 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1302 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1303 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1304 RETVAL = PANGO_DESCENT (rect);
1234} 1305}
1235 OUTPUT: 1306 OUTPUT:
1236 RETVAL 1307 RETVAL
1237 1308
1238int 1309int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1310xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1311 CODE:
1241{ 1312{
1242 int index, trailing; 1313 int index, trailing;
1243 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1314 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1244 RETVAL = index + trailing; 1315 RETVAL = index + trailing;
1245} 1316}
1246 OUTPUT: 1317 OUTPUT:
1247 RETVAL 1318 RETVAL
1248 1319
1249void 1320void
1250cursor_pos (CFPlus::Layout self, int index) 1321cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1322 PPCODE:
1252{ 1323{
1253 PangoRectangle strong_pos; 1324 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1325 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1326
1256 EXTEND (SP, 3); 1327 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1328 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1329 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1330 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1331}
1261 1332
1262void 1333void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1334index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1335 PPCODE:
1265{ 1336{
1266 int line, x; 1337 int line, x;
1267 1338
1268 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1339 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1340#if !PANGO_VERSION_CHECK (1, 17, 3)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1341 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1342 --line;
1343#endif
1271 EXTEND (SP, 2); 1344 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1345 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1346 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1347}
1275 1348
1276void 1349void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1350line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1351 PPCODE:
1279{ 1352{
1280 PangoLayoutLine *lp; 1353 PangoLayoutLine *lp;
1281 int index, trailing; 1354 int index, trailing;
1282 1355
1283 if (line < 0) 1356 if (line < 0)
1284 XSRETURN_EMPTY; 1357 XSRETURN_EMPTY;
1285 1358
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1359 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1360 XSRETURN_EMPTY; /* do better */
1288 1361
1289 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1362 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1290 1363
1291 EXTEND (SP, 2); 1364 EXTEND (SP, 2);
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1370 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1371 }
1299} 1372}
1300 1373
1301void 1374void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1375render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1376 CODE:
1377 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1378 pango_opengl_render_layout_subpixel (
1305 self->pl, 1379 self->pl,
1380 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1381 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1382 self->r, self->g, self->b, self->a,
1308 flags 1383 flags
1309 ); 1384 );
1385 // we assume that context_change actually clears/frees stuff
1386 // and does not do any recomputation...
1387 pango_layout_context_changed (self->pl);
1310 1388
1311MODULE = CFPlus PACKAGE = CFPlus::Texture 1389void
1390draw (DC::Layout self)
1391 CODE:
1392{
1393 glEnable (GL_TEXTURE_2D);
1394 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1395 glEnable (GL_BLEND);
1396 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1397 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1398 glEnable (GL_ALPHA_TEST);
1399 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1400
1401 rc_draw (self->rc);
1402
1403 glDisable (GL_ALPHA_TEST);
1404 glDisable (GL_BLEND);
1405 glDisable (GL_TEXTURE_2D);
1406}
1407
1408MODULE = Deliantra::Client PACKAGE = DC::Texture
1312 1409
1313PROTOTYPES: ENABLE 1410PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1411
1317void 1412void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1413pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1414 CODE:
1320{ 1415{
1347 HV *hv = (HV *)SvRV (self); 1442 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1443 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1444 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1445 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1446
1447 if (name <= 0)
1448 XSRETURN_EMPTY;
1449
1352 if (items < 5) 1450 if (items < 5)
1353 { 1451 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1452 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1453 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1454 }
1394 RETVAL = width > 0; 1492 RETVAL = width > 0;
1395} 1493}
1396 OUTPUT: 1494 OUTPUT:
1397 RETVAL 1495 RETVAL
1398 1496
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1497MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1498
1401PROTOTYPES: DISABLE 1499PROTOTYPES: DISABLE
1402 1500
1403CFPlus::Map 1501DC::Map
1404new (SV *class) 1502new (SV *class)
1405 CODE: 1503 CODE:
1406 New (0, RETVAL, 1, struct map); 1504 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1505 RETVAL->x = 0;
1408 RETVAL->y = 0; 1506 RETVAL->y = 0;
1416 RETVAL->row = 0; 1514 RETVAL->row = 0;
1417 OUTPUT: 1515 OUTPUT:
1418 RETVAL 1516 RETVAL
1419 1517
1420void 1518void
1421DESTROY (CFPlus::Map self) 1519DESTROY (DC::Map self)
1422 CODE: 1520 CODE:
1423{ 1521{
1424 map_clear (self); 1522 map_clear (self);
1425 Safefree (self->face2tile); 1523 Safefree (self->face2tile);
1426 Safefree (self->tex); 1524 Safefree (self->tex);
1427 Safefree (self); 1525 Safefree (self);
1428} 1526}
1429 1527
1430void 1528void
1431resize (CFPlus::Map self, int map_width, int map_height) 1529resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1530 CODE:
1433 self->w = map_width; 1531 self->w = map_width;
1434 self->h = map_height; 1532 self->h = map_height;
1435 1533
1436void 1534void
1437clear (CFPlus::Map self) 1535clear (DC::Map self)
1438 CODE: 1536 CODE:
1439 map_clear (self); 1537 map_clear (self);
1440 1538
1441void 1539void
1442set_tileid (CFPlus::Map self, int face, int tile) 1540set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1541 CODE:
1444{ 1542{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1543 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1544 need_texid (self, tile);
1447} 1545}
1448 1546
1449void 1547void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1548set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1549 CODE:
1452{ 1550{
1453 tileid texid; 1551 tileid texid;
1454 maptex *tex; 1552 maptex *tex;
1455 1553
1468 tex->smoothtile = self->face2tile [smooth]; 1566 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1567 tex->smoothlevel = level;
1470} 1568}
1471 1569
1472void 1570void
1473set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1571set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1474 CODE: 1572 CODE:
1475{ 1573{
1476 need_texid (self, texid); 1574 need_texid (self, texid);
1477 1575
1478 { 1576 {
1498 // from transparent color bleeding and ugly wrapping effects. 1596 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1597 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1598}
1501 1599
1502int 1600int
1503ox (CFPlus::Map self) 1601ox (DC::Map self)
1504 ALIAS: 1602 ALIAS:
1505 oy = 1 1603 oy = 1
1506 x = 2 1604 x = 2
1507 y = 3 1605 y = 3
1508 w = 4 1606 w = 4
1519 } 1617 }
1520 OUTPUT: 1618 OUTPUT:
1521 RETVAL 1619 RETVAL
1522 1620
1523void 1621void
1524scroll (CFPlus::Map self, int dx, int dy) 1622scroll (DC::Map self, int dx, int dy)
1525 CODE: 1623 CODE:
1526{ 1624{
1527 if (dx > 0) 1625 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1626 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1627 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 1642 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1643 self->y += MAP_EXTEND_Y;
1546 } 1644 }
1547} 1645}
1548 1646
1549void 1647SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1648map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1649 CODE:
1552{ 1650{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1651 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1652 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1653 mapcell *cell;
1556 int x, y, flags; 1654 int x, y, z, flags;
1655 AV *missing = newAV ();
1656 RETVAL = newRV_noinc ((SV *)missing);
1557 1657
1558 while (data < data_end - 1) 1658 while (data < data_end - 1)
1559 { 1659 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1660 flags = (data [0] << 8) + data [1]; data += 2;
1561 1661
1612 } 1712 }
1613 else 1713 else
1614 cell->darkness = *data++ + 1; 1714 cell->darkness = *data++ + 1;
1615 } 1715 }
1616 1716
1717 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 1718 if (flags & (4 >> z))
1618 { 1719 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 1720 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 1721 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 1722 cell->tile [z] = self->face2tile [face];
1723
1724 if (cell->tile [z])
1725 {
1726 maptex *tex = self->tex + cell->tile [z];
1727 if (!tex->name)
1728 av_push (missing, newSViv (cell->tile [z]));
1729
1730 if (tex->smoothtile)
1731 {
1732 maptex *smooth = self->tex + tex->smoothtile;
1733 if (!smooth->name)
1734 av_push (missing, newSViv (tex->smoothtile));
1735 }
1736 }
1622 } 1737 }
1623
1624 if (flags & 2)
1625 {
1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [1] = self->face2tile [face];
1629 }
1630
1631 if (flags & 1)
1632 {
1633 faceid face = (data [0] << 8) + data [1]; data += 2;
1634 need_facenum (self, face);
1635 cell->tile [2] = self->face2tile [face];
1636 }
1637 } 1738 }
1638 else 1739 else
1639 cell->darkness = 0; 1740 cell->darkness = 0;
1640 } 1741 }
1641} 1742}
1743 OUTPUT:
1744 RETVAL
1642 1745
1643SV * 1746SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1747mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 1748 CODE:
1646{ 1749{
1647 int x1, x; 1750 int x1, x;
1648 int y1, y; 1751 int y1, y;
1649 int z; 1752 int z;
1694} 1797}
1695 OUTPUT: 1798 OUTPUT:
1696 RETVAL 1799 RETVAL
1697 1800
1698void 1801void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1802draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1700 CODE: 1803 CODE:
1701{ 1804{
1805 int x, y, z;
1806
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1807 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1808 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1704 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1809 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705 smooth_key skey; 1810 smooth_key skey;
1706 int x, y, z; 1811
1707 int last_name; 1812 rc_t *rc = rc_alloc ();
1813 rc_key_t key;
1814 rc_array_t *arr;
1708 1815
1709 // thats current max. sorry. 1816 // thats current max. sorry.
1710 if (sw > 255) sw = 255; 1817 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 1818 if (sh > 255) sh = 255;
1712 1819
1713 // clear key, in case of extra padding 1820 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 1821 memset (&skey, 0, sizeof (skey));
1715 1822
1716 glColor4ub (255, 255, 255, 255); 1823 memset (&key, 0, sizeof (key));
1717 1824 key.r = 255;
1718 glEnable (GL_BLEND); 1825 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1826 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 1827 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1828 key.mode = GL_QUADS;
1722 1829 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS); 1830 key.texname = -1;
1724
1725 last_name = 0;
1726 1831
1727 mx += self->x; 1832 mx += self->x;
1728 my += self->y; 1833 my += self->y;
1729 1834
1730 // first pass: determine smooth_max 1835 // first pass: determine smooth_max
1746 MAX (self->tex [cell->tile [0]].smoothlevel, 1851 MAX (self->tex [cell->tile [0]].smoothlevel,
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 1852 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 1853 self->tex [cell->tile [2]].smoothlevel));
1749 } 1854 }
1750 } 1855 }
1856
1857 glEnable (GL_BLEND);
1858 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1859 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1751 1860
1752 for (z = 0; z <= 2; z++) 1861 for (z = 0; z <= 2; z++)
1753 { 1862 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 1863 memset (smooth_level, 0, sizeof (smooth_level));
1755 1864
1765 tileid tile = cell->tile [z]; 1874 tileid tile = cell->tile [z];
1766 1875
1767 if (tile) 1876 if (tile)
1768 { 1877 {
1769 maptex tex = self->tex [tile]; 1878 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 1879 int px, py;
1771 int py = (y + 1) * T - tex.h;
1772 1880
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 1881 if (key.texname != tex.name)
1776 { 1882 {
1777 if (!tex.name) 1883 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 1884 tex = self->tex [2]; /* missing, replace by noface */
1779 1885
1780 glEnd (); 1886 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1887 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 1888 }
1784 1889
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1890 px = (x + 1) * T - tex.w;
1891 py = (y + 1) * T - tex.h;
1892
1893 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1894 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1787 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1895 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1788 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1896 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1789 1897
1790 if (cell->flags && z == 2) 1898 if (cell->flags && z == 2)
1791 { 1899 {
1900 // overlays such as the speech bubble, probably more to come
1792 if (cell->flags & 1) 1901 if (cell->flags & 1)
1793 { 1902 {
1794 maptex tex = self->tex [1]; 1903 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32; 1904 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32; 1905 int py = y * T - T * 6 / 32;
1797 1906
1907 if (tex.name)
1798 glEnd (); 1908 {
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1909 if (key.texname != tex.name)
1910 {
1911 key.texname = tex.name;
1912 arr = rc_array (rc, &key);
1913 }
1914
1915 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1916 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1917 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1918 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1800 glBegin (GL_QUADS); 1919 }
1801
1802 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1803 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1804 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1805 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1806 } 1920 }
1807 } 1921 }
1808 1922
1809 // update smooth hash 1923 // update smooth hash
1810 if (tex.smoothtile) 1924 if (tex.smoothtile)
1846 } 1960 }
1847 } 1961 }
1848 } 1962 }
1849 } 1963 }
1850 1964
1965 rc_draw (rc);
1966 rc_clear (rc);
1967
1851 // go through all smoothlevels, lowest to highest, then draw. 1968 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 1969 // this is basically counting sort
1853 { 1970 {
1854 int w, b; 1971 int w, b;
1855 1972
1973 glEnable (GL_TEXTURE_2D);
1974 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 1975 for (w = 0; w < 256 / 32; ++w)
1857 { 1976 {
1858 uint32_t smask = smooth_level [w]; 1977 uint32_t smask = smooth_level [w];
1859 if (smask) 1978 if (smask)
1860 for (b = 0; b < 32; ++b) 1979 for (b = 0; b < 32; ++b)
1879 int border = bits & 15; 1998 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1999 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 2000 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 2001 float dy = tex.t * .5f ; // 2 images/column
1883 2002
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 2003 if (tex.name)
1887 { 2004 {
2005 // this time avoiding texture state changes
2006 // save gobs of state changes.
1888 if (!tex.name) 2007 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 2008 {
1890
1891 glEnd (); 2009 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2010 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2011 glBegin (GL_QUADS);
1894 } 2012 }
1895 2013
1896 if (border) 2014 if (border)
1897 { 2015 {
1898 float ox = border * dx; 2016 float ox = border * dx;
1899 2017
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2018 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2019 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2020 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2021 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2022 }
1905 2023
1906 if (corner) 2024 if (corner)
1907 { 2025 {
1908 float ox = corner * dx; 2026 float ox = corner * dx;
1909 2027
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2028 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2029 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2030 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2031 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2032 }
1914 } 2033 }
1915 } 2034 }
1916 } 2035 }
1917 } 2036 }
1918 } 2037 }
2038
2039 glEnd ();
2040 glDisable (GL_TEXTURE_2D);
2041 key.texname = -1;
1919 } 2042 }
1920 2043
1921 hv_clear (smooth); 2044 hv_clear (smooth);
1922 } 2045 }
1923 2046
1924 glEnd ();
1925
1926 glDisable (GL_TEXTURE_2D);
1927 glDisable (GL_BLEND); 2047 glDisable (GL_BLEND);
2048 rc_free (rc);
1928 2049
1929 // top layer: overlays such as the health bar 2050 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2051 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2052 if (0 <= y + my && y + my < self->rows)
1932 { 2053 {
1957 } 2078 }
1958 } 2079 }
1959} 2080}
1960 2081
1961void 2082void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2083draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1963 CODE: 2084 CODE:
1964{ 2085{
1965 static float color[16][3] = { 2086 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2087 { 0.00F, 0.00F, 0.00F },
1967 { 1.00F, 1.00F, 1.00F }, 2088 { 1.00F, 1.00F, 1.00F },
2017 glDisable (GL_BLEND); 2138 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2139 glDisable (GL_TEXTURE_2D);
2019} 2140}
2020 2141
2021void 2142void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2143fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2144 PPCODE:
2024{ 2145{
2025 int x, y; 2146 int x, y;
2026 int sw1 = sw + 2; 2147 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2148 int sh1 = sh + 2;
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2219 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2220 PUSHs (darkness3_sv);
2100} 2221}
2101 2222
2102SV * 2223SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2224get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2225 CODE:
2105{ 2226{
2106 int x, y, x1, y1; 2227 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2228 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2229 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2173} 2294}
2174 OUTPUT: 2295 OUTPUT:
2175 RETVAL 2296 RETVAL
2176 2297
2177void 2298void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2299set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2179 PPCODE: 2300 PPCODE:
2180{ 2301{
2181 int x, y, z; 2302 int x, y, z;
2182 int w, h; 2303 int w, h;
2183 int x1, y1; 2304 int x1, y1;
2184 2305
2185 if (*data++ != 0) 2306 if (*data++ != 0)
2186 return; /* version mismatch */ 2307 XSRETURN_EMPTY; /* version mismatch */
2187 2308
2188 w = *data++ << 8; w |= *data++; 2309 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2310 h = *data++ << 8; h |= *data++;
2190 2311
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2312 // we need to do this 'cause we don't keep an absolute coord system for rows
2236 } 2357 }
2237 } 2358 }
2238 } 2359 }
2239} 2360}
2240 2361
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2362MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2363
2243CFPlus::RW 2364DC::RW
2244new (SV *class, SV *data_sv) 2365new (SV *class, SV *data_sv)
2245 CODE: 2366 CODE:
2246{ 2367{
2247 STRLEN datalen; 2368 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2369 char *data = SvPVbyte (data_sv, datalen);
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2371 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2372}
2252 OUTPUT: 2373 OUTPUT:
2253 RETVAL 2374 RETVAL
2254 2375
2255CFPlus::RW 2376DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2377new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2378 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2379 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2380 OUTPUT:
2260 RETVAL 2381 RETVAL
2261 2382
2383# fails on win32:
2384# dc.xs(2268) : error C2059: syntax error : '('
2262void 2385#void
2263close (CFPlus::RW self) 2386#close (DC::RW self)
2264 CODE: 2387# CODE:
2265 SDL_RWclose (self); 2388# (self->(close)) (self);
2266 2389
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2390MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2391
2269PROTOTYPES: DISABLE 2392PROTOTYPES: DISABLE
2270 2393
2271void 2394DC::Channel
2272halt (CFPlus::Channel self) 2395find ()
2273 CODE: 2396 CODE:
2397{
2398 RETVAL = Mix_GroupAvailable (-1);
2399
2400 if (RETVAL < 0)
2401 {
2402 RETVAL = Mix_GroupOldest (-1);
2403
2404 if (RETVAL < 0)
2405 XSRETURN_UNDEF;
2406
2274 Mix_HaltChannel (self); 2407 Mix_HaltChannel (RETVAL);
2408 }
2275 2409
2276void 2410 Mix_UnregisterAllEffects (RETVAL);
2277expire (CFPlus::Channel self, int ticks = -1) 2411 Mix_Volume (RETVAL, 128);
2278 CODE: 2412}
2279 Mix_ExpireChannel (self, ticks);
2280
2281void
2282fade_out (CFPlus::Channel self, int ticks = -1)
2283 CODE:
2284 Mix_FadeOutChannel (self, ticks);
2285
2286int
2287volume (CFPlus::Channel self, int volume)
2288 CODE:
2289 RETVAL = Mix_Volume (self, volume);
2290 OUTPUT: 2413 OUTPUT:
2291 RETVAL 2414 RETVAL
2292 2415
2293void 2416void
2417halt (DC::Channel self)
2418 CODE:
2419 Mix_HaltChannel (self);
2420
2421void
2422expire (DC::Channel self, int ticks = -1)
2423 CODE:
2424 Mix_ExpireChannel (self, ticks);
2425
2426void
2427fade_out (DC::Channel self, int ticks = -1)
2428 CODE:
2429 Mix_FadeOutChannel (self, ticks);
2430
2431int
2432volume (DC::Channel self, int volume)
2433 CODE:
2434 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2435 OUTPUT:
2436 RETVAL
2437
2438void
2294unregister_all_effects (CFPlus::Channel self) 2439unregister_all_effects (DC::Channel self)
2295 CODE: 2440 CODE:
2296 Mix_UnregisterAllEffects (self); 2441 Mix_UnregisterAllEffects (self);
2297 2442
2298void 2443void
2299set_panning (CFPlus::Channel self, int left, int right) 2444set_panning (DC::Channel self, int left, int right)
2300 CODE: 2445 CODE:
2446 left = CLAMP (left , 0, 255);
2447 right = CLAMP (right, 0, 255);
2301 Mix_SetPanning (self, left, right); 2448 Mix_SetPanning (self, left, right);
2302 2449
2303void 2450void
2304set_distance (CFPlus::Channel self, int distance) 2451set_distance (DC::Channel self, int distance)
2305 CODE: 2452 CODE:
2306 Mix_SetDistance (self, distance); 2453 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2307 2454
2308void 2455void
2309set_position (CFPlus::Channel self, int angle, int distance) 2456set_position (DC::Channel self, int angle, int distance)
2310 CODE: 2457 CODE:
2458
2459void
2460set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2461 CODE:
2462{
2463 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2464 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2311 Mix_SetPosition (self, angle, distance); 2465 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2466}
2312 2467
2313void 2468void
2314set_reverse_stereo (CFPlus::Channel self, int flip) 2469set_reverse_stereo (DC::Channel self, int flip)
2315 CODE: 2470 CODE:
2316 Mix_SetReverseStereo (self, flip); 2471 Mix_SetReverseStereo (self, flip);
2317 2472
2318MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2473MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2319 2474
2320PROTOTYPES: DISABLE 2475PROTOTYPES: DISABLE
2321 2476
2322CFPlus::MixChunk 2477DC::MixChunk
2323new (SV *class, CFPlus::RW rwops) 2478new (SV *class, DC::RW rwops)
2324 CODE: 2479 CODE:
2325 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2480 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2326 OUTPUT: 2481 OUTPUT:
2327 RETVAL 2482 RETVAL
2328 2483
2329void 2484void
2330DESTROY (CFPlus::MixChunk self) 2485DESTROY (DC::MixChunk self)
2331 CODE: 2486 CODE:
2332 Mix_FreeChunk (self); 2487 Mix_FreeChunk (self);
2333 2488
2334int 2489int
2335volume (CFPlus::MixChunk self, int volume = -1) 2490volume (DC::MixChunk self, int volume = -1)
2336 CODE: 2491 CODE:
2492 if (items > 1)
2493 volume = CLAMP (volume, 0, 128);
2337 RETVAL = Mix_VolumeChunk (self, volume); 2494 RETVAL = Mix_VolumeChunk (self, volume);
2338 OUTPUT: 2495 OUTPUT:
2339 RETVAL 2496 RETVAL
2340 2497
2341CFPlus::Channel 2498DC::Channel
2342play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2499play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2343 CODE: 2500 CODE:
2501{
2344 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2502 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2503
2504 if (RETVAL < 0)
2505 XSRETURN_UNDEF;
2506
2507 if (channel < 0)
2508 {
2345 Mix_UnregisterAllEffects (RETVAL); 2509 Mix_UnregisterAllEffects (RETVAL);
2510 Mix_Volume (RETVAL, 128);
2511 }
2512}
2346 OUTPUT: 2513 OUTPUT:
2347 RETVAL 2514 RETVAL
2348 2515
2349MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2516MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2350 2517
2351int 2518int
2352volume (int volume = -1) 2519volume (int volume = -1)
2353 PROTOTYPE: ;$ 2520 PROTOTYPE: ;$
2354 CODE: 2521 CODE:
2522 if (items > 0)
2523 volume = CLAMP (volume, 0, 128);
2355 RETVAL = Mix_VolumeMusic (volume); 2524 RETVAL = Mix_VolumeMusic (volume);
2356 OUTPUT: 2525 OUTPUT:
2357 RETVAL 2526 RETVAL
2358 2527
2359void 2528void
2364void 2533void
2365halt () 2534halt ()
2366 CODE: 2535 CODE:
2367 Mix_HaltMusic (); 2536 Mix_HaltMusic ();
2368 2537
2369CFPlus::MixMusic 2538DC::MixMusic
2370new (SV *class, CFPlus::RW rwops) 2539new (SV *class, DC::RW rwops)
2371 CODE: 2540 CODE:
2372 RETVAL = Mix_LoadMUS_RW (rwops); 2541 RETVAL = Mix_LoadMUS_RW (rwops);
2373 OUTPUT: 2542 OUTPUT:
2374 RETVAL 2543 RETVAL
2375 2544
2376void 2545void
2377DESTROY (CFPlus::MixMusic self) 2546DESTROY (DC::MixMusic self)
2378 CODE: 2547 CODE:
2379 Mix_FreeMusic (self); 2548 Mix_FreeMusic (self);
2380 2549
2381int 2550int
2382play (CFPlus::MixMusic self, int loops = -1) 2551play (DC::MixMusic self, int loops = -1)
2383 CODE: 2552 CODE:
2384 RETVAL = Mix_PlayMusic (self, loops); 2553 RETVAL = Mix_PlayMusic (self, loops);
2385 OUTPUT: 2554 OUTPUT:
2386 RETVAL 2555 RETVAL
2387 2556
2388void 2557void
2389fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2558fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2390 CODE: 2559 CODE:
2391 Mix_FadeInMusicPos (self, loops, ms, position); 2560 Mix_FadeInMusicPos (self, loops, ms, position);
2392 2561
2393MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2562MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2394 2563
2395PROTOTYPES: ENABLE 2564PROTOTYPES: ENABLE
2396 2565
2397BOOT: 2566BOOT:
2398{ 2567{
2399 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2568 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2400 static const struct { 2569 static const struct {
2401 const char *name; 2570 const char *name;
2402 IV iv; 2571 IV iv;
2403 } *civ, const_iv[] = { 2572 } *civ, const_iv[] = {
2404# define const_iv(name) { # name, (IV)name } 2573# define const_iv(name) { # name, (IV)name }
2439 const_iv (GL_INTENSITY), 2608 const_iv (GL_INTENSITY),
2440 const_iv (GL_LUMINANCE), 2609 const_iv (GL_LUMINANCE),
2441 const_iv (GL_LUMINANCE_ALPHA), 2610 const_iv (GL_LUMINANCE_ALPHA),
2442 const_iv (GL_FLOAT), 2611 const_iv (GL_FLOAT),
2443 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2612 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2613 const_iv (GL_COMPRESSED_ALPHA_ARB),
2614 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2615 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2616 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2617 const_iv (GL_COMPRESSED_RGB_ARB),
2618 const_iv (GL_COMPRESSED_RGBA_ARB),
2444 const_iv (GL_COMPILE), 2619 const_iv (GL_COMPILE),
2445 const_iv (GL_PROXY_TEXTURE_1D), 2620 const_iv (GL_PROXY_TEXTURE_1D),
2446 const_iv (GL_PROXY_TEXTURE_2D), 2621 const_iv (GL_PROXY_TEXTURE_2D),
2447 const_iv (GL_TEXTURE_1D), 2622 const_iv (GL_TEXTURE_1D),
2448 const_iv (GL_TEXTURE_2D), 2623 const_iv (GL_TEXTURE_2D),
2487 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2662 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2488 const_iv (GL_POINT_SMOOTH_HINT), 2663 const_iv (GL_POINT_SMOOTH_HINT),
2489 const_iv (GL_LINE_SMOOTH_HINT), 2664 const_iv (GL_LINE_SMOOTH_HINT),
2490 const_iv (GL_POLYGON_SMOOTH_HINT), 2665 const_iv (GL_POLYGON_SMOOTH_HINT),
2491 const_iv (GL_GENERATE_MIPMAP_HINT), 2666 const_iv (GL_GENERATE_MIPMAP_HINT),
2667 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2492 const_iv (GL_FASTEST), 2668 const_iv (GL_FASTEST),
2493 const_iv (GL_DONT_CARE), 2669 const_iv (GL_DONT_CARE),
2494 const_iv (GL_NICEST), 2670 const_iv (GL_NICEST),
2495 const_iv (GL_V2F), 2671 const_iv (GL_V2F),
2496 const_iv (GL_V3F), 2672 const_iv (GL_V3F),
2504 2680
2505 texture_av = newAV (); 2681 texture_av = newAV ();
2506 AvREAL_off (texture_av); 2682 AvREAL_off (texture_av);
2507} 2683}
2508 2684
2685void
2686disable_GL_EXT_blend_func_separate ()
2687 CODE:
2688 gl.BlendFuncSeparate = 0;
2689 gl.BlendFuncSeparateEXT = 0;
2690
2509char * 2691char *
2510gl_vendor () 2692gl_vendor ()
2511 CODE: 2693 CODE:
2512 RETVAL = (char *)glGetString (GL_VENDOR); 2694 RETVAL = (char *)glGetString (GL_VENDOR);
2513 OUTPUT: 2695 OUTPUT:
2634 2816
2635void glRect (float x1, float y1, float x2, float y2) 2817void glRect (float x1, float y1, float x2, float y2)
2636 CODE: 2818 CODE:
2637 glRectf (x1, y1, x2, y2); 2819 glRectf (x1, y1, x2, y2);
2638 2820
2821void glRect_lineloop (float x1, float y1, float x2, float y2)
2822 CODE:
2823 glBegin (GL_LINE_LOOP);
2824 glVertex2f (x1, y1);
2825 glVertex2f (x2, y1);
2826 glVertex2f (x2, y2);
2827 glVertex2f (x1, y2);
2828 glEnd ();
2829
2639PROTOTYPES: ENABLE 2830PROTOTYPES: ENABLE
2640 2831
2641void glBegin (int mode) 2832void glBegin (int mode)
2642 2833
2643void glEnd () 2834void glEnd ()
2675void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2866void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2676 CODE: 2867 CODE:
2677 if (gl.SeparableFilter2D) 2868 if (gl.SeparableFilter2D)
2678 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2869 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2679 2870
2680void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2871void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2681 2872
2682void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2873void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2683 2874
2684void glDrawPixels (int width, int height, int format, int type, char *pixels) 2875void glDrawPixels (int width, int height, int format, int type, char *pixels)
2685 2876
2711 2902
2712void glEndList () 2903void glEndList ()
2713 2904
2714void glCallList (int list) 2905void glCallList (int list)
2715 2906
2716MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2907MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2717 2908
2718PROTOTYPES: DISABLE 2909PROTOTYPES: DISABLE
2719 2910
2720void 2911void
2721find_widget (SV *self, NV x, NV y) 2912find_widget (SV *self, NV x, NV y)
2725 XPUSHs (self); 2916 XPUSHs (self);
2726} 2917}
2727 2918
2728BOOT: 2919BOOT:
2729{ 2920{
2730 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2921 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2731 2922
2732 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2923 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2733 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2924 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2734 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2925 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2735 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2926 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2736} 2927}
2737 2928
2738void 2929void
2739draw (SV *self) 2930draw (SV *self)
2740 CODE: 2931 CODE:
2744 NV x, y, w, h; 2935 NV x, y, w, h;
2745 SV *draw_x_sv = GvSV (draw_x_gv); 2936 SV *draw_x_sv = GvSV (draw_x_gv);
2746 SV *draw_y_sv = GvSV (draw_y_gv); 2937 SV *draw_y_sv = GvSV (draw_y_gv);
2747 SV *draw_w_sv = GvSV (draw_w_gv); 2938 SV *draw_w_sv = GvSV (draw_w_gv);
2748 SV *draw_h_sv = GvSV (draw_h_gv); 2939 SV *draw_h_sv = GvSV (draw_h_gv);
2749 SV *hover;
2750 double draw_x, draw_y, draw_w, draw_h; 2940 double draw_x, draw_y;
2751 2941
2752 if (!SvROK (self)) 2942 if (!SvROK (self))
2753 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2943 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2754 2944
2755 hv = (HV *)SvRV (self); 2945 hv = (HV *)SvRV (self);
2756 2946
2757 if (SvTYPE (hv) != SVt_PVHV) 2947 if (SvTYPE (hv) != SVt_PVHV)
2758 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2948 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2759 2949
2760 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2950 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2761 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 2951 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2762 2952
2763 if (!h || !w) 2953 if (!h || !w)
2783 { 2973 {
2784 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2974 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2785 2975
2786 if (svp && SvTRUE (*svp)) 2976 if (svp && SvTRUE (*svp))
2787 { 2977 {
2788 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 2978 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2789 glEnable (GL_BLEND); 2979 glEnable (GL_BLEND);
2790 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2980 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2791 glBegin (GL_QUADS); 2981 glBegin (GL_QUADS);
2792 glVertex2f (0, 0); 2982 glVertex2f (0, 0);
2793 glVertex2f (w, 0); 2983 glVertex2f (w, 0);
2796 glEnd (); 2986 glEnd ();
2797 glDisable (GL_BLEND); 2987 glDisable (GL_BLEND);
2798 } 2988 }
2799 } 2989 }
2800#if 0 2990#if 0
2801 if ($ENV{CFPLUS_DEBUG} & 1) { 2991 // draw borders, for debugging
2802 glPushMatrix; 2992 glPushMatrix ();
2803 glColor 1, 1, 0, 1; 2993 glColor4f (1., 1., 0., 1.);
2804 glTranslate 0.375, 0.375; 2994 glTranslatef (.5, .5, 0.);
2805 glBegin GL_LINE_LOOP; 2995 glBegin (GL_LINE_LOOP);
2806 glVertex 0 , 0; 2996 glVertex2f (0 , 0);
2807 glVertex $self->{w} - 1, 0; 2997 glVertex2f (w - 1, 0);
2808 glVertex $self->{w} - 1, $self->{h} - 1; 2998 glVertex2f (w - 1, h - 1);
2809 glVertex 0 , $self->{h} - 1; 2999 glVertex2f (0 , h - 1);
2810 glEnd; 3000 glEnd ();
2811 glPopMatrix; 3001 glPopMatrix ();
2812 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2813 }
2814#endif 3002#endif
2815 PUSHMARK (SP); 3003 PUSHMARK (SP);
2816 XPUSHs (self); 3004 XPUSHs (self);
2817 PUTBACK; 3005 PUTBACK;
2818 call_method ("_draw", G_VOID | G_DISCARD); 3006 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines