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

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