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.224 by root, Sat Aug 11 11:21:46 2007 UTC vs.
Revision 1.263 by root, Fri Jul 18 21:18:42 2008 UTC

46 46
47#include <glib/gmacros.h> 47#include <glib/gmacros.h>
48 48
49#include <pango/pango.h> 49#include <pango/pango.h>
50 50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
61
51#ifndef _WIN32 62#ifndef _WIN32
52# include <sys/types.h> 63# include <sys/types.h>
53# include <sys/socket.h> 64# include <sys/socket.h>
54# include <netinet/in.h> 65# include <netinet/in.h>
55# include <netinet/tcp.h> 66# include <netinet/tcp.h>
56# include <inttypes.h> 67# include <inttypes.h>
57#endif 68#endif
58 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 80
61#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
62 82
63#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
65 85
66#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
67 87
68#if 0 88/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else
71# define PARACHUTE 0
72#endif
73 90
74static AV *texture_av; 91static AV *texture_av;
75 92
76static struct 93static struct
77{ 94{
120 137
121#include "pango-font.c" 138#include "pango-font.c"
122#include "pango-fontmap.c" 139#include "pango-fontmap.c"
123#include "pango-render.c" 140#include "pango-render.c"
124 141
125typedef IV CFPlus__Channel; 142typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 143typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 144typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 145typedef Mix_Music *DC__MixMusic;
129 146
130typedef PangoFontDescription *CFPlus__Font; 147typedef PangoFontDescription *DC__Font;
131 148
132static int 149static int
133shape_attr_p (PangoLayoutRun *run) 150shape_attr_p (PangoLayoutRun *run)
134{ 151{
135 GSList *attrs = run->item->analysis.extra_attrs; 152 GSList *attrs = run->item->analysis.extra_attrs;
149 166
150typedef struct cf_layout { 167typedef struct cf_layout {
151 PangoLayout *pl; 168 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 169 float r, g, b, a; // default color for rgba mode
153 int base_height; 170 int base_height;
154 CFPlus__Font font; 171 DC__Font font;
172 rc_t *rc;
155} *CFPlus__Layout; 173} *DC__Layout;
156 174
157static CFPlus__Font default_font; 175static DC__Font default_font;
158static PangoContext *opengl_context; 176static PangoContext *opengl_context;
159static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
160 178
161static void 179static void
162substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
167#endif 185#endif
168 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169} 187}
170 188
171static void 189static void
172layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
173{ 191{
174 /* use a random scale factor to account for unknown descenders, 0.8 works 192 /* use a random scale factor to account for unknown descenders, 0.8 works
175 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
176 */ 194 */
177 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
178 196
179 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
180 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
181 199
182 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
183} 201}
184 202
185static void 203static void
186layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
187{ 205{
188 PangoRectangle rect; 206 PangoRectangle rect;
189 207
190 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
191 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
202 220
203typedef uint16_t tileid; 221typedef uint16_t tileid;
204typedef uint16_t faceid; 222typedef uint16_t faceid;
205 223
206typedef struct { 224typedef struct {
207 int name; 225 GLuint name;
208 int w, h; 226 int w, h;
209 float s, t; 227 float s, t;
210 uint8_t r, g, b, a; 228 uint8_t r, g, b, a;
211 tileid smoothtile; 229 tileid smoothtile;
212 uint8_t smoothlevel; 230 uint8_t smoothlevel;
230 int faces; tileid *face2tile; // [faceid] 248 int faces; tileid *face2tile; // [faceid]
231 int texs; maptex *tex; // [tileid] 249 int texs; maptex *tex; // [tileid]
232 250
233 int32_t rows; 251 int32_t rows;
234 maprow *row; 252 maprow *row;
235} *CFPlus__Map; 253} *DC__Map;
236 254
237static char * 255static char *
238prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
239{ 257{
240 char *p; 258 char *p;
278 self->texs *= 2; 296 self->texs *= 2;
279 } 297 }
280} 298}
281 299
282static maprow * 300static maprow *
283map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
284{ 302{
285 if (0 > y) 303 if (0 > y)
286 { 304 {
287 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
288 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
326 344
327 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
328} 346}
329 347
330static mapcell * 348static mapcell *
331map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
332{ 350{
333 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
334} 352}
335 353
336static void 354static void
337map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
338{ 356{
339 int r; 357 int r;
340 358
341 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
342 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
350 self->row = 0; 368 self->row = 0;
351 self->rows = 0; 369 self->rows = 0;
352} 370}
353 371
354static void 372static void
355map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 373map_blank (DC__Map self, int x0, int y0, int w, int h)
356{ 374{
357 int x, y; 375 int x, y;
358 maprow *row; 376 maprow *row;
359 mapcell *cell; 377 mapcell *cell;
360 378
439 n |= n >> 16; 457 n |= n >> 16;
440 458
441 return n + 1; 459 return n + 1;
442} 460}
443 461
462static unsigned int
463popcount (unsigned int n)
464{
465 n -= (n >> 1) & 0x55555555U;
466 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
467 n = ((n >> 4) + n) & 0x0f0f0f0fU;
468 n *= 0x01010101U;
469
470 return n >> 24;
471}
472
444/* SDL should provide this, really. */ 473/* SDL should provide this, really. */
445#define SDLK_MODIFIER_MIN 300 474#define SDLK_MODIFIER_MIN 300
446#define SDLK_MODIFIER_MAX 314 475#define SDLK_MODIFIER_MAX 314
447 476
448/******************************************************************************/ 477/******************************************************************************/
486 return 0; 515 return 0;
487 516
488 return 1; 517 return 1;
489} 518}
490 519
491MODULE = CFPlus PACKAGE = CFPlus 520MODULE = Deliantra::Client PACKAGE = DC
492 521
493PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
494 523
495BOOT: 524BOOT:
496{ 525{
497 HV *stash = gv_stashpv ("CFPlus", 1); 526 HV *stash = gv_stashpv ("DC", 1);
498 static const struct { 527 static const struct {
499 const char *name; 528 const char *name;
500 IV iv; 529 IV iv;
501 } *civ, const_iv[] = { 530 } *civ, const_iv[] = {
502# define const_iv(name) { # name, (IV)name } 531# define const_iv(name) { # name, (IV)name }
524 553
525 const_iv (SDL_APPINPUTFOCUS), 554 const_iv (SDL_APPINPUTFOCUS),
526 const_iv (SDL_APPMOUSEFOCUS), 555 const_iv (SDL_APPMOUSEFOCUS),
527 const_iv (SDL_APPACTIVE), 556 const_iv (SDL_APPACTIVE),
528 557
558 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST),
529 const_iv (SDLK_KP0), 560 const_iv (SDLK_KP0),
530 const_iv (SDLK_KP1), 561 const_iv (SDLK_KP1),
531 const_iv (SDLK_KP2), 562 const_iv (SDLK_KP2),
532 const_iv (SDLK_KP3), 563 const_iv (SDLK_KP3),
533 const_iv (SDLK_KP4), 564 const_iv (SDLK_KP4),
605 const_iv (KMOD_LMETA), 636 const_iv (KMOD_LMETA),
606 const_iv (KMOD_RMETA), 637 const_iv (KMOD_RMETA),
607 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
608 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
609 const_iv (KMOD_MODE), 640 const_iv (KMOD_MODE),
641
642 const_iv (MIX_DEFAULT_FORMAT),
643
644 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO),
647 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD),
610# undef const_iv 652# undef const_iv
611 }; 653 };
612 654
613 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 655 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
614 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 656 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
632 674
633NV floor (NV x) 675NV floor (NV x)
634 676
635NV ceil (NV x) 677NV ceil (NV x)
636 678
679IV minpot (UV n)
680
681IV popcount (UV n)
682
637void 683void
638pango_init () 684pango_init ()
639 CODE: 685 CODE:
640{ 686{
641 opengl_fontmap = pango_opengl_font_map_new (); 687 opengl_fontmap = pango_opengl_font_map_new ();
642 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 688 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
643 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 689 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
690 /*pango_context_set_font_description (opengl_context, default_font);*/
691#if PANGO_VERSION_CHECK (1, 15, 2)
692 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
693 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
694#endif
644} 695}
645 696
646char *
647SDL_GetError () 697char *SDL_GetError ()
648 698
649int 699int SDL_Init (U32 flags)
650SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
651 700
652void 701int SDL_InitSubSystem (U32 flags)
702
703void SDL_QuitSubSystem (U32 flags)
704
653SDL_Quit () 705void SDL_Quit ()
654 706
655void 707void
656SDL_ListModes (int rgb, int alpha) 708SDL_ListModes (int rgb, int alpha)
657 PPCODE: 709 PPCODE:
658{ 710{
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 732 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 733
682 if (m && m != (SDL_Rect **)-1) 734 if (m && m != (SDL_Rect **)-1)
683 while (*m) 735 while (*m)
684 { 736 {
685 if ((*m)->w >= 640 && (*m)->h >= 480)
686 {
687 AV *av = newAV (); 737 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 738 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 739 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 740 av_push (av, newSViv (rgb));
691 av_push (av, newSViv (alpha)); 741 av_push (av, newSViv (alpha));
692 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 742 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
693 }
694 743
695 ++m; 744 ++m;
696 } 745 }
697} 746}
698 747
714 763
715 if (RETVAL) 764 if (RETVAL)
716 { 765 {
717 av_clear (texture_av); 766 av_clear (texture_av);
718 767
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 768 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 769#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
721#include "glfunc.h" 770#include "glfunc.h"
722#undef GL_FUNC 771#undef GL_FUNC
723 } 772 }
724} 773}
731char * 780char *
732SDL_GetKeyName (int sym) 781SDL_GetKeyName (int sym)
733 782
734int 783int
735SDL_GetAppState () 784SDL_GetAppState ()
785
786int
787SDL_GetModState ()
736 788
737void 789void
738poll_events () 790poll_events ()
739 PPCODE: 791 PPCODE:
740{ 792{
750 { 802 {
751 case SDL_KEYDOWN: 803 case SDL_KEYDOWN:
752 case SDL_KEYUP: 804 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 805 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 806 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 807 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
756 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 808 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
757 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 809 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 810 break;
759 811
760 case SDL_ACTIVEEVENT: 812 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 813 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
779 x = ev.motion.x; 831 x = ev.motion.x;
780 y = ev.motion.y; 832 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 833 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 834 }
783 835
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 836 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 837 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 838 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 839 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 840 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 841 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 842 }
791 break; 843 break;
792 844
793 case SDL_MOUSEBUTTONDOWN: 845 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 846 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 847 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 848
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 849 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 850 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 851 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 852 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 857 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 858 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 859 break;
808 } 860 }
809 861
810 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 862 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
811 } 863 }
812} 864}
813 865
814int 866int
815Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 867Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816 POSTCALL: 868 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 869 Mix_HookMusicFinished (music_finished);
818 Mix_ChannelFinished (channel_finished); 870 Mix_ChannelFinished (channel_finished);
871
872void
873Mix_QuerySpec ()
874 PPCODE:
875{
876 int freq, channels;
877 Uint16 format;
878
879 if (Mix_QuerySpec (&freq, &format, &channels))
880 {
881 EXTEND (SP, 3);
882 PUSHs (sv_2mortal (newSViv (freq)));
883 PUSHs (sv_2mortal (newSViv (format)));
884 PUSHs (sv_2mortal (newSViv (channels)));
885 }
886}
819 887
820void 888void
821Mix_CloseAudio () 889Mix_CloseAudio ()
822 890
823int 891int
858 } 926 }
859 } 927 }
860#endif 928#endif
861} 929}
862 930
863void 931int
864add_font (char *file) 932add_font (char *file)
865 CODE: 933 CODE:
866 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 934 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
935 OUTPUT:
936 RETVAL
867 937
868void 938void
869load_image_inline (SV *image_) 939load_image_inline (SV *image_)
870 ALIAS: 940 ALIAS:
871 load_image_file = 1 941 load_image_file = 1
957void 1027void
958error (char *message) 1028error (char *message)
959 CODE: 1029 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1030 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1031#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1032 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1033#endif
964 1034
965void 1035void
966fatal (char *message) 1036fatal (char *message)
967 CODE: 1037 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1038 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1039#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1040 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1041#endif
972 _exit (1); 1042 _exit (1);
973 1043
974void 1044void
975_exit (int retval = 0) 1045_exit (int retval = 0)
987#if DEBUG 1057#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1058 VALGRIND_DO_LEAK_CHECK;
989#endif 1059#endif
990} 1060}
991 1061
992MODULE = CFPlus PACKAGE = CFPlus::Font 1062MODULE = Deliantra::Client PACKAGE = DC::Font
993 1063
994PROTOTYPES: DISABLE 1064PROTOTYPES: DISABLE
995 1065
996CFPlus::Font 1066DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1067new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1068 CODE:
999{ 1069{
1000 int count; 1070 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1071 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1004} 1074}
1005 OUTPUT: 1075 OUTPUT:
1006 RETVAL 1076 RETVAL
1007 1077
1008void 1078void
1009DESTROY (CFPlus::Font self) 1079DESTROY (DC::Font self)
1010 CODE: 1080 CODE:
1011 pango_font_description_free (self); 1081 pango_font_description_free (self);
1012 1082
1013void 1083void
1014make_default (CFPlus::Font self) 1084make_default (DC::Font self)
1015 PROTOTYPE: $ 1085 PROTOTYPE: $
1016 CODE: 1086 CODE:
1017 default_font = self; 1087 default_font = self;
1018 1088
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1089MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1090
1021PROTOTYPES: DISABLE 1091PROTOTYPES: DISABLE
1022 1092
1023void 1093void
1024reset_glyph_cache () 1094glyph_cache_backup ()
1025 PROTOTYPE: 1095 PROTOTYPE:
1026 CODE: 1096 CODE:
1097 tc_backup ();
1098
1099void
1100glyph_cache_restore ()
1101 PROTOTYPE:
1102 CODE:
1027 tc_clear (); 1103 tc_restore ();
1028 1104
1029CFPlus::Layout 1105DC::Layout
1030new (SV *class) 1106new (SV *class)
1031 CODE: 1107 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1108 New (0, RETVAL, 1, struct cf_layout);
1033 1109
1034 RETVAL->pl = pango_layout_new (opengl_context); 1110 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->g = 1.; 1112 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1113 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1114 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1115 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1116 RETVAL->font = 0;
1117 RETVAL->rc = rc_alloc ();
1041 1118
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1119 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1120 layout_update_font (RETVAL);
1044 OUTPUT: 1121 OUTPUT:
1045 RETVAL 1122 RETVAL
1046 1123
1047void 1124void
1048DESTROY (CFPlus::Layout self) 1125DESTROY (DC::Layout self)
1049 CODE: 1126 CODE:
1050 g_object_unref (self->pl); 1127 g_object_unref (self->pl);
1128 rc_free (self->rc);
1051 Safefree (self); 1129 Safefree (self);
1052 1130
1053void 1131void
1054set_text (CFPlus::Layout self, SV *text_) 1132set_text (DC::Layout self, SV *text_)
1055 CODE: 1133 CODE:
1056{ 1134{
1057 STRLEN textlen; 1135 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1136 char *text = SvPVutf8 (text_, textlen);
1059 1137
1060 pango_layout_set_text (self->pl, text, textlen); 1138 pango_layout_set_text (self->pl, text, textlen);
1061} 1139}
1062 1140
1063void 1141void
1064set_markup (CFPlus::Layout self, SV *text_) 1142set_markup (DC::Layout self, SV *text_)
1065 CODE: 1143 CODE:
1066{ 1144{
1067 STRLEN textlen; 1145 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1146 char *text = SvPVutf8 (text_, textlen);
1069 1147
1070 pango_layout_set_markup (self->pl, text, textlen); 1148 pango_layout_set_markup (self->pl, text, textlen);
1071} 1149}
1072 1150
1073void 1151void
1074set_shapes (CFPlus::Layout self, ...) 1152set_shapes (DC::Layout self, ...)
1075 CODE: 1153 CODE:
1076{ 1154{
1077 PangoAttrList *attrs = 0; 1155 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1156 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1157 const char *pos = text;
1114 if (attrs) 1192 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1193 pango_layout_set_attributes (self->pl, attrs);
1116} 1194}
1117 1195
1118void 1196void
1119get_shapes (CFPlus::Layout self) 1197get_shapes (DC::Layout self)
1120 PPCODE: 1198 PPCODE:
1121{ 1199{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1200 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1201
1124 do 1202 do
1125 { 1203 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1204 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1205
1128 if (run && shape_attr_p (run)) 1206 if (run && shape_attr_p (run))
1129 { 1207 {
1130 PangoRectangle extents; 1208 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1209 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1217
1140 pango_layout_iter_free (iter); 1218 pango_layout_iter_free (iter);
1141} 1219}
1142 1220
1143int 1221int
1144has_wrapped (CFPlus::Layout self) 1222has_wrapped (DC::Layout self)
1145 CODE: 1223 CODE:
1146{ 1224{
1147 int lines = 1; 1225 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1226 const char *text = pango_layout_get_text (self->pl);
1149 1227
1154} 1232}
1155 OUTPUT: 1233 OUTPUT:
1156 RETVAL 1234 RETVAL
1157 1235
1158SV * 1236SV *
1159get_text (CFPlus::Layout self) 1237get_text (DC::Layout self)
1160 CODE: 1238 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1239 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1240 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1241 OUTPUT:
1164 RETVAL 1242 RETVAL
1165 1243
1166void 1244void
1167set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1245set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1168 CODE: 1246 CODE:
1169 self->r = r; 1247 self->r = r;
1170 self->g = g; 1248 self->g = g;
1171 self->b = b; 1249 self->b = b;
1172 self->a = a; 1250 self->a = a;
1173 1251
1174void 1252void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1253set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1254 CODE:
1177 if (self->font != font) 1255 if (self->font != font)
1178 { 1256 {
1179 self->font = font; 1257 self->font = font;
1180 layout_update_font (self); 1258 layout_update_font (self);
1181 } 1259 }
1182 1260
1183void 1261void
1184set_height (CFPlus::Layout self, int base_height) 1262set_height (DC::Layout self, int base_height)
1185 CODE: 1263 CODE:
1186 if (self->base_height != base_height) 1264 if (self->base_height != base_height)
1187 { 1265 {
1188 self->base_height = base_height; 1266 self->base_height = base_height;
1189 layout_update_font (self); 1267 layout_update_font (self);
1190 } 1268 }
1191 1269
1192void 1270void
1193set_width (CFPlus::Layout self, int max_width = -1) 1271set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1272 CODE:
1195 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1273 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1196 1274
1197void 1275void
1198set_indent (CFPlus::Layout self, int indent) 1276set_indent (DC::Layout self, int indent)
1199 CODE: 1277 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1278 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1279
1202void 1280void
1203set_spacing (CFPlus::Layout self, int spacing) 1281set_spacing (DC::Layout self, int spacing)
1204 CODE: 1282 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1283 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1284
1207void 1285void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1286set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1287 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1288 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1289 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1290 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1291 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1292 : PANGO_ELLIPSIZE_NONE
1215 ); 1293 );
1216 1294
1217void 1295void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1296set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1297 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1298 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1299
1222void 1300void
1223size (CFPlus::Layout self) 1301size (DC::Layout self)
1224 PPCODE: 1302 PPCODE:
1225{ 1303{
1226 int w, h; 1304 int w, h;
1227 1305
1228 layout_get_pixel_size (self, &w, &h); 1306 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1309 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1310 PUSHs (sv_2mortal (newSViv (h)));
1233} 1311}
1234 1312
1235int 1313int
1236descent (CFPlus::Layout self) 1314descent (DC::Layout self)
1237 CODE: 1315 CODE:
1238{ 1316{
1239 PangoRectangle rect; 1317 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1318 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1319 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1320 RETVAL = PANGO_DESCENT (rect);
1243} 1321}
1244 OUTPUT: 1322 OUTPUT:
1245 RETVAL 1323 RETVAL
1246 1324
1247int 1325int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1326xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1327 CODE:
1250{ 1328{
1251 int index, trailing; 1329 int index, trailing;
1252 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1330 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1253 RETVAL = index + trailing; 1331 RETVAL = index + trailing;
1254} 1332}
1255 OUTPUT: 1333 OUTPUT:
1256 RETVAL 1334 RETVAL
1257 1335
1258void 1336void
1259cursor_pos (CFPlus::Layout self, int index) 1337cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1338 PPCODE:
1261{ 1339{
1262 PangoRectangle strong_pos; 1340 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1341 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1342
1265 EXTEND (SP, 3); 1343 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1346 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1347}
1270 1348
1271void 1349void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1350index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1351 PPCODE:
1274{ 1352{
1275 int line, x; 1353 int line, x;
1276 1354
1277 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1355 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1356#if !PANGO_VERSION_CHECK (1, 17, 3)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1357 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1358 --line;
1359#endif
1280 EXTEND (SP, 2); 1360 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1361 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1362 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1363}
1284 1364
1285void 1365void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1366line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1367 PPCODE:
1288{ 1368{
1289 PangoLayoutLine *lp; 1369 PangoLayoutLine *lp;
1290 int index, trailing; 1370 int index, trailing;
1291 1371
1292 if (line < 0) 1372 if (line < 0)
1293 XSRETURN_EMPTY; 1373 XSRETURN_EMPTY;
1294 1374
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1375 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1376 XSRETURN_EMPTY; /* do better */
1297 1377
1298 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1378 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1299 1379
1300 EXTEND (SP, 2); 1380 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1386 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1387 }
1308} 1388}
1309 1389
1310void 1390void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1391render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1392 CODE:
1393 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1394 pango_opengl_render_layout_subpixel (
1314 self->pl, 1395 self->pl,
1396 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1397 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1398 self->r, self->g, self->b, self->a,
1317 flags 1399 flags
1318 ); 1400 );
1401 // we assume that context_change actually clears/frees stuff
1402 // and does not do any recomputation...
1403 pango_layout_context_changed (self->pl);
1319 1404
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1405void
1406draw (DC::Layout self)
1407 CODE:
1408{
1409 glEnable (GL_TEXTURE_2D);
1410 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1411 glEnable (GL_BLEND);
1412 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1413 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1414 glEnable (GL_ALPHA_TEST);
1415 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1416
1417 rc_draw (self->rc);
1418
1419 glDisable (GL_ALPHA_TEST);
1420 glDisable (GL_BLEND);
1421 glDisable (GL_TEXTURE_2D);
1422}
1423
1424MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1425
1322PROTOTYPES: ENABLE 1426PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1427
1326void 1428void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1429pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1430 CODE:
1329{ 1431{
1406 RETVAL = width > 0; 1508 RETVAL = width > 0;
1407} 1509}
1408 OUTPUT: 1510 OUTPUT:
1409 RETVAL 1511 RETVAL
1410 1512
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1513MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1514
1413PROTOTYPES: DISABLE 1515PROTOTYPES: DISABLE
1414 1516
1415CFPlus::Map 1517DC::Map
1416new (SV *class) 1518new (SV *class)
1417 CODE: 1519 CODE:
1418 New (0, RETVAL, 1, struct map); 1520 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1521 RETVAL->x = 0;
1420 RETVAL->y = 0; 1522 RETVAL->y = 0;
1428 RETVAL->row = 0; 1530 RETVAL->row = 0;
1429 OUTPUT: 1531 OUTPUT:
1430 RETVAL 1532 RETVAL
1431 1533
1432void 1534void
1433DESTROY (CFPlus::Map self) 1535DESTROY (DC::Map self)
1434 CODE: 1536 CODE:
1435{ 1537{
1436 map_clear (self); 1538 map_clear (self);
1437 Safefree (self->face2tile); 1539 Safefree (self->face2tile);
1438 Safefree (self->tex); 1540 Safefree (self->tex);
1439 Safefree (self); 1541 Safefree (self);
1440} 1542}
1441 1543
1442void 1544void
1443resize (CFPlus::Map self, int map_width, int map_height) 1545resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1546 CODE:
1445 self->w = map_width; 1547 self->w = map_width;
1446 self->h = map_height; 1548 self->h = map_height;
1447 1549
1448void 1550void
1449clear (CFPlus::Map self) 1551clear (DC::Map self)
1450 CODE: 1552 CODE:
1451 map_clear (self); 1553 map_clear (self);
1452 1554
1453void 1555void
1454set_tileid (CFPlus::Map self, int face, int tile) 1556set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1557 CODE:
1456{ 1558{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1559 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1560 need_texid (self, tile);
1459} 1561}
1460 1562
1461void 1563void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1564set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1565 CODE:
1464{ 1566{
1465 tileid texid; 1567 tileid texid;
1466 maptex *tex; 1568 maptex *tex;
1467 1569
1480 tex->smoothtile = self->face2tile [smooth]; 1582 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1583 tex->smoothlevel = level;
1482} 1584}
1483 1585
1484void 1586void
1485set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1587set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1486 CODE: 1588 CODE:
1487{ 1589{
1488 need_texid (self, texid); 1590 need_texid (self, texid);
1489 1591
1490 { 1592 {
1510 // from transparent color bleeding and ugly wrapping effects. 1612 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1613 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1614}
1513 1615
1514int 1616int
1515ox (CFPlus::Map self) 1617ox (DC::Map self)
1516 ALIAS: 1618 ALIAS:
1517 oy = 1 1619 oy = 1
1518 x = 2 1620 x = 2
1519 y = 3 1621 y = 3
1520 w = 4 1622 w = 4
1531 } 1633 }
1532 OUTPUT: 1634 OUTPUT:
1533 RETVAL 1635 RETVAL
1534 1636
1535void 1637void
1536scroll (CFPlus::Map self, int dx, int dy) 1638scroll (DC::Map self, int dx, int dy)
1537 CODE: 1639 CODE:
1538{ 1640{
1539 if (dx > 0) 1641 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 1642 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 1643 else if (dx < 0)
1557 self->y += MAP_EXTEND_Y; 1659 self->y += MAP_EXTEND_Y;
1558 } 1660 }
1559} 1661}
1560 1662
1561SV * 1663SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 1664map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 1665 CODE:
1564{ 1666{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1667 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 1668 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 1669 mapcell *cell;
1595 uint8_t ext, cmd; 1697 uint8_t ext, cmd;
1596 1698
1597 do 1699 do
1598 { 1700 {
1599 ext = *data++; 1701 ext = *data++;
1600 cmd = ext & 0x3f; 1702 cmd = ext & 0x7f;
1601 1703
1602 if (cmd < 4) 1704 if (cmd < 4)
1603 cell->darkness = 255 - ext * 64 + 1; 1705 cell->darkness = 255 - ext * 64 + 1;
1604 else if (cmd == 5) // health 1706 else if (cmd == 5) // health
1605 { 1707 {
1608 } 1710 }
1609 else if (cmd == 6) // monster width 1711 else if (cmd == 6) // monster width
1610 cell->stat_width = *data++ + 1; 1712 cell->stat_width = *data++ + 1;
1611 else if (cmd == 0x47) 1713 else if (cmd == 0x47)
1612 { 1714 {
1613 if (*data == 4) 1715 if (*data == 1) cell->player = data [1];
1614 ; // decode player count 1716 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1717 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1718 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1615 1719
1616 data += *data + 1; 1720 data += *data + 1;
1617 } 1721 }
1618 else if (cmd == 8) // cell flags 1722 else if (cmd == 8) // cell flags
1619 cell->flags = *data++; 1723 cell->flags = *data++;
1656} 1760}
1657 OUTPUT: 1761 OUTPUT:
1658 RETVAL 1762 RETVAL
1659 1763
1660SV * 1764SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1765mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 1766 CODE:
1663{ 1767{
1664 int x1, x; 1768 int x1, x;
1665 int y1, y; 1769 int y1, y;
1666 int z; 1770 int z;
1711} 1815}
1712 OUTPUT: 1816 OUTPUT:
1713 RETVAL 1817 RETVAL
1714 1818
1715void 1819void
1716draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1820draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1717 CODE: 1821 CODE:
1718{ 1822{
1719 int x, y, z; 1823 int x, y, z;
1720 1824
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1825 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1826 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1723 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1827 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724 smooth_key skey; 1828 smooth_key skey;
1725 1829 int pl_x, pl_y;
1830 maptex pl_tex;
1726 rc_t *rc = rc_alloc (); 1831 rc_t *rc = rc_alloc ();
1727 rc_key_t key; 1832 rc_key_t key;
1728 rc_array_t *arr; 1833 rc_array_t *arr;
1834
1835 pl_tex.name = 0;
1729 1836
1730 // thats current max. sorry. 1837 // thats current max. sorry.
1731 if (sw > 255) sw = 255; 1838 if (sw > 255) sw = 255;
1732 if (sh > 255) sh = 255; 1839 if (sh > 255) sh = 255;
1733 1840
1788 tileid tile = cell->tile [z]; 1895 tileid tile = cell->tile [z];
1789 1896
1790 if (tile) 1897 if (tile)
1791 { 1898 {
1792 maptex tex = self->tex [tile]; 1899 maptex tex = self->tex [tile];
1793 int px, py; 1900 int px = (x + 1) * T - tex.w;
1901 int py = (y + 1) * T - tex.h;
1794 1902
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 1903 if (key.texname != tex.name)
1798 { 1904 {
1799 if (!tex.name) 1905 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 1906 tex = self->tex [2]; /* missing, replace by noface */
1801 1907
1802 key.texname = tex.name; 1908 key.texname = tex.name;
1803 arr = rc_array (rc, &key); 1909 arr = rc_array (rc, &key);
1804 } 1910 }
1805 1911
1806 px = (x + 1) * T - tex.w; 1912 if (expect_false (cell->player == player) && expect_false (z == 2))
1807 py = (y + 1) * T - tex.h; 1913 {
1914 pl_x = px;
1915 pl_y = py;
1916 pl_tex = tex;
1917 continue;
1918 }
1808 1919
1809 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1921 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1811 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 1922 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1812 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 1923 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1813 1924
1814 if (cell->flags && z == 2) 1925 if (expect_false (cell->flags) && expect_false (z == 2))
1815 { 1926 {
1816 // overlays such as the speech bubble, probably more to come 1927 // overlays such as the speech bubble, probably more to come
1817 if (cell->flags & 1) 1928 if (cell->flags & 1)
1818 { 1929 {
1819 maptex tex = self->tex [1]; 1930 maptex tex = self->tex [1];
1884 // go through all smoothlevels, lowest to highest, then draw. 1995 // go through all smoothlevels, lowest to highest, then draw.
1885 // this is basically counting sort 1996 // this is basically counting sort
1886 { 1997 {
1887 int w, b; 1998 int w, b;
1888 1999
2000 glEnable (GL_TEXTURE_2D);
2001 glBegin (GL_QUADS);
1889 for (w = 0; w < 256 / 32; ++w) 2002 for (w = 0; w < 256 / 32; ++w)
1890 { 2003 {
1891 uint32_t smask = smooth_level [w]; 2004 uint32_t smask = smooth_level [w];
1892 if (smask) 2005 if (smask)
1893 for (b = 0; b < 32; ++b) 2006 for (b = 0; b < 32; ++b)
1918 { 2031 {
1919 // this time avoiding texture state changes 2032 // this time avoiding texture state changes
1920 // save gobs of state changes. 2033 // save gobs of state changes.
1921 if (key.texname != tex.name) 2034 if (key.texname != tex.name)
1922 { 2035 {
2036 glEnd ();
1923 key.texname = tex.name; 2037 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1924 arr = rc_array (rc, &key); 2038 glBegin (GL_QUADS);
1925 } 2039 }
1926 2040
1927 if (border) 2041 if (border)
1928 { 2042 {
1929 float ox = border * dx; 2043 float ox = border * dx;
1930 2044
1931 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2045 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1932 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2046 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1933 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2047 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1934 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2048 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1935 } 2049 }
1936 2050
1937 if (corner) 2051 if (corner)
1938 { 2052 {
1939 float ox = corner * dx; 2053 float ox = corner * dx;
1940 2054
1941 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2055 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1942 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2056 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1943 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2057 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1944 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2058 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1945 } 2059 }
1946 } 2060 }
1947 } 2061 }
1948 } 2062 }
1949 } 2063 }
1950 } 2064 }
2065
2066 glEnd ();
2067 glDisable (GL_TEXTURE_2D);
2068 key.texname = -1;
1951 } 2069 }
1952 2070
1953 hv_clear (smooth); 2071 hv_clear (smooth);
2072 }
2073
2074 if (pl_tex.name)
2075 {
2076 maptex tex = pl_tex;
2077 int px = pl_x + pdx;
2078 int py = pl_y + pdy;
2079
2080 key.texname = tex.name;
2081 arr = rc_array (rc, &key);
2082
2083 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2084 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2085 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2086 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2087
1954 rc_draw (rc); 2088 rc_draw (rc);
1955 rc_clear (rc);
1956 } 2089 }
1957 2090
1958 glDisable (GL_BLEND); 2091 glDisable (GL_BLEND);
1959 rc_free (rc); 2092 rc_free (rc);
1960 2093
1989 } 2122 }
1990 } 2123 }
1991} 2124}
1992 2125
1993void 2126void
1994draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2127draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1995 CODE: 2128 CODE:
1996{ 2129{
1997 static float color[16][3] = { 2130 static float color[16][3] = {
1998 { 0.00F, 0.00F, 0.00F }, 2131 { 0.00F, 0.00F, 0.00F },
1999 { 1.00F, 1.00F, 1.00F }, 2132 { 1.00F, 1.00F, 1.00F },
2049 glDisable (GL_BLEND); 2182 glDisable (GL_BLEND);
2050 glDisable (GL_TEXTURE_2D); 2183 glDisable (GL_TEXTURE_2D);
2051} 2184}
2052 2185
2053void 2186void
2054fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2187fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2055 PPCODE: 2188 PPCODE:
2056{ 2189{
2057 int x, y; 2190 int x, y;
2058 int sw1 = sw + 2; 2191 int sw1 = sw + 2;
2059 int sh1 = sh + 2; 2192 int sh1 = sh + 2;
2130 PUSHs (sv_2mortal (newSViv (sh3))); 2263 PUSHs (sv_2mortal (newSViv (sh3)));
2131 PUSHs (darkness3_sv); 2264 PUSHs (darkness3_sv);
2132} 2265}
2133 2266
2134SV * 2267SV *
2135get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2268get_rect (DC::Map self, int x0, int y0, int w, int h)
2136 CODE: 2269 CODE:
2137{ 2270{
2138 int x, y, x1, y1; 2271 int x, y, x1, y1;
2139 SV *data_sv = newSV (w * h * 7 + 5); 2272 SV *data_sv = newSV (w * h * 7 + 5);
2140 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2273 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2197 else 2330 else
2198 *data++ = 0; 2331 *data++ = 0;
2199 } 2332 }
2200 } 2333 }
2201 2334
2335 /* if size is w*h + 5 then no data has been found */
2336 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2337 {
2202 SvPOK_only (data_sv); 2338 SvPOK_only (data_sv);
2203 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2339 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2340 }
2341
2204 RETVAL = data_sv; 2342 RETVAL = data_sv;
2205} 2343}
2206 OUTPUT: 2344 OUTPUT:
2207 RETVAL 2345 RETVAL
2208 2346
2209void 2347void
2210set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2348set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2211 PPCODE: 2349 PPCODE:
2212{ 2350{
2213 int x, y, z; 2351 int x, y, z;
2214 int w, h; 2352 int w, h;
2215 int x1, y1; 2353 int x1, y1;
2354 STRLEN len;
2355 uint8_t *data, *end;
2356
2357 len = SvLEN (data_sv);
2358 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2359 data = SvPVbyte_nolen (data_sv);
2360 end = data + len + 8;
2361
2362 if (len < 5)
2363 XSRETURN_EMPTY;
2216 2364
2217 if (*data++ != 0) 2365 if (*data++ != 0)
2218 return; /* version mismatch */ 2366 XSRETURN_EMPTY; /* version mismatch */
2219 2367
2220 w = *data++ << 8; w |= *data++; 2368 w = *data++ << 8; w |= *data++;
2221 h = *data++ << 8; h |= *data++; 2369 h = *data++ << 8; h |= *data++;
2222 2370
2223 // we need to do this 'cause we don't keep an absolute coord system for rows 2371 // we need to do this 'cause we don't keep an absolute coord system for rows
2235 { 2383 {
2236 maprow *row = map_get_row (self, y); 2384 maprow *row = map_get_row (self, y);
2237 2385
2238 for (x = x0; x < x1; x++) 2386 for (x = x0; x < x1; x++)
2239 { 2387 {
2388 uint8_t flags;
2389
2390 if (data + 7 >= end)
2391 XSRETURN_EMPTY;
2392
2240 uint8_t flags = *data++; 2393 flags = *data++;
2241 2394
2242 if (flags) 2395 if (flags)
2243 { 2396 {
2244 mapcell *cell = row_get_cell (row, x); 2397 mapcell *cell = row_get_cell (row, x);
2245 tileid tile[3] = { 0, 0, 0 }; 2398 tileid tile[3] = { 0, 0, 0 };
2248 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2401 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2249 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2402 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2250 2403
2251 if (cell->darkness == 0) 2404 if (cell->darkness == 0)
2252 { 2405 {
2253 cell->darkness = 0; 2406 /*cell->darkness = 0;*/
2407 EXTEND (SP, 3);
2254 2408
2255 for (z = 0; z <= 2; z++) 2409 for (z = 0; z <= 2; z++)
2256 { 2410 {
2257 tileid t = tile [z]; 2411 tileid t = tile [z];
2258 2412
2259 if (t >= self->texs || (t && !self->tex [t].name)) 2413 if (t >= self->texs || (t && !self->tex [t].name))
2260 { 2414 {
2261 XPUSHs (sv_2mortal (newSViv (t))); 2415 PUSHs (sv_2mortal (newSViv (t)));
2262 need_texid (self, t); 2416 need_texid (self, t);
2263 } 2417 }
2264 2418
2265 cell->tile [z] = t; 2419 cell->tile [z] = t;
2266 } 2420 }
2268 } 2422 }
2269 } 2423 }
2270 } 2424 }
2271} 2425}
2272 2426
2273MODULE = CFPlus PACKAGE = CFPlus::RW 2427MODULE = Deliantra::Client PACKAGE = DC::RW
2274 2428
2275CFPlus::RW 2429DC::RW
2276new (SV *class, SV *data_sv) 2430new (SV *class, SV *data_sv)
2277 CODE: 2431 CODE:
2278{ 2432{
2279 STRLEN datalen; 2433 STRLEN datalen;
2280 char *data = SvPVbyte (data_sv, datalen); 2434 char *data = SvPVbyte (data_sv, datalen);
2282 RETVAL = SDL_RWFromConstMem (data, datalen); 2436 RETVAL = SDL_RWFromConstMem (data, datalen);
2283} 2437}
2284 OUTPUT: 2438 OUTPUT:
2285 RETVAL 2439 RETVAL
2286 2440
2287CFPlus::RW 2441DC::RW
2288new_from_file (SV *class, const char *path, const char *mode = "rb") 2442new_from_file (SV *class, const char *path, const char *mode = "rb")
2289 CODE: 2443 CODE:
2290 RETVAL = SDL_RWFromFile (path, mode); 2444 RETVAL = SDL_RWFromFile (path, mode);
2291 OUTPUT: 2445 OUTPUT:
2292 RETVAL 2446 RETVAL
2293 2447
2294# fails on win32: 2448# fails on win32:
2295# CFPlus.xs(2268) : error C2059: syntax error : '(' 2449# dc.xs(2268) : error C2059: syntax error : '('
2296#void 2450#void
2297#close (CFPlus::RW self) 2451#close (DC::RW self)
2298# CODE: 2452# CODE:
2299# (self->(close)) (self); 2453# (self->(close)) (self);
2300 2454
2301MODULE = CFPlus PACKAGE = CFPlus::Channel 2455MODULE = Deliantra::Client PACKAGE = DC::Channel
2302 2456
2303PROTOTYPES: DISABLE 2457PROTOTYPES: DISABLE
2304 2458
2305CFPlus::Channel 2459DC::Channel
2306find () 2460find ()
2307 CODE: 2461 CODE:
2308{ 2462{
2309 RETVAL = Mix_GroupAvailable (-1); 2463 RETVAL = Mix_GroupAvailable (-1);
2310 2464
2323} 2477}
2324 OUTPUT: 2478 OUTPUT:
2325 RETVAL 2479 RETVAL
2326 2480
2327void 2481void
2328halt (CFPlus::Channel self) 2482halt (DC::Channel self)
2329 CODE: 2483 CODE:
2330 Mix_HaltChannel (self); 2484 Mix_HaltChannel (self);
2331 2485
2332void 2486void
2333expire (CFPlus::Channel self, int ticks = -1) 2487expire (DC::Channel self, int ticks = -1)
2334 CODE: 2488 CODE:
2335 Mix_ExpireChannel (self, ticks); 2489 Mix_ExpireChannel (self, ticks);
2336 2490
2337void 2491void
2338fade_out (CFPlus::Channel self, int ticks = -1) 2492fade_out (DC::Channel self, int ticks = -1)
2339 CODE: 2493 CODE:
2340 Mix_FadeOutChannel (self, ticks); 2494 Mix_FadeOutChannel (self, ticks);
2341 2495
2342int 2496int
2343volume (CFPlus::Channel self, int volume) 2497volume (DC::Channel self, int volume)
2344 CODE: 2498 CODE:
2345 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2499 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2346 OUTPUT: 2500 OUTPUT:
2347 RETVAL 2501 RETVAL
2348 2502
2349void 2503void
2350unregister_all_effects (CFPlus::Channel self) 2504unregister_all_effects (DC::Channel self)
2351 CODE: 2505 CODE:
2352 Mix_UnregisterAllEffects (self); 2506 Mix_UnregisterAllEffects (self);
2353 2507
2354void 2508void
2355set_panning (CFPlus::Channel self, int left, int right) 2509set_panning (DC::Channel self, int left, int right)
2356 CODE: 2510 CODE:
2357 left = CLAMP (left , 0, 255); 2511 left = CLAMP (left , 0, 255);
2358 right = CLAMP (right, 0, 255); 2512 right = CLAMP (right, 0, 255);
2359 Mix_SetPanning (self, left, right); 2513 Mix_SetPanning (self, left, right);
2360 2514
2361void 2515void
2362set_distance (CFPlus::Channel self, int distance) 2516set_distance (DC::Channel self, int distance)
2363 CODE: 2517 CODE:
2364 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2518 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2365 2519
2366void 2520void
2367set_position (CFPlus::Channel self, int angle, int distance) 2521set_position (DC::Channel self, int angle, int distance)
2368 CODE: 2522 CODE:
2369 2523
2370void 2524void
2371set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2525set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2372 CODE: 2526 CODE:
2373{ 2527{
2374 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2528 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2375 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2529 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2376 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2530 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2377} 2531}
2378 2532
2379void 2533void
2380set_reverse_stereo (CFPlus::Channel self, int flip) 2534set_reverse_stereo (DC::Channel self, int flip)
2381 CODE: 2535 CODE:
2382 Mix_SetReverseStereo (self, flip); 2536 Mix_SetReverseStereo (self, flip);
2383 2537
2384MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2538MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2385 2539
2386PROTOTYPES: DISABLE 2540PROTOTYPES: DISABLE
2387 2541
2388CFPlus::MixChunk 2542DC::MixChunk
2389new (SV *class, CFPlus::RW rwops) 2543new (SV *class, DC::RW rwops)
2390 CODE: 2544 CODE:
2391 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2545 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2392 OUTPUT: 2546 OUTPUT:
2393 RETVAL 2547 RETVAL
2394 2548
2395void 2549void
2396DESTROY (CFPlus::MixChunk self) 2550DESTROY (DC::MixChunk self)
2397 CODE: 2551 CODE:
2398 Mix_FreeChunk (self); 2552 Mix_FreeChunk (self);
2399 2553
2400int 2554int
2401volume (CFPlus::MixChunk self, int volume = -1) 2555volume (DC::MixChunk self, int volume = -1)
2402 CODE: 2556 CODE:
2403 if (items > 1) 2557 if (items > 1)
2404 volume = CLAMP (volume, 0, 128); 2558 volume = CLAMP (volume, 0, 128);
2405 RETVAL = Mix_VolumeChunk (self, volume); 2559 RETVAL = Mix_VolumeChunk (self, volume);
2406 OUTPUT: 2560 OUTPUT:
2407 RETVAL 2561 RETVAL
2408 2562
2409CFPlus::Channel 2563DC::Channel
2410play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2564play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2411 CODE: 2565 CODE:
2412{ 2566{
2413 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2567 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2414 2568
2415 if (RETVAL < 0) 2569 if (RETVAL < 0)
2422 } 2576 }
2423} 2577}
2424 OUTPUT: 2578 OUTPUT:
2425 RETVAL 2579 RETVAL
2426 2580
2427MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2581MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2428 2582
2429int 2583int
2430volume (int volume = -1) 2584volume (int volume = -1)
2431 PROTOTYPE: ;$ 2585 PROTOTYPE: ;$
2432 CODE: 2586 CODE:
2444void 2598void
2445halt () 2599halt ()
2446 CODE: 2600 CODE:
2447 Mix_HaltMusic (); 2601 Mix_HaltMusic ();
2448 2602
2449CFPlus::MixMusic 2603DC::MixMusic
2450new (SV *class, CFPlus::RW rwops) 2604new (SV *class, DC::RW rwops)
2451 CODE: 2605 CODE:
2452 RETVAL = Mix_LoadMUS_RW (rwops); 2606 RETVAL = Mix_LoadMUS_RW (rwops);
2453 OUTPUT: 2607 OUTPUT:
2454 RETVAL 2608 RETVAL
2455 2609
2456void 2610void
2457DESTROY (CFPlus::MixMusic self) 2611DESTROY (DC::MixMusic self)
2458 CODE: 2612 CODE:
2459 Mix_FreeMusic (self); 2613 Mix_FreeMusic (self);
2460 2614
2461int 2615int
2462play (CFPlus::MixMusic self, int loops = -1) 2616play (DC::MixMusic self, int loops = -1)
2463 CODE: 2617 CODE:
2464 RETVAL = Mix_PlayMusic (self, loops); 2618 RETVAL = Mix_PlayMusic (self, loops);
2465 OUTPUT: 2619 OUTPUT:
2466 RETVAL 2620 RETVAL
2467 2621
2468void 2622void
2469fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2623fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2470 CODE: 2624 CODE:
2471 Mix_FadeInMusicPos (self, loops, ms, position); 2625 Mix_FadeInMusicPos (self, loops, ms, position);
2472 2626
2473MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2627MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2474 2628
2475PROTOTYPES: ENABLE 2629PROTOTYPES: ENABLE
2476 2630
2477BOOT: 2631BOOT:
2478{ 2632{
2479 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2633 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2480 static const struct { 2634 static const struct {
2481 const char *name; 2635 const char *name;
2482 IV iv; 2636 IV iv;
2483 } *civ, const_iv[] = { 2637 } *civ, const_iv[] = {
2484# define const_iv(name) { # name, (IV)name } 2638# define const_iv(name) { # name, (IV)name }
2519 const_iv (GL_INTENSITY), 2673 const_iv (GL_INTENSITY),
2520 const_iv (GL_LUMINANCE), 2674 const_iv (GL_LUMINANCE),
2521 const_iv (GL_LUMINANCE_ALPHA), 2675 const_iv (GL_LUMINANCE_ALPHA),
2522 const_iv (GL_FLOAT), 2676 const_iv (GL_FLOAT),
2523 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2677 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2678 const_iv (GL_COMPRESSED_ALPHA_ARB),
2679 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2680 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2681 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2682 const_iv (GL_COMPRESSED_RGB_ARB),
2683 const_iv (GL_COMPRESSED_RGBA_ARB),
2524 const_iv (GL_COMPILE), 2684 const_iv (GL_COMPILE),
2525 const_iv (GL_PROXY_TEXTURE_1D), 2685 const_iv (GL_PROXY_TEXTURE_1D),
2526 const_iv (GL_PROXY_TEXTURE_2D), 2686 const_iv (GL_PROXY_TEXTURE_2D),
2527 const_iv (GL_TEXTURE_1D), 2687 const_iv (GL_TEXTURE_1D),
2528 const_iv (GL_TEXTURE_2D), 2688 const_iv (GL_TEXTURE_2D),
2567 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2727 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2568 const_iv (GL_POINT_SMOOTH_HINT), 2728 const_iv (GL_POINT_SMOOTH_HINT),
2569 const_iv (GL_LINE_SMOOTH_HINT), 2729 const_iv (GL_LINE_SMOOTH_HINT),
2570 const_iv (GL_POLYGON_SMOOTH_HINT), 2730 const_iv (GL_POLYGON_SMOOTH_HINT),
2571 const_iv (GL_GENERATE_MIPMAP_HINT), 2731 const_iv (GL_GENERATE_MIPMAP_HINT),
2732 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2572 const_iv (GL_FASTEST), 2733 const_iv (GL_FASTEST),
2573 const_iv (GL_DONT_CARE), 2734 const_iv (GL_DONT_CARE),
2574 const_iv (GL_NICEST), 2735 const_iv (GL_NICEST),
2575 const_iv (GL_V2F), 2736 const_iv (GL_V2F),
2576 const_iv (GL_V3F), 2737 const_iv (GL_V3F),
2584 2745
2585 texture_av = newAV (); 2746 texture_av = newAV ();
2586 AvREAL_off (texture_av); 2747 AvREAL_off (texture_av);
2587} 2748}
2588 2749
2750void
2751disable_GL_EXT_blend_func_separate ()
2752 CODE:
2753 gl.BlendFuncSeparate = 0;
2754 gl.BlendFuncSeparateEXT = 0;
2755
2589char * 2756char *
2590gl_vendor () 2757gl_vendor ()
2591 CODE: 2758 CODE:
2592 RETVAL = (char *)glGetString (GL_VENDOR); 2759 RETVAL = (char *)glGetString (GL_VENDOR);
2593 OUTPUT: 2760 OUTPUT:
2714 2881
2715void glRect (float x1, float y1, float x2, float y2) 2882void glRect (float x1, float y1, float x2, float y2)
2716 CODE: 2883 CODE:
2717 glRectf (x1, y1, x2, y2); 2884 glRectf (x1, y1, x2, y2);
2718 2885
2886void glRect_lineloop (float x1, float y1, float x2, float y2)
2887 CODE:
2888 glBegin (GL_LINE_LOOP);
2889 glVertex2f (x1, y1);
2890 glVertex2f (x2, y1);
2891 glVertex2f (x2, y2);
2892 glVertex2f (x1, y2);
2893 glEnd ();
2894
2719PROTOTYPES: ENABLE 2895PROTOTYPES: ENABLE
2720 2896
2721void glBegin (int mode) 2897void glBegin (int mode)
2722 2898
2723void glEnd () 2899void glEnd ()
2755void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2931void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2756 CODE: 2932 CODE:
2757 if (gl.SeparableFilter2D) 2933 if (gl.SeparableFilter2D)
2758 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2934 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2759 2935
2760void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2936void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2761 2937
2762void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2938void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2763 2939
2764void glDrawPixels (int width, int height, int format, int type, char *pixels) 2940void glDrawPixels (int width, int height, int format, int type, char *pixels)
2765 2941
2791 2967
2792void glEndList () 2968void glEndList ()
2793 2969
2794void glCallList (int list) 2970void glCallList (int list)
2795 2971
2796MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2972MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2797 2973
2798PROTOTYPES: DISABLE 2974PROTOTYPES: DISABLE
2799 2975
2800void 2976void
2801find_widget (SV *self, NV x, NV y) 2977find_widget (SV *self, NV x, NV y)
2805 XPUSHs (self); 2981 XPUSHs (self);
2806} 2982}
2807 2983
2808BOOT: 2984BOOT:
2809{ 2985{
2810 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2986 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2811 2987
2812 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2988 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2813 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2989 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2814 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2990 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2815 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2991 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2816} 2992}
2817 2993
2818void 2994void
2819draw (SV *self) 2995draw (SV *self)
2820 CODE: 2996 CODE:
2824 NV x, y, w, h; 3000 NV x, y, w, h;
2825 SV *draw_x_sv = GvSV (draw_x_gv); 3001 SV *draw_x_sv = GvSV (draw_x_gv);
2826 SV *draw_y_sv = GvSV (draw_y_gv); 3002 SV *draw_y_sv = GvSV (draw_y_gv);
2827 SV *draw_w_sv = GvSV (draw_w_gv); 3003 SV *draw_w_sv = GvSV (draw_w_gv);
2828 SV *draw_h_sv = GvSV (draw_h_gv); 3004 SV *draw_h_sv = GvSV (draw_h_gv);
2829 SV *hover;
2830 double draw_x, draw_y, draw_w, draw_h; 3005 double draw_x, draw_y;
2831 3006
2832 if (!SvROK (self)) 3007 if (!SvROK (self))
2833 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3008 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2834 3009
2835 hv = (HV *)SvRV (self); 3010 hv = (HV *)SvRV (self);
2836 3011
2837 if (SvTYPE (hv) != SVt_PVHV) 3012 if (SvTYPE (hv) != SVt_PVHV)
2838 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3013 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2839 3014
2840 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3015 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2841 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3016 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2842 3017
2843 if (!h || !w) 3018 if (!h || !w)
2863 { 3038 {
2864 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3039 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2865 3040
2866 if (svp && SvTRUE (*svp)) 3041 if (svp && SvTRUE (*svp))
2867 { 3042 {
2868 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3043 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2869 glEnable (GL_BLEND); 3044 glEnable (GL_BLEND);
2870 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3045 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2871 glBegin (GL_QUADS); 3046 glBegin (GL_QUADS);
2872 glVertex2f (0, 0); 3047 glVertex2f (0, 0);
2873 glVertex2f (w, 0); 3048 glVertex2f (w, 0);
2876 glEnd (); 3051 glEnd ();
2877 glDisable (GL_BLEND); 3052 glDisable (GL_BLEND);
2878 } 3053 }
2879 } 3054 }
2880#if 0 3055#if 0
2881 if ($ENV{CFPLUS_DEBUG} & 1) { 3056 // draw borders, for debugging
2882 glPushMatrix; 3057 glPushMatrix ();
2883 glColor 1, 1, 0, 1; 3058 glColor4f (1., 1., 0., 1.);
2884 glTranslate 0.375, 0.375; 3059 glTranslatef (.5, .5, 0.);
2885 glBegin GL_LINE_LOOP; 3060 glBegin (GL_LINE_LOOP);
2886 glVertex 0 , 0; 3061 glVertex2f (0 , 0);
2887 glVertex $self->{w} - 1, 0; 3062 glVertex2f (w - 1, 0);
2888 glVertex $self->{w} - 1, $self->{h} - 1; 3063 glVertex2f (w - 1, h - 1);
2889 glVertex 0 , $self->{h} - 1; 3064 glVertex2f (0 , h - 1);
2890 glEnd; 3065 glEnd ();
2891 glPopMatrix; 3066 glPopMatrix ();
2892 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2893 }
2894#endif 3067#endif
2895 PUSHMARK (SP); 3068 PUSHMARK (SP);
2896 XPUSHs (self); 3069 XPUSHs (self);
2897 PUTBACK; 3070 PUTBACK;
2898 call_method ("_draw", G_VOID | G_DISCARD); 3071 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines