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.239 by root, Tue Dec 25 18:58:32 2007 UTC vs.
Revision 1.274 by root, Wed Aug 20 17:50:47 2008 UTC

39#include <SDL_endian.h> 39#include <SDL_endian.h>
40#include <SDL_image.h> 40#include <SDL_image.h>
41#include <SDL_mixer.h> 41#include <SDL_mixer.h>
42#include <SDL_opengl.h> 42#include <SDL_opengl.h>
43 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
44#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
46 51
47#include <glib/gmacros.h> 52#include <glib/gmacros.h>
48 53
49#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
50 66
51#ifndef _WIN32 67#ifndef _WIN32
52# include <sys/types.h> 68# include <sys/types.h>
53# include <sys/socket.h> 69# include <sys/socket.h>
54# include <netinet/in.h> 70# include <netinet/in.h>
55# include <netinet/tcp.h> 71# include <netinet/tcp.h>
56# include <inttypes.h> 72# include <inttypes.h>
57#endif 73#endif
58 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 85
61#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
62 87
63#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
65 90
66#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
67 92
68#if 0 93/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else
71# define PARACHUTE 0
72#endif
73 95
74static AV *texture_av; 96static AV *texture_av;
75 97
76static struct 98static struct
77{ 99{
120 142
121#include "pango-font.c" 143#include "pango-font.c"
122#include "pango-fontmap.c" 144#include "pango-fontmap.c"
123#include "pango-render.c" 145#include "pango-render.c"
124 146
125typedef IV CFPlus__Channel; 147typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 148typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 149typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 150typedef Mix_Music *DC__MixMusic;
129 151
130typedef PangoFontDescription *CFPlus__Font; 152typedef PangoFontDescription *DC__Font;
131 153
132static int 154static int
133shape_attr_p (PangoLayoutRun *run) 155shape_attr_p (PangoLayoutRun *run)
134{ 156{
135 GSList *attrs = run->item->analysis.extra_attrs; 157 GSList *attrs = run->item->analysis.extra_attrs;
149 171
150typedef struct cf_layout { 172typedef struct cf_layout {
151 PangoLayout *pl; 173 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 174 float r, g, b, a; // default color for rgba mode
153 int base_height; 175 int base_height;
154 CFPlus__Font font; 176 DC__Font font;
155 rc_t *rc; 177 rc_t *rc;
156} *CFPlus__Layout; 178} *DC__Layout;
157 179
158static CFPlus__Font default_font; 180static DC__Font default_font;
159static PangoContext *opengl_context; 181static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 182static PangoFontMap *opengl_fontmap;
161 183
162static void 184static void
163substitute_func (FcPattern *pattern, gpointer data) 185substitute_func (FcPattern *pattern, gpointer data)
168#endif 190#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 191 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 192}
171 193
172static void 194static void
173layout_update_font (CFPlus__Layout self) 195layout_update_font (DC__Layout self)
174{ 196{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 197 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 198 * reasonably well with dejavu/bistream fonts
177 */ 199 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 200 PangoFontDescription *font = self->font ? self->font : default_font;
179 201
180 pango_font_description_set_absolute_size (font, 202 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 203 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 204
183 pango_layout_set_font_description (self->pl, font); 205 pango_layout_set_font_description (self->pl, font);
184} 206}
185 207
186static void 208static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 209layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 210{
189 PangoRectangle rect; 211 PangoRectangle rect;
190 212
191 // get_pixel_* wrongly rounds down 213 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 214 pango_layout_get_extents (self->pl, 0, &rect);
231 int faces; tileid *face2tile; // [faceid] 253 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 254 int texs; maptex *tex; // [tileid]
233 255
234 int32_t rows; 256 int32_t rows;
235 maprow *row; 257 maprow *row;
236} *CFPlus__Map; 258} *DC__Map;
237 259
238static char * 260static char *
239prepend (char *ptr, int sze, int inc) 261prepend (char *ptr, int sze, int inc)
240{ 262{
241 char *p; 263 char *p;
279 self->texs *= 2; 301 self->texs *= 2;
280 } 302 }
281} 303}
282 304
283static maprow * 305static maprow *
284map_get_row (CFPlus__Map self, int y) 306map_get_row (DC__Map self, int y)
285{ 307{
286 if (0 > y) 308 if (0 > y)
287 { 309 {
288 int extend = - y + MAP_EXTEND_Y; 310 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 311 Prepend (maprow, self->row, self->rows, extend);
327 349
328 return row->col + (x - row->c0); 350 return row->col + (x - row->c0);
329} 351}
330 352
331static mapcell * 353static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 354map_get_cell (DC__Map self, int x, int y)
333{ 355{
334 return row_get_cell (map_get_row (self, y), x); 356 return row_get_cell (map_get_row (self, y), x);
335} 357}
336 358
337static void 359static void
338map_clear (CFPlus__Map self) 360map_clear (DC__Map self)
339{ 361{
340 int r; 362 int r;
341 363
342 for (r = 0; r < self->rows; r++) 364 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 365 Safefree (self->row[r].col);
350 self->oy = 0; 372 self->oy = 0;
351 self->row = 0; 373 self->row = 0;
352 self->rows = 0; 374 self->rows = 0;
353} 375}
354 376
377#define CELL_CLEAR(cell) \
378 do { \
379 if ((cell)->player) \
380 (cell)->tile [2] = 0; \
381 (cell)->darkness = 0; \
382 (cell)->stat_hp = 0; \
383 (cell)->flags = 0; \
384 (cell)->player = 0; \
385 } while (0)
386
355static void 387static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 388map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 389{
358 int x, y; 390 int x, y;
359 maprow *row; 391 maprow *row;
360 mapcell *cell; 392 mapcell *cell;
361 393
373 if (x >= row->c1) 405 if (x >= row->c1)
374 break; 406 break;
375 407
376 cell = row->col + x - row->c0; 408 cell = row->col + x - row->c0;
377 409
378 cell->darkness = 0; 410 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 411 }
383 } 412 }
384} 413}
385 414
386typedef struct { 415typedef struct {
498 return 0; 527 return 0;
499 528
500 return 1; 529 return 1;
501} 530}
502 531
503MODULE = CFPlus PACKAGE = CFPlus 532static void
533deliantra_main ()
534{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537}
538
539#ifdef __MACOSX__
540 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back.
545 */
546 extern C_LINKAGE int
547 main (int argc, char *argv[])
548 {
549 deliantra_main ();
550 }
551
552 #undef main
553
554 extern C_LINKAGE int main (int argc, char *argv[]);
555
556 static void
557 SDL_braino (void)
558 {
559 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv);
561 }
562#else
563 static void
564 SDL_braino (void)
565 {
566 deliantra_main ();
567 }
568#endif
569
570MODULE = Deliantra::Client PACKAGE = DC
504 571
505PROTOTYPES: ENABLE 572PROTOTYPES: ENABLE
506 573
507BOOT: 574BOOT:
508{ 575{
509 HV *stash = gv_stashpv ("CFPlus", 1); 576 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 577 static const struct {
511 const char *name; 578 const char *name;
512 IV iv; 579 IV iv;
513 } *civ, const_iv[] = { 580 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 581# define const_iv(name) { # name, (IV)name }
621 const_iv (KMOD_NUM), 688 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 689 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 690 const_iv (KMOD_MODE),
624 691
625 const_iv (MIX_DEFAULT_FORMAT), 692 const_iv (MIX_DEFAULT_FORMAT),
693
694 const_iv (SDL_INIT_TIMER),
695 const_iv (SDL_INIT_AUDIO),
696 const_iv (SDL_INIT_VIDEO),
697 const_iv (SDL_INIT_CDROM),
698 const_iv (SDL_INIT_JOYSTICK),
699 const_iv (SDL_INIT_EVERYTHING),
700 const_iv (SDL_INIT_NOPARACHUTE),
701 const_iv (SDL_INIT_EVENTTHREAD),
702
703 const_iv (SDL_GL_RED_SIZE),
704 const_iv (SDL_GL_GREEN_SIZE),
705 const_iv (SDL_GL_BLUE_SIZE),
706 const_iv (SDL_GL_ALPHA_SIZE),
707 const_iv (SDL_GL_DOUBLEBUFFER),
708 const_iv (SDL_GL_BUFFER_SIZE),
709 const_iv (SDL_GL_DEPTH_SIZE),
710 const_iv (SDL_GL_STENCIL_SIZE),
711 const_iv (SDL_GL_ACCUM_RED_SIZE),
712 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
713 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
714 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
715 const_iv (SDL_GL_STEREO),
716 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
717 const_iv (SDL_GL_MULTISAMPLESAMPLES),
718 const_iv (SDL_GL_ACCELERATED_VISUAL),
719 const_iv (SDL_GL_SWAP_CONTROL),
720
721 const_iv (FOW_DARKNESS)
626# undef const_iv 722# undef const_iv
627 }; 723 };
628 724
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 725 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 726 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
659 CODE: 755 CODE:
660{ 756{
661 opengl_fontmap = pango_opengl_font_map_new (); 757 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 758 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 759 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
760 /*pango_context_set_font_description (opengl_context, default_font);*/
761#if PANGO_VERSION_CHECK (1, 15, 2)
762 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
763 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
764#endif
664} 765}
665 766
666char *
667SDL_GetError () 767char *SDL_GetError ()
668 768
669int 769void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 770
672void 771int SDL_Init (U32 flags)
772
773int SDL_InitSubSystem (U32 flags)
774
775void SDL_QuitSubSystem (U32 flags)
776
673SDL_Quit () 777void SDL_Quit ()
778
779int SDL_GL_SetAttribute (int attr, int value)
780
781int SDL_GL_GetAttribute (int attr)
782 CODE:
783 if (SDL_GL_GetAttribute (attr, &RETVAL))
784 XSRETURN_UNDEF;
785 OUTPUT:
786 RETVAL
674 787
675void 788void
676SDL_ListModes (int rgb, int alpha) 789SDL_ListModes (int rgb, int alpha)
677 PPCODE: 790 PPCODE:
678{ 791{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 803 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 804 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 805 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 806
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 807 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 808 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 809
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 810 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 811
702 if (m && m != (SDL_Rect **)-1) 812 if (m && m != (SDL_Rect **)-1)
703 while (*m) 813 while (*m)
704 { 814 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 815 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 816 {
707 AV *av = newAV (); 817 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 818 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 819 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 820 av_push (av, newSViv (rgb));
752SDL_GetKeyName (int sym) 862SDL_GetKeyName (int sym)
753 863
754int 864int
755SDL_GetAppState () 865SDL_GetAppState ()
756 866
867int
868SDL_GetModState ()
869
757void 870void
758poll_events () 871poll_events ()
759 PPCODE: 872 PPCODE:
760{ 873{
761 SDL_Event ev; 874 SDL_Event ev;
770 { 883 {
771 case SDL_KEYDOWN: 884 case SDL_KEYDOWN:
772 case SDL_KEYUP: 885 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 886 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 887 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 888 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 889 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 890 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 891 break;
779 892
780 case SDL_ACTIVEEVENT: 893 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 894 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 912 x = ev.motion.x;
800 y = ev.motion.y; 913 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 914 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 915 }
803 916
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 917 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 918 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 919 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 920 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 921 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 922 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 923 }
811 break; 924 break;
812 925
813 case SDL_MOUSEBUTTONDOWN: 926 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 927 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 928 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 929
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 930 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 931 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 932 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 933 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 938 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 939 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 940 break;
828 } 941 }
829 942
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 943 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 944 }
832} 945}
833 946
834int 947int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 948Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
894 } 1007 }
895 } 1008 }
896#endif 1009#endif
897} 1010}
898 1011
899void 1012int
900add_font (char *file) 1013add_font (char *file)
901 CODE: 1014 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1015 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1016 OUTPUT:
1017 RETVAL
903 1018
904void 1019void
905load_image_inline (SV *image_) 1020load_image_inline (SV *image_)
906 ALIAS: 1021 ALIAS:
907 load_image_file = 1 1022 load_image_file = 1
993void 1108void
994error (char *message) 1109error (char *message)
995 CODE: 1110 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1111 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1112#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1113 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1114#endif
1000 1115
1001void 1116void
1002fatal (char *message) 1117fatal (char *message)
1003 CODE: 1118 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1119 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1120#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1121 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1122#endif
1008 _exit (1); 1123 _exit (1);
1009 1124
1010void 1125void
1011_exit (int retval = 0) 1126_exit (int retval = 0)
1023#if DEBUG 1138#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1139 VALGRIND_DO_LEAK_CHECK;
1025#endif 1140#endif
1026} 1141}
1027 1142
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1143MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1144
1030PROTOTYPES: DISABLE 1145PROTOTYPES: DISABLE
1031 1146
1032CFPlus::Font 1147DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1148new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1149 CODE:
1035{ 1150{
1036 int count; 1151 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1152 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1155}
1041 OUTPUT: 1156 OUTPUT:
1042 RETVAL 1157 RETVAL
1043 1158
1044void 1159void
1045DESTROY (CFPlus::Font self) 1160DESTROY (DC::Font self)
1046 CODE: 1161 CODE:
1047 pango_font_description_free (self); 1162 pango_font_description_free (self);
1048 1163
1049void 1164void
1050make_default (CFPlus::Font self) 1165make_default (DC::Font self)
1051 PROTOTYPE: $ 1166 PROTOTYPE: $
1052 CODE: 1167 CODE:
1053 default_font = self; 1168 default_font = self;
1054 1169
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1170MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1171
1057PROTOTYPES: DISABLE 1172PROTOTYPES: DISABLE
1058 1173
1059void 1174void
1060glyph_cache_backup () 1175glyph_cache_backup ()
1066glyph_cache_restore () 1181glyph_cache_restore ()
1067 PROTOTYPE: 1182 PROTOTYPE:
1068 CODE: 1183 CODE:
1069 tc_restore (); 1184 tc_restore ();
1070 1185
1071CFPlus::Layout 1186DC::Layout
1072new (SV *class) 1187new (SV *class)
1073 CODE: 1188 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1189 New (0, RETVAL, 1, struct cf_layout);
1075 1190
1076 RETVAL->pl = pango_layout_new (opengl_context); 1191 RETVAL->pl = pango_layout_new (opengl_context);
1086 layout_update_font (RETVAL); 1201 layout_update_font (RETVAL);
1087 OUTPUT: 1202 OUTPUT:
1088 RETVAL 1203 RETVAL
1089 1204
1090void 1205void
1091DESTROY (CFPlus::Layout self) 1206DESTROY (DC::Layout self)
1092 CODE: 1207 CODE:
1093 g_object_unref (self->pl); 1208 g_object_unref (self->pl);
1094 rc_free (self->rc); 1209 rc_free (self->rc);
1095 Safefree (self); 1210 Safefree (self);
1096 1211
1097void 1212void
1098set_text (CFPlus::Layout self, SV *text_) 1213set_text (DC::Layout self, SV *text_)
1099 CODE: 1214 CODE:
1100{ 1215{
1101 STRLEN textlen; 1216 STRLEN textlen;
1102 char *text = SvPVutf8 (text_, textlen); 1217 char *text = SvPVutf8 (text_, textlen);
1103 1218
1104 pango_layout_set_text (self->pl, text, textlen); 1219 pango_layout_set_text (self->pl, text, textlen);
1105} 1220}
1106 1221
1107void 1222void
1108set_markup (CFPlus::Layout self, SV *text_) 1223set_markup (DC::Layout self, SV *text_)
1109 CODE: 1224 CODE:
1110{ 1225{
1111 STRLEN textlen; 1226 STRLEN textlen;
1112 char *text = SvPVutf8 (text_, textlen); 1227 char *text = SvPVutf8 (text_, textlen);
1113 1228
1114 pango_layout_set_markup (self->pl, text, textlen); 1229 pango_layout_set_markup (self->pl, text, textlen);
1115} 1230}
1116 1231
1117void 1232void
1118set_shapes (CFPlus::Layout self, ...) 1233set_shapes (DC::Layout self, ...)
1119 CODE: 1234 CODE:
1120{ 1235{
1121 PangoAttrList *attrs = 0; 1236 PangoAttrList *attrs = 0;
1122 const char *text = pango_layout_get_text (self->pl); 1237 const char *text = pango_layout_get_text (self->pl);
1123 const char *pos = text; 1238 const char *pos = text;
1158 if (attrs) 1273 if (attrs)
1159 pango_layout_set_attributes (self->pl, attrs); 1274 pango_layout_set_attributes (self->pl, attrs);
1160} 1275}
1161 1276
1162void 1277void
1163get_shapes (CFPlus::Layout self) 1278get_shapes (DC::Layout self)
1164 PPCODE: 1279 PPCODE:
1165{ 1280{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1281 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1282
1168 do 1283 do
1169 { 1284 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1285 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1286
1172 if (run && shape_attr_p (run)) 1287 if (run && shape_attr_p (run))
1173 { 1288 {
1174 PangoRectangle extents; 1289 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1290 pango_layout_iter_get_run_extents (iter, 0, &extents);
1183 1298
1184 pango_layout_iter_free (iter); 1299 pango_layout_iter_free (iter);
1185} 1300}
1186 1301
1187int 1302int
1188has_wrapped (CFPlus::Layout self) 1303has_wrapped (DC::Layout self)
1189 CODE: 1304 CODE:
1190{ 1305{
1191 int lines = 1; 1306 int lines = 1;
1192 const char *text = pango_layout_get_text (self->pl); 1307 const char *text = pango_layout_get_text (self->pl);
1193 1308
1198} 1313}
1199 OUTPUT: 1314 OUTPUT:
1200 RETVAL 1315 RETVAL
1201 1316
1202SV * 1317SV *
1203get_text (CFPlus::Layout self) 1318get_text (DC::Layout self)
1204 CODE: 1319 CODE:
1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1320 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206 sv_utf8_decode (RETVAL); 1321 sv_utf8_decode (RETVAL);
1207 OUTPUT: 1322 OUTPUT:
1208 RETVAL 1323 RETVAL
1209 1324
1210void 1325void
1211set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1326set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1212 CODE: 1327 CODE:
1213 self->r = r; 1328 self->r = r;
1214 self->g = g; 1329 self->g = g;
1215 self->b = b; 1330 self->b = b;
1216 self->a = a; 1331 self->a = a;
1217 1332
1218void 1333void
1219set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1334set_font (DC::Layout self, DC::Font font = 0)
1220 CODE: 1335 CODE:
1221 if (self->font != font) 1336 if (self->font != font)
1222 { 1337 {
1223 self->font = font; 1338 self->font = font;
1224 layout_update_font (self); 1339 layout_update_font (self);
1225 } 1340 }
1226 1341
1227void 1342void
1228set_height (CFPlus::Layout self, int base_height) 1343set_height (DC::Layout self, int base_height)
1229 CODE: 1344 CODE:
1230 if (self->base_height != base_height) 1345 if (self->base_height != base_height)
1231 { 1346 {
1232 self->base_height = base_height; 1347 self->base_height = base_height;
1233 layout_update_font (self); 1348 layout_update_font (self);
1234 } 1349 }
1235 1350
1236void 1351void
1237set_width (CFPlus::Layout self, int max_width = -1) 1352set_width (DC::Layout self, int max_width = -1)
1238 CODE: 1353 CODE:
1239 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1354 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1240 1355
1241void 1356void
1242set_indent (CFPlus::Layout self, int indent) 1357set_indent (DC::Layout self, int indent)
1243 CODE: 1358 CODE:
1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1359 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245 1360
1246void 1361void
1247set_spacing (CFPlus::Layout self, int spacing) 1362set_spacing (DC::Layout self, int spacing)
1248 CODE: 1363 CODE:
1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1364 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250 1365
1251void 1366void
1252set_ellipsise (CFPlus::Layout self, int ellipsise) 1367set_ellipsise (DC::Layout self, int ellipsise)
1253 CODE: 1368 CODE:
1254 pango_layout_set_ellipsize (self->pl, 1369 pango_layout_set_ellipsize (self->pl,
1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1370 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1371 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1372 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258 : PANGO_ELLIPSIZE_NONE 1373 : PANGO_ELLIPSIZE_NONE
1259 ); 1374 );
1260 1375
1261void 1376void
1262set_single_paragraph_mode (CFPlus::Layout self, int spm) 1377set_single_paragraph_mode (DC::Layout self, int spm)
1263 CODE: 1378 CODE:
1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1379 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265 1380
1266void 1381void
1267size (CFPlus::Layout self) 1382size (DC::Layout self)
1268 PPCODE: 1383 PPCODE:
1269{ 1384{
1270 int w, h; 1385 int w, h;
1271 1386
1272 layout_get_pixel_size (self, &w, &h); 1387 layout_get_pixel_size (self, &w, &h);
1275 PUSHs (sv_2mortal (newSViv (w))); 1390 PUSHs (sv_2mortal (newSViv (w)));
1276 PUSHs (sv_2mortal (newSViv (h))); 1391 PUSHs (sv_2mortal (newSViv (h)));
1277} 1392}
1278 1393
1279int 1394int
1280descent (CFPlus::Layout self) 1395descent (DC::Layout self)
1281 CODE: 1396 CODE:
1282{ 1397{
1283 PangoRectangle rect; 1398 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1399 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1400 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1401 RETVAL = PANGO_DESCENT (rect);
1287} 1402}
1288 OUTPUT: 1403 OUTPUT:
1289 RETVAL 1404 RETVAL
1290 1405
1291int 1406int
1292xy_to_index (CFPlus::Layout self, int x, int y) 1407xy_to_index (DC::Layout self, int x, int y)
1293 CODE: 1408 CODE:
1294{ 1409{
1295 int index, trailing; 1410 int index, trailing;
1296 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1411 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1297 RETVAL = index + trailing; 1412 RETVAL = index + trailing;
1298} 1413}
1299 OUTPUT: 1414 OUTPUT:
1300 RETVAL 1415 RETVAL
1301 1416
1302void 1417void
1303cursor_pos (CFPlus::Layout self, int index) 1418cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1419 PPCODE:
1305{ 1420{
1306 PangoRectangle strong_pos; 1421 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1422 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1423
1309 EXTEND (SP, 3); 1424 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1425 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1426 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1427 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1428}
1314 1429
1315void 1430void
1316index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1431index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1432 PPCODE:
1318{ 1433{
1319 int line, x; 1434 int line, x;
1320 1435
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1436 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1437#if !PANGO_VERSION_CHECK (1, 17, 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1438 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1439 --line;
1440#endif
1324 EXTEND (SP, 2); 1441 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1442 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1443 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1444}
1328 1445
1329void 1446void
1330line_x_to_index (CFPlus::Layout self, int line, int x) 1447line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1448 PPCODE:
1332{ 1449{
1333 PangoLayoutLine *lp; 1450 PangoLayoutLine *lp;
1334 int index, trailing; 1451 int index, trailing;
1335 1452
1336 if (line < 0) 1453 if (line < 0)
1337 XSRETURN_EMPTY; 1454 XSRETURN_EMPTY;
1338 1455
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1456 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1457 XSRETURN_EMPTY; /* do better */
1341 1458
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1459 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1460
1344 EXTEND (SP, 2); 1461 EXTEND (SP, 2);
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1467 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1468 }
1352} 1469}
1353 1470
1354void 1471void
1355render (CFPlus::Layout self, float x, float y, int flags = 0) 1472render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1473 CODE:
1357 rc_clear (self->rc); 1474 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1475 pango_opengl_render_layout_subpixel (
1359 self->pl, 1476 self->pl,
1360 self->rc, 1477 self->rc,
1365 // we assume that context_change actually clears/frees stuff 1482 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1483 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1484 pango_layout_context_changed (self->pl);
1368 1485
1369void 1486void
1370draw (CFPlus::Layout self) 1487draw (DC::Layout self)
1371 CODE: 1488 CODE:
1372{ 1489{
1373 glEnable (GL_TEXTURE_2D); 1490 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1491 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1492 glEnable (GL_BLEND);
1383 glDisable (GL_ALPHA_TEST); 1500 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1501 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1502 glDisable (GL_TEXTURE_2D);
1386} 1503}
1387 1504
1388MODULE = CFPlus PACKAGE = CFPlus::Texture 1505MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1506
1390PROTOTYPES: ENABLE 1507PROTOTYPES: ENABLE
1391 1508
1392void 1509void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1510pad (SV *data_, int ow, int oh, int nw, int nh)
1472 RETVAL = width > 0; 1589 RETVAL = width > 0;
1473} 1590}
1474 OUTPUT: 1591 OUTPUT:
1475 RETVAL 1592 RETVAL
1476 1593
1477MODULE = CFPlus PACKAGE = CFPlus::Map 1594MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1595
1479PROTOTYPES: DISABLE 1596PROTOTYPES: DISABLE
1480 1597
1481CFPlus::Map 1598DC::Map
1482new (SV *class) 1599new (SV *class)
1483 CODE: 1600 CODE:
1484 New (0, RETVAL, 1, struct map); 1601 New (0, RETVAL, 1, struct map);
1485 RETVAL->x = 0; 1602 RETVAL->x = 0;
1486 RETVAL->y = 0; 1603 RETVAL->y = 0;
1494 RETVAL->row = 0; 1611 RETVAL->row = 0;
1495 OUTPUT: 1612 OUTPUT:
1496 RETVAL 1613 RETVAL
1497 1614
1498void 1615void
1499DESTROY (CFPlus::Map self) 1616DESTROY (DC::Map self)
1500 CODE: 1617 CODE:
1501{ 1618{
1502 map_clear (self); 1619 map_clear (self);
1503 Safefree (self->face2tile); 1620 Safefree (self->face2tile);
1504 Safefree (self->tex); 1621 Safefree (self->tex);
1505 Safefree (self); 1622 Safefree (self);
1506} 1623}
1507 1624
1508void 1625void
1509resize (CFPlus::Map self, int map_width, int map_height) 1626resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1627 CODE:
1511 self->w = map_width; 1628 self->w = map_width;
1512 self->h = map_height; 1629 self->h = map_height;
1513 1630
1514void 1631void
1515clear (CFPlus::Map self) 1632clear (DC::Map self)
1516 CODE: 1633 CODE:
1517 map_clear (self); 1634 map_clear (self);
1518 1635
1519void 1636void
1520set_tileid (CFPlus::Map self, int face, int tile) 1637set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1638 CODE:
1522{ 1639{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1640 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1641 need_texid (self, tile);
1525} 1642}
1526 1643
1527void 1644void
1528set_smooth (CFPlus::Map self, int face, int smooth, int level) 1645set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1646 CODE:
1530{ 1647{
1531 tileid texid; 1648 tileid texid;
1532 maptex *tex; 1649 maptex *tex;
1533 1650
1546 tex->smoothtile = self->face2tile [smooth]; 1663 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1664 tex->smoothlevel = level;
1548} 1665}
1549 1666
1550void 1667void
1551set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1668set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1552 CODE: 1669 CODE:
1553{ 1670{
1554 need_texid (self, texid); 1671 need_texid (self, texid);
1555 1672
1556 { 1673 {
1576 // from transparent color bleeding and ugly wrapping effects. 1693 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1694 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1695}
1579 1696
1580int 1697int
1581ox (CFPlus::Map self) 1698ox (DC::Map self)
1582 ALIAS: 1699 ALIAS:
1583 oy = 1 1700 oy = 1
1584 x = 2 1701 x = 2
1585 y = 3 1702 y = 3
1586 w = 4 1703 w = 4
1597 } 1714 }
1598 OUTPUT: 1715 OUTPUT:
1599 RETVAL 1716 RETVAL
1600 1717
1601void 1718void
1602scroll (CFPlus::Map self, int dx, int dy) 1719scroll (DC::Map self, int dx, int dy)
1603 CODE: 1720 CODE:
1604{ 1721{
1605 if (dx > 0) 1722 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 1723 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 1724 else if (dx < 0)
1623 self->y += MAP_EXTEND_Y; 1740 self->y += MAP_EXTEND_Y;
1624 } 1741 }
1625} 1742}
1626 1743
1627SV * 1744SV *
1628map1a_update (CFPlus::Map self, SV *data_, int extmap) 1745map1a_update (DC::Map self, SV *data_, int extmap)
1629 CODE: 1746 CODE:
1630{ 1747{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1748 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 1749 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 1750 mapcell *cell;
1661 uint8_t ext, cmd; 1778 uint8_t ext, cmd;
1662 1779
1663 do 1780 do
1664 { 1781 {
1665 ext = *data++; 1782 ext = *data++;
1666 cmd = ext & 0x3f; 1783 cmd = ext & 0x7f;
1667 1784
1668 if (cmd < 4) 1785 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 1786 cell->darkness = 255 - ext * 64 + 1;
1670 else if (cmd == 5) // health 1787 else if (cmd == 5) // health
1671 { 1788 {
1674 } 1791 }
1675 else if (cmd == 6) // monster width 1792 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 1793 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 1794 else if (cmd == 0x47)
1678 { 1795 {
1679 if (*data == 4) 1796 if (*data == 1) cell->player = data [1];
1680 ; // decode player count 1797 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1798 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1799 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1681 1800
1682 data += *data + 1; 1801 data += *data + 1;
1683 } 1802 }
1684 else if (cmd == 8) // cell flags 1803 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 1804 cell->flags = *data++;
1715 } 1834 }
1716 } 1835 }
1717 } 1836 }
1718 } 1837 }
1719 else 1838 else
1720 cell->darkness = 0; 1839 CELL_CLEAR (cell);
1721 } 1840 }
1722} 1841}
1723 OUTPUT: 1842 OUTPUT:
1724 RETVAL 1843 RETVAL
1725 1844
1726SV * 1845SV *
1727mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1846mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 1847 CODE:
1729{ 1848{
1730 int x1, x; 1849 int x1, x;
1731 int y1, y; 1850 int y1, y;
1732 int z; 1851 int z;
1777} 1896}
1778 OUTPUT: 1897 OUTPUT:
1779 RETVAL 1898 RETVAL
1780 1899
1781void 1900void
1782draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1901draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1783 CODE: 1902 CODE:
1784{ 1903{
1785 int x, y, z; 1904 int x, y, z;
1786 1905
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1906 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1907 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1789 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1908 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790 smooth_key skey; 1909 smooth_key skey;
1791 1910 int pl_x, pl_y;
1911 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 1912 rc_t *rc = rc_alloc ();
1793 rc_key_t key; 1913 rc_key_t key;
1794 rc_array_t *arr; 1914 rc_array_t *arr;
1915
1916 pl_tex.name = 0;
1795 1917
1796 // thats current max. sorry. 1918 // thats current max. sorry.
1797 if (sw > 255) sw = 255; 1919 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 1920 if (sh > 255) sh = 255;
1799 1921
1854 tileid tile = cell->tile [z]; 1976 tileid tile = cell->tile [z];
1855 1977
1856 if (tile) 1978 if (tile)
1857 { 1979 {
1858 maptex tex = self->tex [tile]; 1980 maptex tex = self->tex [tile];
1859 int px, py; 1981 int px = (x + 1) * T - tex.w;
1982 int py = (y + 1) * T - tex.h;
1860 1983
1861 if (key.texname != tex.name) 1984 if (key.texname != tex.name)
1862 { 1985 {
1863 if (!tex.name) 1986 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 1987 tex = self->tex [2]; /* missing, replace by noface */
1865 1988
1866 key.texname = tex.name; 1989 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 1990 arr = rc_array (rc, &key);
1868 } 1991 }
1869 1992
1870 px = (x + 1) * T - tex.w; 1993 if (expect_false (cell->player == player) && expect_false (z == 2))
1871 py = (y + 1) * T - tex.h; 1994 {
1995 pl_x = px;
1996 pl_y = py;
1997 pl_tex = tex;
1998 continue;
1999 }
1872 2000
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2002 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1875 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2003 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1876 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2004 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877 2005
1878 if (cell->flags && z == 2) 2006 if (expect_false (cell->flags) && expect_false (z == 2))
1879 { 2007 {
1880 // overlays such as the speech bubble, probably more to come 2008 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1) 2009 if (cell->flags & 1)
1882 { 2010 {
1883 maptex tex = self->tex [1]; 2011 maptex tex = self->tex [1];
2022 } 2150 }
2023 2151
2024 hv_clear (smooth); 2152 hv_clear (smooth);
2025 } 2153 }
2026 2154
2155 if (pl_tex.name)
2156 {
2157 maptex tex = pl_tex;
2158 int px = pl_x + sdx;
2159 int py = pl_y + sdy;
2160
2161 key.texname = tex.name;
2162 arr = rc_array (rc, &key);
2163
2164 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2165 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2166 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2167 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2168
2169 rc_draw (rc);
2170 }
2171
2027 glDisable (GL_BLEND); 2172 glDisable (GL_BLEND);
2028 rc_free (rc); 2173 rc_free (rc);
2029 2174
2030 // top layer: overlays such as the health bar 2175 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2176 for (y = 0; y < sh; y++)
2058 } 2203 }
2059 } 2204 }
2060} 2205}
2061 2206
2062void 2207void
2063draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2208draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2064 CODE: 2209 CODE:
2065{ 2210{
2066 static float color[16][3] = { 2211 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2212 { 0.00F, 0.00F, 0.00F },
2068 { 1.00F, 1.00F, 1.00F }, 2213 { 1.00F, 1.00F, 1.00F },
2118 glDisable (GL_BLEND); 2263 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2264 glDisable (GL_TEXTURE_2D);
2120} 2265}
2121 2266
2122void 2267void
2123fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2268fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124 PPCODE: 2269 PPCODE:
2125{ 2270{
2126 int x, y; 2271 int x, y;
2127 int sw1 = sw + 2; 2272 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2273 int sh1 = sh + 2;
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2281 SvCUR_set (darkness3_sv, sw34 * sh3);
2137 2282
2138 mx += self->x - 1; 2283 mx += self->x - 1;
2139 my += self->y - 1; 2284 my += self->y - 1;
2140 2285
2141 memset (darkness1, 255, sw1 * sh1); 2286 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2142 2287
2143 for (y = 0; y < sh1; y++) 2288 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2289 if (0 <= y + my && y + my < self->rows)
2145 { 2290 {
2146 maprow *row = self->row + (y + my); 2291 maprow *row = self->row + (y + my);
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2344 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2345 PUSHs (darkness3_sv);
2201} 2346}
2202 2347
2203SV * 2348SV *
2204get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2349get_rect (DC::Map self, int x0, int y0, int w, int h)
2205 CODE: 2350 CODE:
2206{ 2351{
2207 int x, y, x1, y1; 2352 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2353 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2354 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2266 else 2411 else
2267 *data++ = 0; 2412 *data++ = 0;
2268 } 2413 }
2269 } 2414 }
2270 2415
2416 /* if size is w*h + 5 then no data has been found */
2417 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2418 {
2271 SvPOK_only (data_sv); 2419 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2420 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2421 }
2422
2273 RETVAL = data_sv; 2423 RETVAL = data_sv;
2274} 2424}
2275 OUTPUT: 2425 OUTPUT:
2276 RETVAL 2426 RETVAL
2277 2427
2278void 2428void
2279set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2429set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2430 PPCODE:
2281{ 2431{
2282 int x, y, z; 2432 int x, y, z;
2283 int w, h; 2433 int w, h;
2284 int x1, y1; 2434 int x1, y1;
2435 STRLEN len;
2436 uint8_t *data, *end;
2437
2438 len = SvLEN (data_sv);
2439 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2440 data = SvPVbyte_nolen (data_sv);
2441 end = data + len + 8;
2442
2443 if (len < 5)
2444 XSRETURN_EMPTY;
2285 2445
2286 if (*data++ != 0) 2446 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2447 XSRETURN_EMPTY; /* version mismatch */
2288 2448
2289 w = *data++ << 8; w |= *data++; 2449 w = *data++ << 8; w |= *data++;
2304 { 2464 {
2305 maprow *row = map_get_row (self, y); 2465 maprow *row = map_get_row (self, y);
2306 2466
2307 for (x = x0; x < x1; x++) 2467 for (x = x0; x < x1; x++)
2308 { 2468 {
2469 uint8_t flags;
2470
2471 if (data + 7 >= end)
2472 XSRETURN_EMPTY;
2473
2309 uint8_t flags = *data++; 2474 flags = *data++;
2310 2475
2311 if (flags) 2476 if (flags)
2312 { 2477 {
2313 mapcell *cell = row_get_cell (row, x); 2478 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2479 tileid tile[3] = { 0, 0, 0 };
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2482 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2483 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2484
2320 if (cell->darkness == 0) 2485 if (cell->darkness == 0)
2321 { 2486 {
2322 cell->darkness = 0; 2487 /*cell->darkness = 0;*/
2488 EXTEND (SP, 3);
2323 2489
2324 for (z = 0; z <= 2; z++) 2490 for (z = 0; z <= 2; z++)
2325 { 2491 {
2326 tileid t = tile [z]; 2492 tileid t = tile [z];
2327 2493
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2494 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2495 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2496 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2497 need_texid (self, t);
2332 } 2498 }
2333 2499
2334 cell->tile [z] = t; 2500 cell->tile [z] = t;
2335 } 2501 }
2337 } 2503 }
2338 } 2504 }
2339 } 2505 }
2340} 2506}
2341 2507
2342MODULE = CFPlus PACKAGE = CFPlus::RW 2508MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2509
2344CFPlus::RW 2510DC::RW
2345new (SV *class, SV *data_sv) 2511new (SV *class, SV *data_sv)
2346 CODE: 2512 CODE:
2347{ 2513{
2348 STRLEN datalen; 2514 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2515 char *data = SvPVbyte (data_sv, datalen);
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2517 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2518}
2353 OUTPUT: 2519 OUTPUT:
2354 RETVAL 2520 RETVAL
2355 2521
2356CFPlus::RW 2522DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2523new_from_file (SV *class, const char *path, const char *mode = "rb")
2358 CODE: 2524 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2525 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2526 OUTPUT:
2361 RETVAL 2527 RETVAL
2362 2528
2363# fails on win32: 2529# fails on win32:
2364# CFPlus.xs(2268) : error C2059: syntax error : '(' 2530# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2531#void
2366#close (CFPlus::RW self) 2532#close (DC::RW self)
2367# CODE: 2533# CODE:
2368# (self->(close)) (self); 2534# (self->(close)) (self);
2369 2535
2370MODULE = CFPlus PACKAGE = CFPlus::Channel 2536MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2537
2372PROTOTYPES: DISABLE 2538PROTOTYPES: DISABLE
2373 2539
2374CFPlus::Channel 2540DC::Channel
2375find () 2541find ()
2376 CODE: 2542 CODE:
2377{ 2543{
2378 RETVAL = Mix_GroupAvailable (-1); 2544 RETVAL = Mix_GroupAvailable (-1);
2379 2545
2392} 2558}
2393 OUTPUT: 2559 OUTPUT:
2394 RETVAL 2560 RETVAL
2395 2561
2396void 2562void
2397halt (CFPlus::Channel self) 2563halt (DC::Channel self)
2398 CODE: 2564 CODE:
2399 Mix_HaltChannel (self); 2565 Mix_HaltChannel (self);
2400 2566
2401void 2567void
2402expire (CFPlus::Channel self, int ticks = -1) 2568expire (DC::Channel self, int ticks = -1)
2403 CODE: 2569 CODE:
2404 Mix_ExpireChannel (self, ticks); 2570 Mix_ExpireChannel (self, ticks);
2405 2571
2406void 2572void
2407fade_out (CFPlus::Channel self, int ticks = -1) 2573fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2574 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2575 Mix_FadeOutChannel (self, ticks);
2410 2576
2411int 2577int
2412volume (CFPlus::Channel self, int volume) 2578volume (DC::Channel self, int volume)
2413 CODE: 2579 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2580 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2581 OUTPUT:
2416 RETVAL 2582 RETVAL
2417 2583
2418void 2584void
2419unregister_all_effects (CFPlus::Channel self) 2585unregister_all_effects (DC::Channel self)
2420 CODE: 2586 CODE:
2421 Mix_UnregisterAllEffects (self); 2587 Mix_UnregisterAllEffects (self);
2422 2588
2423void 2589void
2424set_panning (CFPlus::Channel self, int left, int right) 2590set_panning (DC::Channel self, int left, int right)
2425 CODE: 2591 CODE:
2426 left = CLAMP (left , 0, 255); 2592 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2593 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2594 Mix_SetPanning (self, left, right);
2429 2595
2430void 2596void
2431set_distance (CFPlus::Channel self, int distance) 2597set_distance (DC::Channel self, int distance)
2432 CODE: 2598 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2599 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2600
2435void 2601void
2436set_position (CFPlus::Channel self, int angle, int distance) 2602set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2603 CODE:
2438 2604
2439void 2605void
2440set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2606set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2607 CODE:
2442{ 2608{
2443 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2609 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2444 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2610 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2611 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2612}
2447 2613
2448void 2614void
2449set_reverse_stereo (CFPlus::Channel self, int flip) 2615set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2616 CODE:
2451 Mix_SetReverseStereo (self, flip); 2617 Mix_SetReverseStereo (self, flip);
2452 2618
2453MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2619MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2620
2455PROTOTYPES: DISABLE 2621PROTOTYPES: DISABLE
2456 2622
2457CFPlus::MixChunk 2623DC::MixChunk
2458new (SV *class, CFPlus::RW rwops) 2624new (SV *class, DC::RW rwops)
2459 CODE: 2625 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2626 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2627 OUTPUT:
2462 RETVAL 2628 RETVAL
2463 2629
2464void 2630void
2465DESTROY (CFPlus::MixChunk self) 2631DESTROY (DC::MixChunk self)
2466 CODE: 2632 CODE:
2467 Mix_FreeChunk (self); 2633 Mix_FreeChunk (self);
2468 2634
2469int 2635int
2470volume (CFPlus::MixChunk self, int volume = -1) 2636volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2637 CODE:
2472 if (items > 1) 2638 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2639 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2640 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2641 OUTPUT:
2476 RETVAL 2642 RETVAL
2477 2643
2478CFPlus::Channel 2644DC::Channel
2479play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2645play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480 CODE: 2646 CODE:
2481{ 2647{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2648 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 2649
2484 if (RETVAL < 0) 2650 if (RETVAL < 0)
2491 } 2657 }
2492} 2658}
2493 OUTPUT: 2659 OUTPUT:
2494 RETVAL 2660 RETVAL
2495 2661
2496MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2662MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497 2663
2498int 2664int
2499volume (int volume = -1) 2665volume (int volume = -1)
2500 PROTOTYPE: ;$ 2666 PROTOTYPE: ;$
2501 CODE: 2667 CODE:
2513void 2679void
2514halt () 2680halt ()
2515 CODE: 2681 CODE:
2516 Mix_HaltMusic (); 2682 Mix_HaltMusic ();
2517 2683
2518CFPlus::MixMusic 2684DC::MixMusic
2519new (SV *class, CFPlus::RW rwops) 2685new (SV *class, DC::RW rwops)
2520 CODE: 2686 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 2687 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 2688 OUTPUT:
2523 RETVAL 2689 RETVAL
2524 2690
2525void 2691void
2526DESTROY (CFPlus::MixMusic self) 2692DESTROY (DC::MixMusic self)
2527 CODE: 2693 CODE:
2528 Mix_FreeMusic (self); 2694 Mix_FreeMusic (self);
2529 2695
2530int 2696int
2531play (CFPlus::MixMusic self, int loops = -1) 2697play (DC::MixMusic self, int loops = -1)
2532 CODE: 2698 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 2699 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 2700 OUTPUT:
2535 RETVAL 2701 RETVAL
2536 2702
2537void 2703void
2538fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2704fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 2705 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 2706 Mix_FadeInMusicPos (self, loops, ms, position);
2541 2707
2542MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2708MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 2709
2544PROTOTYPES: ENABLE 2710PROTOTYPES: ENABLE
2545 2711
2546BOOT: 2712BOOT:
2547{ 2713{
2548 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2714 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 2715 static const struct {
2550 const char *name; 2716 const char *name;
2551 IV iv; 2717 IV iv;
2552 } *civ, const_iv[] = { 2718 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 2719# define const_iv(name) { # name, (IV)name }
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3012void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 3013 CODE:
2848 if (gl.SeparableFilter2D) 3014 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3015 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3016
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3017void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 3018
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3019void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 3020
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3021void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3022
2882 3048
2883void glEndList () 3049void glEndList ()
2884 3050
2885void glCallList (int list) 3051void glCallList (int list)
2886 3052
2887MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3053MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 3054
2889PROTOTYPES: DISABLE 3055PROTOTYPES: DISABLE
2890 3056
2891void 3057void
2892find_widget (SV *self, NV x, NV y) 3058find_widget (SV *self, NV x, NV y)
2896 XPUSHs (self); 3062 XPUSHs (self);
2897} 3063}
2898 3064
2899BOOT: 3065BOOT:
2900{ 3066{
2901 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3067 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 3068
2903 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3069 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2904 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3070 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2905 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3071 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2906 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3072 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907} 3073}
2908 3074
2909void 3075void
2910draw (SV *self) 3076draw (SV *self)
2911 CODE: 3077 CODE:
2918 SV *draw_w_sv = GvSV (draw_w_gv); 3084 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 3085 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 3086 double draw_x, draw_y;
2921 3087
2922 if (!SvROK (self)) 3088 if (!SvROK (self))
2923 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3089 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 3090
2925 hv = (HV *)SvRV (self); 3091 hv = (HV *)SvRV (self);
2926 3092
2927 if (SvTYPE (hv) != SVt_PVHV) 3093 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3094 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 3095
2930 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3096 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2931 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3097 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932 3098
2933 if (!h || !w) 3099 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines