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.253 by root, Fri Dec 28 20:59:14 2007 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#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2))
52# define pango_layout_get_line_readonly pango_layout_get_line_readonly
53# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly
54# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly
55# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly
56#endif
45 57
46#ifndef _WIN32 58#ifndef _WIN32
47# include <sys/types.h> 59# include <sys/types.h>
48# include <sys/socket.h> 60# include <sys/socket.h>
49# include <netinet/in.h> 61# include <netinet/in.h>
58#define MAP_EXTEND_X 32 70#define MAP_EXTEND_X 32
59#define MAP_EXTEND_Y 512 71#define MAP_EXTEND_Y 512
60 72
61#define MIN_FONT_HEIGHT 10 73#define MIN_FONT_HEIGHT 10
62 74
75/* mask out modifiers we are not interested in */
76#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77
63#if 0 78#if 0
64# define PARACHUTE SDL_INIT_NOPARACHUTE 79# define PARACHUTE SDL_INIT_NOPARACHUTE
65#else 80#else
66# define PARACHUTE 0 81# define PARACHUTE 0
67#endif 82#endif
109 av_push (texture_av, (SV *)(size_t)name); 124 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 125 glDeleteTextures (1, &name);
111} 126}
112 127
113#include "texcache.c" 128#include "texcache.c"
129#include "rendercache.c"
114 130
115#include "pango-font.c" 131#include "pango-font.c"
116#include "pango-fontmap.c" 132#include "pango-fontmap.c"
117#include "pango-render.c" 133#include "pango-render.c"
118 134
119typedef IV CFPlus__Channel; 135typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 136typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 137typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 138typedef Mix_Music *DC__MixMusic;
123 139
124typedef PangoFontDescription *CFPlus__Font; 140typedef PangoFontDescription *DC__Font;
125 141
126static int 142static int
127shape_attr_p (PangoLayoutRun *run) 143shape_attr_p (PangoLayoutRun *run)
128{ 144{
129 GSList *attrs = run->item->analysis.extra_attrs; 145 GSList *attrs = run->item->analysis.extra_attrs;
143 159
144typedef struct cf_layout { 160typedef struct cf_layout {
145 PangoLayout *pl; 161 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 162 float r, g, b, a; // default color for rgba mode
147 int base_height; 163 int base_height;
148 CFPlus__Font font; 164 DC__Font font;
165 rc_t *rc;
149} *CFPlus__Layout; 166} *DC__Layout;
150 167
151static CFPlus__Font default_font; 168static DC__Font default_font;
152static PangoContext *opengl_context; 169static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 170static PangoFontMap *opengl_fontmap;
154 171
155static void 172static void
156substitute_func (FcPattern *pattern, gpointer data) 173substitute_func (FcPattern *pattern, gpointer data)
161#endif 178#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 179 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 180}
164 181
165static void 182static void
166layout_update_font (CFPlus__Layout self) 183layout_update_font (DC__Layout self)
167{ 184{
168 /* use a random scale factor to account for unknown descenders, 0.8 works 185 /* use a random scale factor to account for unknown descenders, 0.8 works
169 * reasonably well with bitstream vera 186 * reasonably well with bitstream vera
170 */ 187 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 188 PangoFontDescription *font = self->font ? self->font : default_font;
175 192
176 pango_layout_set_font_description (self->pl, font); 193 pango_layout_set_font_description (self->pl, font);
177} 194}
178 195
179static void 196static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 197layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 198{
182 PangoRectangle rect; 199 PangoRectangle rect;
183 200
184 // get_pixel_* wrongly rounds down 201 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 202 pango_layout_get_extents (self->pl, 0, &rect);
196 213
197typedef uint16_t tileid; 214typedef uint16_t tileid;
198typedef uint16_t faceid; 215typedef uint16_t faceid;
199 216
200typedef struct { 217typedef struct {
201 int name; 218 GLuint name;
202 int w, h; 219 int w, h;
203 float s, t; 220 float s, t;
204 uint8_t r, g, b, a; 221 uint8_t r, g, b, a;
205 tileid smoothtile; 222 tileid smoothtile;
206 uint8_t smoothlevel; 223 uint8_t smoothlevel;
224 int faces; tileid *face2tile; // [faceid] 241 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 242 int texs; maptex *tex; // [tileid]
226 243
227 int32_t rows; 244 int32_t rows;
228 maprow *row; 245 maprow *row;
229} *CFPlus__Map; 246} *DC__Map;
230 247
231static char * 248static char *
232prepend (char *ptr, int sze, int inc) 249prepend (char *ptr, int sze, int inc)
233{ 250{
234 char *p; 251 char *p;
272 self->texs *= 2; 289 self->texs *= 2;
273 } 290 }
274} 291}
275 292
276static maprow * 293static maprow *
277map_get_row (CFPlus__Map self, int y) 294map_get_row (DC__Map self, int y)
278{ 295{
279 if (0 > y) 296 if (0 > y)
280 { 297 {
281 int extend = - y + MAP_EXTEND_Y; 298 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 299 Prepend (maprow, self->row, self->rows, extend);
320 337
321 return row->col + (x - row->c0); 338 return row->col + (x - row->c0);
322} 339}
323 340
324static mapcell * 341static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 342map_get_cell (DC__Map self, int x, int y)
326{ 343{
327 return row_get_cell (map_get_row (self, y), x); 344 return row_get_cell (map_get_row (self, y), x);
328} 345}
329 346
330static void 347static void
331map_clear (CFPlus__Map self) 348map_clear (DC__Map self)
332{ 349{
333 int r; 350 int r;
334 351
335 for (r = 0; r < self->rows; r++) 352 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 353 Safefree (self->row[r].col);
344 self->row = 0; 361 self->row = 0;
345 self->rows = 0; 362 self->rows = 0;
346} 363}
347 364
348static void 365static void
349map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 366map_blank (DC__Map self, int x0, int y0, int w, int h)
350{ 367{
351 int x, y; 368 int x, y;
352 maprow *row; 369 maprow *row;
353 mapcell *cell; 370 mapcell *cell;
354 371
433 n |= n >> 16; 450 n |= n >> 16;
434 451
435 return n + 1; 452 return n + 1;
436} 453}
437 454
455static unsigned int
456popcount (unsigned int n)
457{
458 n -= (n >> 1) & 0x55555555U;
459 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
460 n = ((n >> 4) + n) & 0x0f0f0f0fU;
461 n *= 0x01010101U;
462
463 return n >> 24;
464}
465
438/* SDL should provide this, really. */ 466/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 467#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 468#define SDLK_MODIFIER_MAX 314
441 469
442/******************************************************************************/ 470/******************************************************************************/
480 return 0; 508 return 0;
481 509
482 return 1; 510 return 1;
483} 511}
484 512
485MODULE = CFPlus PACKAGE = CFPlus 513MODULE = Deliantra::Client PACKAGE = DC
486 514
487PROTOTYPES: ENABLE 515PROTOTYPES: ENABLE
488 516
489BOOT: 517BOOT:
490{ 518{
491 HV *stash = gv_stashpv ("CFPlus", 1); 519 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 520 static const struct {
493 const char *name; 521 const char *name;
494 IV iv; 522 IV iv;
495 } *civ, const_iv[] = { 523 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 524# define const_iv(name) { # name, (IV)name }
518 546
519 const_iv (SDL_APPINPUTFOCUS), 547 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 548 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 549 const_iv (SDL_APPACTIVE),
522 550
551 const_iv (SDLK_FIRST),
552 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 553 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 554 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 555 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 556 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 557 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 629 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 630 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 631 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 632 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 633 const_iv (KMOD_MODE),
634
635 const_iv (MIX_DEFAULT_FORMAT),
604# undef const_iv 636# undef const_iv
605 }; 637 };
606 638
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 639 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 658
627NV floor (NV x) 659NV floor (NV x)
628 660
629NV ceil (NV x) 661NV ceil (NV x)
630 662
663IV minpot (UV n)
664
665IV popcount (UV n)
666
631void 667void
632pango_init () 668pango_init ()
633 CODE: 669 CODE:
634{ 670{
635 opengl_fontmap = pango_opengl_font_map_new (); 671 opengl_fontmap = pango_opengl_font_map_new ();
636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 672 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); 673 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)
675 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
677#endif
638} 678}
639 679
640char * 680char *
641SDL_GetError () 681SDL_GetError ()
642 682
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 714 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 715
676 if (m && m != (SDL_Rect **)-1) 716 if (m && m != (SDL_Rect **)-1)
677 while (*m) 717 while (*m)
678 { 718 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 719 if ((*m)->w >= 800 && (*m)->h >= 480)
680 { 720 {
681 AV *av = newAV (); 721 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 722 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 723 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 724 av_push (av, newSViv (rgb));
708 748
709 if (RETVAL) 749 if (RETVAL)
710 { 750 {
711 av_clear (texture_av); 751 av_clear (texture_av);
712 752
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 753 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 754#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 755#include "glfunc.h"
716#undef GL_FUNC 756#undef GL_FUNC
717 } 757 }
718} 758}
744 { 784 {
745 case SDL_KEYDOWN: 785 case SDL_KEYDOWN:
746 case SDL_KEYUP: 786 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 787 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 788 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 789 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 */ 790 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); 791 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 792 break;
753 793
754 case SDL_ACTIVEEVENT: 794 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 795 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 813 x = ev.motion.x;
774 y = ev.motion.y; 814 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 815 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 816 }
777 817
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 818 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 819 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 820 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 821 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 822 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 823 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 824 }
785 break; 825 break;
786 826
787 case SDL_MOUSEBUTTONDOWN: 827 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 828 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 829 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 830
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 831 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 832 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 833 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 834 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 839 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 840 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 841 break;
802 } 842 }
803 843
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 844 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 845 }
806} 846}
807 847
808int 848int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 849Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 850 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 851 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 852 Mix_ChannelFinished (channel_finished);
813 853
814void 854void
855Mix_QuerySpec ()
856 PPCODE:
857{
858 int freq, channels;
859 Uint16 format;
860
861 if (Mix_QuerySpec (&freq, &format, &channels))
862 {
863 EXTEND (SP, 3);
864 PUSHs (sv_2mortal (newSViv (freq)));
865 PUSHs (sv_2mortal (newSViv (format)));
866 PUSHs (sv_2mortal (newSViv (channels)));
867 }
868}
869
870void
815Mix_CloseAudio () 871Mix_CloseAudio ()
816 872
817int 873int
818Mix_AllocateChannels (int numchans = -1) 874Mix_AllocateChannels (int numchans = -1)
875
876const char *
877Mix_GetError ()
819 878
820void 879void
821lowdelay (int fd, int val = 1) 880lowdelay (int fd, int val = 1)
822 CODE: 881 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 882 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
948void 1007void
949error (char *message) 1008error (char *message)
950 CODE: 1009 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1010 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1011#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1012 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1013#endif
955 1014
956void 1015void
957fatal (char *message) 1016fatal (char *message)
958 CODE: 1017 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1018 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1019#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1020 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1021#endif
963 _exit (1); 1022 _exit (1);
964 1023
965void 1024void
966_exit (int retval = 0) 1025_exit (int retval = 0)
978#if DEBUG 1037#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1038 VALGRIND_DO_LEAK_CHECK;
980#endif 1039#endif
981} 1040}
982 1041
983MODULE = CFPlus PACKAGE = CFPlus::Font 1042MODULE = Deliantra::Client PACKAGE = DC::Font
984 1043
985PROTOTYPES: DISABLE 1044PROTOTYPES: DISABLE
986 1045
987CFPlus::Font 1046DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1047new_from_file (SV *class, char *path, int id = 0)
989 CODE: 1048 CODE:
990{ 1049{
991 int count; 1050 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1051 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
995} 1054}
996 OUTPUT: 1055 OUTPUT:
997 RETVAL 1056 RETVAL
998 1057
999void 1058void
1000DESTROY (CFPlus::Font self) 1059DESTROY (DC::Font self)
1001 CODE: 1060 CODE:
1002 pango_font_description_free (self); 1061 pango_font_description_free (self);
1003 1062
1004void 1063void
1005make_default (CFPlus::Font self) 1064make_default (DC::Font self)
1006 PROTOTYPE: $ 1065 PROTOTYPE: $
1007 CODE: 1066 CODE:
1008 default_font = self; 1067 default_font = self;
1009 1068
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1069MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1070
1012PROTOTYPES: DISABLE 1071PROTOTYPES: DISABLE
1013 1072
1014void 1073void
1015reset_glyph_cache () 1074glyph_cache_backup ()
1016 PROTOTYPE: 1075 PROTOTYPE:
1017 CODE: 1076 CODE:
1077 tc_backup ();
1078
1079void
1080glyph_cache_restore ()
1081 PROTOTYPE:
1082 CODE:
1018 tc_clear (); 1083 tc_restore ();
1019 1084
1020CFPlus::Layout 1085DC::Layout
1021new (SV *class) 1086new (SV *class)
1022 CODE: 1087 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1088 New (0, RETVAL, 1, struct cf_layout);
1024 1089
1025 RETVAL->pl = pango_layout_new (opengl_context); 1090 RETVAL->pl = pango_layout_new (opengl_context);
1027 RETVAL->g = 1.; 1092 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1093 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1094 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1095 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1096 RETVAL->font = 0;
1097 RETVAL->rc = rc_alloc ();
1032 1098
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1099 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1100 layout_update_font (RETVAL);
1035 OUTPUT: 1101 OUTPUT:
1036 RETVAL 1102 RETVAL
1037 1103
1038void 1104void
1039DESTROY (CFPlus::Layout self) 1105DESTROY (DC::Layout self)
1040 CODE: 1106 CODE:
1041 g_object_unref (self->pl); 1107 g_object_unref (self->pl);
1108 rc_free (self->rc);
1042 Safefree (self); 1109 Safefree (self);
1043 1110
1044void 1111void
1045set_text (CFPlus::Layout self, SV *text_) 1112set_text (DC::Layout self, SV *text_)
1046 CODE: 1113 CODE:
1047{ 1114{
1048 STRLEN textlen; 1115 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1116 char *text = SvPVutf8 (text_, textlen);
1050 1117
1051 pango_layout_set_text (self->pl, text, textlen); 1118 pango_layout_set_text (self->pl, text, textlen);
1052} 1119}
1053 1120
1054void 1121void
1055set_markup (CFPlus::Layout self, SV *text_) 1122set_markup (DC::Layout self, SV *text_)
1056 CODE: 1123 CODE:
1057{ 1124{
1058 STRLEN textlen; 1125 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1126 char *text = SvPVutf8 (text_, textlen);
1060 1127
1061 pango_layout_set_markup (self->pl, text, textlen); 1128 pango_layout_set_markup (self->pl, text, textlen);
1062} 1129}
1063 1130
1064void 1131void
1065set_shapes (CFPlus::Layout self, ...) 1132set_shapes (DC::Layout self, ...)
1066 CODE: 1133 CODE:
1067{ 1134{
1068 PangoAttrList *attrs = 0; 1135 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1136 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1137 const char *pos = text;
1105 if (attrs) 1172 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1173 pango_layout_set_attributes (self->pl, attrs);
1107} 1174}
1108 1175
1109void 1176void
1110get_shapes (CFPlus::Layout self) 1177get_shapes (DC::Layout self)
1111 PPCODE: 1178 PPCODE:
1112{ 1179{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1180 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1181
1115 do 1182 do
1116 { 1183 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1184 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1185
1119 if (run && shape_attr_p (run)) 1186 if (run && shape_attr_p (run))
1120 { 1187 {
1121 PangoRectangle extents; 1188 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1189 pango_layout_iter_get_run_extents (iter, 0, &extents);
1130 1197
1131 pango_layout_iter_free (iter); 1198 pango_layout_iter_free (iter);
1132} 1199}
1133 1200
1134int 1201int
1135has_wrapped (CFPlus::Layout self) 1202has_wrapped (DC::Layout self)
1136 CODE: 1203 CODE:
1137{ 1204{
1138 int lines = 1; 1205 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1206 const char *text = pango_layout_get_text (self->pl);
1140 1207
1145} 1212}
1146 OUTPUT: 1213 OUTPUT:
1147 RETVAL 1214 RETVAL
1148 1215
1149SV * 1216SV *
1150get_text (CFPlus::Layout self) 1217get_text (DC::Layout self)
1151 CODE: 1218 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1219 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1220 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1221 OUTPUT:
1155 RETVAL 1222 RETVAL
1156 1223
1157void 1224void
1158set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1225set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1159 CODE: 1226 CODE:
1160 self->r = r; 1227 self->r = r;
1161 self->g = g; 1228 self->g = g;
1162 self->b = b; 1229 self->b = b;
1163 self->a = a; 1230 self->a = a;
1164 1231
1165void 1232void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1233set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1234 CODE:
1168 if (self->font != font) 1235 if (self->font != font)
1169 { 1236 {
1170 self->font = font; 1237 self->font = font;
1171 layout_update_font (self); 1238 layout_update_font (self);
1172 } 1239 }
1173 1240
1174void 1241void
1175set_height (CFPlus::Layout self, int base_height) 1242set_height (DC::Layout self, int base_height)
1176 CODE: 1243 CODE:
1177 if (self->base_height != base_height) 1244 if (self->base_height != base_height)
1178 { 1245 {
1179 self->base_height = base_height; 1246 self->base_height = base_height;
1180 layout_update_font (self); 1247 layout_update_font (self);
1181 } 1248 }
1182 1249
1183void 1250void
1184set_width (CFPlus::Layout self, int max_width = -1) 1251set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1252 CODE:
1186 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1253 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1187 1254
1188void 1255void
1189set_indent (CFPlus::Layout self, int indent) 1256set_indent (DC::Layout self, int indent)
1190 CODE: 1257 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1258 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1259
1193void 1260void
1194set_spacing (CFPlus::Layout self, int spacing) 1261set_spacing (DC::Layout self, int spacing)
1195 CODE: 1262 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1263 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1264
1198void 1265void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1266set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1267 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1268 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1269 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1270 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1271 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1272 : PANGO_ELLIPSIZE_NONE
1206 ); 1273 );
1207 1274
1208void 1275void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1276set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1277 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1278 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1279
1213void 1280void
1214size (CFPlus::Layout self) 1281size (DC::Layout self)
1215 PPCODE: 1282 PPCODE:
1216{ 1283{
1217 int w, h; 1284 int w, h;
1218 1285
1219 layout_get_pixel_size (self, &w, &h); 1286 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1289 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1290 PUSHs (sv_2mortal (newSViv (h)));
1224} 1291}
1225 1292
1226int 1293int
1227descent (CFPlus::Layout self) 1294descent (DC::Layout self)
1228 CODE: 1295 CODE:
1229{ 1296{
1230 PangoRectangle rect; 1297 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1298 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1299 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1300 RETVAL = PANGO_DESCENT (rect);
1234} 1301}
1235 OUTPUT: 1302 OUTPUT:
1236 RETVAL 1303 RETVAL
1237 1304
1238int 1305int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1306xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1307 CODE:
1241{ 1308{
1242 int index, trailing; 1309 int index, trailing;
1243 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1310 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1244 RETVAL = index + trailing; 1311 RETVAL = index + trailing;
1245} 1312}
1246 OUTPUT: 1313 OUTPUT:
1247 RETVAL 1314 RETVAL
1248 1315
1249void 1316void
1250cursor_pos (CFPlus::Layout self, int index) 1317cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1318 PPCODE:
1252{ 1319{
1253 PangoRectangle strong_pos; 1320 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1321 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1322
1256 EXTEND (SP, 3); 1323 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1324 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1325 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1326 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1327}
1261 1328
1262void 1329void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1330index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1331 PPCODE:
1265{ 1332{
1266 int line, x; 1333 int line, x;
1267 1334
1268 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1335 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1336#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1337 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1338 --line;
1339#endif
1271 EXTEND (SP, 2); 1340 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1341 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1342 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1343}
1275 1344
1276void 1345void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1346line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1347 PPCODE:
1279{ 1348{
1280 PangoLayoutLine *lp; 1349 PangoLayoutLine *lp;
1281 int index, trailing; 1350 int index, trailing;
1282 1351
1283 if (line < 0) 1352 if (line < 0)
1284 XSRETURN_EMPTY; 1353 XSRETURN_EMPTY;
1285 1354
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1355 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1356 XSRETURN_EMPTY; /* do better */
1288 1357
1289 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1358 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1290 1359
1291 EXTEND (SP, 2); 1360 EXTEND (SP, 2);
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1366 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1367 }
1299} 1368}
1300 1369
1301void 1370void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1371render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1372 CODE:
1373 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1374 pango_opengl_render_layout_subpixel (
1305 self->pl, 1375 self->pl,
1376 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1377 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1378 self->r, self->g, self->b, self->a,
1308 flags 1379 flags
1309 ); 1380 );
1381 // we assume that context_change actually clears/frees stuff
1382 // and does not do any recomputation...
1383 pango_layout_context_changed (self->pl);
1310 1384
1311MODULE = CFPlus PACKAGE = CFPlus::Texture 1385void
1386draw (DC::Layout self)
1387 CODE:
1388{
1389 glEnable (GL_TEXTURE_2D);
1390 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1391 glEnable (GL_BLEND);
1392 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1393 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1394 glEnable (GL_ALPHA_TEST);
1395 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1396
1397 rc_draw (self->rc);
1398
1399 glDisable (GL_ALPHA_TEST);
1400 glDisable (GL_BLEND);
1401 glDisable (GL_TEXTURE_2D);
1402}
1403
1404MODULE = Deliantra::Client PACKAGE = DC::Texture
1312 1405
1313PROTOTYPES: ENABLE 1406PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1407
1317void 1408void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1409pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1410 CODE:
1320{ 1411{
1347 HV *hv = (HV *)SvRV (self); 1438 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1439 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1440 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1441 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1442
1443 if (name <= 0)
1444 XSRETURN_EMPTY;
1445
1352 if (items < 5) 1446 if (items < 5)
1353 { 1447 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1448 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1449 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1450 }
1394 RETVAL = width > 0; 1488 RETVAL = width > 0;
1395} 1489}
1396 OUTPUT: 1490 OUTPUT:
1397 RETVAL 1491 RETVAL
1398 1492
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1493MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1494
1401PROTOTYPES: DISABLE 1495PROTOTYPES: DISABLE
1402 1496
1403CFPlus::Map 1497DC::Map
1404new (SV *class) 1498new (SV *class)
1405 CODE: 1499 CODE:
1406 New (0, RETVAL, 1, struct map); 1500 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1501 RETVAL->x = 0;
1408 RETVAL->y = 0; 1502 RETVAL->y = 0;
1416 RETVAL->row = 0; 1510 RETVAL->row = 0;
1417 OUTPUT: 1511 OUTPUT:
1418 RETVAL 1512 RETVAL
1419 1513
1420void 1514void
1421DESTROY (CFPlus::Map self) 1515DESTROY (DC::Map self)
1422 CODE: 1516 CODE:
1423{ 1517{
1424 map_clear (self); 1518 map_clear (self);
1425 Safefree (self->face2tile); 1519 Safefree (self->face2tile);
1426 Safefree (self->tex); 1520 Safefree (self->tex);
1427 Safefree (self); 1521 Safefree (self);
1428} 1522}
1429 1523
1430void 1524void
1431resize (CFPlus::Map self, int map_width, int map_height) 1525resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1526 CODE:
1433 self->w = map_width; 1527 self->w = map_width;
1434 self->h = map_height; 1528 self->h = map_height;
1435 1529
1436void 1530void
1437clear (CFPlus::Map self) 1531clear (DC::Map self)
1438 CODE: 1532 CODE:
1439 map_clear (self); 1533 map_clear (self);
1440 1534
1441void 1535void
1442set_tileid (CFPlus::Map self, int face, int tile) 1536set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1537 CODE:
1444{ 1538{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1539 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1540 need_texid (self, tile);
1447} 1541}
1448 1542
1449void 1543void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1544set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1545 CODE:
1452{ 1546{
1453 tileid texid; 1547 tileid texid;
1454 maptex *tex; 1548 maptex *tex;
1455 1549
1468 tex->smoothtile = self->face2tile [smooth]; 1562 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1563 tex->smoothlevel = level;
1470} 1564}
1471 1565
1472void 1566void
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) 1567set_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: 1568 CODE:
1475{ 1569{
1476 need_texid (self, texid); 1570 need_texid (self, texid);
1477 1571
1478 { 1572 {
1498 // from transparent color bleeding and ugly wrapping effects. 1592 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1593 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1594}
1501 1595
1502int 1596int
1503ox (CFPlus::Map self) 1597ox (DC::Map self)
1504 ALIAS: 1598 ALIAS:
1505 oy = 1 1599 oy = 1
1506 x = 2 1600 x = 2
1507 y = 3 1601 y = 3
1508 w = 4 1602 w = 4
1519 } 1613 }
1520 OUTPUT: 1614 OUTPUT:
1521 RETVAL 1615 RETVAL
1522 1616
1523void 1617void
1524scroll (CFPlus::Map self, int dx, int dy) 1618scroll (DC::Map self, int dx, int dy)
1525 CODE: 1619 CODE:
1526{ 1620{
1527 if (dx > 0) 1621 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1622 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1623 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 1638 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1639 self->y += MAP_EXTEND_Y;
1546 } 1640 }
1547} 1641}
1548 1642
1549void 1643SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1644map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1645 CODE:
1552{ 1646{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1647 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1648 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1649 mapcell *cell;
1556 int x, y, flags; 1650 int x, y, z, flags;
1651 AV *missing = newAV ();
1652 RETVAL = newRV_noinc ((SV *)missing);
1557 1653
1558 while (data < data_end - 1) 1654 while (data < data_end - 1)
1559 { 1655 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1656 flags = (data [0] << 8) + data [1]; data += 2;
1561 1657
1612 } 1708 }
1613 else 1709 else
1614 cell->darkness = *data++ + 1; 1710 cell->darkness = *data++ + 1;
1615 } 1711 }
1616 1712
1713 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 1714 if (flags & (4 >> z))
1618 { 1715 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 1716 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 1717 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 1718 cell->tile [z] = self->face2tile [face];
1719
1720 if (cell->tile [z])
1721 {
1722 maptex *tex = self->tex + cell->tile [z];
1723 if (!tex->name)
1724 av_push (missing, newSViv (cell->tile [z]));
1725
1726 if (tex->smoothtile)
1727 {
1728 maptex *smooth = self->tex + tex->smoothtile;
1729 if (!smooth->name)
1730 av_push (missing, newSViv (tex->smoothtile));
1731 }
1732 }
1622 } 1733 }
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 } 1734 }
1638 else 1735 else
1639 cell->darkness = 0; 1736 cell->darkness = 0;
1640 } 1737 }
1641} 1738}
1739 OUTPUT:
1740 RETVAL
1642 1741
1643SV * 1742SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1743mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 1744 CODE:
1646{ 1745{
1647 int x1, x; 1746 int x1, x;
1648 int y1, y; 1747 int y1, y;
1649 int z; 1748 int z;
1694} 1793}
1695 OUTPUT: 1794 OUTPUT:
1696 RETVAL 1795 RETVAL
1697 1796
1698void 1797void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1798draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1700 CODE: 1799 CODE:
1701{ 1800{
1801 int x, y, z;
1802
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1803 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1804 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) 1805 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705 smooth_key skey; 1806 smooth_key skey;
1706 int x, y, z; 1807
1707 int last_name; 1808 rc_t *rc = rc_alloc ();
1809 rc_key_t key;
1810 rc_array_t *arr;
1708 1811
1709 // thats current max. sorry. 1812 // thats current max. sorry.
1710 if (sw > 255) sw = 255; 1813 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 1814 if (sh > 255) sh = 255;
1712 1815
1713 // clear key, in case of extra padding 1816 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 1817 memset (&skey, 0, sizeof (skey));
1715 1818
1716 glColor4ub (255, 255, 255, 255); 1819 memset (&key, 0, sizeof (key));
1717 1820 key.r = 255;
1718 glEnable (GL_BLEND); 1821 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1822 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 1823 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1824 key.mode = GL_QUADS;
1722 1825 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS); 1826 key.texname = -1;
1724
1725 last_name = 0;
1726 1827
1727 mx += self->x; 1828 mx += self->x;
1728 my += self->y; 1829 my += self->y;
1729 1830
1730 // first pass: determine smooth_max 1831 // first pass: determine smooth_max
1746 MAX (self->tex [cell->tile [0]].smoothlevel, 1847 MAX (self->tex [cell->tile [0]].smoothlevel,
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 1848 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 1849 self->tex [cell->tile [2]].smoothlevel));
1749 } 1850 }
1750 } 1851 }
1852
1853 glEnable (GL_BLEND);
1854 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1855 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1751 1856
1752 for (z = 0; z <= 2; z++) 1857 for (z = 0; z <= 2; z++)
1753 { 1858 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 1859 memset (smooth_level, 0, sizeof (smooth_level));
1755 1860
1765 tileid tile = cell->tile [z]; 1870 tileid tile = cell->tile [z];
1766 1871
1767 if (tile) 1872 if (tile)
1768 { 1873 {
1769 maptex tex = self->tex [tile]; 1874 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 1875 int px, py;
1771 int py = (y + 1) * T - tex.h;
1772 1876
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 1877 if (key.texname != tex.name)
1776 { 1878 {
1777 if (!tex.name) 1879 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 1880 tex = self->tex [2]; /* missing, replace by noface */
1779 1881
1780 glEnd (); 1882 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1883 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 1884 }
1784 1885
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1886 px = (x + 1) * T - tex.w;
1887 py = (y + 1) * T - tex.h;
1888
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1890 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); 1891 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 ); 1892 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1789 1893
1790 if (cell->flags && z == 2) 1894 if (cell->flags && z == 2)
1791 { 1895 {
1896 // overlays such as the speech bubble, probably more to come
1792 if (cell->flags & 1) 1897 if (cell->flags & 1)
1793 { 1898 {
1794 maptex tex = self->tex [1]; 1899 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32; 1900 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32; 1901 int py = y * T - T * 6 / 32;
1797 1902
1903 if (tex.name)
1798 glEnd (); 1904 {
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1905 if (key.texname != tex.name)
1906 {
1907 key.texname = tex.name;
1908 arr = rc_array (rc, &key);
1909 }
1910
1911 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1912 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1913 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1914 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1800 glBegin (GL_QUADS); 1915 }
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 } 1916 }
1807 } 1917 }
1808 1918
1809 // update smooth hash 1919 // update smooth hash
1810 if (tex.smoothtile) 1920 if (tex.smoothtile)
1846 } 1956 }
1847 } 1957 }
1848 } 1958 }
1849 } 1959 }
1850 1960
1961 rc_draw (rc);
1962 rc_clear (rc);
1963
1851 // go through all smoothlevels, lowest to highest, then draw. 1964 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 1965 // this is basically counting sort
1853 { 1966 {
1854 int w, b; 1967 int w, b;
1855 1968
1969 glEnable (GL_TEXTURE_2D);
1970 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 1971 for (w = 0; w < 256 / 32; ++w)
1857 { 1972 {
1858 uint32_t smask = smooth_level [w]; 1973 uint32_t smask = smooth_level [w];
1859 if (smask) 1974 if (smask)
1860 for (b = 0; b < 32; ++b) 1975 for (b = 0; b < 32; ++b)
1879 int border = bits & 15; 1994 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1995 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 1996 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 1997 float dy = tex.t * .5f ; // 2 images/column
1883 1998
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 1999 if (tex.name)
1887 { 2000 {
2001 // this time avoiding texture state changes
2002 // save gobs of state changes.
1888 if (!tex.name) 2003 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 2004 {
1890
1891 glEnd (); 2005 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2006 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2007 glBegin (GL_QUADS);
1894 } 2008 }
1895 2009
1896 if (border) 2010 if (border)
1897 { 2011 {
1898 float ox = border * dx; 2012 float ox = border * dx;
1899 2013
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2014 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2015 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2016 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2017 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2018 }
1905 2019
1906 if (corner) 2020 if (corner)
1907 { 2021 {
1908 float ox = corner * dx; 2022 float ox = corner * dx;
1909 2023
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2024 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2025 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2026 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2027 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2028 }
1914 } 2029 }
1915 } 2030 }
1916 } 2031 }
1917 } 2032 }
1918 } 2033 }
2034
2035 glEnd ();
2036 glDisable (GL_TEXTURE_2D);
2037 key.texname = -1;
1919 } 2038 }
1920 2039
1921 hv_clear (smooth); 2040 hv_clear (smooth);
1922 } 2041 }
1923 2042
1924 glEnd ();
1925
1926 glDisable (GL_TEXTURE_2D);
1927 glDisable (GL_BLEND); 2043 glDisable (GL_BLEND);
2044 rc_free (rc);
1928 2045
1929 // top layer: overlays such as the health bar 2046 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2047 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2048 if (0 <= y + my && y + my < self->rows)
1932 { 2049 {
1957 } 2074 }
1958 } 2075 }
1959} 2076}
1960 2077
1961void 2078void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2079draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1963 CODE: 2080 CODE:
1964{ 2081{
1965 static float color[16][3] = { 2082 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2083 { 0.00F, 0.00F, 0.00F },
1967 { 1.00F, 1.00F, 1.00F }, 2084 { 1.00F, 1.00F, 1.00F },
2017 glDisable (GL_BLEND); 2134 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2135 glDisable (GL_TEXTURE_2D);
2019} 2136}
2020 2137
2021void 2138void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2139fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2140 PPCODE:
2024{ 2141{
2025 int x, y; 2142 int x, y;
2026 int sw1 = sw + 2; 2143 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2144 int sh1 = sh + 2;
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2215 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2216 PUSHs (darkness3_sv);
2100} 2217}
2101 2218
2102SV * 2219SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2220get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2221 CODE:
2105{ 2222{
2106 int x, y, x1, y1; 2223 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2224 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2225 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2173} 2290}
2174 OUTPUT: 2291 OUTPUT:
2175 RETVAL 2292 RETVAL
2176 2293
2177void 2294void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2295set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2179 PPCODE: 2296 PPCODE:
2180{ 2297{
2181 int x, y, z; 2298 int x, y, z;
2182 int w, h; 2299 int w, h;
2183 int x1, y1; 2300 int x1, y1;
2184 2301
2185 if (*data++ != 0) 2302 if (*data++ != 0)
2186 return; /* version mismatch */ 2303 XSRETURN_EMPTY; /* version mismatch */
2187 2304
2188 w = *data++ << 8; w |= *data++; 2305 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2306 h = *data++ << 8; h |= *data++;
2190 2307
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2308 // we need to do this 'cause we don't keep an absolute coord system for rows
2236 } 2353 }
2237 } 2354 }
2238 } 2355 }
2239} 2356}
2240 2357
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2358MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2359
2243CFPlus::RW 2360DC::RW
2244new (SV *class, SV *data_sv) 2361new (SV *class, SV *data_sv)
2245 CODE: 2362 CODE:
2246{ 2363{
2247 STRLEN datalen; 2364 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2365 char *data = SvPVbyte (data_sv, datalen);
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2367 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2368}
2252 OUTPUT: 2369 OUTPUT:
2253 RETVAL 2370 RETVAL
2254 2371
2255CFPlus::RW 2372DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2373new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2374 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2375 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2376 OUTPUT:
2260 RETVAL 2377 RETVAL
2261 2378
2379# fails on win32:
2380# dc.xs(2268) : error C2059: syntax error : '('
2262void 2381#void
2263close (CFPlus::RW self) 2382#close (DC::RW self)
2264 CODE: 2383# CODE:
2265 SDL_RWclose (self); 2384# (self->(close)) (self);
2266 2385
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2386MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2387
2269PROTOTYPES: DISABLE 2388PROTOTYPES: DISABLE
2270 2389
2271void 2390DC::Channel
2272halt (CFPlus::Channel self) 2391find ()
2273 CODE: 2392 CODE:
2393{
2394 RETVAL = Mix_GroupAvailable (-1);
2395
2396 if (RETVAL < 0)
2397 {
2398 RETVAL = Mix_GroupOldest (-1);
2399
2400 if (RETVAL < 0)
2401 XSRETURN_UNDEF;
2402
2274 Mix_HaltChannel (self); 2403 Mix_HaltChannel (RETVAL);
2404 }
2275 2405
2276void 2406 Mix_UnregisterAllEffects (RETVAL);
2277expire (CFPlus::Channel self, int ticks = -1) 2407 Mix_Volume (RETVAL, 128);
2278 CODE: 2408}
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: 2409 OUTPUT:
2291 RETVAL 2410 RETVAL
2292 2411
2293void 2412void
2413halt (DC::Channel self)
2414 CODE:
2415 Mix_HaltChannel (self);
2416
2417void
2418expire (DC::Channel self, int ticks = -1)
2419 CODE:
2420 Mix_ExpireChannel (self, ticks);
2421
2422void
2423fade_out (DC::Channel self, int ticks = -1)
2424 CODE:
2425 Mix_FadeOutChannel (self, ticks);
2426
2427int
2428volume (DC::Channel self, int volume)
2429 CODE:
2430 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2431 OUTPUT:
2432 RETVAL
2433
2434void
2294unregister_all_effects (CFPlus::Channel self) 2435unregister_all_effects (DC::Channel self)
2295 CODE: 2436 CODE:
2296 Mix_UnregisterAllEffects (self); 2437 Mix_UnregisterAllEffects (self);
2297 2438
2298void 2439void
2299set_panning (CFPlus::Channel self, int left, int right) 2440set_panning (DC::Channel self, int left, int right)
2300 CODE: 2441 CODE:
2442 left = CLAMP (left , 0, 255);
2443 right = CLAMP (right, 0, 255);
2301 Mix_SetPanning (self, left, right); 2444 Mix_SetPanning (self, left, right);
2302 2445
2303void 2446void
2304set_distance (CFPlus::Channel self, int distance) 2447set_distance (DC::Channel self, int distance)
2305 CODE: 2448 CODE:
2306 Mix_SetDistance (self, distance); 2449 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2307 2450
2308void 2451void
2309set_position (CFPlus::Channel self, int angle, int distance) 2452set_position (DC::Channel self, int angle, int distance)
2310 CODE: 2453 CODE:
2454
2455void
2456set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2457 CODE:
2458{
2459 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2460 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2311 Mix_SetPosition (self, angle, distance); 2461 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2462}
2312 2463
2313void 2464void
2314set_reverse_stereo (CFPlus::Channel self, int flip) 2465set_reverse_stereo (DC::Channel self, int flip)
2315 CODE: 2466 CODE:
2316 Mix_SetReverseStereo (self, flip); 2467 Mix_SetReverseStereo (self, flip);
2317 2468
2318MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2469MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2319 2470
2320PROTOTYPES: DISABLE 2471PROTOTYPES: DISABLE
2321 2472
2322CFPlus::MixChunk 2473DC::MixChunk
2323new (SV *class, CFPlus::RW rwops) 2474new (SV *class, DC::RW rwops)
2324 CODE: 2475 CODE:
2325 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2476 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2326 OUTPUT: 2477 OUTPUT:
2327 RETVAL 2478 RETVAL
2328 2479
2329void 2480void
2330DESTROY (CFPlus::MixChunk self) 2481DESTROY (DC::MixChunk self)
2331 CODE: 2482 CODE:
2332 Mix_FreeChunk (self); 2483 Mix_FreeChunk (self);
2333 2484
2334int 2485int
2335volume (CFPlus::MixChunk self, int volume = -1) 2486volume (DC::MixChunk self, int volume = -1)
2336 CODE: 2487 CODE:
2488 if (items > 1)
2489 volume = CLAMP (volume, 0, 128);
2337 RETVAL = Mix_VolumeChunk (self, volume); 2490 RETVAL = Mix_VolumeChunk (self, volume);
2338 OUTPUT: 2491 OUTPUT:
2339 RETVAL 2492 RETVAL
2340 2493
2341CFPlus::Channel 2494DC::Channel
2342play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2495play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2343 CODE: 2496 CODE:
2497{
2344 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2498 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2499
2500 if (RETVAL < 0)
2501 XSRETURN_UNDEF;
2502
2503 if (channel < 0)
2504 {
2345 Mix_UnregisterAllEffects (RETVAL); 2505 Mix_UnregisterAllEffects (RETVAL);
2506 Mix_Volume (RETVAL, 128);
2507 }
2508}
2346 OUTPUT: 2509 OUTPUT:
2347 RETVAL 2510 RETVAL
2348 2511
2349MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2512MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2350 2513
2351int 2514int
2352volume (int volume = -1) 2515volume (int volume = -1)
2353 PROTOTYPE: ;$ 2516 PROTOTYPE: ;$
2354 CODE: 2517 CODE:
2518 if (items > 0)
2519 volume = CLAMP (volume, 0, 128);
2355 RETVAL = Mix_VolumeMusic (volume); 2520 RETVAL = Mix_VolumeMusic (volume);
2356 OUTPUT: 2521 OUTPUT:
2357 RETVAL 2522 RETVAL
2358 2523
2359void 2524void
2364void 2529void
2365halt () 2530halt ()
2366 CODE: 2531 CODE:
2367 Mix_HaltMusic (); 2532 Mix_HaltMusic ();
2368 2533
2369CFPlus::MixMusic 2534DC::MixMusic
2370new (SV *class, CFPlus::RW rwops) 2535new (SV *class, DC::RW rwops)
2371 CODE: 2536 CODE:
2372 RETVAL = Mix_LoadMUS_RW (rwops); 2537 RETVAL = Mix_LoadMUS_RW (rwops);
2373 OUTPUT: 2538 OUTPUT:
2374 RETVAL 2539 RETVAL
2375 2540
2376void 2541void
2377DESTROY (CFPlus::MixMusic self) 2542DESTROY (DC::MixMusic self)
2378 CODE: 2543 CODE:
2379 Mix_FreeMusic (self); 2544 Mix_FreeMusic (self);
2380 2545
2381int 2546int
2382play (CFPlus::MixMusic self, int loops = -1) 2547play (DC::MixMusic self, int loops = -1)
2383 CODE: 2548 CODE:
2384 RETVAL = Mix_PlayMusic (self, loops); 2549 RETVAL = Mix_PlayMusic (self, loops);
2385 OUTPUT: 2550 OUTPUT:
2386 RETVAL 2551 RETVAL
2387 2552
2388void 2553void
2389fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2554fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2390 CODE: 2555 CODE:
2391 Mix_FadeInMusicPos (self, loops, ms, position); 2556 Mix_FadeInMusicPos (self, loops, ms, position);
2392 2557
2393MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2558MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2394 2559
2395PROTOTYPES: ENABLE 2560PROTOTYPES: ENABLE
2396 2561
2397BOOT: 2562BOOT:
2398{ 2563{
2399 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2564 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2400 static const struct { 2565 static const struct {
2401 const char *name; 2566 const char *name;
2402 IV iv; 2567 IV iv;
2403 } *civ, const_iv[] = { 2568 } *civ, const_iv[] = {
2404# define const_iv(name) { # name, (IV)name } 2569# define const_iv(name) { # name, (IV)name }
2439 const_iv (GL_INTENSITY), 2604 const_iv (GL_INTENSITY),
2440 const_iv (GL_LUMINANCE), 2605 const_iv (GL_LUMINANCE),
2441 const_iv (GL_LUMINANCE_ALPHA), 2606 const_iv (GL_LUMINANCE_ALPHA),
2442 const_iv (GL_FLOAT), 2607 const_iv (GL_FLOAT),
2443 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2608 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2609 const_iv (GL_COMPRESSED_ALPHA_ARB),
2610 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2611 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2612 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2613 const_iv (GL_COMPRESSED_RGB_ARB),
2614 const_iv (GL_COMPRESSED_RGBA_ARB),
2444 const_iv (GL_COMPILE), 2615 const_iv (GL_COMPILE),
2445 const_iv (GL_PROXY_TEXTURE_1D), 2616 const_iv (GL_PROXY_TEXTURE_1D),
2446 const_iv (GL_PROXY_TEXTURE_2D), 2617 const_iv (GL_PROXY_TEXTURE_2D),
2447 const_iv (GL_TEXTURE_1D), 2618 const_iv (GL_TEXTURE_1D),
2448 const_iv (GL_TEXTURE_2D), 2619 const_iv (GL_TEXTURE_2D),
2487 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2658 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2488 const_iv (GL_POINT_SMOOTH_HINT), 2659 const_iv (GL_POINT_SMOOTH_HINT),
2489 const_iv (GL_LINE_SMOOTH_HINT), 2660 const_iv (GL_LINE_SMOOTH_HINT),
2490 const_iv (GL_POLYGON_SMOOTH_HINT), 2661 const_iv (GL_POLYGON_SMOOTH_HINT),
2491 const_iv (GL_GENERATE_MIPMAP_HINT), 2662 const_iv (GL_GENERATE_MIPMAP_HINT),
2663 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2492 const_iv (GL_FASTEST), 2664 const_iv (GL_FASTEST),
2493 const_iv (GL_DONT_CARE), 2665 const_iv (GL_DONT_CARE),
2494 const_iv (GL_NICEST), 2666 const_iv (GL_NICEST),
2495 const_iv (GL_V2F), 2667 const_iv (GL_V2F),
2496 const_iv (GL_V3F), 2668 const_iv (GL_V3F),
2504 2676
2505 texture_av = newAV (); 2677 texture_av = newAV ();
2506 AvREAL_off (texture_av); 2678 AvREAL_off (texture_av);
2507} 2679}
2508 2680
2681void
2682disable_GL_EXT_blend_func_separate ()
2683 CODE:
2684 gl.BlendFuncSeparate = 0;
2685 gl.BlendFuncSeparateEXT = 0;
2686
2509char * 2687char *
2510gl_vendor () 2688gl_vendor ()
2511 CODE: 2689 CODE:
2512 RETVAL = (char *)glGetString (GL_VENDOR); 2690 RETVAL = (char *)glGetString (GL_VENDOR);
2513 OUTPUT: 2691 OUTPUT:
2634 2812
2635void glRect (float x1, float y1, float x2, float y2) 2813void glRect (float x1, float y1, float x2, float y2)
2636 CODE: 2814 CODE:
2637 glRectf (x1, y1, x2, y2); 2815 glRectf (x1, y1, x2, y2);
2638 2816
2817void glRect_lineloop (float x1, float y1, float x2, float y2)
2818 CODE:
2819 glBegin (GL_LINE_LOOP);
2820 glVertex2f (x1, y1);
2821 glVertex2f (x2, y1);
2822 glVertex2f (x2, y2);
2823 glVertex2f (x1, y2);
2824 glEnd ();
2825
2639PROTOTYPES: ENABLE 2826PROTOTYPES: ENABLE
2640 2827
2641void glBegin (int mode) 2828void glBegin (int mode)
2642 2829
2643void glEnd () 2830void glEnd ()
2675void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2862void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2676 CODE: 2863 CODE:
2677 if (gl.SeparableFilter2D) 2864 if (gl.SeparableFilter2D)
2678 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2865 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2679 2866
2680void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2867void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2681 2868
2682void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2869void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2683 2870
2684void glDrawPixels (int width, int height, int format, int type, char *pixels) 2871void glDrawPixels (int width, int height, int format, int type, char *pixels)
2685 2872
2711 2898
2712void glEndList () 2899void glEndList ()
2713 2900
2714void glCallList (int list) 2901void glCallList (int list)
2715 2902
2716MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2903MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2717 2904
2718PROTOTYPES: DISABLE 2905PROTOTYPES: DISABLE
2719 2906
2720void 2907void
2721find_widget (SV *self, NV x, NV y) 2908find_widget (SV *self, NV x, NV y)
2725 XPUSHs (self); 2912 XPUSHs (self);
2726} 2913}
2727 2914
2728BOOT: 2915BOOT:
2729{ 2916{
2730 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2917 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2731 2918
2732 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2919 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); 2920 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); 2921 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); 2922 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2736} 2923}
2737 2924
2738void 2925void
2739draw (SV *self) 2926draw (SV *self)
2740 CODE: 2927 CODE:
2744 NV x, y, w, h; 2931 NV x, y, w, h;
2745 SV *draw_x_sv = GvSV (draw_x_gv); 2932 SV *draw_x_sv = GvSV (draw_x_gv);
2746 SV *draw_y_sv = GvSV (draw_y_gv); 2933 SV *draw_y_sv = GvSV (draw_y_gv);
2747 SV *draw_w_sv = GvSV (draw_w_gv); 2934 SV *draw_w_sv = GvSV (draw_w_gv);
2748 SV *draw_h_sv = GvSV (draw_h_gv); 2935 SV *draw_h_sv = GvSV (draw_h_gv);
2749 SV *hover;
2750 double draw_x, draw_y, draw_w, draw_h; 2936 double draw_x, draw_y;
2751 2937
2752 if (!SvROK (self)) 2938 if (!SvROK (self))
2753 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2939 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2754 2940
2755 hv = (HV *)SvRV (self); 2941 hv = (HV *)SvRV (self);
2756 2942
2757 if (SvTYPE (hv) != SVt_PVHV) 2943 if (SvTYPE (hv) != SVt_PVHV)
2758 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2944 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2759 2945
2760 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2946 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.; 2947 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2762 2948
2763 if (!h || !w) 2949 if (!h || !w)
2783 { 2969 {
2784 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2970 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2785 2971
2786 if (svp && SvTRUE (*svp)) 2972 if (svp && SvTRUE (*svp))
2787 { 2973 {
2788 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 2974 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2789 glEnable (GL_BLEND); 2975 glEnable (GL_BLEND);
2790 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2976 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2791 glBegin (GL_QUADS); 2977 glBegin (GL_QUADS);
2792 glVertex2f (0, 0); 2978 glVertex2f (0, 0);
2793 glVertex2f (w, 0); 2979 glVertex2f (w, 0);
2796 glEnd (); 2982 glEnd ();
2797 glDisable (GL_BLEND); 2983 glDisable (GL_BLEND);
2798 } 2984 }
2799 } 2985 }
2800#if 0 2986#if 0
2801 if ($ENV{CFPLUS_DEBUG} & 1) { 2987 // draw borders, for debugging
2802 glPushMatrix; 2988 glPushMatrix ();
2803 glColor 1, 1, 0, 1; 2989 glColor4f (1., 1., 0., 1.);
2804 glTranslate 0.375, 0.375; 2990 glTranslatef (.5, .5, 0.);
2805 glBegin GL_LINE_LOOP; 2991 glBegin (GL_LINE_LOOP);
2806 glVertex 0 , 0; 2992 glVertex2f (0 , 0);
2807 glVertex $self->{w} - 1, 0; 2993 glVertex2f (w - 1, 0);
2808 glVertex $self->{w} - 1, $self->{h} - 1; 2994 glVertex2f (w - 1, h - 1);
2809 glVertex 0 , $self->{h} - 1; 2995 glVertex2f (0 , h - 1);
2810 glEnd; 2996 glEnd ();
2811 glPopMatrix; 2997 glPopMatrix ();
2812 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2813 }
2814#endif 2998#endif
2815 PUSHMARK (SP); 2999 PUSHMARK (SP);
2816 XPUSHs (self); 3000 XPUSHs (self);
2817 PUTBACK; 3001 PUTBACK;
2818 call_method ("_draw", G_VOID | G_DISCARD); 3002 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines