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.212 by root, Sun Jul 29 03:58:26 2007 UTC vs.
Revision 1.279 by root, Thu Oct 2 15:59:40 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 = 4096) 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);
813 1020
814void 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}
1036
1037void
815Mix_CloseAudio () 1038Mix_CloseAudio ()
816 1039
817int 1040int
818Mix_AllocateChannels (int numchans = -1) 1041Mix_AllocateChannels (int numchans = -1)
1042
1043const char *
1044Mix_GetError ()
819 1045
820void 1046void
821lowdelay (int fd, int val = 1) 1047lowdelay (int fd, int val = 1)
822 CODE: 1048 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1049 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
849 } 1075 }
850 } 1076 }
851#endif 1077#endif
852} 1078}
853 1079
854void 1080int
855add_font (char *file) 1081add_font (char *file)
856 CODE: 1082 CODE:
857 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1083 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084 OUTPUT:
1085 RETVAL
858 1086
859void 1087void
860load_image_inline (SV *image_) 1088load_image_inline (SV *image_)
861 ALIAS: 1089 ALIAS:
862 load_image_file = 1 1090 load_image_file = 1
948void 1176void
949error (char *message) 1177error (char *message)
950 CODE: 1178 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1179 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1180#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1181 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1182#endif
955 1183
956void 1184void
957fatal (char *message) 1185fatal (char *message)
958 CODE: 1186 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1187 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1188#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1189 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1190#endif
963 _exit (1); 1191 _exit (1);
964 1192
965void 1193void
966_exit (int retval = 0) 1194_exit (int retval = 0)
978#if DEBUG 1206#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1207 VALGRIND_DO_LEAK_CHECK;
980#endif 1208#endif
981} 1209}
982 1210
983MODULE = CFPlus PACKAGE = CFPlus::Font 1211MODULE = Deliantra::Client PACKAGE = DC::Font
984 1212
985PROTOTYPES: DISABLE 1213PROTOTYPES: DISABLE
986 1214
987CFPlus::Font 1215DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1216new_from_file (SV *class, char *path, int id = 0)
989 CODE: 1217 CODE:
990{ 1218{
991 int count; 1219 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1220 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
995} 1223}
996 OUTPUT: 1224 OUTPUT:
997 RETVAL 1225 RETVAL
998 1226
999void 1227void
1000DESTROY (CFPlus::Font self) 1228DESTROY (DC::Font self)
1001 CODE: 1229 CODE:
1002 pango_font_description_free (self); 1230 pango_font_description_free (self);
1003 1231
1004void 1232void
1005make_default (CFPlus::Font self) 1233make_default (DC::Font self)
1006 PROTOTYPE: $ 1234 PROTOTYPE: $
1007 CODE: 1235 CODE:
1008 default_font = self; 1236 default_font = self;
1009 1237
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1238MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1239
1012PROTOTYPES: DISABLE 1240PROTOTYPES: DISABLE
1013 1241
1014void 1242void
1015reset_glyph_cache () 1243glyph_cache_backup ()
1016 PROTOTYPE: 1244 PROTOTYPE:
1017 CODE: 1245 CODE:
1246 tc_backup ();
1247
1248void
1249glyph_cache_restore ()
1250 PROTOTYPE:
1251 CODE:
1018 tc_clear (); 1252 tc_restore ();
1019 1253
1020CFPlus::Layout 1254DC::Layout
1021new (SV *class) 1255new (SV *class)
1022 CODE: 1256 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1257 New (0, RETVAL, 1, struct cf_layout);
1024 1258
1025 RETVAL->pl = pango_layout_new (opengl_context); 1259 RETVAL->pl = pango_layout_new (opengl_context);
1027 RETVAL->g = 1.; 1261 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1262 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1263 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1264 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1265 RETVAL->font = 0;
1266 RETVAL->rc = rc_alloc ();
1032 1267
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1268 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1269 layout_update_font (RETVAL);
1035 OUTPUT: 1270 OUTPUT:
1036 RETVAL 1271 RETVAL
1037 1272
1038void 1273void
1039DESTROY (CFPlus::Layout self) 1274DESTROY (DC::Layout self)
1040 CODE: 1275 CODE:
1041 g_object_unref (self->pl); 1276 g_object_unref (self->pl);
1277 rc_free (self->rc);
1042 Safefree (self); 1278 Safefree (self);
1043 1279
1044void 1280void
1045set_text (CFPlus::Layout self, SV *text_) 1281set_text (DC::Layout self, SV *text_)
1046 CODE: 1282 CODE:
1047{ 1283{
1048 STRLEN textlen; 1284 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1285 char *text = SvPVutf8 (text_, textlen);
1050 1286
1051 pango_layout_set_text (self->pl, text, textlen); 1287 pango_layout_set_text (self->pl, text, textlen);
1052} 1288}
1053 1289
1054void 1290void
1055set_markup (CFPlus::Layout self, SV *text_) 1291set_markup (DC::Layout self, SV *text_)
1056 CODE: 1292 CODE:
1057{ 1293{
1058 STRLEN textlen; 1294 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1295 char *text = SvPVutf8 (text_, textlen);
1060 1296
1061 pango_layout_set_markup (self->pl, text, textlen); 1297 pango_layout_set_markup (self->pl, text, textlen);
1062} 1298}
1063 1299
1064void 1300void
1065set_shapes (CFPlus::Layout self, ...) 1301set_shapes (DC::Layout self, ...)
1066 CODE: 1302 CODE:
1067{ 1303{
1068 PangoAttrList *attrs = 0; 1304 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1305 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1306 const char *pos = text;
1105 if (attrs) 1341 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1342 pango_layout_set_attributes (self->pl, attrs);
1107} 1343}
1108 1344
1109void 1345void
1110get_shapes (CFPlus::Layout self) 1346get_shapes (DC::Layout self)
1111 PPCODE: 1347 PPCODE:
1112{ 1348{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1349 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1350
1115 do 1351 do
1116 { 1352 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1353 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1354
1119 if (run && shape_attr_p (run)) 1355 if (run && shape_attr_p (run))
1120 { 1356 {
1121 PangoRectangle extents; 1357 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1358 pango_layout_iter_get_run_extents (iter, 0, &extents);
1130 1366
1131 pango_layout_iter_free (iter); 1367 pango_layout_iter_free (iter);
1132} 1368}
1133 1369
1134int 1370int
1135has_wrapped (CFPlus::Layout self) 1371has_wrapped (DC::Layout self)
1136 CODE: 1372 CODE:
1137{ 1373{
1138 int lines = 1; 1374 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1375 const char *text = pango_layout_get_text (self->pl);
1140 1376
1145} 1381}
1146 OUTPUT: 1382 OUTPUT:
1147 RETVAL 1383 RETVAL
1148 1384
1149SV * 1385SV *
1150get_text (CFPlus::Layout self) 1386get_text (DC::Layout self)
1151 CODE: 1387 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1388 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1389 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1390 OUTPUT:
1155 RETVAL 1391 RETVAL
1156 1392
1157void 1393void
1158set_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.)
1159 CODE: 1395 CODE:
1160 self->r = r; 1396 self->r = r;
1161 self->g = g; 1397 self->g = g;
1162 self->b = b; 1398 self->b = b;
1163 self->a = a; 1399 self->a = a;
1164 1400
1165void 1401void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1402set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1403 CODE:
1168 if (self->font != font) 1404 if (self->font != font)
1169 { 1405 {
1170 self->font = font; 1406 self->font = font;
1171 layout_update_font (self); 1407 layout_update_font (self);
1172 } 1408 }
1173 1409
1174void 1410void
1175set_height (CFPlus::Layout self, int base_height) 1411set_height (DC::Layout self, int base_height)
1176 CODE: 1412 CODE:
1177 if (self->base_height != base_height) 1413 if (self->base_height != base_height)
1178 { 1414 {
1179 self->base_height = base_height; 1415 self->base_height = base_height;
1180 layout_update_font (self); 1416 layout_update_font (self);
1181 } 1417 }
1182 1418
1183void 1419void
1184set_width (CFPlus::Layout self, int max_width = -1) 1420set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1421 CODE:
1186 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);
1187 1423
1188void 1424void
1189set_indent (CFPlus::Layout self, int indent) 1425set_indent (DC::Layout self, int indent)
1190 CODE: 1426 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1427 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1428
1193void 1429void
1194set_spacing (CFPlus::Layout self, int spacing) 1430set_spacing (DC::Layout self, int spacing)
1195 CODE: 1431 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1432 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1433
1198void 1434void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1435set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1436 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1437 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1438 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1439 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1440 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1441 : PANGO_ELLIPSIZE_NONE
1206 ); 1442 );
1207 1443
1208void 1444void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1445set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1446 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1447 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1448
1213void 1449void
1214size (CFPlus::Layout self) 1450size (DC::Layout self)
1215 PPCODE: 1451 PPCODE:
1216{ 1452{
1217 int w, h; 1453 int w, h;
1218 1454
1219 layout_get_pixel_size (self, &w, &h); 1455 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1458 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1459 PUSHs (sv_2mortal (newSViv (h)));
1224} 1460}
1225 1461
1226int 1462int
1227descent (CFPlus::Layout self) 1463descent (DC::Layout self)
1228 CODE: 1464 CODE:
1229{ 1465{
1230 PangoRectangle rect; 1466 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1467 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1468 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1469 RETVAL = PANGO_DESCENT (rect);
1234} 1470}
1235 OUTPUT: 1471 OUTPUT:
1236 RETVAL 1472 RETVAL
1237 1473
1238int 1474int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1475xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1476 CODE:
1241{ 1477{
1242 int index, trailing; 1478 int index, trailing;
1243 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);
1244 RETVAL = index + trailing; 1480 RETVAL = index + trailing;
1245} 1481}
1246 OUTPUT: 1482 OUTPUT:
1247 RETVAL 1483 RETVAL
1248 1484
1249void 1485void
1250cursor_pos (CFPlus::Layout self, int index) 1486cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1487 PPCODE:
1252{ 1488{
1253 PangoRectangle strong_pos; 1489 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1490 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1491
1256 EXTEND (SP, 3); 1492 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1494 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1495 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1496}
1261 1497
1262void 1498void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1499index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1500 PPCODE:
1265{ 1501{
1266 int line, x; 1502 int line, x;
1267 1503
1268 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)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1506 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1507 --line;
1508#endif
1271 EXTEND (SP, 2); 1509 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1510 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1512}
1275 1513
1276void 1514void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1515line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1516 PPCODE:
1279{ 1517{
1280 PangoLayoutLine *lp; 1518 PangoLayoutLine *lp;
1281 int index, trailing; 1519 int index, trailing;
1282 1520
1283 if (line < 0) 1521 if (line < 0)
1284 XSRETURN_EMPTY; 1522 XSRETURN_EMPTY;
1285 1523
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1524 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1525 XSRETURN_EMPTY; /* do better */
1288 1526
1289 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);
1290 1528
1291 EXTEND (SP, 2); 1529 EXTEND (SP, 2);
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1535 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1536 }
1299} 1537}
1300 1538
1301void 1539void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1540render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1541 CODE:
1542 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1543 pango_opengl_render_layout_subpixel (
1305 self->pl, 1544 self->pl,
1545 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1546 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1547 self->r, self->g, self->b, self->a,
1308 flags 1548 flags
1309 ); 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);
1310 1553
1311MODULE = 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
1312 1574
1313PROTOTYPES: ENABLE 1575PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1576
1317void 1577void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1578pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1579 CODE:
1320{ 1580{
1347 HV *hv = (HV *)SvRV (self); 1607 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1608 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1609 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1610 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1611
1612 if (name <= 0)
1613 XSRETURN_EMPTY;
1614
1352 if (items < 5) 1615 if (items < 5)
1353 { 1616 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1617 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1618 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1619 }
1394 RETVAL = width > 0; 1657 RETVAL = width > 0;
1395} 1658}
1396 OUTPUT: 1659 OUTPUT:
1397 RETVAL 1660 RETVAL
1398 1661
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1662MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1663
1401PROTOTYPES: DISABLE 1664PROTOTYPES: DISABLE
1402 1665
1403CFPlus::Map 1666DC::Map
1404new (SV *class) 1667new (SV *class)
1405 CODE: 1668 CODE:
1406 New (0, RETVAL, 1, struct map); 1669 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1670 RETVAL->x = 0;
1408 RETVAL->y = 0; 1671 RETVAL->y = 0;
1416 RETVAL->row = 0; 1679 RETVAL->row = 0;
1417 OUTPUT: 1680 OUTPUT:
1418 RETVAL 1681 RETVAL
1419 1682
1420void 1683void
1421DESTROY (CFPlus::Map self) 1684DESTROY (DC::Map self)
1422 CODE: 1685 CODE:
1423{ 1686{
1424 map_clear (self); 1687 map_clear (self);
1425 Safefree (self->face2tile); 1688 Safefree (self->face2tile);
1426 Safefree (self->tex); 1689 Safefree (self->tex);
1427 Safefree (self); 1690 Safefree (self);
1428} 1691}
1429 1692
1430void 1693void
1431resize (CFPlus::Map self, int map_width, int map_height) 1694resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1695 CODE:
1433 self->w = map_width; 1696 self->w = map_width;
1434 self->h = map_height; 1697 self->h = map_height;
1435 1698
1436void 1699void
1437clear (CFPlus::Map self) 1700clear (DC::Map self)
1438 CODE: 1701 CODE:
1439 map_clear (self); 1702 map_clear (self);
1440 1703
1441void 1704void
1442set_tileid (CFPlus::Map self, int face, int tile) 1705set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1706 CODE:
1444{ 1707{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1708 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1709 need_texid (self, tile);
1447} 1710}
1448 1711
1449void 1712void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1713set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1714 CODE:
1452{ 1715{
1453 tileid texid; 1716 tileid texid;
1454 maptex *tex; 1717 maptex *tex;
1455 1718
1468 tex->smoothtile = self->face2tile [smooth]; 1731 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1732 tex->smoothlevel = level;
1470} 1733}
1471 1734
1472void 1735void
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) 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)
1474 CODE: 1737 CODE:
1475{ 1738{
1476 need_texid (self, texid); 1739 need_texid (self, texid);
1477 1740
1478 { 1741 {
1498 // from transparent color bleeding and ugly wrapping effects. 1761 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1763}
1501 1764
1502int 1765int
1503ox (CFPlus::Map self) 1766ox (DC::Map self)
1504 ALIAS: 1767 ALIAS:
1505 oy = 1 1768 oy = 1
1506 x = 2 1769 x = 2
1507 y = 3 1770 y = 3
1508 w = 4 1771 w = 4
1519 } 1782 }
1520 OUTPUT: 1783 OUTPUT:
1521 RETVAL 1784 RETVAL
1522 1785
1523void 1786void
1524scroll (CFPlus::Map self, int dx, int dy) 1787scroll (DC::Map self, int dx, int dy)
1525 CODE: 1788 CODE:
1526{ 1789{
1527 if (dx > 0) 1790 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1791 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1792 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 1807 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1808 self->y += MAP_EXTEND_Y;
1546 } 1809 }
1547} 1810}
1548 1811
1549void 1812SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1813map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1814 CODE:
1552{ 1815{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1816 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1817 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1818 mapcell *cell;
1556 int x, y, flags; 1819 int x, y, z, flags;
1820 AV *missing = newAV ();
1821 RETVAL = newRV_noinc ((SV *)missing);
1557 1822
1558 while (data < data_end - 1) 1823 while (data < data_end - 1)
1559 { 1824 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1825 flags = (data [0] << 8) + data [1]; data += 2;
1561 1826
1581 uint8_t ext, cmd; 1846 uint8_t ext, cmd;
1582 1847
1583 do 1848 do
1584 { 1849 {
1585 ext = *data++; 1850 ext = *data++;
1586 cmd = ext & 0x3f; 1851 cmd = ext & 0x7f;
1587 1852
1588 if (cmd < 4) 1853 if (cmd < 4)
1589 cell->darkness = 255 - ext * 64 + 1; 1854 cell->darkness = 255 - ext * 64 + 1;
1590 else if (cmd == 5) // health 1855 else if (cmd == 5) // health
1591 { 1856 {
1594 } 1859 }
1595 else if (cmd == 6) // monster width 1860 else if (cmd == 6) // monster width
1596 cell->stat_width = *data++ + 1; 1861 cell->stat_width = *data++ + 1;
1597 else if (cmd == 0x47) 1862 else if (cmd == 0x47)
1598 { 1863 {
1599 if (*data == 4) 1864 if (*data == 1) cell->player = data [1];
1600 ; // 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);
1601 1868
1602 data += *data + 1; 1869 data += *data + 1;
1603 } 1870 }
1604 else if (cmd == 8) // cell flags 1871 else if (cmd == 8) // cell flags
1605 cell->flags = *data++; 1872 cell->flags = *data++;
1612 } 1879 }
1613 else 1880 else
1614 cell->darkness = *data++ + 1; 1881 cell->darkness = *data++ + 1;
1615 } 1882 }
1616 1883
1884 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 1885 if (flags & (4 >> z))
1618 { 1886 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 1887 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 1888 need_facenum (self, face);
1621 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 }
1622 } 1904 }
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 } 1905 }
1638 else 1906 else
1639 cell->darkness = 0; 1907 CELL_CLEAR (cell);
1640 } 1908 }
1641} 1909}
1910 OUTPUT:
1911 RETVAL
1642 1912
1643SV * 1913SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1914mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 1915 CODE:
1646{ 1916{
1647 int x1, x; 1917 int x1, x;
1648 int y1, y; 1918 int y1, y;
1649 int z; 1919 int z;
1694} 1964}
1695 OUTPUT: 1965 OUTPUT:
1696 RETVAL 1966 RETVAL
1697 1967
1698void 1968void
1699draw (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)
1700 CODE: 1970 CODE:
1701{ 1971{
1972 int x, y, z;
1973
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 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
1704 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)
1705 smooth_key skey; 1977 smooth_key skey;
1706 int x, y, z; 1978 int pl_x, pl_y;
1707 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;
1708 1985
1709 // thats current max. sorry. 1986 // thats current max. sorry.
1710 if (sw > 255) sw = 255; 1987 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 1988 if (sh > 255) sh = 255;
1712 1989
1713 // clear key, in case of extra padding 1990 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 1991 memset (&skey, 0, sizeof (skey));
1715 1992
1716 glColor4ub (255, 255, 255, 255); 1993 memset (&key, 0, sizeof (key));
1717 1994 key.r = 255;
1718 glEnable (GL_BLEND); 1995 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1996 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 1997 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1998 key.mode = GL_QUADS;
1722 1999 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS); 2000 key.texname = -1;
1724
1725 last_name = 0;
1726 2001
1727 mx += self->x; 2002 mx += self->x;
1728 my += self->y; 2003 my += self->y;
1729 2004
1730 // first pass: determine smooth_max 2005 // first pass: determine smooth_max
1746 MAX (self->tex [cell->tile [0]].smoothlevel, 2021 MAX (self->tex [cell->tile [0]].smoothlevel,
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 2022 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 2023 self->tex [cell->tile [2]].smoothlevel));
1749 } 2024 }
1750 } 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);
1751 2030
1752 for (z = 0; z <= 2; z++) 2031 for (z = 0; z <= 2; z++)
1753 { 2032 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 2033 memset (smooth_level, 0, sizeof (smooth_level));
1755 2034
1768 { 2047 {
1769 maptex tex = self->tex [tile]; 2048 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 2049 int px = (x + 1) * T - tex.w;
1771 int py = (y + 1) * T - tex.h; 2050 int py = (y + 1) * T - tex.h;
1772 2051
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 2052 if (key.texname != tex.name)
1776 { 2053 {
1777 if (!tex.name) 2054 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 2055 tex = self->tex [2]; /* missing, replace by noface */
1779 2056
1780 glEnd (); 2057 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2058 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 2059 }
1784 2060
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2061 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 { 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
1792 if (cell->flags & 1) 2077 if (cell->flags & 1)
1793 { 2078 {
1794 maptex tex = self->tex [1]; 2079 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32; 2080 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32; 2081 int py = y * T - T * 6 / 32;
1797 2082
2083 if (tex.name)
1798 glEnd (); 2084 {
1799 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);
1800 glBegin (GL_QUADS); 2095 }
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 } 2096 }
1807 } 2097 }
1808 2098
1809 // update smooth hash 2099 // update smooth hash
1810 if (tex.smoothtile) 2100 if (tex.smoothtile)
1846 } 2136 }
1847 } 2137 }
1848 } 2138 }
1849 } 2139 }
1850 2140
2141 rc_draw (rc);
2142 rc_clear (rc);
2143
1851 // go through all smoothlevels, lowest to highest, then draw. 2144 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 2145 // this is basically counting sort
1853 { 2146 {
1854 int w, b; 2147 int w, b;
1855 2148
2149 glEnable (GL_TEXTURE_2D);
2150 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 2151 for (w = 0; w < 256 / 32; ++w)
1857 { 2152 {
1858 uint32_t smask = smooth_level [w]; 2153 uint32_t smask = smooth_level [w];
1859 if (smask) 2154 if (smask)
1860 for (b = 0; b < 32; ++b) 2155 for (b = 0; b < 32; ++b)
1879 int border = bits & 15; 2174 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2175 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 2176 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 2177 float dy = tex.t * .5f ; // 2 images/column
1883 2178
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 2179 if (tex.name)
1887 { 2180 {
2181 // this time avoiding texture state changes
2182 // save gobs of state changes.
1888 if (!tex.name) 2183 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 2184 {
1890
1891 glEnd (); 2185 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2186 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2187 glBegin (GL_QUADS);
1894 } 2188 }
1895 2189
1896 if (border) 2190 if (border)
1897 { 2191 {
1898 float ox = border * dx; 2192 float ox = border * dx;
1899 2193
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2194 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2195 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2196 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2197 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2198 }
1905 2199
1906 if (corner) 2200 if (corner)
1907 { 2201 {
1908 float ox = corner * dx; 2202 float ox = corner * dx;
1909 2203
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2204 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2205 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2206 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2207 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2208 }
1914 } 2209 }
1915 } 2210 }
1916 } 2211 }
1917 } 2212 }
1918 } 2213 }
2214
2215 glEnd ();
2216 glDisable (GL_TEXTURE_2D);
2217 key.texname = -1;
1919 } 2218 }
1920 2219
1921 hv_clear (smooth); 2220 hv_clear (smooth);
1922 } 2221 }
1923 2222
1924 glEnd (); 2223 if (pl_tex.name)
2224 {
2225 maptex tex = pl_tex;
2226 int px = pl_x + sdx;
2227 int py = pl_y + sdy;
1925 2228
1926 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
1927 glDisable (GL_BLEND); 2240 glDisable (GL_BLEND);
2241 rc_free (rc);
1928 2242
1929 // top layer: overlays such as the health bar 2243 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2244 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2245 if (0 <= y + my && y + my < self->rows)
1932 { 2246 {
1937 { 2251 {
1938 mapcell *cell = row->col + (x + mx - row->c0); 2252 mapcell *cell = row->col + (x + mx - row->c0);
1939 2253
1940 int px = x * T; 2254 int px = x * T;
1941 int py = y * T; 2255 int py = y * T;
2256
2257 if (expect_false (cell->player == player))
2258 {
2259 px += sdx;
2260 py += sdy;
2261 }
1942 2262
1943 if (cell->stat_hp) 2263 if (cell->stat_hp)
1944 { 2264 {
1945 int width = cell->stat_width * T; 2265 int width = cell->stat_width * T;
1946 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2266 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1957 } 2277 }
1958 } 2278 }
1959} 2279}
1960 2280
1961void 2281void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2282draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1963 CODE: 2283 CODE:
1964{ 2284{
1965 static float color[16][3] = { 2285 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2286 { 0.00F, 0.00F, 0.00F },
1967 { 1.00F, 1.00F, 1.00F }, 2287 { 1.00F, 1.00F, 1.00F },
2017 glDisable (GL_BLEND); 2337 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2338 glDisable (GL_TEXTURE_2D);
2019} 2339}
2020 2340
2021void 2341void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2342fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2343 PPCODE:
2024{ 2344{
2025 int x, y; 2345 int x, y;
2026 int sw1 = sw + 2; 2346 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2347 int sh1 = sh + 2;
2035 SvCUR_set (darkness3_sv, sw34 * sh3); 2355 SvCUR_set (darkness3_sv, sw34 * sh3);
2036 2356
2037 mx += self->x - 1; 2357 mx += self->x - 1;
2038 my += self->y - 1; 2358 my += self->y - 1;
2039 2359
2040 memset (darkness1, 255, sw1 * sh1); 2360 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2041 2361
2042 for (y = 0; y < sh1; y++) 2362 for (y = 0; y < sh1; y++)
2043 if (0 <= y + my && y + my < self->rows) 2363 if (0 <= y + my && y + my < self->rows)
2044 { 2364 {
2045 maprow *row = self->row + (y + my); 2365 maprow *row = self->row + (y + my);
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2418 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2419 PUSHs (darkness3_sv);
2100} 2420}
2101 2421
2102SV * 2422SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2423get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2424 CODE:
2105{ 2425{
2106 int x, y, x1, y1; 2426 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2427 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2428 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2165 else 2485 else
2166 *data++ = 0; 2486 *data++ = 0;
2167 } 2487 }
2168 } 2488 }
2169 2489
2490 /* if size is w*h + 5 then no data has been found */
2491 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2492 {
2170 SvPOK_only (data_sv); 2493 SvPOK_only (data_sv);
2171 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2494 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2495 }
2496
2172 RETVAL = data_sv; 2497 RETVAL = data_sv;
2173} 2498}
2174 OUTPUT: 2499 OUTPUT:
2175 RETVAL 2500 RETVAL
2176 2501
2177void 2502void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2503set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2179 PPCODE: 2504 PPCODE:
2180{ 2505{
2181 int x, y, z; 2506 int x, y, z;
2182 int w, h; 2507 int w, h;
2183 int x1, y1; 2508 int x1, y1;
2509 STRLEN len;
2510 uint8_t *data, *end;
2511
2512 len = SvLEN (data_sv);
2513 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2514 data = SvPVbyte_nolen (data_sv);
2515 end = data + len + 8;
2516
2517 if (len < 5)
2518 XSRETURN_EMPTY;
2184 2519
2185 if (*data++ != 0) 2520 if (*data++ != 0)
2186 return; /* version mismatch */ 2521 XSRETURN_EMPTY; /* version mismatch */
2187 2522
2188 w = *data++ << 8; w |= *data++; 2523 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2524 h = *data++ << 8; h |= *data++;
2190 2525
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2526 // we need to do this 'cause we don't keep an absolute coord system for rows
2203 { 2538 {
2204 maprow *row = map_get_row (self, y); 2539 maprow *row = map_get_row (self, y);
2205 2540
2206 for (x = x0; x < x1; x++) 2541 for (x = x0; x < x1; x++)
2207 { 2542 {
2543 uint8_t flags;
2544
2545 if (data + 7 >= end)
2546 XSRETURN_EMPTY;
2547
2208 uint8_t flags = *data++; 2548 flags = *data++;
2209 2549
2210 if (flags) 2550 if (flags)
2211 { 2551 {
2212 mapcell *cell = row_get_cell (row, x); 2552 mapcell *cell = row_get_cell (row, x);
2213 tileid tile[3] = { 0, 0, 0 }; 2553 tileid tile[3] = { 0, 0, 0 };
2216 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2556 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2217 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2557 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2218 2558
2219 if (cell->darkness == 0) 2559 if (cell->darkness == 0)
2220 { 2560 {
2221 cell->darkness = 0; 2561 /*cell->darkness = 0;*/
2562 EXTEND (SP, 3);
2222 2563
2223 for (z = 0; z <= 2; z++) 2564 for (z = 0; z <= 2; z++)
2224 { 2565 {
2225 tileid t = tile [z]; 2566 tileid t = tile [z];
2226 2567
2227 if (t >= self->texs || (t && !self->tex [t].name)) 2568 if (t >= self->texs || (t && !self->tex [t].name))
2228 { 2569 {
2229 XPUSHs (sv_2mortal (newSViv (t))); 2570 PUSHs (sv_2mortal (newSViv (t)));
2230 need_texid (self, t); 2571 need_texid (self, t);
2231 } 2572 }
2232 2573
2233 cell->tile [z] = t; 2574 cell->tile [z] = t;
2234 } 2575 }
2236 } 2577 }
2237 } 2578 }
2238 } 2579 }
2239} 2580}
2240 2581
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2582MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2583
2243CFPlus::RW 2584DC::RW
2244new (SV *class, SV *data_sv) 2585new (SV *class, SV *data_sv)
2245 CODE: 2586 CODE:
2246{ 2587{
2247 STRLEN datalen; 2588 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2589 char *data = SvPVbyte (data_sv, datalen);
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2591 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2592}
2252 OUTPUT: 2593 OUTPUT:
2253 RETVAL 2594 RETVAL
2254 2595
2255CFPlus::RW 2596DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2597new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2598 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2599 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2600 OUTPUT:
2260 RETVAL 2601 RETVAL
2261 2602
2603# fails on win32:
2604# dc.xs(2268) : error C2059: syntax error : '('
2262void 2605#void
2263close (CFPlus::RW self) 2606#close (DC::RW self)
2264 CODE: 2607# CODE:
2265 SDL_RWclose (self); 2608# (self->(close)) (self);
2266 2609
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2610MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2611
2269PROTOTYPES: DISABLE 2612PROTOTYPES: DISABLE
2270 2613
2271int 2614DC::Channel
2272volume (CFPlus::Channel self, int volume) 2615find ()
2273 CODE: 2616 CODE:
2274 RETVAL = Mix_Volume (self, volume); 2617{
2618 RETVAL = Mix_GroupAvailable (-1);
2619
2620 if (RETVAL < 0)
2621 {
2622 RETVAL = Mix_GroupOldest (-1);
2623
2624 if (RETVAL < 0)
2625 XSRETURN_UNDEF;
2626
2627 Mix_HaltChannel (RETVAL);
2628 }
2629
2630 Mix_UnregisterAllEffects (RETVAL);
2631 Mix_Volume (RETVAL, 128);
2632}
2275 OUTPUT: 2633 OUTPUT:
2276 RETVAL 2634 RETVAL
2277 2635
2636void
2637halt (DC::Channel self)
2638 CODE:
2639 Mix_HaltChannel (self);
2640
2641void
2642expire (DC::Channel self, int ticks = -1)
2643 CODE:
2644 Mix_ExpireChannel (self, ticks);
2645
2646void
2647fade_out (DC::Channel self, int ticks = -1)
2648 CODE:
2649 Mix_FadeOutChannel (self, ticks);
2650
2278int 2651int
2279unregister_all_effects (CFPlus::Channel self) 2652volume (DC::Channel self, int volume)
2280 CODE: 2653 CODE:
2281 RETVAL = Mix_UnregisterAllEffects (self); 2654 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2282 OUTPUT: 2655 OUTPUT:
2283 RETVAL 2656 RETVAL
2284 2657
2285int 2658void
2659unregister_all_effects (DC::Channel self)
2660 CODE:
2661 Mix_UnregisterAllEffects (self);
2662
2663void
2286set_panning (CFPlus::Channel self, int left, int right) 2664set_panning (DC::Channel self, int left, int right)
2287 CODE: 2665 CODE:
2666 left = CLAMP (left , 0, 255);
2667 right = CLAMP (right, 0, 255);
2288 RETVAL = Mix_SetPanning (self, left, right); 2668 Mix_SetPanning (self, left, right);
2289 OUTPUT:
2290 RETVAL
2291 2669
2292int 2670void
2293set_distance (CFPlus::Channel self, int distance) 2671set_distance (DC::Channel self, int distance)
2294 CODE: 2672 CODE:
2295 RETVAL = Mix_SetDistance (self, distance); 2673 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2296 OUTPUT:
2297 RETVAL
2298 2674
2299int 2675void
2300set_position (CFPlus::Channel self, int angle, int distance) 2676set_position (DC::Channel self, int angle, int distance)
2301 CODE: 2677 CODE:
2678
2679void
2680set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2681 CODE:
2682{
2683 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2684 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2302 RETVAL = Mix_SetPosition (self, angle, distance); 2685 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2303 OUTPUT: 2686}
2304 RETVAL
2305 2687
2306int 2688void
2307set_reverse_stereo (CFPlus::Channel self, int flip) 2689set_reverse_stereo (DC::Channel self, int flip)
2308 CODE: 2690 CODE:
2309 RETVAL = Mix_SetReverseStereo (self, flip); 2691 Mix_SetReverseStereo (self, flip);
2310 OUTPUT:
2311 RETVAL
2312 2692
2313MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2693MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2314 2694
2315PROTOTYPES: DISABLE 2695PROTOTYPES: DISABLE
2316 2696
2317CFPlus::MixChunk 2697DC::MixChunk
2318new (SV *class, CFPlus::RW rwops) 2698new (SV *class, DC::RW rwops)
2319 CODE: 2699 CODE:
2320 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2700 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2321 OUTPUT: 2701 OUTPUT:
2322 RETVAL 2702 RETVAL
2323 2703
2324void 2704void
2325DESTROY (CFPlus::MixChunk self) 2705DESTROY (DC::MixChunk self)
2326 CODE: 2706 CODE:
2327 Mix_FreeChunk (self); 2707 Mix_FreeChunk (self);
2328 2708
2329int 2709int
2330volume (CFPlus::MixChunk self, int volume = -1) 2710volume (DC::MixChunk self, int volume = -1)
2331 CODE: 2711 CODE:
2712 if (items > 1)
2713 volume = CLAMP (volume, 0, 128);
2332 RETVAL = Mix_VolumeChunk (self, volume); 2714 RETVAL = Mix_VolumeChunk (self, volume);
2333 OUTPUT: 2715 OUTPUT:
2334 RETVAL 2716 RETVAL
2335 2717
2336CFPlus::Channel 2718DC::Channel
2337play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2719play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2338 CODE: 2720 CODE:
2721{
2339 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2722 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2723
2724 if (RETVAL < 0)
2725 XSRETURN_UNDEF;
2726
2727 if (channel < 0)
2728 {
2340 Mix_UnregisterAllEffects (RETVAL); 2729 Mix_UnregisterAllEffects (RETVAL);
2730 Mix_Volume (RETVAL, 128);
2731 }
2732}
2341 OUTPUT: 2733 OUTPUT:
2342 RETVAL 2734 RETVAL
2343 2735
2344MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2736MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2345 2737
2346int 2738int
2347volume (int volume = -1) 2739volume (int volume = -1)
2348 PROTOTYPE: ;$ 2740 PROTOTYPE: ;$
2349 CODE: 2741 CODE:
2742 if (items > 0)
2743 volume = CLAMP (volume, 0, 128);
2350 RETVAL = Mix_VolumeMusic (volume); 2744 RETVAL = Mix_VolumeMusic (volume);
2351 OUTPUT: 2745 OUTPUT:
2352 RETVAL 2746 RETVAL
2353 2747
2354int 2748void
2355fade_out (int ms) 2749fade_out (int ms)
2356 CODE: 2750 CODE:
2357 RETVAL = Mix_FadeOutMusic (ms); 2751 Mix_FadeOutMusic (ms);
2358 OUTPUT:
2359 RETVAL
2360 2752
2361void 2753void
2362halt () 2754halt ()
2363 CODE: 2755 CODE:
2364 Mix_HaltMusic (); 2756 Mix_HaltMusic ();
2365 2757
2366CFPlus::MixMusic 2758DC::MixMusic
2367new (SV *class, CFPlus::RW rwops) 2759new (SV *class, DC::RW rwops)
2368 CODE: 2760 CODE:
2369 RETVAL = Mix_LoadMUS_RW (rwops); 2761 RETVAL = Mix_LoadMUS_RW (rwops);
2370 OUTPUT: 2762 OUTPUT:
2371 RETVAL 2763 RETVAL
2372 2764
2373void 2765void
2374DESTROY (CFPlus::MixMusic self) 2766DESTROY (DC::MixMusic self)
2375 CODE: 2767 CODE:
2376 Mix_FreeMusic (self); 2768 Mix_FreeMusic (self);
2377 2769
2378int 2770int
2379play (CFPlus::MixMusic self, int loops = -1) 2771play (DC::MixMusic self, int loops = -1)
2380 CODE: 2772 CODE:
2381 RETVAL = Mix_PlayMusic (self, loops); 2773 RETVAL = Mix_PlayMusic (self, loops);
2382 OUTPUT: 2774 OUTPUT:
2383 RETVAL 2775 RETVAL
2384 2776
2385int 2777void
2386fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2778fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2387 CODE: 2779 CODE:
2388 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2780 Mix_FadeInMusicPos (self, loops, ms, position);
2389 OUTPUT:
2390 RETVAL
2391 2781
2392MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2782MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2393 2783
2394PROTOTYPES: ENABLE 2784PROTOTYPES: ENABLE
2395 2785
2396BOOT: 2786BOOT:
2397{ 2787{
2398 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2788 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2399 static const struct { 2789 static const struct {
2400 const char *name; 2790 const char *name;
2401 IV iv; 2791 IV iv;
2402 } *civ, const_iv[] = { 2792 } *civ, const_iv[] = {
2403# define const_iv(name) { # name, (IV)name } 2793# define const_iv(name) { # name, (IV)name }
2438 const_iv (GL_INTENSITY), 2828 const_iv (GL_INTENSITY),
2439 const_iv (GL_LUMINANCE), 2829 const_iv (GL_LUMINANCE),
2440 const_iv (GL_LUMINANCE_ALPHA), 2830 const_iv (GL_LUMINANCE_ALPHA),
2441 const_iv (GL_FLOAT), 2831 const_iv (GL_FLOAT),
2442 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2832 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2833 const_iv (GL_COMPRESSED_ALPHA_ARB),
2834 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2835 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2836 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2837 const_iv (GL_COMPRESSED_RGB_ARB),
2838 const_iv (GL_COMPRESSED_RGBA_ARB),
2443 const_iv (GL_COMPILE), 2839 const_iv (GL_COMPILE),
2444 const_iv (GL_PROXY_TEXTURE_1D), 2840 const_iv (GL_PROXY_TEXTURE_1D),
2445 const_iv (GL_PROXY_TEXTURE_2D), 2841 const_iv (GL_PROXY_TEXTURE_2D),
2446 const_iv (GL_TEXTURE_1D), 2842 const_iv (GL_TEXTURE_1D),
2447 const_iv (GL_TEXTURE_2D), 2843 const_iv (GL_TEXTURE_2D),
2486 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2882 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2487 const_iv (GL_POINT_SMOOTH_HINT), 2883 const_iv (GL_POINT_SMOOTH_HINT),
2488 const_iv (GL_LINE_SMOOTH_HINT), 2884 const_iv (GL_LINE_SMOOTH_HINT),
2489 const_iv (GL_POLYGON_SMOOTH_HINT), 2885 const_iv (GL_POLYGON_SMOOTH_HINT),
2490 const_iv (GL_GENERATE_MIPMAP_HINT), 2886 const_iv (GL_GENERATE_MIPMAP_HINT),
2887 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2491 const_iv (GL_FASTEST), 2888 const_iv (GL_FASTEST),
2492 const_iv (GL_DONT_CARE), 2889 const_iv (GL_DONT_CARE),
2493 const_iv (GL_NICEST), 2890 const_iv (GL_NICEST),
2494 const_iv (GL_V2F), 2891 const_iv (GL_V2F),
2495 const_iv (GL_V3F), 2892 const_iv (GL_V3F),
2503 2900
2504 texture_av = newAV (); 2901 texture_av = newAV ();
2505 AvREAL_off (texture_av); 2902 AvREAL_off (texture_av);
2506} 2903}
2507 2904
2905void
2906disable_GL_EXT_blend_func_separate ()
2907 CODE:
2908 gl.BlendFuncSeparate = 0;
2909 gl.BlendFuncSeparateEXT = 0;
2910
2508char * 2911char *
2509gl_vendor () 2912gl_vendor ()
2510 CODE: 2913 CODE:
2511 RETVAL = (char *)glGetString (GL_VENDOR); 2914 RETVAL = (char *)glGetString (GL_VENDOR);
2512 OUTPUT: 2915 OUTPUT:
2604void glRotate (float angle, float x, float y, float z) 3007void glRotate (float angle, float x, float y, float z)
2605 CODE: 3008 CODE:
2606 glRotatef (angle, x, y, z); 3009 glRotatef (angle, x, y, z);
2607 3010
2608void glColor (float r, float g, float b, float a = 1.0) 3011void glColor (float r, float g, float b, float a = 1.0)
3012 PROTOTYPE: @
2609 ALIAS: 3013 ALIAS:
2610 glColor_premultiply = 1 3014 glColor_premultiply = 1
2611 CODE: 3015 CODE:
2612 if (ix) 3016 if (ix)
2613 { 3017 {
2633 3037
2634void glRect (float x1, float y1, float x2, float y2) 3038void glRect (float x1, float y1, float x2, float y2)
2635 CODE: 3039 CODE:
2636 glRectf (x1, y1, x2, y2); 3040 glRectf (x1, y1, x2, y2);
2637 3041
3042void glRect_lineloop (float x1, float y1, float x2, float y2)
3043 CODE:
3044 glBegin (GL_LINE_LOOP);
3045 glVertex2f (x1, y1);
3046 glVertex2f (x2, y1);
3047 glVertex2f (x2, y2);
3048 glVertex2f (x1, y2);
3049 glEnd ();
3050
2638PROTOTYPES: ENABLE 3051PROTOTYPES: ENABLE
2639 3052
2640void glBegin (int mode) 3053void glBegin (int mode)
2641 3054
2642void glEnd () 3055void glEnd ()
2674void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3087void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2675 CODE: 3088 CODE:
2676 if (gl.SeparableFilter2D) 3089 if (gl.SeparableFilter2D)
2677 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3090 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2678 3091
2679void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3092void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2680 3093
2681void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3094void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2682 3095
2683void glDrawPixels (int width, int height, int format, int type, char *pixels) 3096void glDrawPixels (int width, int height, int format, int type, char *pixels)
2684 3097
2710 3123
2711void glEndList () 3124void glEndList ()
2712 3125
2713void glCallList (int list) 3126void glCallList (int list)
2714 3127
2715MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3128MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2716 3129
2717PROTOTYPES: DISABLE 3130PROTOTYPES: DISABLE
2718 3131
2719void 3132void
2720find_widget (SV *self, NV x, NV y) 3133find_widget (SV *self, NV x, NV y)
2724 XPUSHs (self); 3137 XPUSHs (self);
2725} 3138}
2726 3139
2727BOOT: 3140BOOT:
2728{ 3141{
2729 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3142 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2730 3143
2731 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3144 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2732 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3145 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2733 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3146 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2734 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3147 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2735} 3148}
2736 3149
2737void 3150void
2738draw (SV *self) 3151draw (SV *self)
2739 CODE: 3152 CODE:
2743 NV x, y, w, h; 3156 NV x, y, w, h;
2744 SV *draw_x_sv = GvSV (draw_x_gv); 3157 SV *draw_x_sv = GvSV (draw_x_gv);
2745 SV *draw_y_sv = GvSV (draw_y_gv); 3158 SV *draw_y_sv = GvSV (draw_y_gv);
2746 SV *draw_w_sv = GvSV (draw_w_gv); 3159 SV *draw_w_sv = GvSV (draw_w_gv);
2747 SV *draw_h_sv = GvSV (draw_h_gv); 3160 SV *draw_h_sv = GvSV (draw_h_gv);
2748 SV *hover;
2749 double draw_x, draw_y, draw_w, draw_h; 3161 double draw_x, draw_y;
2750 3162
2751 if (!SvROK (self)) 3163 if (!SvROK (self))
2752 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3164 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2753 3165
2754 hv = (HV *)SvRV (self); 3166 hv = (HV *)SvRV (self);
2755 3167
2756 if (SvTYPE (hv) != SVt_PVHV) 3168 if (SvTYPE (hv) != SVt_PVHV)
2757 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3169 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2758 3170
2759 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3171 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2760 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3172 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2761 3173
2762 if (!h || !w) 3174 if (!h || !w)
2782 { 3194 {
2783 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3195 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2784 3196
2785 if (svp && SvTRUE (*svp)) 3197 if (svp && SvTRUE (*svp))
2786 { 3198 {
2787 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3199 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2788 glEnable (GL_BLEND); 3200 glEnable (GL_BLEND);
2789 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3201 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2790 glBegin (GL_QUADS); 3202 glBegin (GL_QUADS);
2791 glVertex2f (0, 0); 3203 glVertex2f (0, 0);
2792 glVertex2f (w, 0); 3204 glVertex2f (w, 0);
2795 glEnd (); 3207 glEnd ();
2796 glDisable (GL_BLEND); 3208 glDisable (GL_BLEND);
2797 } 3209 }
2798 } 3210 }
2799#if 0 3211#if 0
2800 if ($ENV{CFPLUS_DEBUG} & 1) { 3212 // draw borders, for debugging
2801 glPushMatrix; 3213 glPushMatrix ();
2802 glColor 1, 1, 0, 1; 3214 glColor4f (1., 1., 0., 1.);
2803 glTranslate 0.375, 0.375; 3215 glTranslatef (.5, .5, 0.);
2804 glBegin GL_LINE_LOOP; 3216 glBegin (GL_LINE_LOOP);
2805 glVertex 0 , 0; 3217 glVertex2f (0 , 0);
2806 glVertex $self->{w} - 1, 0; 3218 glVertex2f (w - 1, 0);
2807 glVertex $self->{w} - 1, $self->{h} - 1; 3219 glVertex2f (w - 1, h - 1);
2808 glVertex 0 , $self->{h} - 1; 3220 glVertex2f (0 , h - 1);
2809 glEnd; 3221 glEnd ();
2810 glPopMatrix; 3222 glPopMatrix ();
2811 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2812 }
2813#endif 3223#endif
2814 PUSHMARK (SP); 3224 PUSHMARK (SP);
2815 XPUSHs (self); 3225 XPUSHs (self);
2816 PUTBACK; 3226 PUTBACK;
2817 call_method ("_draw", G_VOID | G_DISCARD); 3227 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines