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.238 by root, Sat Nov 3 12:08:43 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
1060reset_glyph_cache () 1175glyph_cache_backup ()
1061 PROTOTYPE: 1176 PROTOTYPE:
1062 CODE: 1177 CODE:
1178 tc_backup ();
1179
1180void
1181glyph_cache_restore ()
1182 PROTOTYPE:
1183 CODE:
1063 tc_clear (); 1184 tc_restore ();
1064 1185
1065CFPlus::Layout 1186DC::Layout
1066new (SV *class) 1187new (SV *class)
1067 CODE: 1188 CODE:
1068 New (0, RETVAL, 1, struct cf_layout); 1189 New (0, RETVAL, 1, struct cf_layout);
1069 1190
1070 RETVAL->pl = pango_layout_new (opengl_context); 1191 RETVAL->pl = pango_layout_new (opengl_context);
1080 layout_update_font (RETVAL); 1201 layout_update_font (RETVAL);
1081 OUTPUT: 1202 OUTPUT:
1082 RETVAL 1203 RETVAL
1083 1204
1084void 1205void
1085DESTROY (CFPlus::Layout self) 1206DESTROY (DC::Layout self)
1086 CODE: 1207 CODE:
1087 g_object_unref (self->pl); 1208 g_object_unref (self->pl);
1088 rc_free (self->rc); 1209 rc_free (self->rc);
1089 Safefree (self); 1210 Safefree (self);
1090 1211
1091void 1212void
1092set_text (CFPlus::Layout self, SV *text_) 1213set_text (DC::Layout self, SV *text_)
1093 CODE: 1214 CODE:
1094{ 1215{
1095 STRLEN textlen; 1216 STRLEN textlen;
1096 char *text = SvPVutf8 (text_, textlen); 1217 char *text = SvPVutf8 (text_, textlen);
1097 1218
1098 pango_layout_set_text (self->pl, text, textlen); 1219 pango_layout_set_text (self->pl, text, textlen);
1099} 1220}
1100 1221
1101void 1222void
1102set_markup (CFPlus::Layout self, SV *text_) 1223set_markup (DC::Layout self, SV *text_)
1103 CODE: 1224 CODE:
1104{ 1225{
1105 STRLEN textlen; 1226 STRLEN textlen;
1106 char *text = SvPVutf8 (text_, textlen); 1227 char *text = SvPVutf8 (text_, textlen);
1107 1228
1108 pango_layout_set_markup (self->pl, text, textlen); 1229 pango_layout_set_markup (self->pl, text, textlen);
1109} 1230}
1110 1231
1111void 1232void
1112set_shapes (CFPlus::Layout self, ...) 1233set_shapes (DC::Layout self, ...)
1113 CODE: 1234 CODE:
1114{ 1235{
1115 PangoAttrList *attrs = 0; 1236 PangoAttrList *attrs = 0;
1116 const char *text = pango_layout_get_text (self->pl); 1237 const char *text = pango_layout_get_text (self->pl);
1117 const char *pos = text; 1238 const char *pos = text;
1152 if (attrs) 1273 if (attrs)
1153 pango_layout_set_attributes (self->pl, attrs); 1274 pango_layout_set_attributes (self->pl, attrs);
1154} 1275}
1155 1276
1156void 1277void
1157get_shapes (CFPlus::Layout self) 1278get_shapes (DC::Layout self)
1158 PPCODE: 1279 PPCODE:
1159{ 1280{
1160 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1281 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161 1282
1162 do 1283 do
1163 { 1284 {
1164 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1285 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165 1286
1166 if (run && shape_attr_p (run)) 1287 if (run && shape_attr_p (run))
1167 { 1288 {
1168 PangoRectangle extents; 1289 PangoRectangle extents;
1169 pango_layout_iter_get_run_extents (iter, 0, &extents); 1290 pango_layout_iter_get_run_extents (iter, 0, &extents);
1177 1298
1178 pango_layout_iter_free (iter); 1299 pango_layout_iter_free (iter);
1179} 1300}
1180 1301
1181int 1302int
1182has_wrapped (CFPlus::Layout self) 1303has_wrapped (DC::Layout self)
1183 CODE: 1304 CODE:
1184{ 1305{
1185 int lines = 1; 1306 int lines = 1;
1186 const char *text = pango_layout_get_text (self->pl); 1307 const char *text = pango_layout_get_text (self->pl);
1187 1308
1192} 1313}
1193 OUTPUT: 1314 OUTPUT:
1194 RETVAL 1315 RETVAL
1195 1316
1196SV * 1317SV *
1197get_text (CFPlus::Layout self) 1318get_text (DC::Layout self)
1198 CODE: 1319 CODE:
1199 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1320 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200 sv_utf8_decode (RETVAL); 1321 sv_utf8_decode (RETVAL);
1201 OUTPUT: 1322 OUTPUT:
1202 RETVAL 1323 RETVAL
1203 1324
1204void 1325void
1205set_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.)
1206 CODE: 1327 CODE:
1207 self->r = r; 1328 self->r = r;
1208 self->g = g; 1329 self->g = g;
1209 self->b = b; 1330 self->b = b;
1210 self->a = a; 1331 self->a = a;
1211 1332
1212void 1333void
1213set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1334set_font (DC::Layout self, DC::Font font = 0)
1214 CODE: 1335 CODE:
1215 if (self->font != font) 1336 if (self->font != font)
1216 { 1337 {
1217 self->font = font; 1338 self->font = font;
1218 layout_update_font (self); 1339 layout_update_font (self);
1219 } 1340 }
1220 1341
1221void 1342void
1222set_height (CFPlus::Layout self, int base_height) 1343set_height (DC::Layout self, int base_height)
1223 CODE: 1344 CODE:
1224 if (self->base_height != base_height) 1345 if (self->base_height != base_height)
1225 { 1346 {
1226 self->base_height = base_height; 1347 self->base_height = base_height;
1227 layout_update_font (self); 1348 layout_update_font (self);
1228 } 1349 }
1229 1350
1230void 1351void
1231set_width (CFPlus::Layout self, int max_width = -1) 1352set_width (DC::Layout self, int max_width = -1)
1232 CODE: 1353 CODE:
1233 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);
1234 1355
1235void 1356void
1236set_indent (CFPlus::Layout self, int indent) 1357set_indent (DC::Layout self, int indent)
1237 CODE: 1358 CODE:
1238 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1359 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239 1360
1240void 1361void
1241set_spacing (CFPlus::Layout self, int spacing) 1362set_spacing (DC::Layout self, int spacing)
1242 CODE: 1363 CODE:
1243 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1364 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244 1365
1245void 1366void
1246set_ellipsise (CFPlus::Layout self, int ellipsise) 1367set_ellipsise (DC::Layout self, int ellipsise)
1247 CODE: 1368 CODE:
1248 pango_layout_set_ellipsize (self->pl, 1369 pango_layout_set_ellipsize (self->pl,
1249 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1370 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1371 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1372 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252 : PANGO_ELLIPSIZE_NONE 1373 : PANGO_ELLIPSIZE_NONE
1253 ); 1374 );
1254 1375
1255void 1376void
1256set_single_paragraph_mode (CFPlus::Layout self, int spm) 1377set_single_paragraph_mode (DC::Layout self, int spm)
1257 CODE: 1378 CODE:
1258 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1379 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259 1380
1260void 1381void
1261size (CFPlus::Layout self) 1382size (DC::Layout self)
1262 PPCODE: 1383 PPCODE:
1263{ 1384{
1264 int w, h; 1385 int w, h;
1265 1386
1266 layout_get_pixel_size (self, &w, &h); 1387 layout_get_pixel_size (self, &w, &h);
1269 PUSHs (sv_2mortal (newSViv (w))); 1390 PUSHs (sv_2mortal (newSViv (w)));
1270 PUSHs (sv_2mortal (newSViv (h))); 1391 PUSHs (sv_2mortal (newSViv (h)));
1271} 1392}
1272 1393
1273int 1394int
1274descent (CFPlus::Layout self) 1395descent (DC::Layout self)
1275 CODE: 1396 CODE:
1276{ 1397{
1277 PangoRectangle rect; 1398 PangoRectangle rect;
1278 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1399 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279 pango_layout_line_get_pixel_extents (line, 0, &rect); 1400 pango_layout_line_get_pixel_extents (line, 0, &rect);
1280 RETVAL = PANGO_DESCENT (rect); 1401 RETVAL = PANGO_DESCENT (rect);
1281} 1402}
1282 OUTPUT: 1403 OUTPUT:
1283 RETVAL 1404 RETVAL
1284 1405
1285int 1406int
1286xy_to_index (CFPlus::Layout self, int x, int y) 1407xy_to_index (DC::Layout self, int x, int y)
1287 CODE: 1408 CODE:
1288{ 1409{
1289 int index, trailing; 1410 int index, trailing;
1290 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);
1291 RETVAL = index + trailing; 1412 RETVAL = index + trailing;
1292} 1413}
1293 OUTPUT: 1414 OUTPUT:
1294 RETVAL 1415 RETVAL
1295 1416
1296void 1417void
1297cursor_pos (CFPlus::Layout self, int index) 1418cursor_pos (DC::Layout self, int index)
1298 PPCODE: 1419 PPCODE:
1299{ 1420{
1300 PangoRectangle strong_pos; 1421 PangoRectangle pos;
1301 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1422 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302 1423
1303 EXTEND (SP, 3); 1424 EXTEND (SP, 3);
1304 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1425 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1426 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1427 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307} 1428}
1308 1429
1309void 1430void
1310index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1431index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311 PPCODE: 1432 PPCODE:
1312{ 1433{
1313 int line, x; 1434 int line, x;
1314 1435
1315 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)
1316 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1438 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317 1439 --line;
1440#endif
1318 EXTEND (SP, 2); 1441 EXTEND (SP, 2);
1319 PUSHs (sv_2mortal (newSViv (line - 1))); 1442 PUSHs (sv_2mortal (newSViv (line)));
1320 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1443 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321} 1444}
1322 1445
1323void 1446void
1324line_x_to_index (CFPlus::Layout self, int line, int x) 1447line_x_to_index (DC::Layout self, int line, int x)
1325 PPCODE: 1448 PPCODE:
1326{ 1449{
1327 PangoLayoutLine *lp; 1450 PangoLayoutLine *lp;
1328 int index, trailing; 1451 int index, trailing;
1329 1452
1330 if (line < 0) 1453 if (line < 0)
1331 XSRETURN_EMPTY; 1454 XSRETURN_EMPTY;
1332 1455
1333 if (!(lp = pango_layout_get_line (self->pl, line))) 1456 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334 XSRETURN_EMPTY; /* do better */ 1457 XSRETURN_EMPTY; /* do better */
1335 1458
1336 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);
1337 1460
1338 EXTEND (SP, 2); 1461 EXTEND (SP, 2);
1344 PUSHs (sv_2mortal (newSViv (trailing))); 1467 PUSHs (sv_2mortal (newSViv (trailing)));
1345 } 1468 }
1346} 1469}
1347 1470
1348void 1471void
1349render (CFPlus::Layout self, float x, float y, int flags = 0) 1472render (DC::Layout self, float x, float y, int flags = 0)
1350 CODE: 1473 CODE:
1351 rc_clear (self->rc); 1474 rc_clear (self->rc);
1352 pango_opengl_render_layout_subpixel ( 1475 pango_opengl_render_layout_subpixel (
1353 self->pl, 1476 self->pl,
1354 self->rc, 1477 self->rc,
1359 // we assume that context_change actually clears/frees stuff 1482 // we assume that context_change actually clears/frees stuff
1360 // and does not do any recomputation... 1483 // and does not do any recomputation...
1361 pango_layout_context_changed (self->pl); 1484 pango_layout_context_changed (self->pl);
1362 1485
1363void 1486void
1364draw (CFPlus::Layout self) 1487draw (DC::Layout self)
1365 CODE: 1488 CODE:
1366{ 1489{
1367 glEnable (GL_TEXTURE_2D); 1490 glEnable (GL_TEXTURE_2D);
1368 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1491 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369 glEnable (GL_BLEND); 1492 glEnable (GL_BLEND);
1377 glDisable (GL_ALPHA_TEST); 1500 glDisable (GL_ALPHA_TEST);
1378 glDisable (GL_BLEND); 1501 glDisable (GL_BLEND);
1379 glDisable (GL_TEXTURE_2D); 1502 glDisable (GL_TEXTURE_2D);
1380} 1503}
1381 1504
1382MODULE = CFPlus PACKAGE = CFPlus::Texture 1505MODULE = Deliantra::Client PACKAGE = DC::Texture
1383 1506
1384PROTOTYPES: ENABLE 1507PROTOTYPES: ENABLE
1385 1508
1386void 1509void
1387pad (SV *data_, int ow, int oh, int nw, int nh) 1510pad (SV *data_, int ow, int oh, int nw, int nh)
1466 RETVAL = width > 0; 1589 RETVAL = width > 0;
1467} 1590}
1468 OUTPUT: 1591 OUTPUT:
1469 RETVAL 1592 RETVAL
1470 1593
1471MODULE = CFPlus PACKAGE = CFPlus::Map 1594MODULE = Deliantra::Client PACKAGE = DC::Map
1472 1595
1473PROTOTYPES: DISABLE 1596PROTOTYPES: DISABLE
1474 1597
1475CFPlus::Map 1598DC::Map
1476new (SV *class) 1599new (SV *class)
1477 CODE: 1600 CODE:
1478 New (0, RETVAL, 1, struct map); 1601 New (0, RETVAL, 1, struct map);
1479 RETVAL->x = 0; 1602 RETVAL->x = 0;
1480 RETVAL->y = 0; 1603 RETVAL->y = 0;
1488 RETVAL->row = 0; 1611 RETVAL->row = 0;
1489 OUTPUT: 1612 OUTPUT:
1490 RETVAL 1613 RETVAL
1491 1614
1492void 1615void
1493DESTROY (CFPlus::Map self) 1616DESTROY (DC::Map self)
1494 CODE: 1617 CODE:
1495{ 1618{
1496 map_clear (self); 1619 map_clear (self);
1497 Safefree (self->face2tile); 1620 Safefree (self->face2tile);
1498 Safefree (self->tex); 1621 Safefree (self->tex);
1499 Safefree (self); 1622 Safefree (self);
1500} 1623}
1501 1624
1502void 1625void
1503resize (CFPlus::Map self, int map_width, int map_height) 1626resize (DC::Map self, int map_width, int map_height)
1504 CODE: 1627 CODE:
1505 self->w = map_width; 1628 self->w = map_width;
1506 self->h = map_height; 1629 self->h = map_height;
1507 1630
1508void 1631void
1509clear (CFPlus::Map self) 1632clear (DC::Map self)
1510 CODE: 1633 CODE:
1511 map_clear (self); 1634 map_clear (self);
1512 1635
1513void 1636void
1514set_tileid (CFPlus::Map self, int face, int tile) 1637set_tileid (DC::Map self, int face, int tile)
1515 CODE: 1638 CODE:
1516{ 1639{
1517 need_facenum (self, face); self->face2tile [face] = tile; 1640 need_facenum (self, face); self->face2tile [face] = tile;
1518 need_texid (self, tile); 1641 need_texid (self, tile);
1519} 1642}
1520 1643
1521void 1644void
1522set_smooth (CFPlus::Map self, int face, int smooth, int level) 1645set_smooth (DC::Map self, int face, int smooth, int level)
1523 CODE: 1646 CODE:
1524{ 1647{
1525 tileid texid; 1648 tileid texid;
1526 maptex *tex; 1649 maptex *tex;
1527 1650
1540 tex->smoothtile = self->face2tile [smooth]; 1663 tex->smoothtile = self->face2tile [smooth];
1541 tex->smoothlevel = level; 1664 tex->smoothlevel = level;
1542} 1665}
1543 1666
1544void 1667void
1545set_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)
1546 CODE: 1669 CODE:
1547{ 1670{
1548 need_texid (self, texid); 1671 need_texid (self, texid);
1549 1672
1550 { 1673 {
1570 // from transparent color bleeding and ugly wrapping effects. 1693 // from transparent color bleeding and ugly wrapping effects.
1571 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1694 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572} 1695}
1573 1696
1574int 1697int
1575ox (CFPlus::Map self) 1698ox (DC::Map self)
1576 ALIAS: 1699 ALIAS:
1577 oy = 1 1700 oy = 1
1578 x = 2 1701 x = 2
1579 y = 3 1702 y = 3
1580 w = 4 1703 w = 4
1591 } 1714 }
1592 OUTPUT: 1715 OUTPUT:
1593 RETVAL 1716 RETVAL
1594 1717
1595void 1718void
1596scroll (CFPlus::Map self, int dx, int dy) 1719scroll (DC::Map self, int dx, int dy)
1597 CODE: 1720 CODE:
1598{ 1721{
1599 if (dx > 0) 1722 if (dx > 0)
1600 map_blank (self, self->x, self->y, dx, self->h); 1723 map_blank (self, self->x, self->y, dx, self->h);
1601 else if (dx < 0) 1724 else if (dx < 0)
1617 self->y += MAP_EXTEND_Y; 1740 self->y += MAP_EXTEND_Y;
1618 } 1741 }
1619} 1742}
1620 1743
1621SV * 1744SV *
1622map1a_update (CFPlus::Map self, SV *data_, int extmap) 1745map1a_update (DC::Map self, SV *data_, int extmap)
1623 CODE: 1746 CODE:
1624{ 1747{
1625 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1748 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1626 uint8_t *data_end = (uint8_t *)SvEND (data_); 1749 uint8_t *data_end = (uint8_t *)SvEND (data_);
1627 mapcell *cell; 1750 mapcell *cell;
1655 uint8_t ext, cmd; 1778 uint8_t ext, cmd;
1656 1779
1657 do 1780 do
1658 { 1781 {
1659 ext = *data++; 1782 ext = *data++;
1660 cmd = ext & 0x3f; 1783 cmd = ext & 0x7f;
1661 1784
1662 if (cmd < 4) 1785 if (cmd < 4)
1663 cell->darkness = 255 - ext * 64 + 1; 1786 cell->darkness = 255 - ext * 64 + 1;
1664 else if (cmd == 5) // health 1787 else if (cmd == 5) // health
1665 { 1788 {
1668 } 1791 }
1669 else if (cmd == 6) // monster width 1792 else if (cmd == 6) // monster width
1670 cell->stat_width = *data++ + 1; 1793 cell->stat_width = *data++ + 1;
1671 else if (cmd == 0x47) 1794 else if (cmd == 0x47)
1672 { 1795 {
1673 if (*data == 4) 1796 if (*data == 1) cell->player = data [1];
1674 ; // 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);
1675 1800
1676 data += *data + 1; 1801 data += *data + 1;
1677 } 1802 }
1678 else if (cmd == 8) // cell flags 1803 else if (cmd == 8) // cell flags
1679 cell->flags = *data++; 1804 cell->flags = *data++;
1709 } 1834 }
1710 } 1835 }
1711 } 1836 }
1712 } 1837 }
1713 else 1838 else
1714 cell->darkness = 0; 1839 CELL_CLEAR (cell);
1715 } 1840 }
1716} 1841}
1717 OUTPUT: 1842 OUTPUT:
1718 RETVAL 1843 RETVAL
1719 1844
1720SV * 1845SV *
1721mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1846mapmap (DC::Map self, int x0, int y0, int w, int h)
1722 CODE: 1847 CODE:
1723{ 1848{
1724 int x1, x; 1849 int x1, x;
1725 int y1, y; 1850 int y1, y;
1726 int z; 1851 int z;
1771} 1896}
1772 OUTPUT: 1897 OUTPUT:
1773 RETVAL 1898 RETVAL
1774 1899
1775void 1900void
1776draw (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)
1777 CODE: 1902 CODE:
1778{ 1903{
1779 int x, y, z; 1904 int x, y, z;
1780 1905
1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1906 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1782 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
1783 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)
1784 smooth_key skey; 1909 smooth_key skey;
1785 1910 int pl_x, pl_y;
1911 maptex pl_tex;
1786 rc_t *rc = rc_alloc (); 1912 rc_t *rc = rc_alloc ();
1787 rc_key_t key; 1913 rc_key_t key;
1788 rc_array_t *arr; 1914 rc_array_t *arr;
1915
1916 pl_tex.name = 0;
1789 1917
1790 // thats current max. sorry. 1918 // thats current max. sorry.
1791 if (sw > 255) sw = 255; 1919 if (sw > 255) sw = 255;
1792 if (sh > 255) sh = 255; 1920 if (sh > 255) sh = 255;
1793 1921
1848 tileid tile = cell->tile [z]; 1976 tileid tile = cell->tile [z];
1849 1977
1850 if (tile) 1978 if (tile)
1851 { 1979 {
1852 maptex tex = self->tex [tile]; 1980 maptex tex = self->tex [tile];
1853 int px, py; 1981 int px = (x + 1) * T - tex.w;
1982 int py = (y + 1) * T - tex.h;
1854 1983
1855 if (key.texname != tex.name) 1984 if (key.texname != tex.name)
1856 { 1985 {
1857 if (!tex.name) 1986 if (!tex.name)
1858 tex = self->tex [2]; /* missing, replace by noface */ 1987 tex = self->tex [2]; /* missing, replace by noface */
1859 1988
1860 key.texname = tex.name; 1989 key.texname = tex.name;
1861 arr = rc_array (rc, &key); 1990 arr = rc_array (rc, &key);
1862 } 1991 }
1863 1992
1864 px = (x + 1) * T - tex.w; 1993 if (expect_false (cell->player == player) && expect_false (z == 2))
1865 py = (y + 1) * T - tex.h; 1994 {
1995 pl_x = px;
1996 pl_y = py;
1997 pl_tex = tex;
1998 continue;
1999 }
1866 2000
1867 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2001 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1868 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);
1869 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);
1870 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);
1871 2005
1872 if (cell->flags && z == 2) 2006 if (expect_false (cell->flags) && expect_false (z == 2))
1873 { 2007 {
1874 // overlays such as the speech bubble, probably more to come 2008 // overlays such as the speech bubble, probably more to come
1875 if (cell->flags & 1) 2009 if (cell->flags & 1)
1876 { 2010 {
1877 maptex tex = self->tex [1]; 2011 maptex tex = self->tex [1];
2016 } 2150 }
2017 2151
2018 hv_clear (smooth); 2152 hv_clear (smooth);
2019 } 2153 }
2020 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
2021 glDisable (GL_BLEND); 2172 glDisable (GL_BLEND);
2022 rc_free (rc); 2173 rc_free (rc);
2023 2174
2024 // top layer: overlays such as the health bar 2175 // top layer: overlays such as the health bar
2025 for (y = 0; y < sh; y++) 2176 for (y = 0; y < sh; y++)
2052 } 2203 }
2053 } 2204 }
2054} 2205}
2055 2206
2056void 2207void
2057draw_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)
2058 CODE: 2209 CODE:
2059{ 2210{
2060 static float color[16][3] = { 2211 static float color[16][3] = {
2061 { 0.00F, 0.00F, 0.00F }, 2212 { 0.00F, 0.00F, 0.00F },
2062 { 1.00F, 1.00F, 1.00F }, 2213 { 1.00F, 1.00F, 1.00F },
2112 glDisable (GL_BLEND); 2263 glDisable (GL_BLEND);
2113 glDisable (GL_TEXTURE_2D); 2264 glDisable (GL_TEXTURE_2D);
2114} 2265}
2115 2266
2116void 2267void
2117fow_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)
2118 PPCODE: 2269 PPCODE:
2119{ 2270{
2120 int x, y; 2271 int x, y;
2121 int sw1 = sw + 2; 2272 int sw1 = sw + 2;
2122 int sh1 = sh + 2; 2273 int sh1 = sh + 2;
2130 SvCUR_set (darkness3_sv, sw34 * sh3); 2281 SvCUR_set (darkness3_sv, sw34 * sh3);
2131 2282
2132 mx += self->x - 1; 2283 mx += self->x - 1;
2133 my += self->y - 1; 2284 my += self->y - 1;
2134 2285
2135 memset (darkness1, 255, sw1 * sh1); 2286 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2136 2287
2137 for (y = 0; y < sh1; y++) 2288 for (y = 0; y < sh1; y++)
2138 if (0 <= y + my && y + my < self->rows) 2289 if (0 <= y + my && y + my < self->rows)
2139 { 2290 {
2140 maprow *row = self->row + (y + my); 2291 maprow *row = self->row + (y + my);
2193 PUSHs (sv_2mortal (newSViv (sh3))); 2344 PUSHs (sv_2mortal (newSViv (sh3)));
2194 PUSHs (darkness3_sv); 2345 PUSHs (darkness3_sv);
2195} 2346}
2196 2347
2197SV * 2348SV *
2198get_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)
2199 CODE: 2350 CODE:
2200{ 2351{
2201 int x, y, x1, y1; 2352 int x, y, x1, y1;
2202 SV *data_sv = newSV (w * h * 7 + 5); 2353 SV *data_sv = newSV (w * h * 7 + 5);
2203 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2354 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2260 else 2411 else
2261 *data++ = 0; 2412 *data++ = 0;
2262 } 2413 }
2263 } 2414 }
2264 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 {
2265 SvPOK_only (data_sv); 2419 SvPOK_only (data_sv);
2266 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2420 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2421 }
2422
2267 RETVAL = data_sv; 2423 RETVAL = data_sv;
2268} 2424}
2269 OUTPUT: 2425 OUTPUT:
2270 RETVAL 2426 RETVAL
2271 2427
2272void 2428void
2273set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2429set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274 PPCODE: 2430 PPCODE:
2275{ 2431{
2276 int x, y, z; 2432 int x, y, z;
2277 int w, h; 2433 int w, h;
2278 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;
2279 2445
2280 if (*data++ != 0) 2446 if (*data++ != 0)
2281 XSRETURN_EMPTY; /* version mismatch */ 2447 XSRETURN_EMPTY; /* version mismatch */
2282 2448
2283 w = *data++ << 8; w |= *data++; 2449 w = *data++ << 8; w |= *data++;
2298 { 2464 {
2299 maprow *row = map_get_row (self, y); 2465 maprow *row = map_get_row (self, y);
2300 2466
2301 for (x = x0; x < x1; x++) 2467 for (x = x0; x < x1; x++)
2302 { 2468 {
2469 uint8_t flags;
2470
2471 if (data + 7 >= end)
2472 XSRETURN_EMPTY;
2473
2303 uint8_t flags = *data++; 2474 flags = *data++;
2304 2475
2305 if (flags) 2476 if (flags)
2306 { 2477 {
2307 mapcell *cell = row_get_cell (row, x); 2478 mapcell *cell = row_get_cell (row, x);
2308 tileid tile[3] = { 0, 0, 0 }; 2479 tileid tile[3] = { 0, 0, 0 };
2311 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2482 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2312 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2483 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2313 2484
2314 if (cell->darkness == 0) 2485 if (cell->darkness == 0)
2315 { 2486 {
2316 cell->darkness = 0; 2487 /*cell->darkness = 0;*/
2488 EXTEND (SP, 3);
2317 2489
2318 for (z = 0; z <= 2; z++) 2490 for (z = 0; z <= 2; z++)
2319 { 2491 {
2320 tileid t = tile [z]; 2492 tileid t = tile [z];
2321 2493
2322 if (t >= self->texs || (t && !self->tex [t].name)) 2494 if (t >= self->texs || (t && !self->tex [t].name))
2323 { 2495 {
2324 XPUSHs (sv_2mortal (newSViv (t))); 2496 PUSHs (sv_2mortal (newSViv (t)));
2325 need_texid (self, t); 2497 need_texid (self, t);
2326 } 2498 }
2327 2499
2328 cell->tile [z] = t; 2500 cell->tile [z] = t;
2329 } 2501 }
2331 } 2503 }
2332 } 2504 }
2333 } 2505 }
2334} 2506}
2335 2507
2336MODULE = CFPlus PACKAGE = CFPlus::RW 2508MODULE = Deliantra::Client PACKAGE = DC::RW
2337 2509
2338CFPlus::RW 2510DC::RW
2339new (SV *class, SV *data_sv) 2511new (SV *class, SV *data_sv)
2340 CODE: 2512 CODE:
2341{ 2513{
2342 STRLEN datalen; 2514 STRLEN datalen;
2343 char *data = SvPVbyte (data_sv, datalen); 2515 char *data = SvPVbyte (data_sv, datalen);
2345 RETVAL = SDL_RWFromConstMem (data, datalen); 2517 RETVAL = SDL_RWFromConstMem (data, datalen);
2346} 2518}
2347 OUTPUT: 2519 OUTPUT:
2348 RETVAL 2520 RETVAL
2349 2521
2350CFPlus::RW 2522DC::RW
2351new_from_file (SV *class, const char *path, const char *mode = "rb") 2523new_from_file (SV *class, const char *path, const char *mode = "rb")
2352 CODE: 2524 CODE:
2353 RETVAL = SDL_RWFromFile (path, mode); 2525 RETVAL = SDL_RWFromFile (path, mode);
2354 OUTPUT: 2526 OUTPUT:
2355 RETVAL 2527 RETVAL
2356 2528
2357# fails on win32: 2529# fails on win32:
2358# CFPlus.xs(2268) : error C2059: syntax error : '(' 2530# dc.xs(2268) : error C2059: syntax error : '('
2359#void 2531#void
2360#close (CFPlus::RW self) 2532#close (DC::RW self)
2361# CODE: 2533# CODE:
2362# (self->(close)) (self); 2534# (self->(close)) (self);
2363 2535
2364MODULE = CFPlus PACKAGE = CFPlus::Channel 2536MODULE = Deliantra::Client PACKAGE = DC::Channel
2365 2537
2366PROTOTYPES: DISABLE 2538PROTOTYPES: DISABLE
2367 2539
2368CFPlus::Channel 2540DC::Channel
2369find () 2541find ()
2370 CODE: 2542 CODE:
2371{ 2543{
2372 RETVAL = Mix_GroupAvailable (-1); 2544 RETVAL = Mix_GroupAvailable (-1);
2373 2545
2386} 2558}
2387 OUTPUT: 2559 OUTPUT:
2388 RETVAL 2560 RETVAL
2389 2561
2390void 2562void
2391halt (CFPlus::Channel self) 2563halt (DC::Channel self)
2392 CODE: 2564 CODE:
2393 Mix_HaltChannel (self); 2565 Mix_HaltChannel (self);
2394 2566
2395void 2567void
2396expire (CFPlus::Channel self, int ticks = -1) 2568expire (DC::Channel self, int ticks = -1)
2397 CODE: 2569 CODE:
2398 Mix_ExpireChannel (self, ticks); 2570 Mix_ExpireChannel (self, ticks);
2399 2571
2400void 2572void
2401fade_out (CFPlus::Channel self, int ticks = -1) 2573fade_out (DC::Channel self, int ticks = -1)
2402 CODE: 2574 CODE:
2403 Mix_FadeOutChannel (self, ticks); 2575 Mix_FadeOutChannel (self, ticks);
2404 2576
2405int 2577int
2406volume (CFPlus::Channel self, int volume) 2578volume (DC::Channel self, int volume)
2407 CODE: 2579 CODE:
2408 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2580 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409 OUTPUT: 2581 OUTPUT:
2410 RETVAL 2582 RETVAL
2411 2583
2412void 2584void
2413unregister_all_effects (CFPlus::Channel self) 2585unregister_all_effects (DC::Channel self)
2414 CODE: 2586 CODE:
2415 Mix_UnregisterAllEffects (self); 2587 Mix_UnregisterAllEffects (self);
2416 2588
2417void 2589void
2418set_panning (CFPlus::Channel self, int left, int right) 2590set_panning (DC::Channel self, int left, int right)
2419 CODE: 2591 CODE:
2420 left = CLAMP (left , 0, 255); 2592 left = CLAMP (left , 0, 255);
2421 right = CLAMP (right, 0, 255); 2593 right = CLAMP (right, 0, 255);
2422 Mix_SetPanning (self, left, right); 2594 Mix_SetPanning (self, left, right);
2423 2595
2424void 2596void
2425set_distance (CFPlus::Channel self, int distance) 2597set_distance (DC::Channel self, int distance)
2426 CODE: 2598 CODE:
2427 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2599 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428 2600
2429void 2601void
2430set_position (CFPlus::Channel self, int angle, int distance) 2602set_position (DC::Channel self, int angle, int distance)
2431 CODE: 2603 CODE:
2432 2604
2433void 2605void
2434set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2606set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435 CODE: 2607 CODE:
2436{ 2608{
2437 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));
2438 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);
2439 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2611 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440} 2612}
2441 2613
2442void 2614void
2443set_reverse_stereo (CFPlus::Channel self, int flip) 2615set_reverse_stereo (DC::Channel self, int flip)
2444 CODE: 2616 CODE:
2445 Mix_SetReverseStereo (self, flip); 2617 Mix_SetReverseStereo (self, flip);
2446 2618
2447MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2619MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448 2620
2449PROTOTYPES: DISABLE 2621PROTOTYPES: DISABLE
2450 2622
2451CFPlus::MixChunk 2623DC::MixChunk
2452new (SV *class, CFPlus::RW rwops) 2624new (SV *class, DC::RW rwops)
2453 CODE: 2625 CODE:
2454 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2626 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455 OUTPUT: 2627 OUTPUT:
2456 RETVAL 2628 RETVAL
2457 2629
2458void 2630void
2459DESTROY (CFPlus::MixChunk self) 2631DESTROY (DC::MixChunk self)
2460 CODE: 2632 CODE:
2461 Mix_FreeChunk (self); 2633 Mix_FreeChunk (self);
2462 2634
2463int 2635int
2464volume (CFPlus::MixChunk self, int volume = -1) 2636volume (DC::MixChunk self, int volume = -1)
2465 CODE: 2637 CODE:
2466 if (items > 1) 2638 if (items > 1)
2467 volume = CLAMP (volume, 0, 128); 2639 volume = CLAMP (volume, 0, 128);
2468 RETVAL = Mix_VolumeChunk (self, volume); 2640 RETVAL = Mix_VolumeChunk (self, volume);
2469 OUTPUT: 2641 OUTPUT:
2470 RETVAL 2642 RETVAL
2471 2643
2472CFPlus::Channel 2644DC::Channel
2473play (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)
2474 CODE: 2646 CODE:
2475{ 2647{
2476 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2648 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477 2649
2478 if (RETVAL < 0) 2650 if (RETVAL < 0)
2485 } 2657 }
2486} 2658}
2487 OUTPUT: 2659 OUTPUT:
2488 RETVAL 2660 RETVAL
2489 2661
2490MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2662MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2491 2663
2492int 2664int
2493volume (int volume = -1) 2665volume (int volume = -1)
2494 PROTOTYPE: ;$ 2666 PROTOTYPE: ;$
2495 CODE: 2667 CODE:
2507void 2679void
2508halt () 2680halt ()
2509 CODE: 2681 CODE:
2510 Mix_HaltMusic (); 2682 Mix_HaltMusic ();
2511 2683
2512CFPlus::MixMusic 2684DC::MixMusic
2513new (SV *class, CFPlus::RW rwops) 2685new (SV *class, DC::RW rwops)
2514 CODE: 2686 CODE:
2515 RETVAL = Mix_LoadMUS_RW (rwops); 2687 RETVAL = Mix_LoadMUS_RW (rwops);
2516 OUTPUT: 2688 OUTPUT:
2517 RETVAL 2689 RETVAL
2518 2690
2519void 2691void
2520DESTROY (CFPlus::MixMusic self) 2692DESTROY (DC::MixMusic self)
2521 CODE: 2693 CODE:
2522 Mix_FreeMusic (self); 2694 Mix_FreeMusic (self);
2523 2695
2524int 2696int
2525play (CFPlus::MixMusic self, int loops = -1) 2697play (DC::MixMusic self, int loops = -1)
2526 CODE: 2698 CODE:
2527 RETVAL = Mix_PlayMusic (self, loops); 2699 RETVAL = Mix_PlayMusic (self, loops);
2528 OUTPUT: 2700 OUTPUT:
2529 RETVAL 2701 RETVAL
2530 2702
2531void 2703void
2532fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2704fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533 CODE: 2705 CODE:
2534 Mix_FadeInMusicPos (self, loops, ms, position); 2706 Mix_FadeInMusicPos (self, loops, ms, position);
2535 2707
2536MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2708MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537 2709
2538PROTOTYPES: ENABLE 2710PROTOTYPES: ENABLE
2539 2711
2540BOOT: 2712BOOT:
2541{ 2713{
2542 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2714 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543 static const struct { 2715 static const struct {
2544 const char *name; 2716 const char *name;
2545 IV iv; 2717 IV iv;
2546 } *civ, const_iv[] = { 2718 } *civ, const_iv[] = {
2547# define const_iv(name) { # name, (IV)name } 2719# define const_iv(name) { # name, (IV)name }
2840void 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)
2841 CODE: 3013 CODE:
2842 if (gl.SeparableFilter2D) 3014 if (gl.SeparableFilter2D)
2843 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3015 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844 3016
2845void 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)
2846 3018
2847void 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)
2848 3020
2849void glDrawPixels (int width, int height, int format, int type, char *pixels) 3021void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850 3022
2876 3048
2877void glEndList () 3049void glEndList ()
2878 3050
2879void glCallList (int list) 3051void glCallList (int list)
2880 3052
2881MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3053MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2882 3054
2883PROTOTYPES: DISABLE 3055PROTOTYPES: DISABLE
2884 3056
2885void 3057void
2886find_widget (SV *self, NV x, NV y) 3058find_widget (SV *self, NV x, NV y)
2890 XPUSHs (self); 3062 XPUSHs (self);
2891} 3063}
2892 3064
2893BOOT: 3065BOOT:
2894{ 3066{
2895 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3067 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896 3068
2897 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);
2898 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);
2899 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);
2900 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);
2901} 3073}
2902 3074
2903void 3075void
2904draw (SV *self) 3076draw (SV *self)
2905 CODE: 3077 CODE:
2912 SV *draw_w_sv = GvSV (draw_w_gv); 3084 SV *draw_w_sv = GvSV (draw_w_gv);
2913 SV *draw_h_sv = GvSV (draw_h_gv); 3085 SV *draw_h_sv = GvSV (draw_h_gv);
2914 double draw_x, draw_y; 3086 double draw_x, draw_y;
2915 3087
2916 if (!SvROK (self)) 3088 if (!SvROK (self))
2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3089 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918 3090
2919 hv = (HV *)SvRV (self); 3091 hv = (HV *)SvRV (self);
2920 3092
2921 if (SvTYPE (hv) != SVt_PVHV) 3093 if (SvTYPE (hv) != SVt_PVHV)
2922 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3094 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923 3095
2924 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.;
2925 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.;
2926 3098
2927 if (!h || !w) 3099 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines