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.209 by root, Sat Jul 21 22:54:52 2007 UTC vs.
Revision 1.275 by root, Thu Aug 28 00:53:53 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines