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.235 by root, Tue Aug 28 01:23:47 2007 UTC vs.
Revision 1.270 by root, Sun Jul 20 15:05:13 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;
155 rc_t *rc; 172 rc_t *rc;
156} *CFPlus__Layout; 173} *DC__Layout;
157 174
158static CFPlus__Font default_font; 175static DC__Font default_font;
159static PangoContext *opengl_context; 176static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
161 178
162static void 179static void
163substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
168#endif 185#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 187}
171 188
172static void 189static void
173layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
174{ 191{
175 /* 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
176 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
177 */ 194 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
179 196
180 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 199
183 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
184} 201}
185 202
186static void 203static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 205{
189 PangoRectangle rect; 206 PangoRectangle rect;
190 207
191 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
231 int faces; tileid *face2tile; // [faceid] 248 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 249 int texs; maptex *tex; // [tileid]
233 250
234 int32_t rows; 251 int32_t rows;
235 maprow *row; 252 maprow *row;
236} *CFPlus__Map; 253} *DC__Map;
237 254
238static char * 255static char *
239prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
240{ 257{
241 char *p; 258 char *p;
279 self->texs *= 2; 296 self->texs *= 2;
280 } 297 }
281} 298}
282 299
283static maprow * 300static maprow *
284map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
285{ 302{
286 if (0 > y) 303 if (0 > y)
287 { 304 {
288 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
327 344
328 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
329} 346}
330 347
331static mapcell * 348static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
333{ 350{
334 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
335} 352}
336 353
337static void 354static void
338map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
339{ 356{
340 int r; 357 int r;
341 358
342 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
350 self->oy = 0; 367 self->oy = 0;
351 self->row = 0; 368 self->row = 0;
352 self->rows = 0; 369 self->rows = 0;
353} 370}
354 371
372#define CELL_CLEAR(cell) \
373 do { \
374 if ((cell)->player) \
375 (cell)->tile [2] = 0; \
376 (cell)->darkness = 0; \
377 (cell)->stat_hp = 0; \
378 (cell)->flags = 0; \
379 (cell)->player = 0; \
380 } while (0)
381
355static void 382static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 383map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 384{
358 int x, y; 385 int x, y;
359 maprow *row; 386 maprow *row;
360 mapcell *cell; 387 mapcell *cell;
361 388
373 if (x >= row->c1) 400 if (x >= row->c1)
374 break; 401 break;
375 402
376 cell = row->col + x - row->c0; 403 cell = row->col + x - row->c0;
377 404
378 cell->darkness = 0; 405 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 406 }
383 } 407 }
384} 408}
385 409
386typedef struct { 410typedef struct {
498 return 0; 522 return 0;
499 523
500 return 1; 524 return 1;
501} 525}
502 526
503MODULE = CFPlus PACKAGE = CFPlus 527MODULE = Deliantra::Client PACKAGE = DC
504 528
505PROTOTYPES: ENABLE 529PROTOTYPES: ENABLE
506 530
507BOOT: 531BOOT:
508{ 532{
509 HV *stash = gv_stashpv ("CFPlus", 1); 533 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 534 static const struct {
511 const char *name; 535 const char *name;
512 IV iv; 536 IV iv;
513 } *civ, const_iv[] = { 537 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 538# define const_iv(name) { # name, (IV)name }
619 const_iv (KMOD_LMETA), 643 const_iv (KMOD_LMETA),
620 const_iv (KMOD_RMETA), 644 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 645 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 646 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 647 const_iv (KMOD_MODE),
648
649 const_iv (MIX_DEFAULT_FORMAT),
650
651 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO),
654 const_iv (SDL_INIT_CDROM),
655 const_iv (SDL_INIT_JOYSTICK),
656 const_iv (SDL_INIT_EVERYTHING),
657 const_iv (SDL_INIT_NOPARACHUTE),
658 const_iv (SDL_INIT_EVENTTHREAD),
659
660 const_iv (SDL_GL_RED_SIZE),
661 const_iv (SDL_GL_GREEN_SIZE),
662 const_iv (SDL_GL_BLUE_SIZE),
663 const_iv (SDL_GL_ALPHA_SIZE),
664 const_iv (SDL_GL_DOUBLEBUFFER),
665 const_iv (SDL_GL_BUFFER_SIZE),
666 const_iv (SDL_GL_DEPTH_SIZE),
667 const_iv (SDL_GL_STENCIL_SIZE),
668 const_iv (SDL_GL_ACCUM_RED_SIZE),
669 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
670 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
671 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
672 const_iv (SDL_GL_STEREO),
673 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
674 const_iv (SDL_GL_MULTISAMPLESAMPLES),
675 const_iv (SDL_GL_ACCELERATED_VISUAL),
676 const_iv (SDL_GL_SWAP_CONTROL),
677
678 const_iv (FOW_DARKNESS)
624# undef const_iv 679# undef const_iv
625 }; 680 };
626 681
627 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 682 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
628 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
646 701
647NV floor (NV x) 702NV floor (NV x)
648 703
649NV ceil (NV x) 704NV ceil (NV x)
650 705
706NV ceilabs (NV x)
707 CODE:
708 RETVAL = x < 0. ? - ceil (-x) : ceil (x);
709 OUTPUT:
710 RETVAL
711
651IV minpot (UV n) 712IV minpot (UV n)
652 713
653IV popcount (UV n) 714IV popcount (UV n)
654 715
655void 716void
657 CODE: 718 CODE:
658{ 719{
659 opengl_fontmap = pango_opengl_font_map_new (); 720 opengl_fontmap = pango_opengl_font_map_new ();
660 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 721 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
661 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 722 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
723 /*pango_context_set_font_description (opengl_context, default_font);*/
724#if PANGO_VERSION_CHECK (1, 15, 2)
725 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
726 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
727#endif
662} 728}
663 729
664char *
665SDL_GetError () 730char *SDL_GetError ()
666 731
667int 732int SDL_Init (U32 flags)
668SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
669 733
670void 734int SDL_InitSubSystem (U32 flags)
735
736void SDL_QuitSubSystem (U32 flags)
737
671SDL_Quit () 738void SDL_Quit ()
739
740int SDL_GL_SetAttribute (int attr, int value)
741
742int SDL_GL_GetAttribute (int attr)
743 CODE:
744 if (SDL_GL_GetAttribute (attr, &RETVAL))
745 XSRETURN_UNDEF;
746 OUTPUT:
747 RETVAL
672 748
673void 749void
674SDL_ListModes (int rgb, int alpha) 750SDL_ListModes (int rgb, int alpha)
675 PPCODE: 751 PPCODE:
676{ 752{
688 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 764 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
689 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 765 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 766 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
691 767
692 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 768 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
693#if SDL_VERSION_ATLEAST(1,2,10)
694 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
695 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 769 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
696#endif
697 770
698 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 771 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
699 772
700 if (m && m != (SDL_Rect **)-1) 773 if (m && m != (SDL_Rect **)-1)
701 while (*m) 774 while (*m)
702 { 775 {
703 if ((*m)->w >= 640 && (*m)->h >= 480) 776 if ((*m)->w >= 400 && (*m)->h >= 300)
704 { 777 {
705 AV *av = newAV (); 778 AV *av = newAV ();
706 av_push (av, newSViv ((*m)->w)); 779 av_push (av, newSViv ((*m)->w));
707 av_push (av, newSViv ((*m)->h)); 780 av_push (av, newSViv ((*m)->h));
708 av_push (av, newSViv (rgb)); 781 av_push (av, newSViv (rgb));
732 805
733 if (RETVAL) 806 if (RETVAL)
734 { 807 {
735 av_clear (texture_av); 808 av_clear (texture_av);
736 809
737 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 810 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
738#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 811#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
739#include "glfunc.h" 812#include "glfunc.h"
740#undef GL_FUNC 813#undef GL_FUNC
741 } 814 }
742} 815}
749char * 822char *
750SDL_GetKeyName (int sym) 823SDL_GetKeyName (int sym)
751 824
752int 825int
753SDL_GetAppState () 826SDL_GetAppState ()
827
828int
829SDL_GetModState ()
754 830
755void 831void
756poll_events () 832poll_events ()
757 PPCODE: 833 PPCODE:
758{ 834{
768 { 844 {
769 case SDL_KEYDOWN: 845 case SDL_KEYDOWN:
770 case SDL_KEYUP: 846 case SDL_KEYUP:
771 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 847 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
772 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 848 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
773 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 849 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
774 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 850 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
775 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 851 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
776 break; 852 break;
777 853
778 case SDL_ACTIVEEVENT: 854 case SDL_ACTIVEEVENT:
779 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 855 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
797 x = ev.motion.x; 873 x = ev.motion.x;
798 y = ev.motion.y; 874 y = ev.motion.y;
799 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 875 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
800 } 876 }
801 877
802 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 878 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
803 hv_store (hv, "state", 5, newSViv (state), 0); 879 hv_store (hv, "state", 5, newSViv (state), 0);
804 hv_store (hv, "x", 1, newSViv (x), 0); 880 hv_store (hv, "x", 1, newSViv (x), 0);
805 hv_store (hv, "y", 1, newSViv (y), 0); 881 hv_store (hv, "y", 1, newSViv (y), 0);
806 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 882 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
807 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 883 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
808 } 884 }
809 break; 885 break;
810 886
811 case SDL_MOUSEBUTTONDOWN: 887 case SDL_MOUSEBUTTONDOWN:
812 case SDL_MOUSEBUTTONUP: 888 case SDL_MOUSEBUTTONUP:
813 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 889 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
814 890
815 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 891 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
816 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 892 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
817 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 893 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
818 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 894 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
823 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 899 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
824 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 900 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
825 break; 901 break;
826 } 902 }
827 903
828 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 904 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
829 } 905 }
830} 906}
831 907
832int 908int
833Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 909Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
834 POSTCALL: 910 POSTCALL:
835 Mix_HookMusicFinished (music_finished); 911 Mix_HookMusicFinished (music_finished);
836 Mix_ChannelFinished (channel_finished); 912 Mix_ChannelFinished (channel_finished);
913
914void
915Mix_QuerySpec ()
916 PPCODE:
917{
918 int freq, channels;
919 Uint16 format;
920
921 if (Mix_QuerySpec (&freq, &format, &channels))
922 {
923 EXTEND (SP, 3);
924 PUSHs (sv_2mortal (newSViv (freq)));
925 PUSHs (sv_2mortal (newSViv (format)));
926 PUSHs (sv_2mortal (newSViv (channels)));
927 }
928}
837 929
838void 930void
839Mix_CloseAudio () 931Mix_CloseAudio ()
840 932
841int 933int
876 } 968 }
877 } 969 }
878#endif 970#endif
879} 971}
880 972
881void 973int
882add_font (char *file) 974add_font (char *file)
883 CODE: 975 CODE:
884 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 976 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
977 OUTPUT:
978 RETVAL
885 979
886void 980void
887load_image_inline (SV *image_) 981load_image_inline (SV *image_)
888 ALIAS: 982 ALIAS:
889 load_image_file = 1 983 load_image_file = 1
975void 1069void
976error (char *message) 1070error (char *message)
977 CODE: 1071 CODE:
978 fprintf (stderr, "ERROR: %s\n", message); 1072 fprintf (stderr, "ERROR: %s\n", message);
979#ifdef _WIN32 1073#ifdef _WIN32
980 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1074 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
981#endif 1075#endif
982 1076
983void 1077void
984fatal (char *message) 1078fatal (char *message)
985 CODE: 1079 CODE:
986 fprintf (stderr, "FATAL: %s\n", message); 1080 fprintf (stderr, "FATAL: %s\n", message);
987#ifdef _WIN32 1081#ifdef _WIN32
988 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1082 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
989#endif 1083#endif
990 _exit (1); 1084 _exit (1);
991 1085
992void 1086void
993_exit (int retval = 0) 1087_exit (int retval = 0)
1005#if DEBUG 1099#if DEBUG
1006 VALGRIND_DO_LEAK_CHECK; 1100 VALGRIND_DO_LEAK_CHECK;
1007#endif 1101#endif
1008} 1102}
1009 1103
1010MODULE = CFPlus PACKAGE = CFPlus::Font 1104MODULE = Deliantra::Client PACKAGE = DC::Font
1011 1105
1012PROTOTYPES: DISABLE 1106PROTOTYPES: DISABLE
1013 1107
1014CFPlus::Font 1108DC::Font
1015new_from_file (SV *class, char *path, int id = 0) 1109new_from_file (SV *class, char *path, int id = 0)
1016 CODE: 1110 CODE:
1017{ 1111{
1018 int count; 1112 int count;
1019 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1113 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1022} 1116}
1023 OUTPUT: 1117 OUTPUT:
1024 RETVAL 1118 RETVAL
1025 1119
1026void 1120void
1027DESTROY (CFPlus::Font self) 1121DESTROY (DC::Font self)
1028 CODE: 1122 CODE:
1029 pango_font_description_free (self); 1123 pango_font_description_free (self);
1030 1124
1031void 1125void
1032make_default (CFPlus::Font self) 1126make_default (DC::Font self)
1033 PROTOTYPE: $ 1127 PROTOTYPE: $
1034 CODE: 1128 CODE:
1035 default_font = self; 1129 default_font = self;
1036 1130
1037MODULE = CFPlus PACKAGE = CFPlus::Layout 1131MODULE = Deliantra::Client PACKAGE = DC::Layout
1038 1132
1039PROTOTYPES: DISABLE 1133PROTOTYPES: DISABLE
1040 1134
1041void 1135void
1042reset_glyph_cache () 1136glyph_cache_backup ()
1043 PROTOTYPE: 1137 PROTOTYPE:
1044 CODE: 1138 CODE:
1139 tc_backup ();
1140
1141void
1142glyph_cache_restore ()
1143 PROTOTYPE:
1144 CODE:
1045 tc_clear (); 1145 tc_restore ();
1046 1146
1047CFPlus::Layout 1147DC::Layout
1048new (SV *class) 1148new (SV *class)
1049 CODE: 1149 CODE:
1050 New (0, RETVAL, 1, struct cf_layout); 1150 New (0, RETVAL, 1, struct cf_layout);
1051 1151
1052 RETVAL->pl = pango_layout_new (opengl_context); 1152 RETVAL->pl = pango_layout_new (opengl_context);
1062 layout_update_font (RETVAL); 1162 layout_update_font (RETVAL);
1063 OUTPUT: 1163 OUTPUT:
1064 RETVAL 1164 RETVAL
1065 1165
1066void 1166void
1067DESTROY (CFPlus::Layout self) 1167DESTROY (DC::Layout self)
1068 CODE: 1168 CODE:
1069 g_object_unref (self->pl); 1169 g_object_unref (self->pl);
1070 rc_free (self->rc); 1170 rc_free (self->rc);
1071 Safefree (self); 1171 Safefree (self);
1072 1172
1073void 1173void
1074set_text (CFPlus::Layout self, SV *text_) 1174set_text (DC::Layout self, SV *text_)
1075 CODE: 1175 CODE:
1076{ 1176{
1077 STRLEN textlen; 1177 STRLEN textlen;
1078 char *text = SvPVutf8 (text_, textlen); 1178 char *text = SvPVutf8 (text_, textlen);
1079 1179
1080 pango_layout_set_text (self->pl, text, textlen); 1180 pango_layout_set_text (self->pl, text, textlen);
1081} 1181}
1082 1182
1083void 1183void
1084set_markup (CFPlus::Layout self, SV *text_) 1184set_markup (DC::Layout self, SV *text_)
1085 CODE: 1185 CODE:
1086{ 1186{
1087 STRLEN textlen; 1187 STRLEN textlen;
1088 char *text = SvPVutf8 (text_, textlen); 1188 char *text = SvPVutf8 (text_, textlen);
1089 1189
1090 pango_layout_set_markup (self->pl, text, textlen); 1190 pango_layout_set_markup (self->pl, text, textlen);
1091} 1191}
1092 1192
1093void 1193void
1094set_shapes (CFPlus::Layout self, ...) 1194set_shapes (DC::Layout self, ...)
1095 CODE: 1195 CODE:
1096{ 1196{
1097 PangoAttrList *attrs = 0; 1197 PangoAttrList *attrs = 0;
1098 const char *text = pango_layout_get_text (self->pl); 1198 const char *text = pango_layout_get_text (self->pl);
1099 const char *pos = text; 1199 const char *pos = text;
1134 if (attrs) 1234 if (attrs)
1135 pango_layout_set_attributes (self->pl, attrs); 1235 pango_layout_set_attributes (self->pl, attrs);
1136} 1236}
1137 1237
1138void 1238void
1139get_shapes (CFPlus::Layout self) 1239get_shapes (DC::Layout self)
1140 PPCODE: 1240 PPCODE:
1141{ 1241{
1142 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1242 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1143 1243
1144 do 1244 do
1145 { 1245 {
1146 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1246 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1147 1247
1148 if (run && shape_attr_p (run)) 1248 if (run && shape_attr_p (run))
1149 { 1249 {
1150 PangoRectangle extents; 1250 PangoRectangle extents;
1151 pango_layout_iter_get_run_extents (iter, 0, &extents); 1251 pango_layout_iter_get_run_extents (iter, 0, &extents);
1159 1259
1160 pango_layout_iter_free (iter); 1260 pango_layout_iter_free (iter);
1161} 1261}
1162 1262
1163int 1263int
1164has_wrapped (CFPlus::Layout self) 1264has_wrapped (DC::Layout self)
1165 CODE: 1265 CODE:
1166{ 1266{
1167 int lines = 1; 1267 int lines = 1;
1168 const char *text = pango_layout_get_text (self->pl); 1268 const char *text = pango_layout_get_text (self->pl);
1169 1269
1174} 1274}
1175 OUTPUT: 1275 OUTPUT:
1176 RETVAL 1276 RETVAL
1177 1277
1178SV * 1278SV *
1179get_text (CFPlus::Layout self) 1279get_text (DC::Layout self)
1180 CODE: 1280 CODE:
1181 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1281 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1182 sv_utf8_decode (RETVAL); 1282 sv_utf8_decode (RETVAL);
1183 OUTPUT: 1283 OUTPUT:
1184 RETVAL 1284 RETVAL
1185 1285
1186void 1286void
1187set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1287set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1188 CODE: 1288 CODE:
1189 self->r = r; 1289 self->r = r;
1190 self->g = g; 1290 self->g = g;
1191 self->b = b; 1291 self->b = b;
1192 self->a = a; 1292 self->a = a;
1193 1293
1194void 1294void
1195set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1295set_font (DC::Layout self, DC::Font font = 0)
1196 CODE: 1296 CODE:
1197 if (self->font != font) 1297 if (self->font != font)
1198 { 1298 {
1199 self->font = font; 1299 self->font = font;
1200 layout_update_font (self); 1300 layout_update_font (self);
1201 } 1301 }
1202 1302
1203void 1303void
1204set_height (CFPlus::Layout self, int base_height) 1304set_height (DC::Layout self, int base_height)
1205 CODE: 1305 CODE:
1206 if (self->base_height != base_height) 1306 if (self->base_height != base_height)
1207 { 1307 {
1208 self->base_height = base_height; 1308 self->base_height = base_height;
1209 layout_update_font (self); 1309 layout_update_font (self);
1210 } 1310 }
1211 1311
1212void 1312void
1213set_width (CFPlus::Layout self, int max_width = -1) 1313set_width (DC::Layout self, int max_width = -1)
1214 CODE: 1314 CODE:
1215 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1315 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1216 1316
1217void 1317void
1218set_indent (CFPlus::Layout self, int indent) 1318set_indent (DC::Layout self, int indent)
1219 CODE: 1319 CODE:
1220 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1320 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1221 1321
1222void 1322void
1223set_spacing (CFPlus::Layout self, int spacing) 1323set_spacing (DC::Layout self, int spacing)
1224 CODE: 1324 CODE:
1225 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1325 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1226 1326
1227void 1327void
1228set_ellipsise (CFPlus::Layout self, int ellipsise) 1328set_ellipsise (DC::Layout self, int ellipsise)
1229 CODE: 1329 CODE:
1230 pango_layout_set_ellipsize (self->pl, 1330 pango_layout_set_ellipsize (self->pl,
1231 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1331 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1232 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1332 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1233 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1333 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1234 : PANGO_ELLIPSIZE_NONE 1334 : PANGO_ELLIPSIZE_NONE
1235 ); 1335 );
1236 1336
1237void 1337void
1238set_single_paragraph_mode (CFPlus::Layout self, int spm) 1338set_single_paragraph_mode (DC::Layout self, int spm)
1239 CODE: 1339 CODE:
1240 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1340 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1241 1341
1242void 1342void
1243size (CFPlus::Layout self) 1343size (DC::Layout self)
1244 PPCODE: 1344 PPCODE:
1245{ 1345{
1246 int w, h; 1346 int w, h;
1247 1347
1248 layout_get_pixel_size (self, &w, &h); 1348 layout_get_pixel_size (self, &w, &h);
1251 PUSHs (sv_2mortal (newSViv (w))); 1351 PUSHs (sv_2mortal (newSViv (w)));
1252 PUSHs (sv_2mortal (newSViv (h))); 1352 PUSHs (sv_2mortal (newSViv (h)));
1253} 1353}
1254 1354
1255int 1355int
1256descent (CFPlus::Layout self) 1356descent (DC::Layout self)
1257 CODE: 1357 CODE:
1258{ 1358{
1259 PangoRectangle rect; 1359 PangoRectangle rect;
1260 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1360 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1261 pango_layout_line_get_pixel_extents (line, 0, &rect); 1361 pango_layout_line_get_pixel_extents (line, 0, &rect);
1262 RETVAL = PANGO_DESCENT (rect); 1362 RETVAL = PANGO_DESCENT (rect);
1263} 1363}
1264 OUTPUT: 1364 OUTPUT:
1265 RETVAL 1365 RETVAL
1266 1366
1267int 1367int
1268xy_to_index (CFPlus::Layout self, int x, int y) 1368xy_to_index (DC::Layout self, int x, int y)
1269 CODE: 1369 CODE:
1270{ 1370{
1271 int index, trailing; 1371 int index, trailing;
1272 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1372 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1273 RETVAL = index + trailing; 1373 RETVAL = index + trailing;
1274} 1374}
1275 OUTPUT: 1375 OUTPUT:
1276 RETVAL 1376 RETVAL
1277 1377
1278void 1378void
1279cursor_pos (CFPlus::Layout self, int index) 1379cursor_pos (DC::Layout self, int index)
1280 PPCODE: 1380 PPCODE:
1281{ 1381{
1282 PangoRectangle strong_pos; 1382 PangoRectangle pos;
1283 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1383 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1284 1384
1285 EXTEND (SP, 3); 1385 EXTEND (SP, 3);
1286 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1386 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1287 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1387 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1288 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1388 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1289} 1389}
1290 1390
1291void 1391void
1292index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1392index_to_line_x (DC::Layout self, int index, int trailing = 0)
1293 PPCODE: 1393 PPCODE:
1294{ 1394{
1295 int line, x; 1395 int line, x;
1296 1396
1297 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1397 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1398#if !PANGO_VERSION_CHECK (1, 17, 3)
1298 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1399 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1299 1400 --line;
1401#endif
1300 EXTEND (SP, 2); 1402 EXTEND (SP, 2);
1301 PUSHs (sv_2mortal (newSViv (line - 1))); 1403 PUSHs (sv_2mortal (newSViv (line)));
1302 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1404 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1303} 1405}
1304 1406
1305void 1407void
1306line_x_to_index (CFPlus::Layout self, int line, int x) 1408line_x_to_index (DC::Layout self, int line, int x)
1307 PPCODE: 1409 PPCODE:
1308{ 1410{
1309 PangoLayoutLine *lp; 1411 PangoLayoutLine *lp;
1310 int index, trailing; 1412 int index, trailing;
1311 1413
1312 if (line < 0) 1414 if (line < 0)
1313 XSRETURN_EMPTY; 1415 XSRETURN_EMPTY;
1314 1416
1315 if (!(lp = pango_layout_get_line (self->pl, line))) 1417 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1316 XSRETURN_EMPTY; /* do better */ 1418 XSRETURN_EMPTY; /* do better */
1317 1419
1318 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1420 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1319 1421
1320 EXTEND (SP, 2); 1422 EXTEND (SP, 2);
1326 PUSHs (sv_2mortal (newSViv (trailing))); 1428 PUSHs (sv_2mortal (newSViv (trailing)));
1327 } 1429 }
1328} 1430}
1329 1431
1330void 1432void
1331render (CFPlus::Layout self, float x, float y, int flags = 0) 1433render (DC::Layout self, float x, float y, int flags = 0)
1332 CODE: 1434 CODE:
1333 rc_clear (self->rc); 1435 rc_clear (self->rc);
1334 pango_opengl_render_layout_subpixel ( 1436 pango_opengl_render_layout_subpixel (
1335 self->pl, 1437 self->pl,
1336 self->rc, 1438 self->rc,
1341 // we assume that context_change actually clears/frees stuff 1443 // we assume that context_change actually clears/frees stuff
1342 // and does not do any recomputation... 1444 // and does not do any recomputation...
1343 pango_layout_context_changed (self->pl); 1445 pango_layout_context_changed (self->pl);
1344 1446
1345void 1447void
1346draw (CFPlus::Layout self) 1448draw (DC::Layout self)
1347 CODE: 1449 CODE:
1348{ 1450{
1349 glEnable (GL_TEXTURE_2D); 1451 glEnable (GL_TEXTURE_2D);
1350 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1452 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1351 glEnable (GL_BLEND); 1453 glEnable (GL_BLEND);
1359 glDisable (GL_ALPHA_TEST); 1461 glDisable (GL_ALPHA_TEST);
1360 glDisable (GL_BLEND); 1462 glDisable (GL_BLEND);
1361 glDisable (GL_TEXTURE_2D); 1463 glDisable (GL_TEXTURE_2D);
1362} 1464}
1363 1465
1364MODULE = CFPlus PACKAGE = CFPlus::Texture 1466MODULE = Deliantra::Client PACKAGE = DC::Texture
1365 1467
1366PROTOTYPES: ENABLE 1468PROTOTYPES: ENABLE
1367 1469
1368void 1470void
1369pad (SV *data_, int ow, int oh, int nw, int nh) 1471pad (SV *data_, int ow, int oh, int nw, int nh)
1448 RETVAL = width > 0; 1550 RETVAL = width > 0;
1449} 1551}
1450 OUTPUT: 1552 OUTPUT:
1451 RETVAL 1553 RETVAL
1452 1554
1453MODULE = CFPlus PACKAGE = CFPlus::Map 1555MODULE = Deliantra::Client PACKAGE = DC::Map
1454 1556
1455PROTOTYPES: DISABLE 1557PROTOTYPES: DISABLE
1456 1558
1457CFPlus::Map 1559DC::Map
1458new (SV *class) 1560new (SV *class)
1459 CODE: 1561 CODE:
1460 New (0, RETVAL, 1, struct map); 1562 New (0, RETVAL, 1, struct map);
1461 RETVAL->x = 0; 1563 RETVAL->x = 0;
1462 RETVAL->y = 0; 1564 RETVAL->y = 0;
1470 RETVAL->row = 0; 1572 RETVAL->row = 0;
1471 OUTPUT: 1573 OUTPUT:
1472 RETVAL 1574 RETVAL
1473 1575
1474void 1576void
1475DESTROY (CFPlus::Map self) 1577DESTROY (DC::Map self)
1476 CODE: 1578 CODE:
1477{ 1579{
1478 map_clear (self); 1580 map_clear (self);
1479 Safefree (self->face2tile); 1581 Safefree (self->face2tile);
1480 Safefree (self->tex); 1582 Safefree (self->tex);
1481 Safefree (self); 1583 Safefree (self);
1482} 1584}
1483 1585
1484void 1586void
1485resize (CFPlus::Map self, int map_width, int map_height) 1587resize (DC::Map self, int map_width, int map_height)
1486 CODE: 1588 CODE:
1487 self->w = map_width; 1589 self->w = map_width;
1488 self->h = map_height; 1590 self->h = map_height;
1489 1591
1490void 1592void
1491clear (CFPlus::Map self) 1593clear (DC::Map self)
1492 CODE: 1594 CODE:
1493 map_clear (self); 1595 map_clear (self);
1494 1596
1495void 1597void
1496set_tileid (CFPlus::Map self, int face, int tile) 1598set_tileid (DC::Map self, int face, int tile)
1497 CODE: 1599 CODE:
1498{ 1600{
1499 need_facenum (self, face); self->face2tile [face] = tile; 1601 need_facenum (self, face); self->face2tile [face] = tile;
1500 need_texid (self, tile); 1602 need_texid (self, tile);
1501} 1603}
1502 1604
1503void 1605void
1504set_smooth (CFPlus::Map self, int face, int smooth, int level) 1606set_smooth (DC::Map self, int face, int smooth, int level)
1505 CODE: 1607 CODE:
1506{ 1608{
1507 tileid texid; 1609 tileid texid;
1508 maptex *tex; 1610 maptex *tex;
1509 1611
1522 tex->smoothtile = self->face2tile [smooth]; 1624 tex->smoothtile = self->face2tile [smooth];
1523 tex->smoothlevel = level; 1625 tex->smoothlevel = level;
1524} 1626}
1525 1627
1526void 1628void
1527set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1629set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1528 CODE: 1630 CODE:
1529{ 1631{
1530 need_texid (self, texid); 1632 need_texid (self, texid);
1531 1633
1532 { 1634 {
1552 // from transparent color bleeding and ugly wrapping effects. 1654 // from transparent color bleeding and ugly wrapping effects.
1553 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1655 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1554} 1656}
1555 1657
1556int 1658int
1557ox (CFPlus::Map self) 1659ox (DC::Map self)
1558 ALIAS: 1660 ALIAS:
1559 oy = 1 1661 oy = 1
1560 x = 2 1662 x = 2
1561 y = 3 1663 y = 3
1562 w = 4 1664 w = 4
1573 } 1675 }
1574 OUTPUT: 1676 OUTPUT:
1575 RETVAL 1677 RETVAL
1576 1678
1577void 1679void
1578scroll (CFPlus::Map self, int dx, int dy) 1680scroll (DC::Map self, int dx, int dy)
1579 CODE: 1681 CODE:
1580{ 1682{
1581 if (dx > 0) 1683 if (dx > 0)
1582 map_blank (self, self->x, self->y, dx, self->h); 1684 map_blank (self, self->x, self->y, dx, self->h);
1583 else if (dx < 0) 1685 else if (dx < 0)
1599 self->y += MAP_EXTEND_Y; 1701 self->y += MAP_EXTEND_Y;
1600 } 1702 }
1601} 1703}
1602 1704
1603SV * 1705SV *
1604map1a_update (CFPlus::Map self, SV *data_, int extmap) 1706map1a_update (DC::Map self, SV *data_, int extmap)
1605 CODE: 1707 CODE:
1606{ 1708{
1607 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1709 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1608 uint8_t *data_end = (uint8_t *)SvEND (data_); 1710 uint8_t *data_end = (uint8_t *)SvEND (data_);
1609 mapcell *cell; 1711 mapcell *cell;
1637 uint8_t ext, cmd; 1739 uint8_t ext, cmd;
1638 1740
1639 do 1741 do
1640 { 1742 {
1641 ext = *data++; 1743 ext = *data++;
1642 cmd = ext & 0x3f; 1744 cmd = ext & 0x7f;
1643 1745
1644 if (cmd < 4) 1746 if (cmd < 4)
1645 cell->darkness = 255 - ext * 64 + 1; 1747 cell->darkness = 255 - ext * 64 + 1;
1646 else if (cmd == 5) // health 1748 else if (cmd == 5) // health
1647 { 1749 {
1650 } 1752 }
1651 else if (cmd == 6) // monster width 1753 else if (cmd == 6) // monster width
1652 cell->stat_width = *data++ + 1; 1754 cell->stat_width = *data++ + 1;
1653 else if (cmd == 0x47) 1755 else if (cmd == 0x47)
1654 { 1756 {
1655 if (*data == 4) 1757 if (*data == 1) cell->player = data [1];
1656 ; // decode player count 1758 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1759 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1760 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1657 1761
1658 data += *data + 1; 1762 data += *data + 1;
1659 } 1763 }
1660 else if (cmd == 8) // cell flags 1764 else if (cmd == 8) // cell flags
1661 cell->flags = *data++; 1765 cell->flags = *data++;
1691 } 1795 }
1692 } 1796 }
1693 } 1797 }
1694 } 1798 }
1695 else 1799 else
1696 cell->darkness = 0; 1800 CELL_CLEAR (cell);
1697 } 1801 }
1698} 1802}
1699 OUTPUT: 1803 OUTPUT:
1700 RETVAL 1804 RETVAL
1701 1805
1702SV * 1806SV *
1703mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1807mapmap (DC::Map self, int x0, int y0, int w, int h)
1704 CODE: 1808 CODE:
1705{ 1809{
1706 int x1, x; 1810 int x1, x;
1707 int y1, y; 1811 int y1, y;
1708 int z; 1812 int z;
1753} 1857}
1754 OUTPUT: 1858 OUTPUT:
1755 RETVAL 1859 RETVAL
1756 1860
1757void 1861void
1758draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1862draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1759 CODE: 1863 CODE:
1760{ 1864{
1761 int x, y, z; 1865 int x, y, z;
1762 1866
1763 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1867 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1764 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1868 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1765 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1869 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1766 smooth_key skey; 1870 smooth_key skey;
1767 1871 int pl_x, pl_y;
1872 maptex pl_tex;
1768 rc_t *rc = rc_alloc (); 1873 rc_t *rc = rc_alloc ();
1769 rc_key_t key; 1874 rc_key_t key;
1770 rc_array_t *arr; 1875 rc_array_t *arr;
1876
1877 pl_tex.name = 0;
1771 1878
1772 // thats current max. sorry. 1879 // thats current max. sorry.
1773 if (sw > 255) sw = 255; 1880 if (sw > 255) sw = 255;
1774 if (sh > 255) sh = 255; 1881 if (sh > 255) sh = 255;
1775 1882
1830 tileid tile = cell->tile [z]; 1937 tileid tile = cell->tile [z];
1831 1938
1832 if (tile) 1939 if (tile)
1833 { 1940 {
1834 maptex tex = self->tex [tile]; 1941 maptex tex = self->tex [tile];
1835 int px, py; 1942 int px = (x + 1) * T - tex.w;
1943 int py = (y + 1) * T - tex.h;
1836 1944
1837 if (key.texname != tex.name) 1945 if (key.texname != tex.name)
1838 { 1946 {
1839 if (!tex.name) 1947 if (!tex.name)
1840 tex = self->tex [2]; /* missing, replace by noface */ 1948 tex = self->tex [2]; /* missing, replace by noface */
1841 1949
1842 key.texname = tex.name; 1950 key.texname = tex.name;
1843 arr = rc_array (rc, &key); 1951 arr = rc_array (rc, &key);
1844 } 1952 }
1845 1953
1846 px = (x + 1) * T - tex.w; 1954 if (expect_false (cell->player == player) && expect_false (z == 2))
1847 py = (y + 1) * T - tex.h; 1955 {
1956 pl_x = px;
1957 pl_y = py;
1958 pl_tex = tex;
1959 continue;
1960 }
1848 1961
1849 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1962 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1850 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1963 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1851 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 1964 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1852 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 1965 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1853 1966
1854 if (cell->flags && z == 2) 1967 if (expect_false (cell->flags) && expect_false (z == 2))
1855 { 1968 {
1856 // overlays such as the speech bubble, probably more to come 1969 // overlays such as the speech bubble, probably more to come
1857 if (cell->flags & 1) 1970 if (cell->flags & 1)
1858 { 1971 {
1859 maptex tex = self->tex [1]; 1972 maptex tex = self->tex [1];
1998 } 2111 }
1999 2112
2000 hv_clear (smooth); 2113 hv_clear (smooth);
2001 } 2114 }
2002 2115
2116 if (pl_tex.name)
2117 {
2118 maptex tex = pl_tex;
2119 int px = pl_x + sdx;
2120 int py = pl_y + sdy;
2121
2122 key.texname = tex.name;
2123 arr = rc_array (rc, &key);
2124
2125 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2126 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2127 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2128 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2129
2130 rc_draw (rc);
2131 }
2132
2003 glDisable (GL_BLEND); 2133 glDisable (GL_BLEND);
2004 rc_free (rc); 2134 rc_free (rc);
2005 2135
2006 // top layer: overlays such as the health bar 2136 // top layer: overlays such as the health bar
2007 for (y = 0; y < sh; y++) 2137 for (y = 0; y < sh; y++)
2034 } 2164 }
2035 } 2165 }
2036} 2166}
2037 2167
2038void 2168void
2039draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2169draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2040 CODE: 2170 CODE:
2041{ 2171{
2042 static float color[16][3] = { 2172 static float color[16][3] = {
2043 { 0.00F, 0.00F, 0.00F }, 2173 { 0.00F, 0.00F, 0.00F },
2044 { 1.00F, 1.00F, 1.00F }, 2174 { 1.00F, 1.00F, 1.00F },
2094 glDisable (GL_BLEND); 2224 glDisable (GL_BLEND);
2095 glDisable (GL_TEXTURE_2D); 2225 glDisable (GL_TEXTURE_2D);
2096} 2226}
2097 2227
2098void 2228void
2099fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2229fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2100 PPCODE: 2230 PPCODE:
2101{ 2231{
2102 int x, y; 2232 int x, y;
2103 int sw1 = sw + 2; 2233 int sw1 = sw + 2;
2104 int sh1 = sh + 2; 2234 int sh1 = sh + 2;
2112 SvCUR_set (darkness3_sv, sw34 * sh3); 2242 SvCUR_set (darkness3_sv, sw34 * sh3);
2113 2243
2114 mx += self->x - 1; 2244 mx += self->x - 1;
2115 my += self->y - 1; 2245 my += self->y - 1;
2116 2246
2117 memset (darkness1, 255, sw1 * sh1); 2247 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2118 2248
2119 for (y = 0; y < sh1; y++) 2249 for (y = 0; y < sh1; y++)
2120 if (0 <= y + my && y + my < self->rows) 2250 if (0 <= y + my && y + my < self->rows)
2121 { 2251 {
2122 maprow *row = self->row + (y + my); 2252 maprow *row = self->row + (y + my);
2175 PUSHs (sv_2mortal (newSViv (sh3))); 2305 PUSHs (sv_2mortal (newSViv (sh3)));
2176 PUSHs (darkness3_sv); 2306 PUSHs (darkness3_sv);
2177} 2307}
2178 2308
2179SV * 2309SV *
2180get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2310get_rect (DC::Map self, int x0, int y0, int w, int h)
2181 CODE: 2311 CODE:
2182{ 2312{
2183 int x, y, x1, y1; 2313 int x, y, x1, y1;
2184 SV *data_sv = newSV (w * h * 7 + 5); 2314 SV *data_sv = newSV (w * h * 7 + 5);
2185 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2315 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2242 else 2372 else
2243 *data++ = 0; 2373 *data++ = 0;
2244 } 2374 }
2245 } 2375 }
2246 2376
2377 /* if size is w*h + 5 then no data has been found */
2378 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2379 {
2247 SvPOK_only (data_sv); 2380 SvPOK_only (data_sv);
2248 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2381 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2382 }
2383
2249 RETVAL = data_sv; 2384 RETVAL = data_sv;
2250} 2385}
2251 OUTPUT: 2386 OUTPUT:
2252 RETVAL 2387 RETVAL
2253 2388
2254void 2389void
2255set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2390set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2256 PPCODE: 2391 PPCODE:
2257{ 2392{
2258 int x, y, z; 2393 int x, y, z;
2259 int w, h; 2394 int w, h;
2260 int x1, y1; 2395 int x1, y1;
2396 STRLEN len;
2397 uint8_t *data, *end;
2398
2399 len = SvLEN (data_sv);
2400 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2401 data = SvPVbyte_nolen (data_sv);
2402 end = data + len + 8;
2403
2404 if (len < 5)
2405 XSRETURN_EMPTY;
2261 2406
2262 if (*data++ != 0) 2407 if (*data++ != 0)
2263 XSRETURN_EMPTY; /* version mismatch */ 2408 XSRETURN_EMPTY; /* version mismatch */
2264 2409
2265 w = *data++ << 8; w |= *data++; 2410 w = *data++ << 8; w |= *data++;
2280 { 2425 {
2281 maprow *row = map_get_row (self, y); 2426 maprow *row = map_get_row (self, y);
2282 2427
2283 for (x = x0; x < x1; x++) 2428 for (x = x0; x < x1; x++)
2284 { 2429 {
2430 uint8_t flags;
2431
2432 if (data + 7 >= end)
2433 XSRETURN_EMPTY;
2434
2285 uint8_t flags = *data++; 2435 flags = *data++;
2286 2436
2287 if (flags) 2437 if (flags)
2288 { 2438 {
2289 mapcell *cell = row_get_cell (row, x); 2439 mapcell *cell = row_get_cell (row, x);
2290 tileid tile[3] = { 0, 0, 0 }; 2440 tileid tile[3] = { 0, 0, 0 };
2293 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2443 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2294 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2444 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2295 2445
2296 if (cell->darkness == 0) 2446 if (cell->darkness == 0)
2297 { 2447 {
2298 cell->darkness = 0; 2448 /*cell->darkness = 0;*/
2449 EXTEND (SP, 3);
2299 2450
2300 for (z = 0; z <= 2; z++) 2451 for (z = 0; z <= 2; z++)
2301 { 2452 {
2302 tileid t = tile [z]; 2453 tileid t = tile [z];
2303 2454
2304 if (t >= self->texs || (t && !self->tex [t].name)) 2455 if (t >= self->texs || (t && !self->tex [t].name))
2305 { 2456 {
2306 XPUSHs (sv_2mortal (newSViv (t))); 2457 PUSHs (sv_2mortal (newSViv (t)));
2307 need_texid (self, t); 2458 need_texid (self, t);
2308 } 2459 }
2309 2460
2310 cell->tile [z] = t; 2461 cell->tile [z] = t;
2311 } 2462 }
2313 } 2464 }
2314 } 2465 }
2315 } 2466 }
2316} 2467}
2317 2468
2318MODULE = CFPlus PACKAGE = CFPlus::RW 2469MODULE = Deliantra::Client PACKAGE = DC::RW
2319 2470
2320CFPlus::RW 2471DC::RW
2321new (SV *class, SV *data_sv) 2472new (SV *class, SV *data_sv)
2322 CODE: 2473 CODE:
2323{ 2474{
2324 STRLEN datalen; 2475 STRLEN datalen;
2325 char *data = SvPVbyte (data_sv, datalen); 2476 char *data = SvPVbyte (data_sv, datalen);
2327 RETVAL = SDL_RWFromConstMem (data, datalen); 2478 RETVAL = SDL_RWFromConstMem (data, datalen);
2328} 2479}
2329 OUTPUT: 2480 OUTPUT:
2330 RETVAL 2481 RETVAL
2331 2482
2332CFPlus::RW 2483DC::RW
2333new_from_file (SV *class, const char *path, const char *mode = "rb") 2484new_from_file (SV *class, const char *path, const char *mode = "rb")
2334 CODE: 2485 CODE:
2335 RETVAL = SDL_RWFromFile (path, mode); 2486 RETVAL = SDL_RWFromFile (path, mode);
2336 OUTPUT: 2487 OUTPUT:
2337 RETVAL 2488 RETVAL
2338 2489
2339# fails on win32: 2490# fails on win32:
2340# CFPlus.xs(2268) : error C2059: syntax error : '(' 2491# dc.xs(2268) : error C2059: syntax error : '('
2341#void 2492#void
2342#close (CFPlus::RW self) 2493#close (DC::RW self)
2343# CODE: 2494# CODE:
2344# (self->(close)) (self); 2495# (self->(close)) (self);
2345 2496
2346MODULE = CFPlus PACKAGE = CFPlus::Channel 2497MODULE = Deliantra::Client PACKAGE = DC::Channel
2347 2498
2348PROTOTYPES: DISABLE 2499PROTOTYPES: DISABLE
2349 2500
2350CFPlus::Channel 2501DC::Channel
2351find () 2502find ()
2352 CODE: 2503 CODE:
2353{ 2504{
2354 RETVAL = Mix_GroupAvailable (-1); 2505 RETVAL = Mix_GroupAvailable (-1);
2355 2506
2368} 2519}
2369 OUTPUT: 2520 OUTPUT:
2370 RETVAL 2521 RETVAL
2371 2522
2372void 2523void
2373halt (CFPlus::Channel self) 2524halt (DC::Channel self)
2374 CODE: 2525 CODE:
2375 Mix_HaltChannel (self); 2526 Mix_HaltChannel (self);
2376 2527
2377void 2528void
2378expire (CFPlus::Channel self, int ticks = -1) 2529expire (DC::Channel self, int ticks = -1)
2379 CODE: 2530 CODE:
2380 Mix_ExpireChannel (self, ticks); 2531 Mix_ExpireChannel (self, ticks);
2381 2532
2382void 2533void
2383fade_out (CFPlus::Channel self, int ticks = -1) 2534fade_out (DC::Channel self, int ticks = -1)
2384 CODE: 2535 CODE:
2385 Mix_FadeOutChannel (self, ticks); 2536 Mix_FadeOutChannel (self, ticks);
2386 2537
2387int 2538int
2388volume (CFPlus::Channel self, int volume) 2539volume (DC::Channel self, int volume)
2389 CODE: 2540 CODE:
2390 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2541 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2391 OUTPUT: 2542 OUTPUT:
2392 RETVAL 2543 RETVAL
2393 2544
2394void 2545void
2395unregister_all_effects (CFPlus::Channel self) 2546unregister_all_effects (DC::Channel self)
2396 CODE: 2547 CODE:
2397 Mix_UnregisterAllEffects (self); 2548 Mix_UnregisterAllEffects (self);
2398 2549
2399void 2550void
2400set_panning (CFPlus::Channel self, int left, int right) 2551set_panning (DC::Channel self, int left, int right)
2401 CODE: 2552 CODE:
2402 left = CLAMP (left , 0, 255); 2553 left = CLAMP (left , 0, 255);
2403 right = CLAMP (right, 0, 255); 2554 right = CLAMP (right, 0, 255);
2404 Mix_SetPanning (self, left, right); 2555 Mix_SetPanning (self, left, right);
2405 2556
2406void 2557void
2407set_distance (CFPlus::Channel self, int distance) 2558set_distance (DC::Channel self, int distance)
2408 CODE: 2559 CODE:
2409 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2560 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2410 2561
2411void 2562void
2412set_position (CFPlus::Channel self, int angle, int distance) 2563set_position (DC::Channel self, int angle, int distance)
2413 CODE: 2564 CODE:
2414 2565
2415void 2566void
2416set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2567set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2417 CODE: 2568 CODE:
2418{ 2569{
2419 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2570 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2420 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2571 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2421 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2572 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2422} 2573}
2423 2574
2424void 2575void
2425set_reverse_stereo (CFPlus::Channel self, int flip) 2576set_reverse_stereo (DC::Channel self, int flip)
2426 CODE: 2577 CODE:
2427 Mix_SetReverseStereo (self, flip); 2578 Mix_SetReverseStereo (self, flip);
2428 2579
2429MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2580MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2430 2581
2431PROTOTYPES: DISABLE 2582PROTOTYPES: DISABLE
2432 2583
2433CFPlus::MixChunk 2584DC::MixChunk
2434new (SV *class, CFPlus::RW rwops) 2585new (SV *class, DC::RW rwops)
2435 CODE: 2586 CODE:
2436 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2587 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2437 OUTPUT: 2588 OUTPUT:
2438 RETVAL 2589 RETVAL
2439 2590
2440void 2591void
2441DESTROY (CFPlus::MixChunk self) 2592DESTROY (DC::MixChunk self)
2442 CODE: 2593 CODE:
2443 Mix_FreeChunk (self); 2594 Mix_FreeChunk (self);
2444 2595
2445int 2596int
2446volume (CFPlus::MixChunk self, int volume = -1) 2597volume (DC::MixChunk self, int volume = -1)
2447 CODE: 2598 CODE:
2448 if (items > 1) 2599 if (items > 1)
2449 volume = CLAMP (volume, 0, 128); 2600 volume = CLAMP (volume, 0, 128);
2450 RETVAL = Mix_VolumeChunk (self, volume); 2601 RETVAL = Mix_VolumeChunk (self, volume);
2451 OUTPUT: 2602 OUTPUT:
2452 RETVAL 2603 RETVAL
2453 2604
2454CFPlus::Channel 2605DC::Channel
2455play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2606play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2456 CODE: 2607 CODE:
2457{ 2608{
2458 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2609 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2459 2610
2460 if (RETVAL < 0) 2611 if (RETVAL < 0)
2467 } 2618 }
2468} 2619}
2469 OUTPUT: 2620 OUTPUT:
2470 RETVAL 2621 RETVAL
2471 2622
2472MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2623MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2473 2624
2474int 2625int
2475volume (int volume = -1) 2626volume (int volume = -1)
2476 PROTOTYPE: ;$ 2627 PROTOTYPE: ;$
2477 CODE: 2628 CODE:
2489void 2640void
2490halt () 2641halt ()
2491 CODE: 2642 CODE:
2492 Mix_HaltMusic (); 2643 Mix_HaltMusic ();
2493 2644
2494CFPlus::MixMusic 2645DC::MixMusic
2495new (SV *class, CFPlus::RW rwops) 2646new (SV *class, DC::RW rwops)
2496 CODE: 2647 CODE:
2497 RETVAL = Mix_LoadMUS_RW (rwops); 2648 RETVAL = Mix_LoadMUS_RW (rwops);
2498 OUTPUT: 2649 OUTPUT:
2499 RETVAL 2650 RETVAL
2500 2651
2501void 2652void
2502DESTROY (CFPlus::MixMusic self) 2653DESTROY (DC::MixMusic self)
2503 CODE: 2654 CODE:
2504 Mix_FreeMusic (self); 2655 Mix_FreeMusic (self);
2505 2656
2506int 2657int
2507play (CFPlus::MixMusic self, int loops = -1) 2658play (DC::MixMusic self, int loops = -1)
2508 CODE: 2659 CODE:
2509 RETVAL = Mix_PlayMusic (self, loops); 2660 RETVAL = Mix_PlayMusic (self, loops);
2510 OUTPUT: 2661 OUTPUT:
2511 RETVAL 2662 RETVAL
2512 2663
2513void 2664void
2514fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2665fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2515 CODE: 2666 CODE:
2516 Mix_FadeInMusicPos (self, loops, ms, position); 2667 Mix_FadeInMusicPos (self, loops, ms, position);
2517 2668
2518MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2669MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2519 2670
2520PROTOTYPES: ENABLE 2671PROTOTYPES: ENABLE
2521 2672
2522BOOT: 2673BOOT:
2523{ 2674{
2524 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2675 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2525 static const struct { 2676 static const struct {
2526 const char *name; 2677 const char *name;
2527 IV iv; 2678 IV iv;
2528 } *civ, const_iv[] = { 2679 } *civ, const_iv[] = {
2529# define const_iv(name) { # name, (IV)name } 2680# define const_iv(name) { # name, (IV)name }
2822void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2973void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2823 CODE: 2974 CODE:
2824 if (gl.SeparableFilter2D) 2975 if (gl.SeparableFilter2D)
2825 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2976 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2826 2977
2827void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2978void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2828 2979
2829void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2980void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2830 2981
2831void glDrawPixels (int width, int height, int format, int type, char *pixels) 2982void glDrawPixels (int width, int height, int format, int type, char *pixels)
2832 2983
2858 3009
2859void glEndList () 3010void glEndList ()
2860 3011
2861void glCallList (int list) 3012void glCallList (int list)
2862 3013
2863MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3014MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2864 3015
2865PROTOTYPES: DISABLE 3016PROTOTYPES: DISABLE
2866 3017
2867void 3018void
2868find_widget (SV *self, NV x, NV y) 3019find_widget (SV *self, NV x, NV y)
2872 XPUSHs (self); 3023 XPUSHs (self);
2873} 3024}
2874 3025
2875BOOT: 3026BOOT:
2876{ 3027{
2877 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3028 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2878 3029
2879 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3030 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2880 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3031 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2881 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3032 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2882 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3033 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2883} 3034}
2884 3035
2885void 3036void
2886draw (SV *self) 3037draw (SV *self)
2887 CODE: 3038 CODE:
2894 SV *draw_w_sv = GvSV (draw_w_gv); 3045 SV *draw_w_sv = GvSV (draw_w_gv);
2895 SV *draw_h_sv = GvSV (draw_h_gv); 3046 SV *draw_h_sv = GvSV (draw_h_gv);
2896 double draw_x, draw_y; 3047 double draw_x, draw_y;
2897 3048
2898 if (!SvROK (self)) 3049 if (!SvROK (self))
2899 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3050 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2900 3051
2901 hv = (HV *)SvRV (self); 3052 hv = (HV *)SvRV (self);
2902 3053
2903 if (SvTYPE (hv) != SVt_PVHV) 3054 if (SvTYPE (hv) != SVt_PVHV)
2904 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3055 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2905 3056
2906 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3057 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2907 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3058 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2908 3059
2909 if (!h || !w) 3060 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines