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.218 by root, Mon Aug 6 02:11:45 2007 UTC vs.
Revision 1.278 by root, Wed Sep 3 10:36:25 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 95
66# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
67#endif
68 97
69static AV *texture_av; 98static AV *texture_av;
70 99
71static struct 100static struct
72{ 101{
109 av_push (texture_av, (SV *)(size_t)name); 138 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 139 glDeleteTextures (1, &name);
111} 140}
112 141
113#include "texcache.c" 142#include "texcache.c"
143#include "rendercache.c"
114 144
115#include "pango-font.c" 145#include "pango-font.c"
116#include "pango-fontmap.c" 146#include "pango-fontmap.c"
117#include "pango-render.c" 147#include "pango-render.c"
118 148
119typedef IV CFPlus__Channel; 149typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 150typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 151typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 152typedef Mix_Music *DC__MixMusic;
123 153
124typedef PangoFontDescription *CFPlus__Font; 154typedef PangoFontDescription *DC__Font;
125 155
126static int 156static int
127shape_attr_p (PangoLayoutRun *run) 157shape_attr_p (PangoLayoutRun *run)
128{ 158{
129 GSList *attrs = run->item->analysis.extra_attrs; 159 GSList *attrs = run->item->analysis.extra_attrs;
143 173
144typedef struct cf_layout { 174typedef struct cf_layout {
145 PangoLayout *pl; 175 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 176 float r, g, b, a; // default color for rgba mode
147 int base_height; 177 int base_height;
148 CFPlus__Font font; 178 DC__Font font;
179 rc_t *rc;
149} *CFPlus__Layout; 180} *DC__Layout;
150 181
151static CFPlus__Font default_font; 182static DC__Font default_font;
152static PangoContext *opengl_context; 183static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 184static PangoFontMap *opengl_fontmap;
154 185
155static void 186static void
156substitute_func (FcPattern *pattern, gpointer data) 187substitute_func (FcPattern *pattern, gpointer data)
161#endif 192#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 193 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 194}
164 195
165static void 196static void
166layout_update_font (CFPlus__Layout self) 197layout_update_font (DC__Layout self)
167{ 198{
168 /* use a random scale factor to account for unknown descenders, 0.8 works 199 /* use a random scale factor to account for unknown descenders, 0.8 works
169 * reasonably well with bitstream vera 200 * reasonably well with dejavu/bistream fonts
170 */ 201 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 202 PangoFontDescription *font = self->font ? self->font : default_font;
172 203
173 pango_font_description_set_absolute_size (font, 204 pango_font_description_set_absolute_size (font,
174 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 205 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175 206
176 pango_layout_set_font_description (self->pl, font); 207 pango_layout_set_font_description (self->pl, font);
177} 208}
178 209
179static void 210static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 211layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 212{
182 PangoRectangle rect; 213 PangoRectangle rect;
183 214
184 // get_pixel_* wrongly rounds down 215 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 216 pango_layout_get_extents (self->pl, 0, &rect);
196 227
197typedef uint16_t tileid; 228typedef uint16_t tileid;
198typedef uint16_t faceid; 229typedef uint16_t faceid;
199 230
200typedef struct { 231typedef struct {
201 int name; 232 GLuint name;
202 int w, h; 233 int w, h;
203 float s, t; 234 float s, t;
204 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
205 tileid smoothtile; 236 tileid smoothtile;
206 uint8_t smoothlevel; 237 uint8_t smoothlevel;
224 int faces; tileid *face2tile; // [faceid] 255 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 256 int texs; maptex *tex; // [tileid]
226 257
227 int32_t rows; 258 int32_t rows;
228 maprow *row; 259 maprow *row;
229} *CFPlus__Map; 260} *DC__Map;
230 261
231static char * 262static char *
232prepend (char *ptr, int sze, int inc) 263prepend (char *ptr, int sze, int inc)
233{ 264{
234 char *p; 265 char *p;
272 self->texs *= 2; 303 self->texs *= 2;
273 } 304 }
274} 305}
275 306
276static maprow * 307static maprow *
277map_get_row (CFPlus__Map self, int y) 308map_get_row (DC__Map self, int y)
278{ 309{
279 if (0 > y) 310 if (0 > y)
280 { 311 {
281 int extend = - y + MAP_EXTEND_Y; 312 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 313 Prepend (maprow, self->row, self->rows, extend);
320 351
321 return row->col + (x - row->c0); 352 return row->col + (x - row->c0);
322} 353}
323 354
324static mapcell * 355static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 356map_get_cell (DC__Map self, int x, int y)
326{ 357{
327 return row_get_cell (map_get_row (self, y), x); 358 return row_get_cell (map_get_row (self, y), x);
328} 359}
329 360
330static void 361static void
331map_clear (CFPlus__Map self) 362map_clear (DC__Map self)
332{ 363{
333 int r; 364 int r;
334 365
335 for (r = 0; r < self->rows; r++) 366 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 367 Safefree (self->row[r].col);
343 self->oy = 0; 374 self->oy = 0;
344 self->row = 0; 375 self->row = 0;
345 self->rows = 0; 376 self->rows = 0;
346} 377}
347 378
379#define CELL_CLEAR(cell) \
380 do { \
381 if ((cell)->player) \
382 (cell)->tile [2] = 0; \
383 (cell)->darkness = 0; \
384 (cell)->stat_hp = 0; \
385 (cell)->flags = 0; \
386 (cell)->player = 0; \
387 } while (0)
388
348static void 389static void
349map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 390map_blank (DC__Map self, int x0, int y0, int w, int h)
350{ 391{
351 int x, y; 392 int x, y;
352 maprow *row; 393 maprow *row;
353 mapcell *cell; 394 mapcell *cell;
354 395
366 if (x >= row->c1) 407 if (x >= row->c1)
367 break; 408 break;
368 409
369 cell = row->col + x - row->c0; 410 cell = row->col + x - row->c0;
370 411
371 cell->darkness = 0; 412 CELL_CLEAR (cell);
372 cell->stat_hp = 0;
373 cell->flags = 0;
374 cell->player = 0;
375 } 413 }
376 } 414 }
377} 415}
378 416
379typedef struct { 417typedef struct {
433 n |= n >> 16; 471 n |= n >> 16;
434 472
435 return n + 1; 473 return n + 1;
436} 474}
437 475
476static unsigned int
477popcount (unsigned int n)
478{
479 n -= (n >> 1) & 0x55555555U;
480 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
481 n = ((n >> 4) + n) & 0x0f0f0f0fU;
482 n *= 0x01010101U;
483
484 return n >> 24;
485}
486
438/* SDL should provide this, really. */ 487/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 488#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 489#define SDLK_MODIFIER_MAX 314
441 490
442/******************************************************************************/ 491/******************************************************************************/
480 return 0; 529 return 0;
481 530
482 return 1; 531 return 1;
483} 532}
484 533
485MODULE = CFPlus PACKAGE = CFPlus 534/******************************************************************************/
535
536/* process keyboard modifiers */
537static int
538mod_munge (int mod)
539{
540 mod &= MOD_MASK;
541
542 if (mod & (KMOD_META | KMOD_ALT))
543 mod |= KMOD_LRAM;
544
545 return mod;
546}
547
548static void
549deliantra_main ()
550{
551 char *argv[] = { 0 };
552 call_argv ("::main", G_DISCARD | G_VOID, argv);
553}
554
555#ifdef __MACOSX__
556 /* to due surprising braindamage on the side of SDL design, we
557 * do some mind-boggling hack here: SDL requires a custom main()
558 * on OS X, so... we provide one and call the original main(), which,
559 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
560 * and which calls our main (== SDL_main) back.
561 */
562 extern C_LINKAGE int
563 main (int argc, char *argv[])
564 {
565 deliantra_main ();
566 }
567
568 #undef main
569
570 extern C_LINKAGE int main (int argc, char *argv[]);
571
572 static void
573 SDL_braino (void)
574 {
575 char *argv[] = { "deliantra client", 0 };
576 (main) (1, argv);
577 }
578#else
579 static void
580 SDL_braino (void)
581 {
582 deliantra_main ();
583 }
584#endif
585
586MODULE = Deliantra::Client PACKAGE = DC
486 587
487PROTOTYPES: ENABLE 588PROTOTYPES: ENABLE
488 589
489BOOT: 590BOOT:
490{ 591{
491 HV *stash = gv_stashpv ("CFPlus", 1); 592 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 593 static const struct {
493 const char *name; 594 const char *name;
494 IV iv; 595 IV iv;
495 } *civ, const_iv[] = { 596 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 597# define const_iv(name) { # name, (IV)name }
518 619
519 const_iv (SDL_APPINPUTFOCUS), 620 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 621 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 622 const_iv (SDL_APPACTIVE),
522 623
624
625 const_iv (SDLK_UNKNOWN),
626 const_iv (SDLK_FIRST),
627 const_iv (SDLK_BACKSPACE),
628 const_iv (SDLK_TAB),
629 const_iv (SDLK_CLEAR),
630 const_iv (SDLK_RETURN),
631 const_iv (SDLK_PAUSE),
632 const_iv (SDLK_ESCAPE),
633 const_iv (SDLK_SPACE),
634 const_iv (SDLK_EXCLAIM),
635 const_iv (SDLK_QUOTEDBL),
636 const_iv (SDLK_HASH),
637 const_iv (SDLK_DOLLAR),
638 const_iv (SDLK_AMPERSAND),
639 const_iv (SDLK_QUOTE),
640 const_iv (SDLK_LEFTPAREN),
641 const_iv (SDLK_RIGHTPAREN),
642 const_iv (SDLK_ASTERISK),
643 const_iv (SDLK_PLUS),
644 const_iv (SDLK_COMMA),
645 const_iv (SDLK_MINUS),
646 const_iv (SDLK_PERIOD),
647 const_iv (SDLK_SLASH),
648 const_iv (SDLK_0),
649 const_iv (SDLK_1),
650 const_iv (SDLK_2),
651 const_iv (SDLK_3),
652 const_iv (SDLK_4),
653 const_iv (SDLK_5),
654 const_iv (SDLK_6),
655 const_iv (SDLK_7),
656 const_iv (SDLK_8),
657 const_iv (SDLK_9),
658 const_iv (SDLK_COLON),
659 const_iv (SDLK_SEMICOLON),
660 const_iv (SDLK_LESS),
661 const_iv (SDLK_EQUALS),
662 const_iv (SDLK_GREATER),
663 const_iv (SDLK_QUESTION),
664 const_iv (SDLK_AT),
665
666 const_iv (SDLK_LEFTBRACKET),
667 const_iv (SDLK_BACKSLASH),
668 const_iv (SDLK_RIGHTBRACKET),
669 const_iv (SDLK_CARET),
670 const_iv (SDLK_UNDERSCORE),
671 const_iv (SDLK_BACKQUOTE),
672 const_iv (SDLK_DELETE),
673
674 const_iv (SDLK_FIRST),
675 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 676 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 677 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 678 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 679 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 680 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 752 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 753 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 754 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 755 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 756 const_iv (KMOD_MODE),
757
758 const_iv (KMOD_LRAM),
759
760 const_iv (MIX_DEFAULT_FORMAT),
761
762 const_iv (SDL_INIT_TIMER),
763 const_iv (SDL_INIT_AUDIO),
764 const_iv (SDL_INIT_VIDEO),
765 const_iv (SDL_INIT_CDROM),
766 const_iv (SDL_INIT_JOYSTICK),
767 const_iv (SDL_INIT_EVERYTHING),
768 const_iv (SDL_INIT_NOPARACHUTE),
769 const_iv (SDL_INIT_EVENTTHREAD),
770
771 const_iv (SDL_GL_RED_SIZE),
772 const_iv (SDL_GL_GREEN_SIZE),
773 const_iv (SDL_GL_BLUE_SIZE),
774 const_iv (SDL_GL_ALPHA_SIZE),
775 const_iv (SDL_GL_DOUBLEBUFFER),
776 const_iv (SDL_GL_BUFFER_SIZE),
777 const_iv (SDL_GL_DEPTH_SIZE),
778 const_iv (SDL_GL_STENCIL_SIZE),
779 const_iv (SDL_GL_ACCUM_RED_SIZE),
780 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
781 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
782 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
783 const_iv (SDL_GL_STEREO),
784 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
785 const_iv (SDL_GL_MULTISAMPLESAMPLES),
786 const_iv (SDL_GL_ACCELERATED_VISUAL),
787 const_iv (SDL_GL_SWAP_CONTROL),
788
789 const_iv (FOW_DARKNESS)
604# undef const_iv 790# undef const_iv
605 }; 791 };
606 792
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 793 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 812
627NV floor (NV x) 813NV floor (NV x)
628 814
629NV ceil (NV x) 815NV ceil (NV x)
630 816
817IV minpot (UV n)
818
819IV popcount (UV n)
820
631void 821void
632pango_init () 822pango_init ()
633 CODE: 823 CODE:
634{ 824{
635 opengl_fontmap = pango_opengl_font_map_new (); 825 opengl_fontmap = pango_opengl_font_map_new ();
636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 826 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); 827 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
828 /*pango_context_set_font_description (opengl_context, default_font);*/
829#if PANGO_VERSION_CHECK (1, 15, 2)
830 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
831 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
832#endif
638} 833}
639 834
640char *
641SDL_GetError () 835char *SDL_GetError ()
642 836
643int 837void SDL_braino ()
644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
645 838
646void 839int SDL_Init (U32 flags)
840
841int SDL_InitSubSystem (U32 flags)
842
843void SDL_QuitSubSystem (U32 flags)
844
647SDL_Quit () 845void SDL_Quit ()
846
847int SDL_GL_SetAttribute (int attr, int value)
848
849int SDL_GL_GetAttribute (int attr)
850 CODE:
851 if (SDL_GL_GetAttribute (attr, &RETVAL))
852 XSRETURN_UNDEF;
853 OUTPUT:
854 RETVAL
648 855
649void 856void
650SDL_ListModes (int rgb, int alpha) 857SDL_ListModes (int rgb, int alpha)
651 PPCODE: 858 PPCODE:
652{ 859{
664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 872 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 873 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667 874
668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 875 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); 876 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672#endif
673 877
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 878 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 879
676 if (m && m != (SDL_Rect **)-1) 880 if (m && m != (SDL_Rect **)-1)
677 while (*m) 881 while (*m)
678 { 882 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 883 if ((*m)->w >= 400 && (*m)->h >= 300)
680 { 884 {
681 AV *av = newAV (); 885 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 886 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 887 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 888 av_push (av, newSViv (rgb));
708 912
709 if (RETVAL) 913 if (RETVAL)
710 { 914 {
711 av_clear (texture_av); 915 av_clear (texture_av);
712 916
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 917 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 918#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 919#include "glfunc.h"
716#undef GL_FUNC 920#undef GL_FUNC
717 } 921 }
718} 922}
725char * 929char *
726SDL_GetKeyName (int sym) 930SDL_GetKeyName (int sym)
727 931
728int 932int
729SDL_GetAppState () 933SDL_GetAppState ()
934
935int
936SDL_GetModState ()
730 937
731void 938void
732poll_events () 939poll_events ()
733 PPCODE: 940 PPCODE:
734{ 941{
744 { 951 {
745 case SDL_KEYDOWN: 952 case SDL_KEYDOWN:
746 case SDL_KEYUP: 953 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 954 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 955 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 956 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
750 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 957 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 958 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 959 break;
753 960
754 case SDL_ACTIVEEVENT: 961 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 962 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 980 x = ev.motion.x;
774 y = ev.motion.y; 981 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 982 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 983 }
777 984
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 985 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 986 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 987 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 988 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 989 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 990 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 991 }
785 break; 992 break;
786 993
787 case SDL_MOUSEBUTTONDOWN: 994 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 995 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 997
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 998 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 999 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1000 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1001 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1006 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1007 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 1008 break;
802 } 1009 }
803 1010
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1011 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 1012 }
806} 1013}
807 1014
808int 1015int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1016Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 1017 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 1018 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 1019 Mix_ChannelFinished (channel_finished);
1020
1021void
1022Mix_QuerySpec ()
1023 PPCODE:
1024{
1025 int freq, channels;
1026 Uint16 format;
1027
1028 if (Mix_QuerySpec (&freq, &format, &channels))
1029 {
1030 EXTEND (SP, 3);
1031 PUSHs (sv_2mortal (newSViv (freq)));
1032 PUSHs (sv_2mortal (newSViv (format)));
1033 PUSHs (sv_2mortal (newSViv (channels)));
1034 }
1035}
813 1036
814void 1037void
815Mix_CloseAudio () 1038Mix_CloseAudio ()
816 1039
817int 1040int
852 } 1075 }
853 } 1076 }
854#endif 1077#endif
855} 1078}
856 1079
857void 1080int
858add_font (char *file) 1081add_font (char *file)
859 CODE: 1082 CODE:
860 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1083 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084 OUTPUT:
1085 RETVAL
861 1086
862void 1087void
863load_image_inline (SV *image_) 1088load_image_inline (SV *image_)
864 ALIAS: 1089 ALIAS:
865 load_image_file = 1 1090 load_image_file = 1
951void 1176void
952error (char *message) 1177error (char *message)
953 CODE: 1178 CODE:
954 fprintf (stderr, "ERROR: %s\n", message); 1179 fprintf (stderr, "ERROR: %s\n", message);
955#ifdef _WIN32 1180#ifdef _WIN32
956 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1181 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957#endif 1182#endif
958 1183
959void 1184void
960fatal (char *message) 1185fatal (char *message)
961 CODE: 1186 CODE:
962 fprintf (stderr, "FATAL: %s\n", message); 1187 fprintf (stderr, "FATAL: %s\n", message);
963#ifdef _WIN32 1188#ifdef _WIN32
964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1189 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965#endif 1190#endif
966 _exit (1); 1191 _exit (1);
967 1192
968void 1193void
969_exit (int retval = 0) 1194_exit (int retval = 0)
981#if DEBUG 1206#if DEBUG
982 VALGRIND_DO_LEAK_CHECK; 1207 VALGRIND_DO_LEAK_CHECK;
983#endif 1208#endif
984} 1209}
985 1210
986MODULE = CFPlus PACKAGE = CFPlus::Font 1211MODULE = Deliantra::Client PACKAGE = DC::Font
987 1212
988PROTOTYPES: DISABLE 1213PROTOTYPES: DISABLE
989 1214
990CFPlus::Font 1215DC::Font
991new_from_file (SV *class, char *path, int id = 0) 1216new_from_file (SV *class, char *path, int id = 0)
992 CODE: 1217 CODE:
993{ 1218{
994 int count; 1219 int count;
995 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1220 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
998} 1223}
999 OUTPUT: 1224 OUTPUT:
1000 RETVAL 1225 RETVAL
1001 1226
1002void 1227void
1003DESTROY (CFPlus::Font self) 1228DESTROY (DC::Font self)
1004 CODE: 1229 CODE:
1005 pango_font_description_free (self); 1230 pango_font_description_free (self);
1006 1231
1007void 1232void
1008make_default (CFPlus::Font self) 1233make_default (DC::Font self)
1009 PROTOTYPE: $ 1234 PROTOTYPE: $
1010 CODE: 1235 CODE:
1011 default_font = self; 1236 default_font = self;
1012 1237
1013MODULE = CFPlus PACKAGE = CFPlus::Layout 1238MODULE = Deliantra::Client PACKAGE = DC::Layout
1014 1239
1015PROTOTYPES: DISABLE 1240PROTOTYPES: DISABLE
1016 1241
1017void 1242void
1018reset_glyph_cache () 1243glyph_cache_backup ()
1019 PROTOTYPE: 1244 PROTOTYPE:
1020 CODE: 1245 CODE:
1246 tc_backup ();
1247
1248void
1249glyph_cache_restore ()
1250 PROTOTYPE:
1251 CODE:
1021 tc_clear (); 1252 tc_restore ();
1022 1253
1023CFPlus::Layout 1254DC::Layout
1024new (SV *class) 1255new (SV *class)
1025 CODE: 1256 CODE:
1026 New (0, RETVAL, 1, struct cf_layout); 1257 New (0, RETVAL, 1, struct cf_layout);
1027 1258
1028 RETVAL->pl = pango_layout_new (opengl_context); 1259 RETVAL->pl = pango_layout_new (opengl_context);
1030 RETVAL->g = 1.; 1261 RETVAL->g = 1.;
1031 RETVAL->b = 1.; 1262 RETVAL->b = 1.;
1032 RETVAL->a = 1.; 1263 RETVAL->a = 1.;
1033 RETVAL->base_height = MIN_FONT_HEIGHT; 1264 RETVAL->base_height = MIN_FONT_HEIGHT;
1034 RETVAL->font = 0; 1265 RETVAL->font = 0;
1266 RETVAL->rc = rc_alloc ();
1035 1267
1036 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1268 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037 layout_update_font (RETVAL); 1269 layout_update_font (RETVAL);
1038 OUTPUT: 1270 OUTPUT:
1039 RETVAL 1271 RETVAL
1040 1272
1041void 1273void
1042DESTROY (CFPlus::Layout self) 1274DESTROY (DC::Layout self)
1043 CODE: 1275 CODE:
1044 g_object_unref (self->pl); 1276 g_object_unref (self->pl);
1277 rc_free (self->rc);
1045 Safefree (self); 1278 Safefree (self);
1046 1279
1047void 1280void
1048set_text (CFPlus::Layout self, SV *text_) 1281set_text (DC::Layout self, SV *text_)
1049 CODE: 1282 CODE:
1050{ 1283{
1051 STRLEN textlen; 1284 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1285 char *text = SvPVutf8 (text_, textlen);
1053 1286
1054 pango_layout_set_text (self->pl, text, textlen); 1287 pango_layout_set_text (self->pl, text, textlen);
1055} 1288}
1056 1289
1057void 1290void
1058set_markup (CFPlus::Layout self, SV *text_) 1291set_markup (DC::Layout self, SV *text_)
1059 CODE: 1292 CODE:
1060{ 1293{
1061 STRLEN textlen; 1294 STRLEN textlen;
1062 char *text = SvPVutf8 (text_, textlen); 1295 char *text = SvPVutf8 (text_, textlen);
1063 1296
1064 pango_layout_set_markup (self->pl, text, textlen); 1297 pango_layout_set_markup (self->pl, text, textlen);
1065} 1298}
1066 1299
1067void 1300void
1068set_shapes (CFPlus::Layout self, ...) 1301set_shapes (DC::Layout self, ...)
1069 CODE: 1302 CODE:
1070{ 1303{
1071 PangoAttrList *attrs = 0; 1304 PangoAttrList *attrs = 0;
1072 const char *text = pango_layout_get_text (self->pl); 1305 const char *text = pango_layout_get_text (self->pl);
1073 const char *pos = text; 1306 const char *pos = text;
1108 if (attrs) 1341 if (attrs)
1109 pango_layout_set_attributes (self->pl, attrs); 1342 pango_layout_set_attributes (self->pl, attrs);
1110} 1343}
1111 1344
1112void 1345void
1113get_shapes (CFPlus::Layout self) 1346get_shapes (DC::Layout self)
1114 PPCODE: 1347 PPCODE:
1115{ 1348{
1116 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1349 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117 1350
1118 do 1351 do
1119 { 1352 {
1120 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1353 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121 1354
1122 if (run && shape_attr_p (run)) 1355 if (run && shape_attr_p (run))
1123 { 1356 {
1124 PangoRectangle extents; 1357 PangoRectangle extents;
1125 pango_layout_iter_get_run_extents (iter, 0, &extents); 1358 pango_layout_iter_get_run_extents (iter, 0, &extents);
1133 1366
1134 pango_layout_iter_free (iter); 1367 pango_layout_iter_free (iter);
1135} 1368}
1136 1369
1137int 1370int
1138has_wrapped (CFPlus::Layout self) 1371has_wrapped (DC::Layout self)
1139 CODE: 1372 CODE:
1140{ 1373{
1141 int lines = 1; 1374 int lines = 1;
1142 const char *text = pango_layout_get_text (self->pl); 1375 const char *text = pango_layout_get_text (self->pl);
1143 1376
1148} 1381}
1149 OUTPUT: 1382 OUTPUT:
1150 RETVAL 1383 RETVAL
1151 1384
1152SV * 1385SV *
1153get_text (CFPlus::Layout self) 1386get_text (DC::Layout self)
1154 CODE: 1387 CODE:
1155 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1388 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156 sv_utf8_decode (RETVAL); 1389 sv_utf8_decode (RETVAL);
1157 OUTPUT: 1390 OUTPUT:
1158 RETVAL 1391 RETVAL
1159 1392
1160void 1393void
1161set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1394set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1162 CODE: 1395 CODE:
1163 self->r = r; 1396 self->r = r;
1164 self->g = g; 1397 self->g = g;
1165 self->b = b; 1398 self->b = b;
1166 self->a = a; 1399 self->a = a;
1167 1400
1168void 1401void
1169set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1402set_font (DC::Layout self, DC::Font font = 0)
1170 CODE: 1403 CODE:
1171 if (self->font != font) 1404 if (self->font != font)
1172 { 1405 {
1173 self->font = font; 1406 self->font = font;
1174 layout_update_font (self); 1407 layout_update_font (self);
1175 } 1408 }
1176 1409
1177void 1410void
1178set_height (CFPlus::Layout self, int base_height) 1411set_height (DC::Layout self, int base_height)
1179 CODE: 1412 CODE:
1180 if (self->base_height != base_height) 1413 if (self->base_height != base_height)
1181 { 1414 {
1182 self->base_height = base_height; 1415 self->base_height = base_height;
1183 layout_update_font (self); 1416 layout_update_font (self);
1184 } 1417 }
1185 1418
1186void 1419void
1187set_width (CFPlus::Layout self, int max_width = -1) 1420set_width (DC::Layout self, int max_width = -1)
1188 CODE: 1421 CODE:
1189 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1422 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1190 1423
1191void 1424void
1192set_indent (CFPlus::Layout self, int indent) 1425set_indent (DC::Layout self, int indent)
1193 CODE: 1426 CODE:
1194 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1427 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195 1428
1196void 1429void
1197set_spacing (CFPlus::Layout self, int spacing) 1430set_spacing (DC::Layout self, int spacing)
1198 CODE: 1431 CODE:
1199 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1432 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200 1433
1201void 1434void
1202set_ellipsise (CFPlus::Layout self, int ellipsise) 1435set_ellipsise (DC::Layout self, int ellipsise)
1203 CODE: 1436 CODE:
1204 pango_layout_set_ellipsize (self->pl, 1437 pango_layout_set_ellipsize (self->pl,
1205 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1438 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1439 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1440 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208 : PANGO_ELLIPSIZE_NONE 1441 : PANGO_ELLIPSIZE_NONE
1209 ); 1442 );
1210 1443
1211void 1444void
1212set_single_paragraph_mode (CFPlus::Layout self, int spm) 1445set_single_paragraph_mode (DC::Layout self, int spm)
1213 CODE: 1446 CODE:
1214 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1447 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215 1448
1216void 1449void
1217size (CFPlus::Layout self) 1450size (DC::Layout self)
1218 PPCODE: 1451 PPCODE:
1219{ 1452{
1220 int w, h; 1453 int w, h;
1221 1454
1222 layout_get_pixel_size (self, &w, &h); 1455 layout_get_pixel_size (self, &w, &h);
1225 PUSHs (sv_2mortal (newSViv (w))); 1458 PUSHs (sv_2mortal (newSViv (w)));
1226 PUSHs (sv_2mortal (newSViv (h))); 1459 PUSHs (sv_2mortal (newSViv (h)));
1227} 1460}
1228 1461
1229int 1462int
1230descent (CFPlus::Layout self) 1463descent (DC::Layout self)
1231 CODE: 1464 CODE:
1232{ 1465{
1233 PangoRectangle rect; 1466 PangoRectangle rect;
1234 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1467 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235 pango_layout_line_get_pixel_extents (line, 0, &rect); 1468 pango_layout_line_get_pixel_extents (line, 0, &rect);
1236 RETVAL = PANGO_DESCENT (rect); 1469 RETVAL = PANGO_DESCENT (rect);
1237} 1470}
1238 OUTPUT: 1471 OUTPUT:
1239 RETVAL 1472 RETVAL
1240 1473
1241int 1474int
1242xy_to_index (CFPlus::Layout self, int x, int y) 1475xy_to_index (DC::Layout self, int x, int y)
1243 CODE: 1476 CODE:
1244{ 1477{
1245 int index, trailing; 1478 int index, trailing;
1246 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1479 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1247 RETVAL = index + trailing; 1480 RETVAL = index + trailing;
1248} 1481}
1249 OUTPUT: 1482 OUTPUT:
1250 RETVAL 1483 RETVAL
1251 1484
1252void 1485void
1253cursor_pos (CFPlus::Layout self, int index) 1486cursor_pos (DC::Layout self, int index)
1254 PPCODE: 1487 PPCODE:
1255{ 1488{
1256 PangoRectangle strong_pos; 1489 PangoRectangle pos;
1257 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1490 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258 1491
1259 EXTEND (SP, 3); 1492 EXTEND (SP, 3);
1260 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1494 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1495 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263} 1496}
1264 1497
1265void 1498void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1499index_to_line_x (DC::Layout self, int index, int trailing = 0)
1267 PPCODE: 1500 PPCODE:
1268{ 1501{
1269 int line, x; 1502 int line, x;
1270 1503
1271 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1504 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1505#if !PANGO_VERSION_CHECK (1, 17, 3)
1272 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1506 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273 1507 --line;
1508#endif
1274 EXTEND (SP, 2); 1509 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (newSViv (line - 1))); 1510 PUSHs (sv_2mortal (newSViv (line)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277} 1512}
1278 1513
1279void 1514void
1280line_x_to_index (CFPlus::Layout self, int line, int x) 1515line_x_to_index (DC::Layout self, int line, int x)
1281 PPCODE: 1516 PPCODE:
1282{ 1517{
1283 PangoLayoutLine *lp; 1518 PangoLayoutLine *lp;
1284 int index, trailing; 1519 int index, trailing;
1285 1520
1286 if (line < 0) 1521 if (line < 0)
1287 XSRETURN_EMPTY; 1522 XSRETURN_EMPTY;
1288 1523
1289 if (!(lp = pango_layout_get_line (self->pl, line))) 1524 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290 XSRETURN_EMPTY; /* do better */ 1525 XSRETURN_EMPTY; /* do better */
1291 1526
1292 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1527 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1293 1528
1294 EXTEND (SP, 2); 1529 EXTEND (SP, 2);
1300 PUSHs (sv_2mortal (newSViv (trailing))); 1535 PUSHs (sv_2mortal (newSViv (trailing)));
1301 } 1536 }
1302} 1537}
1303 1538
1304void 1539void
1305render (CFPlus::Layout self, float x, float y, int flags = 0) 1540render (DC::Layout self, float x, float y, int flags = 0)
1306 PPCODE: 1541 CODE:
1542 rc_clear (self->rc);
1307 pango_opengl_render_layout_subpixel ( 1543 pango_opengl_render_layout_subpixel (
1308 self->pl, 1544 self->pl,
1545 self->rc,
1309 x * PANGO_SCALE, y * PANGO_SCALE, 1546 x * PANGO_SCALE, y * PANGO_SCALE,
1310 self->r, self->g, self->b, self->a, 1547 self->r, self->g, self->b, self->a,
1311 flags 1548 flags
1312 ); 1549 );
1550 // we assume that context_change actually clears/frees stuff
1551 // and does not do any recomputation...
1552 pango_layout_context_changed (self->pl);
1313 1553
1314MODULE = CFPlus PACKAGE = CFPlus::Texture 1554void
1555draw (DC::Layout self)
1556 CODE:
1557{
1558 glEnable (GL_TEXTURE_2D);
1559 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1560 glEnable (GL_BLEND);
1561 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1562 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1563 glEnable (GL_ALPHA_TEST);
1564 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1565
1566 rc_draw (self->rc);
1567
1568 glDisable (GL_ALPHA_TEST);
1569 glDisable (GL_BLEND);
1570 glDisable (GL_TEXTURE_2D);
1571}
1572
1573MODULE = Deliantra::Client PACKAGE = DC::Texture
1315 1574
1316PROTOTYPES: ENABLE 1575PROTOTYPES: ENABLE
1317
1318int minpot (int n)
1319 1576
1320void 1577void
1321pad (SV *data_, int ow, int oh, int nw, int nh) 1578pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE: 1579 CODE:
1323{ 1580{
1350 HV *hv = (HV *)SvRV (self); 1607 HV *hv = (HV *)SvRV (self);
1351 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1608 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1352 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1609 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1353 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1610 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1354 1611
1612 if (name <= 0)
1613 XSRETURN_EMPTY;
1614
1355 if (items < 5) 1615 if (items < 5)
1356 { 1616 {
1357 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1617 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1358 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1618 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1359 } 1619 }
1397 RETVAL = width > 0; 1657 RETVAL = width > 0;
1398} 1658}
1399 OUTPUT: 1659 OUTPUT:
1400 RETVAL 1660 RETVAL
1401 1661
1402MODULE = CFPlus PACKAGE = CFPlus::Map 1662MODULE = Deliantra::Client PACKAGE = DC::Map
1403 1663
1404PROTOTYPES: DISABLE 1664PROTOTYPES: DISABLE
1405 1665
1406CFPlus::Map 1666DC::Map
1407new (SV *class) 1667new (SV *class)
1408 CODE: 1668 CODE:
1409 New (0, RETVAL, 1, struct map); 1669 New (0, RETVAL, 1, struct map);
1410 RETVAL->x = 0; 1670 RETVAL->x = 0;
1411 RETVAL->y = 0; 1671 RETVAL->y = 0;
1419 RETVAL->row = 0; 1679 RETVAL->row = 0;
1420 OUTPUT: 1680 OUTPUT:
1421 RETVAL 1681 RETVAL
1422 1682
1423void 1683void
1424DESTROY (CFPlus::Map self) 1684DESTROY (DC::Map self)
1425 CODE: 1685 CODE:
1426{ 1686{
1427 map_clear (self); 1687 map_clear (self);
1428 Safefree (self->face2tile); 1688 Safefree (self->face2tile);
1429 Safefree (self->tex); 1689 Safefree (self->tex);
1430 Safefree (self); 1690 Safefree (self);
1431} 1691}
1432 1692
1433void 1693void
1434resize (CFPlus::Map self, int map_width, int map_height) 1694resize (DC::Map self, int map_width, int map_height)
1435 CODE: 1695 CODE:
1436 self->w = map_width; 1696 self->w = map_width;
1437 self->h = map_height; 1697 self->h = map_height;
1438 1698
1439void 1699void
1440clear (CFPlus::Map self) 1700clear (DC::Map self)
1441 CODE: 1701 CODE:
1442 map_clear (self); 1702 map_clear (self);
1443 1703
1444void 1704void
1445set_tileid (CFPlus::Map self, int face, int tile) 1705set_tileid (DC::Map self, int face, int tile)
1446 CODE: 1706 CODE:
1447{ 1707{
1448 need_facenum (self, face); self->face2tile [face] = tile; 1708 need_facenum (self, face); self->face2tile [face] = tile;
1449 need_texid (self, tile); 1709 need_texid (self, tile);
1450} 1710}
1451 1711
1452void 1712void
1453set_smooth (CFPlus::Map self, int face, int smooth, int level) 1713set_smooth (DC::Map self, int face, int smooth, int level)
1454 CODE: 1714 CODE:
1455{ 1715{
1456 tileid texid; 1716 tileid texid;
1457 maptex *tex; 1717 maptex *tex;
1458 1718
1471 tex->smoothtile = self->face2tile [smooth]; 1731 tex->smoothtile = self->face2tile [smooth];
1472 tex->smoothlevel = level; 1732 tex->smoothlevel = level;
1473} 1733}
1474 1734
1475void 1735void
1476set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1736set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1477 CODE: 1737 CODE:
1478{ 1738{
1479 need_texid (self, texid); 1739 need_texid (self, texid);
1480 1740
1481 { 1741 {
1501 // from transparent color bleeding and ugly wrapping effects. 1761 // from transparent color bleeding and ugly wrapping effects.
1502 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1503} 1763}
1504 1764
1505int 1765int
1506ox (CFPlus::Map self) 1766ox (DC::Map self)
1507 ALIAS: 1767 ALIAS:
1508 oy = 1 1768 oy = 1
1509 x = 2 1769 x = 2
1510 y = 3 1770 y = 3
1511 w = 4 1771 w = 4
1522 } 1782 }
1523 OUTPUT: 1783 OUTPUT:
1524 RETVAL 1784 RETVAL
1525 1785
1526void 1786void
1527scroll (CFPlus::Map self, int dx, int dy) 1787scroll (DC::Map self, int dx, int dy)
1528 CODE: 1788 CODE:
1529{ 1789{
1530 if (dx > 0) 1790 if (dx > 0)
1531 map_blank (self, self->x, self->y, dx, self->h); 1791 map_blank (self, self->x, self->y, dx, self->h);
1532 else if (dx < 0) 1792 else if (dx < 0)
1547 self->rows += MAP_EXTEND_Y; 1807 self->rows += MAP_EXTEND_Y;
1548 self->y += MAP_EXTEND_Y; 1808 self->y += MAP_EXTEND_Y;
1549 } 1809 }
1550} 1810}
1551 1811
1552void 1812SV *
1553map1a_update (CFPlus::Map self, SV *data_, int extmap) 1813map1a_update (DC::Map self, SV *data_, int extmap)
1554 CODE: 1814 CODE:
1555{ 1815{
1556 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1816 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1557 uint8_t *data_end = (uint8_t *)SvEND (data_); 1817 uint8_t *data_end = (uint8_t *)SvEND (data_);
1558 mapcell *cell; 1818 mapcell *cell;
1559 int x, y, flags; 1819 int x, y, z, flags;
1820 AV *missing = newAV ();
1821 RETVAL = newRV_noinc ((SV *)missing);
1560 1822
1561 while (data < data_end - 1) 1823 while (data < data_end - 1)
1562 { 1824 {
1563 flags = (data [0] << 8) + data [1]; data += 2; 1825 flags = (data [0] << 8) + data [1]; data += 2;
1564 1826
1584 uint8_t ext, cmd; 1846 uint8_t ext, cmd;
1585 1847
1586 do 1848 do
1587 { 1849 {
1588 ext = *data++; 1850 ext = *data++;
1589 cmd = ext & 0x3f; 1851 cmd = ext & 0x7f;
1590 1852
1591 if (cmd < 4) 1853 if (cmd < 4)
1592 cell->darkness = 255 - ext * 64 + 1; 1854 cell->darkness = 255 - ext * 64 + 1;
1593 else if (cmd == 5) // health 1855 else if (cmd == 5) // health
1594 { 1856 {
1597 } 1859 }
1598 else if (cmd == 6) // monster width 1860 else if (cmd == 6) // monster width
1599 cell->stat_width = *data++ + 1; 1861 cell->stat_width = *data++ + 1;
1600 else if (cmd == 0x47) 1862 else if (cmd == 0x47)
1601 { 1863 {
1602 if (*data == 4) 1864 if (*data == 1) cell->player = data [1];
1603 ; // decode player count 1865 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1866 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1867 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1604 1868
1605 data += *data + 1; 1869 data += *data + 1;
1606 } 1870 }
1607 else if (cmd == 8) // cell flags 1871 else if (cmd == 8) // cell flags
1608 cell->flags = *data++; 1872 cell->flags = *data++;
1615 } 1879 }
1616 else 1880 else
1617 cell->darkness = *data++ + 1; 1881 cell->darkness = *data++ + 1;
1618 } 1882 }
1619 1883
1884 for (z = 0; z <= 2; ++z)
1620 if (flags & 4) 1885 if (flags & (4 >> z))
1621 { 1886 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2; 1887 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face); 1888 need_facenum (self, face);
1624 cell->tile [0] = self->face2tile [face]; 1889 cell->tile [z] = self->face2tile [face];
1890
1891 if (cell->tile [z])
1892 {
1893 maptex *tex = self->tex + cell->tile [z];
1894 if (!tex->name)
1895 av_push (missing, newSViv (cell->tile [z]));
1896
1897 if (tex->smoothtile)
1898 {
1899 maptex *smooth = self->tex + tex->smoothtile;
1900 if (!smooth->name)
1901 av_push (missing, newSViv (tex->smoothtile));
1902 }
1903 }
1625 } 1904 }
1626
1627 if (flags & 2)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [1] = self->face2tile [face];
1632 }
1633
1634 if (flags & 1)
1635 {
1636 faceid face = (data [0] << 8) + data [1]; data += 2;
1637 need_facenum (self, face);
1638 cell->tile [2] = self->face2tile [face];
1639 }
1640 } 1905 }
1641 else 1906 else
1642 cell->darkness = 0; 1907 CELL_CLEAR (cell);
1643 } 1908 }
1644} 1909}
1910 OUTPUT:
1911 RETVAL
1645 1912
1646SV * 1913SV *
1647mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1914mapmap (DC::Map self, int x0, int y0, int w, int h)
1648 CODE: 1915 CODE:
1649{ 1916{
1650 int x1, x; 1917 int x1, x;
1651 int y1, y; 1918 int y1, y;
1652 int z; 1919 int z;
1697} 1964}
1698 OUTPUT: 1965 OUTPUT:
1699 RETVAL 1966 RETVAL
1700 1967
1701void 1968void
1702draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1969draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1703 CODE: 1970 CODE:
1704{ 1971{
1972 int x, y, z;
1973
1705 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1706 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1975 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1707 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1976 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1708 smooth_key skey; 1977 smooth_key skey;
1709 int x, y, z; 1978 int pl_x, pl_y;
1710 int last_name; 1979 maptex pl_tex;
1980 rc_t *rc = rc_alloc ();
1981 rc_key_t key;
1982 rc_array_t *arr;
1983
1984 pl_tex.name = 0;
1711 1985
1712 // thats current max. sorry. 1986 // thats current max. sorry.
1713 if (sw > 255) sw = 255; 1987 if (sw > 255) sw = 255;
1714 if (sh > 255) sh = 255; 1988 if (sh > 255) sh = 255;
1715 1989
1716 // clear key, in case of extra padding 1990 // clear key, in case of extra padding
1717 memset (&skey, 0, sizeof (skey)); 1991 memset (&skey, 0, sizeof (skey));
1718 1992
1719 glColor4ub (255, 255, 255, 255); 1993 memset (&key, 0, sizeof (key));
1720 1994 key.r = 255;
1721 glEnable (GL_BLEND); 1995 key.g = 255;
1722 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1996 key.b = 255;
1723 glEnable (GL_TEXTURE_2D); 1997 key.a = 255;
1724 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1998 key.mode = GL_QUADS;
1725 1999 key.format = GL_T2F_V3F;
1726 glBegin (GL_QUADS); 2000 key.texname = -1;
1727
1728 last_name = 0;
1729 2001
1730 mx += self->x; 2002 mx += self->x;
1731 my += self->y; 2003 my += self->y;
1732 2004
1733 // first pass: determine smooth_max 2005 // first pass: determine smooth_max
1749 MAX (self->tex [cell->tile [0]].smoothlevel, 2021 MAX (self->tex [cell->tile [0]].smoothlevel,
1750 MAX (self->tex [cell->tile [1]].smoothlevel, 2022 MAX (self->tex [cell->tile [1]].smoothlevel,
1751 self->tex [cell->tile [2]].smoothlevel)); 2023 self->tex [cell->tile [2]].smoothlevel));
1752 } 2024 }
1753 } 2025 }
2026
2027 glEnable (GL_BLEND);
2028 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2029 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1754 2030
1755 for (z = 0; z <= 2; z++) 2031 for (z = 0; z <= 2; z++)
1756 { 2032 {
1757 memset (smooth_level, 0, sizeof (smooth_level)); 2033 memset (smooth_level, 0, sizeof (smooth_level));
1758 2034
1771 { 2047 {
1772 maptex tex = self->tex [tile]; 2048 maptex tex = self->tex [tile];
1773 int px = (x + 1) * T - tex.w; 2049 int px = (x + 1) * T - tex.w;
1774 int py = (y + 1) * T - tex.h; 2050 int py = (y + 1) * T - tex.h;
1775 2051
1776 // suppressing texture state switches here
1777 // is only moderately effective, but worth the extra effort
1778 if (last_name != tex.name) 2052 if (key.texname != tex.name)
1779 { 2053 {
1780 if (!tex.name) 2054 if (!tex.name)
1781 tex = self->tex [2]; /* missing, replace by noface */ 2055 tex = self->tex [2]; /* missing, replace by noface */
1782 2056
1783 glEnd (); 2057 key.texname = tex.name;
1784 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2058 arr = rc_array (rc, &key);
1785 glBegin (GL_QUADS);
1786 } 2059 }
1787 2060
1788 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2061 if (expect_false (cell->player == player) && expect_false (z == 2))
1789 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1790 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1791 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1792
1793 if (cell->flags && z == 2)
1794 { 2062 {
2063 pl_x = px;
2064 pl_y = py;
2065 pl_tex = tex;
2066 continue;
2067 }
2068
2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2070 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2071 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2072 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2073
2074 if (expect_false (cell->flags) && expect_false (z == 2))
2075 {
2076 // overlays such as the speech bubble, probably more to come
1795 if (cell->flags & 1) 2077 if (cell->flags & 1)
1796 { 2078 {
1797 maptex tex = self->tex [1]; 2079 maptex tex = self->tex [1];
1798 int px = x * T + T * 2 / 32; 2080 int px = x * T + T * 2 / 32;
1799 int py = y * T - T * 6 / 32; 2081 int py = y * T - T * 6 / 32;
1800 2082
2083 if (tex.name)
1801 glEnd (); 2084 {
1802 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2085 if (key.texname != tex.name)
2086 {
2087 key.texname = tex.name;
2088 arr = rc_array (rc, &key);
2089 }
2090
2091 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2092 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2093 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2094 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1803 glBegin (GL_QUADS); 2095 }
1804
1805 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1806 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1807 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1808 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1809 } 2096 }
1810 } 2097 }
1811 2098
1812 // update smooth hash 2099 // update smooth hash
1813 if (tex.smoothtile) 2100 if (tex.smoothtile)
1849 } 2136 }
1850 } 2137 }
1851 } 2138 }
1852 } 2139 }
1853 2140
2141 rc_draw (rc);
2142 rc_clear (rc);
2143
1854 // go through all smoothlevels, lowest to highest, then draw. 2144 // go through all smoothlevels, lowest to highest, then draw.
1855 // this is basically counting sort 2145 // this is basically counting sort
1856 { 2146 {
1857 int w, b; 2147 int w, b;
1858 2148
2149 glEnable (GL_TEXTURE_2D);
2150 glBegin (GL_QUADS);
1859 for (w = 0; w < 256 / 32; ++w) 2151 for (w = 0; w < 256 / 32; ++w)
1860 { 2152 {
1861 uint32_t smask = smooth_level [w]; 2153 uint32_t smask = smooth_level [w];
1862 if (smask) 2154 if (smask)
1863 for (b = 0; b < 32; ++b) 2155 for (b = 0; b < 32; ++b)
1882 int border = bits & 15; 2174 int border = bits & 15;
1883 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2175 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884 float dx = tex.s * .0625f; // 16 images/row 2176 float dx = tex.s * .0625f; // 16 images/row
1885 float dy = tex.t * .5f ; // 2 images/column 2177 float dy = tex.t * .5f ; // 2 images/column
1886 2178
1887 // this time naively avoiding texture state changes
1888 // save gobs of state changes.
1889 if (last_name != tex.name) 2179 if (tex.name)
1890 { 2180 {
2181 // this time avoiding texture state changes
2182 // save gobs of state changes.
1891 if (!tex.name) 2183 if (key.texname != tex.name)
1892 continue; // smoothing not yet available 2184 {
1893
1894 glEnd (); 2185 glEnd ();
1895 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2186 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1896 glBegin (GL_QUADS); 2187 glBegin (GL_QUADS);
1897 } 2188 }
1898 2189
1899 if (border) 2190 if (border)
1900 { 2191 {
1901 float ox = border * dx; 2192 float ox = border * dx;
1902 2193
1903 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2194 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1904 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2195 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1905 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2196 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1906 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2197 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1907 } 2198 }
1908 2199
1909 if (corner) 2200 if (corner)
1910 { 2201 {
1911 float ox = corner * dx; 2202 float ox = corner * dx;
1912 2203
1913 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2204 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1914 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2205 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1915 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2206 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1916 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2207 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2208 }
1917 } 2209 }
1918 } 2210 }
1919 } 2211 }
1920 } 2212 }
1921 } 2213 }
2214
2215 glEnd ();
2216 glDisable (GL_TEXTURE_2D);
2217 key.texname = -1;
1922 } 2218 }
1923 2219
1924 hv_clear (smooth); 2220 hv_clear (smooth);
1925 } 2221 }
1926 2222
1927 glEnd (); 2223 if (pl_tex.name)
2224 {
2225 maptex tex = pl_tex;
2226 int px = pl_x + sdx;
2227 int py = pl_y + sdy;
1928 2228
1929 glDisable (GL_TEXTURE_2D); 2229 key.texname = tex.name;
2230 arr = rc_array (rc, &key);
2231
2232 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2233 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2234 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2236
2237 rc_draw (rc);
2238 }
2239
1930 glDisable (GL_BLEND); 2240 glDisable (GL_BLEND);
2241 rc_free (rc);
1931 2242
1932 // top layer: overlays such as the health bar 2243 // top layer: overlays such as the health bar
1933 for (y = 0; y < sh; y++) 2244 for (y = 0; y < sh; y++)
1934 if (0 <= y + my && y + my < self->rows) 2245 if (0 <= y + my && y + my < self->rows)
1935 { 2246 {
1960 } 2271 }
1961 } 2272 }
1962} 2273}
1963 2274
1964void 2275void
1965draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2276draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1966 CODE: 2277 CODE:
1967{ 2278{
1968 static float color[16][3] = { 2279 static float color[16][3] = {
1969 { 0.00F, 0.00F, 0.00F }, 2280 { 0.00F, 0.00F, 0.00F },
1970 { 1.00F, 1.00F, 1.00F }, 2281 { 1.00F, 1.00F, 1.00F },
2020 glDisable (GL_BLEND); 2331 glDisable (GL_BLEND);
2021 glDisable (GL_TEXTURE_2D); 2332 glDisable (GL_TEXTURE_2D);
2022} 2333}
2023 2334
2024void 2335void
2025fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2336fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2026 PPCODE: 2337 PPCODE:
2027{ 2338{
2028 int x, y; 2339 int x, y;
2029 int sw1 = sw + 2; 2340 int sw1 = sw + 2;
2030 int sh1 = sh + 2; 2341 int sh1 = sh + 2;
2038 SvCUR_set (darkness3_sv, sw34 * sh3); 2349 SvCUR_set (darkness3_sv, sw34 * sh3);
2039 2350
2040 mx += self->x - 1; 2351 mx += self->x - 1;
2041 my += self->y - 1; 2352 my += self->y - 1;
2042 2353
2043 memset (darkness1, 255, sw1 * sh1); 2354 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2044 2355
2045 for (y = 0; y < sh1; y++) 2356 for (y = 0; y < sh1; y++)
2046 if (0 <= y + my && y + my < self->rows) 2357 if (0 <= y + my && y + my < self->rows)
2047 { 2358 {
2048 maprow *row = self->row + (y + my); 2359 maprow *row = self->row + (y + my);
2101 PUSHs (sv_2mortal (newSViv (sh3))); 2412 PUSHs (sv_2mortal (newSViv (sh3)));
2102 PUSHs (darkness3_sv); 2413 PUSHs (darkness3_sv);
2103} 2414}
2104 2415
2105SV * 2416SV *
2106get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2417get_rect (DC::Map self, int x0, int y0, int w, int h)
2107 CODE: 2418 CODE:
2108{ 2419{
2109 int x, y, x1, y1; 2420 int x, y, x1, y1;
2110 SV *data_sv = newSV (w * h * 7 + 5); 2421 SV *data_sv = newSV (w * h * 7 + 5);
2111 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2422 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2168 else 2479 else
2169 *data++ = 0; 2480 *data++ = 0;
2170 } 2481 }
2171 } 2482 }
2172 2483
2484 /* if size is w*h + 5 then no data has been found */
2485 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2486 {
2173 SvPOK_only (data_sv); 2487 SvPOK_only (data_sv);
2174 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2488 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2489 }
2490
2175 RETVAL = data_sv; 2491 RETVAL = data_sv;
2176} 2492}
2177 OUTPUT: 2493 OUTPUT:
2178 RETVAL 2494 RETVAL
2179 2495
2180void 2496void
2181set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2497set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2182 PPCODE: 2498 PPCODE:
2183{ 2499{
2184 int x, y, z; 2500 int x, y, z;
2185 int w, h; 2501 int w, h;
2186 int x1, y1; 2502 int x1, y1;
2503 STRLEN len;
2504 uint8_t *data, *end;
2505
2506 len = SvLEN (data_sv);
2507 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2508 data = SvPVbyte_nolen (data_sv);
2509 end = data + len + 8;
2510
2511 if (len < 5)
2512 XSRETURN_EMPTY;
2187 2513
2188 if (*data++ != 0) 2514 if (*data++ != 0)
2189 return; /* version mismatch */ 2515 XSRETURN_EMPTY; /* version mismatch */
2190 2516
2191 w = *data++ << 8; w |= *data++; 2517 w = *data++ << 8; w |= *data++;
2192 h = *data++ << 8; h |= *data++; 2518 h = *data++ << 8; h |= *data++;
2193 2519
2194 // we need to do this 'cause we don't keep an absolute coord system for rows 2520 // we need to do this 'cause we don't keep an absolute coord system for rows
2206 { 2532 {
2207 maprow *row = map_get_row (self, y); 2533 maprow *row = map_get_row (self, y);
2208 2534
2209 for (x = x0; x < x1; x++) 2535 for (x = x0; x < x1; x++)
2210 { 2536 {
2537 uint8_t flags;
2538
2539 if (data + 7 >= end)
2540 XSRETURN_EMPTY;
2541
2211 uint8_t flags = *data++; 2542 flags = *data++;
2212 2543
2213 if (flags) 2544 if (flags)
2214 { 2545 {
2215 mapcell *cell = row_get_cell (row, x); 2546 mapcell *cell = row_get_cell (row, x);
2216 tileid tile[3] = { 0, 0, 0 }; 2547 tileid tile[3] = { 0, 0, 0 };
2219 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2550 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2220 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2551 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2221 2552
2222 if (cell->darkness == 0) 2553 if (cell->darkness == 0)
2223 { 2554 {
2224 cell->darkness = 0; 2555 /*cell->darkness = 0;*/
2556 EXTEND (SP, 3);
2225 2557
2226 for (z = 0; z <= 2; z++) 2558 for (z = 0; z <= 2; z++)
2227 { 2559 {
2228 tileid t = tile [z]; 2560 tileid t = tile [z];
2229 2561
2230 if (t >= self->texs || (t && !self->tex [t].name)) 2562 if (t >= self->texs || (t && !self->tex [t].name))
2231 { 2563 {
2232 XPUSHs (sv_2mortal (newSViv (t))); 2564 PUSHs (sv_2mortal (newSViv (t)));
2233 need_texid (self, t); 2565 need_texid (self, t);
2234 } 2566 }
2235 2567
2236 cell->tile [z] = t; 2568 cell->tile [z] = t;
2237 } 2569 }
2239 } 2571 }
2240 } 2572 }
2241 } 2573 }
2242} 2574}
2243 2575
2244MODULE = CFPlus PACKAGE = CFPlus::RW 2576MODULE = Deliantra::Client PACKAGE = DC::RW
2245 2577
2246CFPlus::RW 2578DC::RW
2247new (SV *class, SV *data_sv) 2579new (SV *class, SV *data_sv)
2248 CODE: 2580 CODE:
2249{ 2581{
2250 STRLEN datalen; 2582 STRLEN datalen;
2251 char *data = SvPVbyte (data_sv, datalen); 2583 char *data = SvPVbyte (data_sv, datalen);
2253 RETVAL = SDL_RWFromConstMem (data, datalen); 2585 RETVAL = SDL_RWFromConstMem (data, datalen);
2254} 2586}
2255 OUTPUT: 2587 OUTPUT:
2256 RETVAL 2588 RETVAL
2257 2589
2258CFPlus::RW 2590DC::RW
2259new_from_file (SV *class, const char *path, const char *mode = "rb") 2591new_from_file (SV *class, const char *path, const char *mode = "rb")
2260 CODE: 2592 CODE:
2261 RETVAL = SDL_RWFromFile (path, mode); 2593 RETVAL = SDL_RWFromFile (path, mode);
2262 OUTPUT: 2594 OUTPUT:
2263 RETVAL 2595 RETVAL
2264 2596
2265# fails on win32: 2597# fails on win32:
2266# CFPlus.xs(2268) : error C2059: syntax error : '(' 2598# dc.xs(2268) : error C2059: syntax error : '('
2267#void 2599#void
2268#close (CFPlus::RW self) 2600#close (DC::RW self)
2269# CODE: 2601# CODE:
2270# (self->(close)) (self); 2602# (self->(close)) (self);
2271 2603
2272MODULE = CFPlus PACKAGE = CFPlus::Channel 2604MODULE = Deliantra::Client PACKAGE = DC::Channel
2273 2605
2274PROTOTYPES: DISABLE 2606PROTOTYPES: DISABLE
2275 2607
2276CFPlus::Channel 2608DC::Channel
2277find () 2609find ()
2278 CODE: 2610 CODE:
2279{ 2611{
2280 RETVAL = Mix_GroupAvailable (-1); 2612 RETVAL = Mix_GroupAvailable (-1);
2281 2613
2294} 2626}
2295 OUTPUT: 2627 OUTPUT:
2296 RETVAL 2628 RETVAL
2297 2629
2298void 2630void
2299halt (CFPlus::Channel self) 2631halt (DC::Channel self)
2300 CODE: 2632 CODE:
2301 Mix_HaltChannel (self); 2633 Mix_HaltChannel (self);
2302 2634
2303void 2635void
2304expire (CFPlus::Channel self, int ticks = -1) 2636expire (DC::Channel self, int ticks = -1)
2305 CODE: 2637 CODE:
2306 Mix_ExpireChannel (self, ticks); 2638 Mix_ExpireChannel (self, ticks);
2307 2639
2308void 2640void
2309fade_out (CFPlus::Channel self, int ticks = -1) 2641fade_out (DC::Channel self, int ticks = -1)
2310 CODE: 2642 CODE:
2311 Mix_FadeOutChannel (self, ticks); 2643 Mix_FadeOutChannel (self, ticks);
2312 2644
2313int 2645int
2314volume (CFPlus::Channel self, int volume) 2646volume (DC::Channel self, int volume)
2315 CODE: 2647 CODE:
2316 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2648 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2317 OUTPUT: 2649 OUTPUT:
2318 RETVAL 2650 RETVAL
2319 2651
2320void 2652void
2321unregister_all_effects (CFPlus::Channel self) 2653unregister_all_effects (DC::Channel self)
2322 CODE: 2654 CODE:
2323 Mix_UnregisterAllEffects (self); 2655 Mix_UnregisterAllEffects (self);
2324 2656
2325void 2657void
2326set_panning (CFPlus::Channel self, int left, int right) 2658set_panning (DC::Channel self, int left, int right)
2327 CODE: 2659 CODE:
2328 left = CLAMP (left , 0, 255); 2660 left = CLAMP (left , 0, 255);
2329 right = CLAMP (right, 0, 255); 2661 right = CLAMP (right, 0, 255);
2330 Mix_SetPanning (self, left, right); 2662 Mix_SetPanning (self, left, right);
2331 2663
2332void 2664void
2333set_distance (CFPlus::Channel self, int distance) 2665set_distance (DC::Channel self, int distance)
2334 CODE: 2666 CODE:
2335 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2667 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2336 2668
2337void 2669void
2338set_position (CFPlus::Channel self, int angle, int distance) 2670set_position (DC::Channel self, int angle, int distance)
2339 CODE: 2671 CODE:
2672
2673void
2674set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2675 CODE:
2676{
2677 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2678 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2340 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2679 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2680}
2341 2681
2342void 2682void
2343set_reverse_stereo (CFPlus::Channel self, int flip) 2683set_reverse_stereo (DC::Channel self, int flip)
2344 CODE: 2684 CODE:
2345 Mix_SetReverseStereo (self, flip); 2685 Mix_SetReverseStereo (self, flip);
2346 2686
2347MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2687MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2348 2688
2349PROTOTYPES: DISABLE 2689PROTOTYPES: DISABLE
2350 2690
2351CFPlus::MixChunk 2691DC::MixChunk
2352new (SV *class, CFPlus::RW rwops) 2692new (SV *class, DC::RW rwops)
2353 CODE: 2693 CODE:
2354 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2694 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2355 OUTPUT: 2695 OUTPUT:
2356 RETVAL 2696 RETVAL
2357 2697
2358void 2698void
2359DESTROY (CFPlus::MixChunk self) 2699DESTROY (DC::MixChunk self)
2360 CODE: 2700 CODE:
2361 Mix_FreeChunk (self); 2701 Mix_FreeChunk (self);
2362 2702
2363int 2703int
2364volume (CFPlus::MixChunk self, int volume = -1) 2704volume (DC::MixChunk self, int volume = -1)
2365 CODE: 2705 CODE:
2366 if (items > 1) 2706 if (items > 1)
2367 volume = CLAMP (volume, 0, 128); 2707 volume = CLAMP (volume, 0, 128);
2368 RETVAL = Mix_VolumeChunk (self, volume); 2708 RETVAL = Mix_VolumeChunk (self, volume);
2369 OUTPUT: 2709 OUTPUT:
2370 RETVAL 2710 RETVAL
2371 2711
2372CFPlus::Channel 2712DC::Channel
2373play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2713play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2374 CODE: 2714 CODE:
2375{ 2715{
2376 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2716 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2377 2717
2378 if (RETVAL < 0) 2718 if (RETVAL < 0)
2385 } 2725 }
2386} 2726}
2387 OUTPUT: 2727 OUTPUT:
2388 RETVAL 2728 RETVAL
2389 2729
2390MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2730MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2391 2731
2392int 2732int
2393volume (int volume = -1) 2733volume (int volume = -1)
2394 PROTOTYPE: ;$ 2734 PROTOTYPE: ;$
2395 CODE: 2735 CODE:
2407void 2747void
2408halt () 2748halt ()
2409 CODE: 2749 CODE:
2410 Mix_HaltMusic (); 2750 Mix_HaltMusic ();
2411 2751
2412CFPlus::MixMusic 2752DC::MixMusic
2413new (SV *class, CFPlus::RW rwops) 2753new (SV *class, DC::RW rwops)
2414 CODE: 2754 CODE:
2415 RETVAL = Mix_LoadMUS_RW (rwops); 2755 RETVAL = Mix_LoadMUS_RW (rwops);
2416 OUTPUT: 2756 OUTPUT:
2417 RETVAL 2757 RETVAL
2418 2758
2419void 2759void
2420DESTROY (CFPlus::MixMusic self) 2760DESTROY (DC::MixMusic self)
2421 CODE: 2761 CODE:
2422 Mix_FreeMusic (self); 2762 Mix_FreeMusic (self);
2423 2763
2424int 2764int
2425play (CFPlus::MixMusic self, int loops = -1) 2765play (DC::MixMusic self, int loops = -1)
2426 CODE: 2766 CODE:
2427 RETVAL = Mix_PlayMusic (self, loops); 2767 RETVAL = Mix_PlayMusic (self, loops);
2428 OUTPUT: 2768 OUTPUT:
2429 RETVAL 2769 RETVAL
2430 2770
2431void 2771void
2432fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2772fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2433 CODE: 2773 CODE:
2434 Mix_FadeInMusicPos (self, loops, ms, position); 2774 Mix_FadeInMusicPos (self, loops, ms, position);
2435 2775
2436MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2776MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2437 2777
2438PROTOTYPES: ENABLE 2778PROTOTYPES: ENABLE
2439 2779
2440BOOT: 2780BOOT:
2441{ 2781{
2442 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2782 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2443 static const struct { 2783 static const struct {
2444 const char *name; 2784 const char *name;
2445 IV iv; 2785 IV iv;
2446 } *civ, const_iv[] = { 2786 } *civ, const_iv[] = {
2447# define const_iv(name) { # name, (IV)name } 2787# define const_iv(name) { # name, (IV)name }
2482 const_iv (GL_INTENSITY), 2822 const_iv (GL_INTENSITY),
2483 const_iv (GL_LUMINANCE), 2823 const_iv (GL_LUMINANCE),
2484 const_iv (GL_LUMINANCE_ALPHA), 2824 const_iv (GL_LUMINANCE_ALPHA),
2485 const_iv (GL_FLOAT), 2825 const_iv (GL_FLOAT),
2486 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2826 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2827 const_iv (GL_COMPRESSED_ALPHA_ARB),
2828 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2829 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2830 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2831 const_iv (GL_COMPRESSED_RGB_ARB),
2832 const_iv (GL_COMPRESSED_RGBA_ARB),
2487 const_iv (GL_COMPILE), 2833 const_iv (GL_COMPILE),
2488 const_iv (GL_PROXY_TEXTURE_1D), 2834 const_iv (GL_PROXY_TEXTURE_1D),
2489 const_iv (GL_PROXY_TEXTURE_2D), 2835 const_iv (GL_PROXY_TEXTURE_2D),
2490 const_iv (GL_TEXTURE_1D), 2836 const_iv (GL_TEXTURE_1D),
2491 const_iv (GL_TEXTURE_2D), 2837 const_iv (GL_TEXTURE_2D),
2530 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2876 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2531 const_iv (GL_POINT_SMOOTH_HINT), 2877 const_iv (GL_POINT_SMOOTH_HINT),
2532 const_iv (GL_LINE_SMOOTH_HINT), 2878 const_iv (GL_LINE_SMOOTH_HINT),
2533 const_iv (GL_POLYGON_SMOOTH_HINT), 2879 const_iv (GL_POLYGON_SMOOTH_HINT),
2534 const_iv (GL_GENERATE_MIPMAP_HINT), 2880 const_iv (GL_GENERATE_MIPMAP_HINT),
2881 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2535 const_iv (GL_FASTEST), 2882 const_iv (GL_FASTEST),
2536 const_iv (GL_DONT_CARE), 2883 const_iv (GL_DONT_CARE),
2537 const_iv (GL_NICEST), 2884 const_iv (GL_NICEST),
2538 const_iv (GL_V2F), 2885 const_iv (GL_V2F),
2539 const_iv (GL_V3F), 2886 const_iv (GL_V3F),
2547 2894
2548 texture_av = newAV (); 2895 texture_av = newAV ();
2549 AvREAL_off (texture_av); 2896 AvREAL_off (texture_av);
2550} 2897}
2551 2898
2899void
2900disable_GL_EXT_blend_func_separate ()
2901 CODE:
2902 gl.BlendFuncSeparate = 0;
2903 gl.BlendFuncSeparateEXT = 0;
2904
2552char * 2905char *
2553gl_vendor () 2906gl_vendor ()
2554 CODE: 2907 CODE:
2555 RETVAL = (char *)glGetString (GL_VENDOR); 2908 RETVAL = (char *)glGetString (GL_VENDOR);
2556 OUTPUT: 2909 OUTPUT:
2648void glRotate (float angle, float x, float y, float z) 3001void glRotate (float angle, float x, float y, float z)
2649 CODE: 3002 CODE:
2650 glRotatef (angle, x, y, z); 3003 glRotatef (angle, x, y, z);
2651 3004
2652void glColor (float r, float g, float b, float a = 1.0) 3005void glColor (float r, float g, float b, float a = 1.0)
3006 PROTOTYPE: @
2653 ALIAS: 3007 ALIAS:
2654 glColor_premultiply = 1 3008 glColor_premultiply = 1
2655 CODE: 3009 CODE:
2656 if (ix) 3010 if (ix)
2657 { 3011 {
2677 3031
2678void glRect (float x1, float y1, float x2, float y2) 3032void glRect (float x1, float y1, float x2, float y2)
2679 CODE: 3033 CODE:
2680 glRectf (x1, y1, x2, y2); 3034 glRectf (x1, y1, x2, y2);
2681 3035
3036void glRect_lineloop (float x1, float y1, float x2, float y2)
3037 CODE:
3038 glBegin (GL_LINE_LOOP);
3039 glVertex2f (x1, y1);
3040 glVertex2f (x2, y1);
3041 glVertex2f (x2, y2);
3042 glVertex2f (x1, y2);
3043 glEnd ();
3044
2682PROTOTYPES: ENABLE 3045PROTOTYPES: ENABLE
2683 3046
2684void glBegin (int mode) 3047void glBegin (int mode)
2685 3048
2686void glEnd () 3049void glEnd ()
2718void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3081void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2719 CODE: 3082 CODE:
2720 if (gl.SeparableFilter2D) 3083 if (gl.SeparableFilter2D)
2721 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3084 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2722 3085
2723void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3086void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2724 3087
2725void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3088void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2726 3089
2727void glDrawPixels (int width, int height, int format, int type, char *pixels) 3090void glDrawPixels (int width, int height, int format, int type, char *pixels)
2728 3091
2754 3117
2755void glEndList () 3118void glEndList ()
2756 3119
2757void glCallList (int list) 3120void glCallList (int list)
2758 3121
2759MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3122MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2760 3123
2761PROTOTYPES: DISABLE 3124PROTOTYPES: DISABLE
2762 3125
2763void 3126void
2764find_widget (SV *self, NV x, NV y) 3127find_widget (SV *self, NV x, NV y)
2768 XPUSHs (self); 3131 XPUSHs (self);
2769} 3132}
2770 3133
2771BOOT: 3134BOOT:
2772{ 3135{
2773 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3136 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2774 3137
2775 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3138 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2776 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3139 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2777 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3140 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2778 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3141 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2779} 3142}
2780 3143
2781void 3144void
2782draw (SV *self) 3145draw (SV *self)
2783 CODE: 3146 CODE:
2787 NV x, y, w, h; 3150 NV x, y, w, h;
2788 SV *draw_x_sv = GvSV (draw_x_gv); 3151 SV *draw_x_sv = GvSV (draw_x_gv);
2789 SV *draw_y_sv = GvSV (draw_y_gv); 3152 SV *draw_y_sv = GvSV (draw_y_gv);
2790 SV *draw_w_sv = GvSV (draw_w_gv); 3153 SV *draw_w_sv = GvSV (draw_w_gv);
2791 SV *draw_h_sv = GvSV (draw_h_gv); 3154 SV *draw_h_sv = GvSV (draw_h_gv);
2792 SV *hover;
2793 double draw_x, draw_y, draw_w, draw_h; 3155 double draw_x, draw_y;
2794 3156
2795 if (!SvROK (self)) 3157 if (!SvROK (self))
2796 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3158 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2797 3159
2798 hv = (HV *)SvRV (self); 3160 hv = (HV *)SvRV (self);
2799 3161
2800 if (SvTYPE (hv) != SVt_PVHV) 3162 if (SvTYPE (hv) != SVt_PVHV)
2801 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3163 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2802 3164
2803 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3165 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2804 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3166 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2805 3167
2806 if (!h || !w) 3168 if (!h || !w)
2826 { 3188 {
2827 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3189 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2828 3190
2829 if (svp && SvTRUE (*svp)) 3191 if (svp && SvTRUE (*svp))
2830 { 3192 {
2831 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3193 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2832 glEnable (GL_BLEND); 3194 glEnable (GL_BLEND);
2833 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3195 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2834 glBegin (GL_QUADS); 3196 glBegin (GL_QUADS);
2835 glVertex2f (0, 0); 3197 glVertex2f (0, 0);
2836 glVertex2f (w, 0); 3198 glVertex2f (w, 0);
2839 glEnd (); 3201 glEnd ();
2840 glDisable (GL_BLEND); 3202 glDisable (GL_BLEND);
2841 } 3203 }
2842 } 3204 }
2843#if 0 3205#if 0
2844 if ($ENV{CFPLUS_DEBUG} & 1) { 3206 // draw borders, for debugging
2845 glPushMatrix; 3207 glPushMatrix ();
2846 glColor 1, 1, 0, 1; 3208 glColor4f (1., 1., 0., 1.);
2847 glTranslate 0.375, 0.375; 3209 glTranslatef (.5, .5, 0.);
2848 glBegin GL_LINE_LOOP; 3210 glBegin (GL_LINE_LOOP);
2849 glVertex 0 , 0; 3211 glVertex2f (0 , 0);
2850 glVertex $self->{w} - 1, 0; 3212 glVertex2f (w - 1, 0);
2851 glVertex $self->{w} - 1, $self->{h} - 1; 3213 glVertex2f (w - 1, h - 1);
2852 glVertex 0 , $self->{h} - 1; 3214 glVertex2f (0 , h - 1);
2853 glEnd; 3215 glEnd ();
2854 glPopMatrix; 3216 glPopMatrix ();
2855 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2856 }
2857#endif 3217#endif
2858 PUSHMARK (SP); 3218 PUSHMARK (SP);
2859 XPUSHs (self); 3219 XPUSHs (self);
2860 PUTBACK; 3220 PUTBACK;
2861 call_method ("_draw", G_VOID | G_DISCARD); 3221 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines