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.213 by root, Sun Jul 29 04:14:45 2007 UTC vs.
Revision 1.275 by root, Thu Aug 28 00:53:53 2008 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
34#include <SDL_endian.h> 39#include <SDL_endian.h>
35#include <SDL_image.h> 40#include <SDL_image.h>
36#include <SDL_mixer.h> 41#include <SDL_mixer.h>
37#include <SDL_opengl.h> 42#include <SDL_opengl.h>
38 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
39#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
40#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
41 51
42#include <glib/gmacros.h> 52#include <glib/gmacros.h>
43 53
44#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
45 66
46#ifndef _WIN32 67#ifndef _WIN32
47# include <sys/types.h> 68# include <sys/types.h>
48# include <sys/socket.h> 69# include <sys/socket.h>
49# include <netinet/in.h> 70# include <netinet/in.h>
50# include <netinet/tcp.h> 71# include <netinet/tcp.h>
51# include <inttypes.h> 72# include <inttypes.h>
52#endif 73#endif
53 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
54#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
55 85
56#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
57 87
58#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
59#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
60 90
61#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
62 92
63#if 0 93/* mask out modifiers we are not interested in */
64# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
65#else
66# define PARACHUTE 0
67#endif
68 95
69static AV *texture_av; 96static AV *texture_av;
70 97
71static struct 98static struct
72{ 99{
109 av_push (texture_av, (SV *)(size_t)name); 136 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 137 glDeleteTextures (1, &name);
111} 138}
112 139
113#include "texcache.c" 140#include "texcache.c"
141#include "rendercache.c"
114 142
115#include "pango-font.c" 143#include "pango-font.c"
116#include "pango-fontmap.c" 144#include "pango-fontmap.c"
117#include "pango-render.c" 145#include "pango-render.c"
118 146
119typedef IV CFPlus__Channel; 147typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 148typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 149typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 150typedef Mix_Music *DC__MixMusic;
123 151
124typedef PangoFontDescription *CFPlus__Font; 152typedef PangoFontDescription *DC__Font;
125 153
126static int 154static int
127shape_attr_p (PangoLayoutRun *run) 155shape_attr_p (PangoLayoutRun *run)
128{ 156{
129 GSList *attrs = run->item->analysis.extra_attrs; 157 GSList *attrs = run->item->analysis.extra_attrs;
143 171
144typedef struct cf_layout { 172typedef struct cf_layout {
145 PangoLayout *pl; 173 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 174 float r, g, b, a; // default color for rgba mode
147 int base_height; 175 int base_height;
148 CFPlus__Font font; 176 DC__Font font;
177 rc_t *rc;
149} *CFPlus__Layout; 178} *DC__Layout;
150 179
151static CFPlus__Font default_font; 180static DC__Font default_font;
152static PangoContext *opengl_context; 181static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 182static PangoFontMap *opengl_fontmap;
154 183
155static void 184static void
156substitute_func (FcPattern *pattern, gpointer data) 185substitute_func (FcPattern *pattern, gpointer data)
161#endif 190#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 191 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 192}
164 193
165static void 194static void
166layout_update_font (CFPlus__Layout self) 195layout_update_font (DC__Layout self)
167{ 196{
168 /* 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
169 * reasonably well with bitstream vera 198 * reasonably well with dejavu/bistream fonts
170 */ 199 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 200 PangoFontDescription *font = self->font ? self->font : default_font;
172 201
173 pango_font_description_set_absolute_size (font, 202 pango_font_description_set_absolute_size (font,
174 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 203 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175 204
176 pango_layout_set_font_description (self->pl, font); 205 pango_layout_set_font_description (self->pl, font);
177} 206}
178 207
179static void 208static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 209layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 210{
182 PangoRectangle rect; 211 PangoRectangle rect;
183 212
184 // get_pixel_* wrongly rounds down 213 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 214 pango_layout_get_extents (self->pl, 0, &rect);
196 225
197typedef uint16_t tileid; 226typedef uint16_t tileid;
198typedef uint16_t faceid; 227typedef uint16_t faceid;
199 228
200typedef struct { 229typedef struct {
201 int name; 230 GLuint name;
202 int w, h; 231 int w, h;
203 float s, t; 232 float s, t;
204 uint8_t r, g, b, a; 233 uint8_t r, g, b, a;
205 tileid smoothtile; 234 tileid smoothtile;
206 uint8_t smoothlevel; 235 uint8_t smoothlevel;
224 int faces; tileid *face2tile; // [faceid] 253 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 254 int texs; maptex *tex; // [tileid]
226 255
227 int32_t rows; 256 int32_t rows;
228 maprow *row; 257 maprow *row;
229} *CFPlus__Map; 258} *DC__Map;
230 259
231static char * 260static char *
232prepend (char *ptr, int sze, int inc) 261prepend (char *ptr, int sze, int inc)
233{ 262{
234 char *p; 263 char *p;
272 self->texs *= 2; 301 self->texs *= 2;
273 } 302 }
274} 303}
275 304
276static maprow * 305static maprow *
277map_get_row (CFPlus__Map self, int y) 306map_get_row (DC__Map self, int y)
278{ 307{
279 if (0 > y) 308 if (0 > y)
280 { 309 {
281 int extend = - y + MAP_EXTEND_Y; 310 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 311 Prepend (maprow, self->row, self->rows, extend);
320 349
321 return row->col + (x - row->c0); 350 return row->col + (x - row->c0);
322} 351}
323 352
324static mapcell * 353static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 354map_get_cell (DC__Map self, int x, int y)
326{ 355{
327 return row_get_cell (map_get_row (self, y), x); 356 return row_get_cell (map_get_row (self, y), x);
328} 357}
329 358
330static void 359static void
331map_clear (CFPlus__Map self) 360map_clear (DC__Map self)
332{ 361{
333 int r; 362 int r;
334 363
335 for (r = 0; r < self->rows; r++) 364 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 365 Safefree (self->row[r].col);
343 self->oy = 0; 372 self->oy = 0;
344 self->row = 0; 373 self->row = 0;
345 self->rows = 0; 374 self->rows = 0;
346} 375}
347 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
348static void 387static void
349map_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)
350{ 389{
351 int x, y; 390 int x, y;
352 maprow *row; 391 maprow *row;
353 mapcell *cell; 392 mapcell *cell;
354 393
366 if (x >= row->c1) 405 if (x >= row->c1)
367 break; 406 break;
368 407
369 cell = row->col + x - row->c0; 408 cell = row->col + x - row->c0;
370 409
371 cell->darkness = 0; 410 CELL_CLEAR (cell);
372 cell->stat_hp = 0;
373 cell->flags = 0;
374 cell->player = 0;
375 } 411 }
376 } 412 }
377} 413}
378 414
379typedef struct { 415typedef struct {
433 n |= n >> 16; 469 n |= n >> 16;
434 470
435 return n + 1; 471 return n + 1;
436} 472}
437 473
474static unsigned int
475popcount (unsigned int n)
476{
477 n -= (n >> 1) & 0x55555555U;
478 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
479 n = ((n >> 4) + n) & 0x0f0f0f0fU;
480 n *= 0x01010101U;
481
482 return n >> 24;
483}
484
438/* SDL should provide this, really. */ 485/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 486#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 487#define SDLK_MODIFIER_MAX 314
441 488
442/******************************************************************************/ 489/******************************************************************************/
480 return 0; 527 return 0;
481 528
482 return 1; 529 return 1;
483} 530}
484 531
485MODULE = 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
486 571
487PROTOTYPES: ENABLE 572PROTOTYPES: ENABLE
488 573
489BOOT: 574BOOT:
490{ 575{
491 HV *stash = gv_stashpv ("CFPlus", 1); 576 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 577 static const struct {
493 const char *name; 578 const char *name;
494 IV iv; 579 IV iv;
495 } *civ, const_iv[] = { 580 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 581# define const_iv(name) { # name, (IV)name }
518 603
519 const_iv (SDL_APPINPUTFOCUS), 604 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 605 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 606 const_iv (SDL_APPACTIVE),
522 607
608
609 const_iv (SDLK_UNKNOWN),
610 const_iv (SDLK_FIRST),
611 const_iv (SDLK_BACKSPACE),
612 const_iv (SDLK_TAB),
613 const_iv (SDLK_CLEAR),
614 const_iv (SDLK_RETURN),
615 const_iv (SDLK_PAUSE),
616 const_iv (SDLK_ESCAPE),
617 const_iv (SDLK_SPACE),
618 const_iv (SDLK_EXCLAIM),
619 const_iv (SDLK_QUOTEDBL),
620 const_iv (SDLK_HASH),
621 const_iv (SDLK_DOLLAR),
622 const_iv (SDLK_AMPERSAND),
623 const_iv (SDLK_QUOTE),
624 const_iv (SDLK_LEFTPAREN),
625 const_iv (SDLK_RIGHTPAREN),
626 const_iv (SDLK_ASTERISK),
627 const_iv (SDLK_PLUS),
628 const_iv (SDLK_COMMA),
629 const_iv (SDLK_MINUS),
630 const_iv (SDLK_PERIOD),
631 const_iv (SDLK_SLASH),
632 const_iv (SDLK_0),
633 const_iv (SDLK_1),
634 const_iv (SDLK_2),
635 const_iv (SDLK_3),
636 const_iv (SDLK_4),
637 const_iv (SDLK_5),
638 const_iv (SDLK_6),
639 const_iv (SDLK_7),
640 const_iv (SDLK_8),
641 const_iv (SDLK_9),
642 const_iv (SDLK_COLON),
643 const_iv (SDLK_SEMICOLON),
644 const_iv (SDLK_LESS),
645 const_iv (SDLK_EQUALS),
646 const_iv (SDLK_GREATER),
647 const_iv (SDLK_QUESTION),
648 const_iv (SDLK_AT),
649
650 const_iv (SDLK_LEFTBRACKET),
651 const_iv (SDLK_BACKSLASH),
652 const_iv (SDLK_RIGHTBRACKET),
653 const_iv (SDLK_CARET),
654 const_iv (SDLK_UNDERSCORE),
655 const_iv (SDLK_BACKQUOTE),
656 const_iv (SDLK_DELETE),
657
658 const_iv (SDLK_FIRST),
659 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 660 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 661 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 662 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 663 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 664 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 736 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 737 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 738 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 739 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 740 const_iv (KMOD_MODE),
741
742 const_iv (MIX_DEFAULT_FORMAT),
743
744 const_iv (SDL_INIT_TIMER),
745 const_iv (SDL_INIT_AUDIO),
746 const_iv (SDL_INIT_VIDEO),
747 const_iv (SDL_INIT_CDROM),
748 const_iv (SDL_INIT_JOYSTICK),
749 const_iv (SDL_INIT_EVERYTHING),
750 const_iv (SDL_INIT_NOPARACHUTE),
751 const_iv (SDL_INIT_EVENTTHREAD),
752
753 const_iv (SDL_GL_RED_SIZE),
754 const_iv (SDL_GL_GREEN_SIZE),
755 const_iv (SDL_GL_BLUE_SIZE),
756 const_iv (SDL_GL_ALPHA_SIZE),
757 const_iv (SDL_GL_DOUBLEBUFFER),
758 const_iv (SDL_GL_BUFFER_SIZE),
759 const_iv (SDL_GL_DEPTH_SIZE),
760 const_iv (SDL_GL_STENCIL_SIZE),
761 const_iv (SDL_GL_ACCUM_RED_SIZE),
762 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
763 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
764 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
765 const_iv (SDL_GL_STEREO),
766 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
767 const_iv (SDL_GL_MULTISAMPLESAMPLES),
768 const_iv (SDL_GL_ACCELERATED_VISUAL),
769 const_iv (SDL_GL_SWAP_CONTROL),
770
771 const_iv (FOW_DARKNESS)
604# undef const_iv 772# undef const_iv
605 }; 773 };
606 774
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 775 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 794
627NV floor (NV x) 795NV floor (NV x)
628 796
629NV ceil (NV x) 797NV ceil (NV x)
630 798
799IV minpot (UV n)
800
801IV popcount (UV n)
802
631void 803void
632pango_init () 804pango_init ()
633 CODE: 805 CODE:
634{ 806{
635 opengl_fontmap = pango_opengl_font_map_new (); 807 opengl_fontmap = pango_opengl_font_map_new ();
636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 808 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
637 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 809 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
810 /*pango_context_set_font_description (opengl_context, default_font);*/
811#if PANGO_VERSION_CHECK (1, 15, 2)
812 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
813 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
814#endif
638} 815}
639 816
640char *
641SDL_GetError () 817char *SDL_GetError ()
642 818
643int 819void SDL_braino ()
644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
645 820
646void 821int SDL_Init (U32 flags)
822
823int SDL_InitSubSystem (U32 flags)
824
825void SDL_QuitSubSystem (U32 flags)
826
647SDL_Quit () 827void SDL_Quit ()
828
829int SDL_GL_SetAttribute (int attr, int value)
830
831int SDL_GL_GetAttribute (int attr)
832 CODE:
833 if (SDL_GL_GetAttribute (attr, &RETVAL))
834 XSRETURN_UNDEF;
835 OUTPUT:
836 RETVAL
648 837
649void 838void
650SDL_ListModes (int rgb, int alpha) 839SDL_ListModes (int rgb, int alpha)
651 PPCODE: 840 PPCODE:
652{ 841{
664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 853 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 854 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 855 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667 856
668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 857 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
669#if SDL_VERSION_ATLEAST(1,2,10)
670 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
671 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 858 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672#endif
673 859
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 860 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 861
676 if (m && m != (SDL_Rect **)-1) 862 if (m && m != (SDL_Rect **)-1)
677 while (*m) 863 while (*m)
678 { 864 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 865 if ((*m)->w >= 400 && (*m)->h >= 300)
680 { 866 {
681 AV *av = newAV (); 867 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 868 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 869 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 870 av_push (av, newSViv (rgb));
708 894
709 if (RETVAL) 895 if (RETVAL)
710 { 896 {
711 av_clear (texture_av); 897 av_clear (texture_av);
712 898
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 899 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 900#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 901#include "glfunc.h"
716#undef GL_FUNC 902#undef GL_FUNC
717 } 903 }
718} 904}
725char * 911char *
726SDL_GetKeyName (int sym) 912SDL_GetKeyName (int sym)
727 913
728int 914int
729SDL_GetAppState () 915SDL_GetAppState ()
916
917int
918SDL_GetModState ()
730 919
731void 920void
732poll_events () 921poll_events ()
733 PPCODE: 922 PPCODE:
734{ 923{
744 { 933 {
745 case SDL_KEYDOWN: 934 case SDL_KEYDOWN:
746 case SDL_KEYUP: 935 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 938 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
750 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 939 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 940 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 941 break;
753 942
754 case SDL_ACTIVEEVENT: 943 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 962 x = ev.motion.x;
774 y = ev.motion.y; 963 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 965 }
777 966
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 968 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 969 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 970 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 971 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 972 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 973 }
785 break; 974 break;
786 975
787 case SDL_MOUSEBUTTONDOWN: 976 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 977 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 978 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 979
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 980 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 981 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 982 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 983 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 988 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 989 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 990 break;
802 } 991 }
803 992
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 993 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 994 }
806} 995}
807 996
808int 997int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 998Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 999 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 1000 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 1001 Mix_ChannelFinished (channel_finished);
813 1002
814void 1003void
1004Mix_QuerySpec ()
1005 PPCODE:
1006{
1007 int freq, channels;
1008 Uint16 format;
1009
1010 if (Mix_QuerySpec (&freq, &format, &channels))
1011 {
1012 EXTEND (SP, 3);
1013 PUSHs (sv_2mortal (newSViv (freq)));
1014 PUSHs (sv_2mortal (newSViv (format)));
1015 PUSHs (sv_2mortal (newSViv (channels)));
1016 }
1017}
1018
1019void
815Mix_CloseAudio () 1020Mix_CloseAudio ()
816 1021
817int 1022int
818Mix_AllocateChannels (int numchans = -1) 1023Mix_AllocateChannels (int numchans = -1)
1024
1025const char *
1026Mix_GetError ()
819 1027
820void 1028void
821lowdelay (int fd, int val = 1) 1029lowdelay (int fd, int val = 1)
822 CODE: 1030 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1031 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
849 } 1057 }
850 } 1058 }
851#endif 1059#endif
852} 1060}
853 1061
854void 1062int
855add_font (char *file) 1063add_font (char *file)
856 CODE: 1064 CODE:
857 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1065 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1066 OUTPUT:
1067 RETVAL
858 1068
859void 1069void
860load_image_inline (SV *image_) 1070load_image_inline (SV *image_)
861 ALIAS: 1071 ALIAS:
862 load_image_file = 1 1072 load_image_file = 1
948void 1158void
949error (char *message) 1159error (char *message)
950 CODE: 1160 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1161 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1162#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1163 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1164#endif
955 1165
956void 1166void
957fatal (char *message) 1167fatal (char *message)
958 CODE: 1168 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1169 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1170#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1171 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1172#endif
963 _exit (1); 1173 _exit (1);
964 1174
965void 1175void
966_exit (int retval = 0) 1176_exit (int retval = 0)
978#if DEBUG 1188#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1189 VALGRIND_DO_LEAK_CHECK;
980#endif 1190#endif
981} 1191}
982 1192
983MODULE = CFPlus PACKAGE = CFPlus::Font 1193MODULE = Deliantra::Client PACKAGE = DC::Font
984 1194
985PROTOTYPES: DISABLE 1195PROTOTYPES: DISABLE
986 1196
987CFPlus::Font 1197DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1198new_from_file (SV *class, char *path, int id = 0)
989 CODE: 1199 CODE:
990{ 1200{
991 int count; 1201 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1202 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
995} 1205}
996 OUTPUT: 1206 OUTPUT:
997 RETVAL 1207 RETVAL
998 1208
999void 1209void
1000DESTROY (CFPlus::Font self) 1210DESTROY (DC::Font self)
1001 CODE: 1211 CODE:
1002 pango_font_description_free (self); 1212 pango_font_description_free (self);
1003 1213
1004void 1214void
1005make_default (CFPlus::Font self) 1215make_default (DC::Font self)
1006 PROTOTYPE: $ 1216 PROTOTYPE: $
1007 CODE: 1217 CODE:
1008 default_font = self; 1218 default_font = self;
1009 1219
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1220MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1221
1012PROTOTYPES: DISABLE 1222PROTOTYPES: DISABLE
1013 1223
1014void 1224void
1015reset_glyph_cache () 1225glyph_cache_backup ()
1016 PROTOTYPE: 1226 PROTOTYPE:
1017 CODE: 1227 CODE:
1228 tc_backup ();
1229
1230void
1231glyph_cache_restore ()
1232 PROTOTYPE:
1233 CODE:
1018 tc_clear (); 1234 tc_restore ();
1019 1235
1020CFPlus::Layout 1236DC::Layout
1021new (SV *class) 1237new (SV *class)
1022 CODE: 1238 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1239 New (0, RETVAL, 1, struct cf_layout);
1024 1240
1025 RETVAL->pl = pango_layout_new (opengl_context); 1241 RETVAL->pl = pango_layout_new (opengl_context);
1027 RETVAL->g = 1.; 1243 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1244 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1245 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1246 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1247 RETVAL->font = 0;
1248 RETVAL->rc = rc_alloc ();
1032 1249
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1250 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1251 layout_update_font (RETVAL);
1035 OUTPUT: 1252 OUTPUT:
1036 RETVAL 1253 RETVAL
1037 1254
1038void 1255void
1039DESTROY (CFPlus::Layout self) 1256DESTROY (DC::Layout self)
1040 CODE: 1257 CODE:
1041 g_object_unref (self->pl); 1258 g_object_unref (self->pl);
1259 rc_free (self->rc);
1042 Safefree (self); 1260 Safefree (self);
1043 1261
1044void 1262void
1045set_text (CFPlus::Layout self, SV *text_) 1263set_text (DC::Layout self, SV *text_)
1046 CODE: 1264 CODE:
1047{ 1265{
1048 STRLEN textlen; 1266 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1267 char *text = SvPVutf8 (text_, textlen);
1050 1268
1051 pango_layout_set_text (self->pl, text, textlen); 1269 pango_layout_set_text (self->pl, text, textlen);
1052} 1270}
1053 1271
1054void 1272void
1055set_markup (CFPlus::Layout self, SV *text_) 1273set_markup (DC::Layout self, SV *text_)
1056 CODE: 1274 CODE:
1057{ 1275{
1058 STRLEN textlen; 1276 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1277 char *text = SvPVutf8 (text_, textlen);
1060 1278
1061 pango_layout_set_markup (self->pl, text, textlen); 1279 pango_layout_set_markup (self->pl, text, textlen);
1062} 1280}
1063 1281
1064void 1282void
1065set_shapes (CFPlus::Layout self, ...) 1283set_shapes (DC::Layout self, ...)
1066 CODE: 1284 CODE:
1067{ 1285{
1068 PangoAttrList *attrs = 0; 1286 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1287 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1288 const char *pos = text;
1105 if (attrs) 1323 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1324 pango_layout_set_attributes (self->pl, attrs);
1107} 1325}
1108 1326
1109void 1327void
1110get_shapes (CFPlus::Layout self) 1328get_shapes (DC::Layout self)
1111 PPCODE: 1329 PPCODE:
1112{ 1330{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1331 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1332
1115 do 1333 do
1116 { 1334 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1335 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1336
1119 if (run && shape_attr_p (run)) 1337 if (run && shape_attr_p (run))
1120 { 1338 {
1121 PangoRectangle extents; 1339 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1340 pango_layout_iter_get_run_extents (iter, 0, &extents);
1130 1348
1131 pango_layout_iter_free (iter); 1349 pango_layout_iter_free (iter);
1132} 1350}
1133 1351
1134int 1352int
1135has_wrapped (CFPlus::Layout self) 1353has_wrapped (DC::Layout self)
1136 CODE: 1354 CODE:
1137{ 1355{
1138 int lines = 1; 1356 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1357 const char *text = pango_layout_get_text (self->pl);
1140 1358
1145} 1363}
1146 OUTPUT: 1364 OUTPUT:
1147 RETVAL 1365 RETVAL
1148 1366
1149SV * 1367SV *
1150get_text (CFPlus::Layout self) 1368get_text (DC::Layout self)
1151 CODE: 1369 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1370 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1371 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1372 OUTPUT:
1155 RETVAL 1373 RETVAL
1156 1374
1157void 1375void
1158set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1376set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1159 CODE: 1377 CODE:
1160 self->r = r; 1378 self->r = r;
1161 self->g = g; 1379 self->g = g;
1162 self->b = b; 1380 self->b = b;
1163 self->a = a; 1381 self->a = a;
1164 1382
1165void 1383void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1384set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1385 CODE:
1168 if (self->font != font) 1386 if (self->font != font)
1169 { 1387 {
1170 self->font = font; 1388 self->font = font;
1171 layout_update_font (self); 1389 layout_update_font (self);
1172 } 1390 }
1173 1391
1174void 1392void
1175set_height (CFPlus::Layout self, int base_height) 1393set_height (DC::Layout self, int base_height)
1176 CODE: 1394 CODE:
1177 if (self->base_height != base_height) 1395 if (self->base_height != base_height)
1178 { 1396 {
1179 self->base_height = base_height; 1397 self->base_height = base_height;
1180 layout_update_font (self); 1398 layout_update_font (self);
1181 } 1399 }
1182 1400
1183void 1401void
1184set_width (CFPlus::Layout self, int max_width = -1) 1402set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1403 CODE:
1186 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1404 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1187 1405
1188void 1406void
1189set_indent (CFPlus::Layout self, int indent) 1407set_indent (DC::Layout self, int indent)
1190 CODE: 1408 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1409 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1410
1193void 1411void
1194set_spacing (CFPlus::Layout self, int spacing) 1412set_spacing (DC::Layout self, int spacing)
1195 CODE: 1413 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1414 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1415
1198void 1416void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1417set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1418 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1419 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1420 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1421 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1422 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1423 : PANGO_ELLIPSIZE_NONE
1206 ); 1424 );
1207 1425
1208void 1426void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1427set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1428 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1429 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1430
1213void 1431void
1214size (CFPlus::Layout self) 1432size (DC::Layout self)
1215 PPCODE: 1433 PPCODE:
1216{ 1434{
1217 int w, h; 1435 int w, h;
1218 1436
1219 layout_get_pixel_size (self, &w, &h); 1437 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1440 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1441 PUSHs (sv_2mortal (newSViv (h)));
1224} 1442}
1225 1443
1226int 1444int
1227descent (CFPlus::Layout self) 1445descent (DC::Layout self)
1228 CODE: 1446 CODE:
1229{ 1447{
1230 PangoRectangle rect; 1448 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1449 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1450 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1451 RETVAL = PANGO_DESCENT (rect);
1234} 1452}
1235 OUTPUT: 1453 OUTPUT:
1236 RETVAL 1454 RETVAL
1237 1455
1238int 1456int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1457xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1458 CODE:
1241{ 1459{
1242 int index, trailing; 1460 int index, trailing;
1243 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1461 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1244 RETVAL = index + trailing; 1462 RETVAL = index + trailing;
1245} 1463}
1246 OUTPUT: 1464 OUTPUT:
1247 RETVAL 1465 RETVAL
1248 1466
1249void 1467void
1250cursor_pos (CFPlus::Layout self, int index) 1468cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1469 PPCODE:
1252{ 1470{
1253 PangoRectangle strong_pos; 1471 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1472 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1473
1256 EXTEND (SP, 3); 1474 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1475 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1476 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1477 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1478}
1261 1479
1262void 1480void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1481index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1482 PPCODE:
1265{ 1483{
1266 int line, x; 1484 int line, x;
1267 1485
1268 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1486 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1487#if !PANGO_VERSION_CHECK (1, 17, 3)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1488 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1489 --line;
1490#endif
1271 EXTEND (SP, 2); 1491 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1492 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1494}
1275 1495
1276void 1496void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1497line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1498 PPCODE:
1279{ 1499{
1280 PangoLayoutLine *lp; 1500 PangoLayoutLine *lp;
1281 int index, trailing; 1501 int index, trailing;
1282 1502
1283 if (line < 0) 1503 if (line < 0)
1284 XSRETURN_EMPTY; 1504 XSRETURN_EMPTY;
1285 1505
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1506 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1507 XSRETURN_EMPTY; /* do better */
1288 1508
1289 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1509 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1290 1510
1291 EXTEND (SP, 2); 1511 EXTEND (SP, 2);
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1517 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1518 }
1299} 1519}
1300 1520
1301void 1521void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1522render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1523 CODE:
1524 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1525 pango_opengl_render_layout_subpixel (
1305 self->pl, 1526 self->pl,
1527 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1528 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1529 self->r, self->g, self->b, self->a,
1308 flags 1530 flags
1309 ); 1531 );
1532 // we assume that context_change actually clears/frees stuff
1533 // and does not do any recomputation...
1534 pango_layout_context_changed (self->pl);
1310 1535
1311MODULE = CFPlus PACKAGE = CFPlus::Texture 1536void
1537draw (DC::Layout self)
1538 CODE:
1539{
1540 glEnable (GL_TEXTURE_2D);
1541 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1542 glEnable (GL_BLEND);
1543 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1544 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1545 glEnable (GL_ALPHA_TEST);
1546 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1547
1548 rc_draw (self->rc);
1549
1550 glDisable (GL_ALPHA_TEST);
1551 glDisable (GL_BLEND);
1552 glDisable (GL_TEXTURE_2D);
1553}
1554
1555MODULE = Deliantra::Client PACKAGE = DC::Texture
1312 1556
1313PROTOTYPES: ENABLE 1557PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1558
1317void 1559void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1560pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1561 CODE:
1320{ 1562{
1347 HV *hv = (HV *)SvRV (self); 1589 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1590 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1591 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1592 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1593
1594 if (name <= 0)
1595 XSRETURN_EMPTY;
1596
1352 if (items < 5) 1597 if (items < 5)
1353 { 1598 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1599 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1600 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1601 }
1394 RETVAL = width > 0; 1639 RETVAL = width > 0;
1395} 1640}
1396 OUTPUT: 1641 OUTPUT:
1397 RETVAL 1642 RETVAL
1398 1643
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1644MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1645
1401PROTOTYPES: DISABLE 1646PROTOTYPES: DISABLE
1402 1647
1403CFPlus::Map 1648DC::Map
1404new (SV *class) 1649new (SV *class)
1405 CODE: 1650 CODE:
1406 New (0, RETVAL, 1, struct map); 1651 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1652 RETVAL->x = 0;
1408 RETVAL->y = 0; 1653 RETVAL->y = 0;
1416 RETVAL->row = 0; 1661 RETVAL->row = 0;
1417 OUTPUT: 1662 OUTPUT:
1418 RETVAL 1663 RETVAL
1419 1664
1420void 1665void
1421DESTROY (CFPlus::Map self) 1666DESTROY (DC::Map self)
1422 CODE: 1667 CODE:
1423{ 1668{
1424 map_clear (self); 1669 map_clear (self);
1425 Safefree (self->face2tile); 1670 Safefree (self->face2tile);
1426 Safefree (self->tex); 1671 Safefree (self->tex);
1427 Safefree (self); 1672 Safefree (self);
1428} 1673}
1429 1674
1430void 1675void
1431resize (CFPlus::Map self, int map_width, int map_height) 1676resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1677 CODE:
1433 self->w = map_width; 1678 self->w = map_width;
1434 self->h = map_height; 1679 self->h = map_height;
1435 1680
1436void 1681void
1437clear (CFPlus::Map self) 1682clear (DC::Map self)
1438 CODE: 1683 CODE:
1439 map_clear (self); 1684 map_clear (self);
1440 1685
1441void 1686void
1442set_tileid (CFPlus::Map self, int face, int tile) 1687set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1688 CODE:
1444{ 1689{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1690 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1691 need_texid (self, tile);
1447} 1692}
1448 1693
1449void 1694void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1695set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1696 CODE:
1452{ 1697{
1453 tileid texid; 1698 tileid texid;
1454 maptex *tex; 1699 maptex *tex;
1455 1700
1468 tex->smoothtile = self->face2tile [smooth]; 1713 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1714 tex->smoothlevel = level;
1470} 1715}
1471 1716
1472void 1717void
1473set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1718set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1474 CODE: 1719 CODE:
1475{ 1720{
1476 need_texid (self, texid); 1721 need_texid (self, texid);
1477 1722
1478 { 1723 {
1498 // from transparent color bleeding and ugly wrapping effects. 1743 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1745}
1501 1746
1502int 1747int
1503ox (CFPlus::Map self) 1748ox (DC::Map self)
1504 ALIAS: 1749 ALIAS:
1505 oy = 1 1750 oy = 1
1506 x = 2 1751 x = 2
1507 y = 3 1752 y = 3
1508 w = 4 1753 w = 4
1519 } 1764 }
1520 OUTPUT: 1765 OUTPUT:
1521 RETVAL 1766 RETVAL
1522 1767
1523void 1768void
1524scroll (CFPlus::Map self, int dx, int dy) 1769scroll (DC::Map self, int dx, int dy)
1525 CODE: 1770 CODE:
1526{ 1771{
1527 if (dx > 0) 1772 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1773 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1774 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 1789 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1790 self->y += MAP_EXTEND_Y;
1546 } 1791 }
1547} 1792}
1548 1793
1549void 1794SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1795map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1796 CODE:
1552{ 1797{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1798 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1799 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1800 mapcell *cell;
1556 int x, y, flags; 1801 int x, y, z, flags;
1802 AV *missing = newAV ();
1803 RETVAL = newRV_noinc ((SV *)missing);
1557 1804
1558 while (data < data_end - 1) 1805 while (data < data_end - 1)
1559 { 1806 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1807 flags = (data [0] << 8) + data [1]; data += 2;
1561 1808
1581 uint8_t ext, cmd; 1828 uint8_t ext, cmd;
1582 1829
1583 do 1830 do
1584 { 1831 {
1585 ext = *data++; 1832 ext = *data++;
1586 cmd = ext & 0x3f; 1833 cmd = ext & 0x7f;
1587 1834
1588 if (cmd < 4) 1835 if (cmd < 4)
1589 cell->darkness = 255 - ext * 64 + 1; 1836 cell->darkness = 255 - ext * 64 + 1;
1590 else if (cmd == 5) // health 1837 else if (cmd == 5) // health
1591 { 1838 {
1594 } 1841 }
1595 else if (cmd == 6) // monster width 1842 else if (cmd == 6) // monster width
1596 cell->stat_width = *data++ + 1; 1843 cell->stat_width = *data++ + 1;
1597 else if (cmd == 0x47) 1844 else if (cmd == 0x47)
1598 { 1845 {
1599 if (*data == 4) 1846 if (*data == 1) cell->player = data [1];
1600 ; // decode player count 1847 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1848 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1849 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1601 1850
1602 data += *data + 1; 1851 data += *data + 1;
1603 } 1852 }
1604 else if (cmd == 8) // cell flags 1853 else if (cmd == 8) // cell flags
1605 cell->flags = *data++; 1854 cell->flags = *data++;
1612 } 1861 }
1613 else 1862 else
1614 cell->darkness = *data++ + 1; 1863 cell->darkness = *data++ + 1;
1615 } 1864 }
1616 1865
1866 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 1867 if (flags & (4 >> z))
1618 { 1868 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 1869 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 1870 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 1871 cell->tile [z] = self->face2tile [face];
1872
1873 if (cell->tile [z])
1874 {
1875 maptex *tex = self->tex + cell->tile [z];
1876 if (!tex->name)
1877 av_push (missing, newSViv (cell->tile [z]));
1878
1879 if (tex->smoothtile)
1880 {
1881 maptex *smooth = self->tex + tex->smoothtile;
1882 if (!smooth->name)
1883 av_push (missing, newSViv (tex->smoothtile));
1884 }
1885 }
1622 } 1886 }
1623
1624 if (flags & 2)
1625 {
1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [1] = self->face2tile [face];
1629 }
1630
1631 if (flags & 1)
1632 {
1633 faceid face = (data [0] << 8) + data [1]; data += 2;
1634 need_facenum (self, face);
1635 cell->tile [2] = self->face2tile [face];
1636 }
1637 } 1887 }
1638 else 1888 else
1639 cell->darkness = 0; 1889 CELL_CLEAR (cell);
1640 } 1890 }
1641} 1891}
1892 OUTPUT:
1893 RETVAL
1642 1894
1643SV * 1895SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1896mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 1897 CODE:
1646{ 1898{
1647 int x1, x; 1899 int x1, x;
1648 int y1, y; 1900 int y1, y;
1649 int z; 1901 int z;
1694} 1946}
1695 OUTPUT: 1947 OUTPUT:
1696 RETVAL 1948 RETVAL
1697 1949
1698void 1950void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1951draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1700 CODE: 1952 CODE:
1701{ 1953{
1954 int x, y, z;
1955
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1956 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1957 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1704 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1958 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705 smooth_key skey; 1959 smooth_key skey;
1706 int x, y, z; 1960 int pl_x, pl_y;
1707 int last_name; 1961 maptex pl_tex;
1962 rc_t *rc = rc_alloc ();
1963 rc_key_t key;
1964 rc_array_t *arr;
1965
1966 pl_tex.name = 0;
1708 1967
1709 // thats current max. sorry. 1968 // thats current max. sorry.
1710 if (sw > 255) sw = 255; 1969 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 1970 if (sh > 255) sh = 255;
1712 1971
1713 // clear key, in case of extra padding 1972 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 1973 memset (&skey, 0, sizeof (skey));
1715 1974
1716 glColor4ub (255, 255, 255, 255); 1975 memset (&key, 0, sizeof (key));
1717 1976 key.r = 255;
1718 glEnable (GL_BLEND); 1977 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1978 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 1979 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1980 key.mode = GL_QUADS;
1722 1981 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS); 1982 key.texname = -1;
1724
1725 last_name = 0;
1726 1983
1727 mx += self->x; 1984 mx += self->x;
1728 my += self->y; 1985 my += self->y;
1729 1986
1730 // first pass: determine smooth_max 1987 // first pass: determine smooth_max
1746 MAX (self->tex [cell->tile [0]].smoothlevel, 2003 MAX (self->tex [cell->tile [0]].smoothlevel,
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 2004 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 2005 self->tex [cell->tile [2]].smoothlevel));
1749 } 2006 }
1750 } 2007 }
2008
2009 glEnable (GL_BLEND);
2010 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2011 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1751 2012
1752 for (z = 0; z <= 2; z++) 2013 for (z = 0; z <= 2; z++)
1753 { 2014 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 2015 memset (smooth_level, 0, sizeof (smooth_level));
1755 2016
1768 { 2029 {
1769 maptex tex = self->tex [tile]; 2030 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 2031 int px = (x + 1) * T - tex.w;
1771 int py = (y + 1) * T - tex.h; 2032 int py = (y + 1) * T - tex.h;
1772 2033
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 2034 if (key.texname != tex.name)
1776 { 2035 {
1777 if (!tex.name) 2036 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 2037 tex = self->tex [2]; /* missing, replace by noface */
1779 2038
1780 glEnd (); 2039 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2040 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 2041 }
1784 2042
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2043 if (expect_false (cell->player == player) && expect_false (z == 2))
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1787 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1788 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1789
1790 if (cell->flags && z == 2)
1791 { 2044 {
2045 pl_x = px;
2046 pl_y = py;
2047 pl_tex = tex;
2048 continue;
2049 }
2050
2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2052 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2053 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2054 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2055
2056 if (expect_false (cell->flags) && expect_false (z == 2))
2057 {
2058 // overlays such as the speech bubble, probably more to come
1792 if (cell->flags & 1) 2059 if (cell->flags & 1)
1793 { 2060 {
1794 maptex tex = self->tex [1]; 2061 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32; 2062 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32; 2063 int py = y * T - T * 6 / 32;
1797 2064
2065 if (tex.name)
1798 glEnd (); 2066 {
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2067 if (key.texname != tex.name)
2068 {
2069 key.texname = tex.name;
2070 arr = rc_array (rc, &key);
2071 }
2072
2073 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2074 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2075 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2076 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1800 glBegin (GL_QUADS); 2077 }
1801
1802 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1803 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1804 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1805 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1806 } 2078 }
1807 } 2079 }
1808 2080
1809 // update smooth hash 2081 // update smooth hash
1810 if (tex.smoothtile) 2082 if (tex.smoothtile)
1846 } 2118 }
1847 } 2119 }
1848 } 2120 }
1849 } 2121 }
1850 2122
2123 rc_draw (rc);
2124 rc_clear (rc);
2125
1851 // go through all smoothlevels, lowest to highest, then draw. 2126 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 2127 // this is basically counting sort
1853 { 2128 {
1854 int w, b; 2129 int w, b;
1855 2130
2131 glEnable (GL_TEXTURE_2D);
2132 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 2133 for (w = 0; w < 256 / 32; ++w)
1857 { 2134 {
1858 uint32_t smask = smooth_level [w]; 2135 uint32_t smask = smooth_level [w];
1859 if (smask) 2136 if (smask)
1860 for (b = 0; b < 32; ++b) 2137 for (b = 0; b < 32; ++b)
1879 int border = bits & 15; 2156 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2157 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 2158 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 2159 float dy = tex.t * .5f ; // 2 images/column
1883 2160
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 2161 if (tex.name)
1887 { 2162 {
2163 // this time avoiding texture state changes
2164 // save gobs of state changes.
1888 if (!tex.name) 2165 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 2166 {
1890
1891 glEnd (); 2167 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2168 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2169 glBegin (GL_QUADS);
1894 } 2170 }
1895 2171
1896 if (border) 2172 if (border)
1897 { 2173 {
1898 float ox = border * dx; 2174 float ox = border * dx;
1899 2175
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2176 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2177 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2178 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2179 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2180 }
1905 2181
1906 if (corner) 2182 if (corner)
1907 { 2183 {
1908 float ox = corner * dx; 2184 float ox = corner * dx;
1909 2185
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2186 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2187 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2188 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2189 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2190 }
1914 } 2191 }
1915 } 2192 }
1916 } 2193 }
1917 } 2194 }
1918 } 2195 }
2196
2197 glEnd ();
2198 glDisable (GL_TEXTURE_2D);
2199 key.texname = -1;
1919 } 2200 }
1920 2201
1921 hv_clear (smooth); 2202 hv_clear (smooth);
1922 } 2203 }
1923 2204
1924 glEnd (); 2205 if (pl_tex.name)
2206 {
2207 maptex tex = pl_tex;
2208 int px = pl_x + sdx;
2209 int py = pl_y + sdy;
1925 2210
1926 glDisable (GL_TEXTURE_2D); 2211 key.texname = tex.name;
2212 arr = rc_array (rc, &key);
2213
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2218
2219 rc_draw (rc);
2220 }
2221
1927 glDisable (GL_BLEND); 2222 glDisable (GL_BLEND);
2223 rc_free (rc);
1928 2224
1929 // top layer: overlays such as the health bar 2225 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2226 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2227 if (0 <= y + my && y + my < self->rows)
1932 { 2228 {
1957 } 2253 }
1958 } 2254 }
1959} 2255}
1960 2256
1961void 2257void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2258draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1963 CODE: 2259 CODE:
1964{ 2260{
1965 static float color[16][3] = { 2261 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2262 { 0.00F, 0.00F, 0.00F },
1967 { 1.00F, 1.00F, 1.00F }, 2263 { 1.00F, 1.00F, 1.00F },
2017 glDisable (GL_BLEND); 2313 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2314 glDisable (GL_TEXTURE_2D);
2019} 2315}
2020 2316
2021void 2317void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2318fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2319 PPCODE:
2024{ 2320{
2025 int x, y; 2321 int x, y;
2026 int sw1 = sw + 2; 2322 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2323 int sh1 = sh + 2;
2035 SvCUR_set (darkness3_sv, sw34 * sh3); 2331 SvCUR_set (darkness3_sv, sw34 * sh3);
2036 2332
2037 mx += self->x - 1; 2333 mx += self->x - 1;
2038 my += self->y - 1; 2334 my += self->y - 1;
2039 2335
2040 memset (darkness1, 255, sw1 * sh1); 2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2041 2337
2042 for (y = 0; y < sh1; y++) 2338 for (y = 0; y < sh1; y++)
2043 if (0 <= y + my && y + my < self->rows) 2339 if (0 <= y + my && y + my < self->rows)
2044 { 2340 {
2045 maprow *row = self->row + (y + my); 2341 maprow *row = self->row + (y + my);
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2394 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2395 PUSHs (darkness3_sv);
2100} 2396}
2101 2397
2102SV * 2398SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2399get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2400 CODE:
2105{ 2401{
2106 int x, y, x1, y1; 2402 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2403 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2404 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2165 else 2461 else
2166 *data++ = 0; 2462 *data++ = 0;
2167 } 2463 }
2168 } 2464 }
2169 2465
2466 /* if size is w*h + 5 then no data has been found */
2467 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2468 {
2170 SvPOK_only (data_sv); 2469 SvPOK_only (data_sv);
2171 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2470 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2471 }
2472
2172 RETVAL = data_sv; 2473 RETVAL = data_sv;
2173} 2474}
2174 OUTPUT: 2475 OUTPUT:
2175 RETVAL 2476 RETVAL
2176 2477
2177void 2478void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2479set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2179 PPCODE: 2480 PPCODE:
2180{ 2481{
2181 int x, y, z; 2482 int x, y, z;
2182 int w, h; 2483 int w, h;
2183 int x1, y1; 2484 int x1, y1;
2485 STRLEN len;
2486 uint8_t *data, *end;
2487
2488 len = SvLEN (data_sv);
2489 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2490 data = SvPVbyte_nolen (data_sv);
2491 end = data + len + 8;
2492
2493 if (len < 5)
2494 XSRETURN_EMPTY;
2184 2495
2185 if (*data++ != 0) 2496 if (*data++ != 0)
2186 return; /* version mismatch */ 2497 XSRETURN_EMPTY; /* version mismatch */
2187 2498
2188 w = *data++ << 8; w |= *data++; 2499 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2500 h = *data++ << 8; h |= *data++;
2190 2501
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2502 // we need to do this 'cause we don't keep an absolute coord system for rows
2203 { 2514 {
2204 maprow *row = map_get_row (self, y); 2515 maprow *row = map_get_row (self, y);
2205 2516
2206 for (x = x0; x < x1; x++) 2517 for (x = x0; x < x1; x++)
2207 { 2518 {
2519 uint8_t flags;
2520
2521 if (data + 7 >= end)
2522 XSRETURN_EMPTY;
2523
2208 uint8_t flags = *data++; 2524 flags = *data++;
2209 2525
2210 if (flags) 2526 if (flags)
2211 { 2527 {
2212 mapcell *cell = row_get_cell (row, x); 2528 mapcell *cell = row_get_cell (row, x);
2213 tileid tile[3] = { 0, 0, 0 }; 2529 tileid tile[3] = { 0, 0, 0 };
2216 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2532 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2217 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2533 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2218 2534
2219 if (cell->darkness == 0) 2535 if (cell->darkness == 0)
2220 { 2536 {
2221 cell->darkness = 0; 2537 /*cell->darkness = 0;*/
2538 EXTEND (SP, 3);
2222 2539
2223 for (z = 0; z <= 2; z++) 2540 for (z = 0; z <= 2; z++)
2224 { 2541 {
2225 tileid t = tile [z]; 2542 tileid t = tile [z];
2226 2543
2227 if (t >= self->texs || (t && !self->tex [t].name)) 2544 if (t >= self->texs || (t && !self->tex [t].name))
2228 { 2545 {
2229 XPUSHs (sv_2mortal (newSViv (t))); 2546 PUSHs (sv_2mortal (newSViv (t)));
2230 need_texid (self, t); 2547 need_texid (self, t);
2231 } 2548 }
2232 2549
2233 cell->tile [z] = t; 2550 cell->tile [z] = t;
2234 } 2551 }
2236 } 2553 }
2237 } 2554 }
2238 } 2555 }
2239} 2556}
2240 2557
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2558MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2559
2243CFPlus::RW 2560DC::RW
2244new (SV *class, SV *data_sv) 2561new (SV *class, SV *data_sv)
2245 CODE: 2562 CODE:
2246{ 2563{
2247 STRLEN datalen; 2564 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2565 char *data = SvPVbyte (data_sv, datalen);
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2567 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2568}
2252 OUTPUT: 2569 OUTPUT:
2253 RETVAL 2570 RETVAL
2254 2571
2255CFPlus::RW 2572DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2573new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2574 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2575 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2576 OUTPUT:
2260 RETVAL 2577 RETVAL
2261 2578
2579# fails on win32:
2580# dc.xs(2268) : error C2059: syntax error : '('
2262void 2581#void
2263close (CFPlus::RW self) 2582#close (DC::RW self)
2264 CODE: 2583# CODE:
2265 SDL_RWclose (self); 2584# (self->(close)) (self);
2266 2585
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2586MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2587
2269PROTOTYPES: DISABLE 2588PROTOTYPES: DISABLE
2270 2589
2271void 2590DC::Channel
2272halt (CFPlus::Channel self) 2591find ()
2273 CODE: 2592 CODE:
2593{
2594 RETVAL = Mix_GroupAvailable (-1);
2595
2596 if (RETVAL < 0)
2597 {
2598 RETVAL = Mix_GroupOldest (-1);
2599
2600 if (RETVAL < 0)
2601 XSRETURN_UNDEF;
2602
2274 Mix_HaltChannel (self); 2603 Mix_HaltChannel (RETVAL);
2604 }
2275 2605
2276void 2606 Mix_UnregisterAllEffects (RETVAL);
2277expire (CFPlus::Channel self, int ticks = -1) 2607 Mix_Volume (RETVAL, 128);
2278 CODE: 2608}
2279 Mix_ExpireChannel (self, ticks);
2280
2281void
2282fade_out (CFPlus::Channel self, int ticks = -1)
2283 CODE:
2284 Mix_FadeOutChannel (self, ticks);
2285
2286int
2287volume (CFPlus::Channel self, int volume)
2288 CODE:
2289 RETVAL = Mix_Volume (self, volume);
2290 OUTPUT: 2609 OUTPUT:
2291 RETVAL 2610 RETVAL
2292 2611
2293void 2612void
2613halt (DC::Channel self)
2614 CODE:
2615 Mix_HaltChannel (self);
2616
2617void
2618expire (DC::Channel self, int ticks = -1)
2619 CODE:
2620 Mix_ExpireChannel (self, ticks);
2621
2622void
2623fade_out (DC::Channel self, int ticks = -1)
2624 CODE:
2625 Mix_FadeOutChannel (self, ticks);
2626
2627int
2628volume (DC::Channel self, int volume)
2629 CODE:
2630 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2631 OUTPUT:
2632 RETVAL
2633
2634void
2294unregister_all_effects (CFPlus::Channel self) 2635unregister_all_effects (DC::Channel self)
2295 CODE: 2636 CODE:
2296 Mix_UnregisterAllEffects (self); 2637 Mix_UnregisterAllEffects (self);
2297 2638
2298void 2639void
2299set_panning (CFPlus::Channel self, int left, int right) 2640set_panning (DC::Channel self, int left, int right)
2300 CODE: 2641 CODE:
2642 left = CLAMP (left , 0, 255);
2643 right = CLAMP (right, 0, 255);
2301 Mix_SetPanning (self, left, right); 2644 Mix_SetPanning (self, left, right);
2302 2645
2303void 2646void
2304set_distance (CFPlus::Channel self, int distance) 2647set_distance (DC::Channel self, int distance)
2305 CODE: 2648 CODE:
2306 Mix_SetDistance (self, distance); 2649 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2307 2650
2308void 2651void
2309set_position (CFPlus::Channel self, int angle, int distance) 2652set_position (DC::Channel self, int angle, int distance)
2310 CODE: 2653 CODE:
2654
2655void
2656set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2657 CODE:
2658{
2659 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2660 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2311 Mix_SetPosition (self, angle, distance); 2661 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2662}
2312 2663
2313void 2664void
2314set_reverse_stereo (CFPlus::Channel self, int flip) 2665set_reverse_stereo (DC::Channel self, int flip)
2315 CODE: 2666 CODE:
2316 Mix_SetReverseStereo (self, flip); 2667 Mix_SetReverseStereo (self, flip);
2317 2668
2318MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2669MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2319 2670
2320PROTOTYPES: DISABLE 2671PROTOTYPES: DISABLE
2321 2672
2322CFPlus::MixChunk 2673DC::MixChunk
2323new (SV *class, CFPlus::RW rwops) 2674new (SV *class, DC::RW rwops)
2324 CODE: 2675 CODE:
2325 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2676 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2326 OUTPUT: 2677 OUTPUT:
2327 RETVAL 2678 RETVAL
2328 2679
2329void 2680void
2330DESTROY (CFPlus::MixChunk self) 2681DESTROY (DC::MixChunk self)
2331 CODE: 2682 CODE:
2332 Mix_FreeChunk (self); 2683 Mix_FreeChunk (self);
2333 2684
2334int 2685int
2335volume (CFPlus::MixChunk self, int volume = -1) 2686volume (DC::MixChunk self, int volume = -1)
2336 CODE: 2687 CODE:
2688 if (items > 1)
2689 volume = CLAMP (volume, 0, 128);
2337 RETVAL = Mix_VolumeChunk (self, volume); 2690 RETVAL = Mix_VolumeChunk (self, volume);
2338 OUTPUT: 2691 OUTPUT:
2339 RETVAL 2692 RETVAL
2340 2693
2341CFPlus::Channel 2694DC::Channel
2342play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2695play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2343 CODE: 2696 CODE:
2697{
2344 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2698 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2699
2700 if (RETVAL < 0)
2701 XSRETURN_UNDEF;
2702
2703 if (channel < 0)
2704 {
2345 Mix_UnregisterAllEffects (RETVAL); 2705 Mix_UnregisterAllEffects (RETVAL);
2706 Mix_Volume (RETVAL, 128);
2707 }
2708}
2346 OUTPUT: 2709 OUTPUT:
2347 RETVAL 2710 RETVAL
2348 2711
2349MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2712MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2350 2713
2351int 2714int
2352volume (int volume = -1) 2715volume (int volume = -1)
2353 PROTOTYPE: ;$ 2716 PROTOTYPE: ;$
2354 CODE: 2717 CODE:
2718 if (items > 0)
2719 volume = CLAMP (volume, 0, 128);
2355 RETVAL = Mix_VolumeMusic (volume); 2720 RETVAL = Mix_VolumeMusic (volume);
2356 OUTPUT: 2721 OUTPUT:
2357 RETVAL 2722 RETVAL
2358 2723
2359void 2724void
2364void 2729void
2365halt () 2730halt ()
2366 CODE: 2731 CODE:
2367 Mix_HaltMusic (); 2732 Mix_HaltMusic ();
2368 2733
2369CFPlus::MixMusic 2734DC::MixMusic
2370new (SV *class, CFPlus::RW rwops) 2735new (SV *class, DC::RW rwops)
2371 CODE: 2736 CODE:
2372 RETVAL = Mix_LoadMUS_RW (rwops); 2737 RETVAL = Mix_LoadMUS_RW (rwops);
2373 OUTPUT: 2738 OUTPUT:
2374 RETVAL 2739 RETVAL
2375 2740
2376void 2741void
2377DESTROY (CFPlus::MixMusic self) 2742DESTROY (DC::MixMusic self)
2378 CODE: 2743 CODE:
2379 Mix_FreeMusic (self); 2744 Mix_FreeMusic (self);
2380 2745
2381int 2746int
2382play (CFPlus::MixMusic self, int loops = -1) 2747play (DC::MixMusic self, int loops = -1)
2383 CODE: 2748 CODE:
2384 RETVAL = Mix_PlayMusic (self, loops); 2749 RETVAL = Mix_PlayMusic (self, loops);
2385 OUTPUT: 2750 OUTPUT:
2386 RETVAL 2751 RETVAL
2387 2752
2388void 2753void
2389fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2754fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2390 CODE: 2755 CODE:
2391 Mix_FadeInMusicPos (self, loops, ms, position); 2756 Mix_FadeInMusicPos (self, loops, ms, position);
2392 2757
2393MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2758MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2394 2759
2395PROTOTYPES: ENABLE 2760PROTOTYPES: ENABLE
2396 2761
2397BOOT: 2762BOOT:
2398{ 2763{
2399 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2764 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2400 static const struct { 2765 static const struct {
2401 const char *name; 2766 const char *name;
2402 IV iv; 2767 IV iv;
2403 } *civ, const_iv[] = { 2768 } *civ, const_iv[] = {
2404# define const_iv(name) { # name, (IV)name } 2769# define const_iv(name) { # name, (IV)name }
2439 const_iv (GL_INTENSITY), 2804 const_iv (GL_INTENSITY),
2440 const_iv (GL_LUMINANCE), 2805 const_iv (GL_LUMINANCE),
2441 const_iv (GL_LUMINANCE_ALPHA), 2806 const_iv (GL_LUMINANCE_ALPHA),
2442 const_iv (GL_FLOAT), 2807 const_iv (GL_FLOAT),
2443 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2808 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2809 const_iv (GL_COMPRESSED_ALPHA_ARB),
2810 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2811 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2812 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2813 const_iv (GL_COMPRESSED_RGB_ARB),
2814 const_iv (GL_COMPRESSED_RGBA_ARB),
2444 const_iv (GL_COMPILE), 2815 const_iv (GL_COMPILE),
2445 const_iv (GL_PROXY_TEXTURE_1D), 2816 const_iv (GL_PROXY_TEXTURE_1D),
2446 const_iv (GL_PROXY_TEXTURE_2D), 2817 const_iv (GL_PROXY_TEXTURE_2D),
2447 const_iv (GL_TEXTURE_1D), 2818 const_iv (GL_TEXTURE_1D),
2448 const_iv (GL_TEXTURE_2D), 2819 const_iv (GL_TEXTURE_2D),
2487 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2858 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2488 const_iv (GL_POINT_SMOOTH_HINT), 2859 const_iv (GL_POINT_SMOOTH_HINT),
2489 const_iv (GL_LINE_SMOOTH_HINT), 2860 const_iv (GL_LINE_SMOOTH_HINT),
2490 const_iv (GL_POLYGON_SMOOTH_HINT), 2861 const_iv (GL_POLYGON_SMOOTH_HINT),
2491 const_iv (GL_GENERATE_MIPMAP_HINT), 2862 const_iv (GL_GENERATE_MIPMAP_HINT),
2863 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2492 const_iv (GL_FASTEST), 2864 const_iv (GL_FASTEST),
2493 const_iv (GL_DONT_CARE), 2865 const_iv (GL_DONT_CARE),
2494 const_iv (GL_NICEST), 2866 const_iv (GL_NICEST),
2495 const_iv (GL_V2F), 2867 const_iv (GL_V2F),
2496 const_iv (GL_V3F), 2868 const_iv (GL_V3F),
2504 2876
2505 texture_av = newAV (); 2877 texture_av = newAV ();
2506 AvREAL_off (texture_av); 2878 AvREAL_off (texture_av);
2507} 2879}
2508 2880
2881void
2882disable_GL_EXT_blend_func_separate ()
2883 CODE:
2884 gl.BlendFuncSeparate = 0;
2885 gl.BlendFuncSeparateEXT = 0;
2886
2509char * 2887char *
2510gl_vendor () 2888gl_vendor ()
2511 CODE: 2889 CODE:
2512 RETVAL = (char *)glGetString (GL_VENDOR); 2890 RETVAL = (char *)glGetString (GL_VENDOR);
2513 OUTPUT: 2891 OUTPUT:
2634 3012
2635void glRect (float x1, float y1, float x2, float y2) 3013void glRect (float x1, float y1, float x2, float y2)
2636 CODE: 3014 CODE:
2637 glRectf (x1, y1, x2, y2); 3015 glRectf (x1, y1, x2, y2);
2638 3016
3017void glRect_lineloop (float x1, float y1, float x2, float y2)
3018 CODE:
3019 glBegin (GL_LINE_LOOP);
3020 glVertex2f (x1, y1);
3021 glVertex2f (x2, y1);
3022 glVertex2f (x2, y2);
3023 glVertex2f (x1, y2);
3024 glEnd ();
3025
2639PROTOTYPES: ENABLE 3026PROTOTYPES: ENABLE
2640 3027
2641void glBegin (int mode) 3028void glBegin (int mode)
2642 3029
2643void glEnd () 3030void glEnd ()
2675void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3062void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2676 CODE: 3063 CODE:
2677 if (gl.SeparableFilter2D) 3064 if (gl.SeparableFilter2D)
2678 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3065 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2679 3066
2680void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3067void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2681 3068
2682void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3069void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2683 3070
2684void glDrawPixels (int width, int height, int format, int type, char *pixels) 3071void glDrawPixels (int width, int height, int format, int type, char *pixels)
2685 3072
2711 3098
2712void glEndList () 3099void glEndList ()
2713 3100
2714void glCallList (int list) 3101void glCallList (int list)
2715 3102
2716MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3103MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2717 3104
2718PROTOTYPES: DISABLE 3105PROTOTYPES: DISABLE
2719 3106
2720void 3107void
2721find_widget (SV *self, NV x, NV y) 3108find_widget (SV *self, NV x, NV y)
2725 XPUSHs (self); 3112 XPUSHs (self);
2726} 3113}
2727 3114
2728BOOT: 3115BOOT:
2729{ 3116{
2730 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3117 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2731 3118
2732 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3119 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2733 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3120 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2734 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3121 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2735 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3122 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2736} 3123}
2737 3124
2738void 3125void
2739draw (SV *self) 3126draw (SV *self)
2740 CODE: 3127 CODE:
2744 NV x, y, w, h; 3131 NV x, y, w, h;
2745 SV *draw_x_sv = GvSV (draw_x_gv); 3132 SV *draw_x_sv = GvSV (draw_x_gv);
2746 SV *draw_y_sv = GvSV (draw_y_gv); 3133 SV *draw_y_sv = GvSV (draw_y_gv);
2747 SV *draw_w_sv = GvSV (draw_w_gv); 3134 SV *draw_w_sv = GvSV (draw_w_gv);
2748 SV *draw_h_sv = GvSV (draw_h_gv); 3135 SV *draw_h_sv = GvSV (draw_h_gv);
2749 SV *hover;
2750 double draw_x, draw_y, draw_w, draw_h; 3136 double draw_x, draw_y;
2751 3137
2752 if (!SvROK (self)) 3138 if (!SvROK (self))
2753 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3139 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2754 3140
2755 hv = (HV *)SvRV (self); 3141 hv = (HV *)SvRV (self);
2756 3142
2757 if (SvTYPE (hv) != SVt_PVHV) 3143 if (SvTYPE (hv) != SVt_PVHV)
2758 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3144 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2759 3145
2760 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3146 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2761 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3147 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2762 3148
2763 if (!h || !w) 3149 if (!h || !w)
2783 { 3169 {
2784 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3170 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2785 3171
2786 if (svp && SvTRUE (*svp)) 3172 if (svp && SvTRUE (*svp))
2787 { 3173 {
2788 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3174 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2789 glEnable (GL_BLEND); 3175 glEnable (GL_BLEND);
2790 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3176 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2791 glBegin (GL_QUADS); 3177 glBegin (GL_QUADS);
2792 glVertex2f (0, 0); 3178 glVertex2f (0, 0);
2793 glVertex2f (w, 0); 3179 glVertex2f (w, 0);
2796 glEnd (); 3182 glEnd ();
2797 glDisable (GL_BLEND); 3183 glDisable (GL_BLEND);
2798 } 3184 }
2799 } 3185 }
2800#if 0 3186#if 0
2801 if ($ENV{CFPLUS_DEBUG} & 1) { 3187 // draw borders, for debugging
2802 glPushMatrix; 3188 glPushMatrix ();
2803 glColor 1, 1, 0, 1; 3189 glColor4f (1., 1., 0., 1.);
2804 glTranslate 0.375, 0.375; 3190 glTranslatef (.5, .5, 0.);
2805 glBegin GL_LINE_LOOP; 3191 glBegin (GL_LINE_LOOP);
2806 glVertex 0 , 0; 3192 glVertex2f (0 , 0);
2807 glVertex $self->{w} - 1, 0; 3193 glVertex2f (w - 1, 0);
2808 glVertex $self->{w} - 1, $self->{h} - 1; 3194 glVertex2f (w - 1, h - 1);
2809 glVertex 0 , $self->{h} - 1; 3195 glVertex2f (0 , h - 1);
2810 glEnd; 3196 glEnd ();
2811 glPopMatrix; 3197 glPopMatrix ();
2812 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2813 }
2814#endif 3198#endif
2815 PUSHMARK (SP); 3199 PUSHMARK (SP);
2816 XPUSHs (self); 3200 XPUSHs (self);
2817 PUTBACK; 3201 PUTBACK;
2818 call_method ("_draw", G_VOID | G_DISCARD); 3202 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines