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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines