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.221 by root, Fri Aug 10 04:02:13 2007 UTC vs.
Revision 1.285 by root, Sat Dec 20 19:45:49 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 16
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 97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
68 101
69static AV *texture_av; 102static AV *texture_av;
70 103
71static struct 104static struct
72{ 105{
109 av_push (texture_av, (SV *)(size_t)name); 142 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 143 glDeleteTextures (1, &name);
111} 144}
112 145
113#include "texcache.c" 146#include "texcache.c"
147#include "rendercache.c"
114 148
115#include "pango-font.c" 149#include "pango-font.c"
116#include "pango-fontmap.c" 150#include "pango-fontmap.c"
117#include "pango-render.c" 151#include "pango-render.c"
118 152
119typedef IV CFPlus__Channel; 153typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 154typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 155typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 156typedef Mix_Music *DC__MixMusic;
123 157
124typedef PangoFontDescription *CFPlus__Font; 158typedef PangoFontDescription *DC__Font;
125 159
126static int 160static int
127shape_attr_p (PangoLayoutRun *run) 161shape_attr_p (PangoLayoutRun *run)
128{ 162{
129 GSList *attrs = run->item->analysis.extra_attrs; 163 GSList *attrs = run->item->analysis.extra_attrs;
143 177
144typedef struct cf_layout { 178typedef struct cf_layout {
145 PangoLayout *pl; 179 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 180 float r, g, b, a; // default color for rgba mode
147 int base_height; 181 int base_height;
148 CFPlus__Font font; 182 DC__Font font;
183 rc_t *rc;
149} *CFPlus__Layout; 184} *DC__Layout;
150 185
151static CFPlus__Font default_font; 186static DC__Font default_font;
152static PangoContext *opengl_context; 187static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 188static PangoFontMap *opengl_fontmap;
154 189
155static void 190static void
156substitute_func (FcPattern *pattern, gpointer data) 191substitute_func (FcPattern *pattern, gpointer data)
161#endif 196#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 197 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 198}
164 199
165static void 200static void
166layout_update_font (CFPlus__Layout self) 201layout_update_font (DC__Layout self)
167{ 202{
168 /* use a random scale factor to account for unknown descenders, 0.8 works 203 /* use a random scale factor to account for unknown descenders, 0.8 works
169 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
170 */ 205 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
172 207
173 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
174 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175 210
176 pango_layout_set_font_description (self->pl, font); 211 pango_layout_set_font_description (self->pl, font);
177} 212}
178 213
179static void 214static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 215layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 216{
182 PangoRectangle rect; 217 PangoRectangle rect;
183 218
184 // get_pixel_* wrongly rounds down 219 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 220 pango_layout_get_extents (self->pl, 0, &rect);
196 231
197typedef uint16_t tileid; 232typedef uint16_t tileid;
198typedef uint16_t faceid; 233typedef uint16_t faceid;
199 234
200typedef struct { 235typedef struct {
201 int name; 236 GLuint name;
202 int w, h; 237 int w, h;
203 float s, t; 238 float s, t;
204 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
205 tileid smoothtile; 240 tileid smoothtile;
206 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
207} maptex; 243} maptex;
208 244
209typedef struct { 245typedef struct {
210 uint32_t player; 246 uint32_t player;
211 tileid tile[3]; 247 tileid tile[3];
224 int faces; tileid *face2tile; // [faceid] 260 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 261 int texs; maptex *tex; // [tileid]
226 262
227 int32_t rows; 263 int32_t rows;
228 maprow *row; 264 maprow *row;
229} *CFPlus__Map; 265} *DC__Map;
230 266
231static char * 267static char *
232prepend (char *ptr, int sze, int inc) 268prepend (char *ptr, int sze, int inc)
233{ 269{
234 char *p; 270 char *p;
272 self->texs *= 2; 308 self->texs *= 2;
273 } 309 }
274} 310}
275 311
276static maprow * 312static maprow *
277map_get_row (CFPlus__Map self, int y) 313map_get_row (DC__Map self, int y)
278{ 314{
279 if (0 > y) 315 if (0 > y)
280 { 316 {
281 int extend = - y + MAP_EXTEND_Y; 317 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 318 Prepend (maprow, self->row, self->rows, extend);
320 356
321 return row->col + (x - row->c0); 357 return row->col + (x - row->c0);
322} 358}
323 359
324static mapcell * 360static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 361map_get_cell (DC__Map self, int x, int y)
326{ 362{
327 return row_get_cell (map_get_row (self, y), x); 363 return row_get_cell (map_get_row (self, y), x);
328} 364}
329 365
330static void 366static void
331map_clear (CFPlus__Map self) 367map_clear (DC__Map self)
332{ 368{
333 int r; 369 int r;
334 370
335 for (r = 0; r < self->rows; r++) 371 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 372 Safefree (self->row[r].col);
343 self->oy = 0; 379 self->oy = 0;
344 self->row = 0; 380 self->row = 0;
345 self->rows = 0; 381 self->rows = 0;
346} 382}
347 383
384#define CELL_CLEAR(cell) \
385 do { \
386 if ((cell)->player) \
387 (cell)->tile [2] = 0; \
388 (cell)->darkness = 0; \
389 (cell)->stat_hp = 0; \
390 (cell)->flags = 0; \
391 (cell)->player = 0; \
392 } while (0)
393
348static void 394static void
349map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 395map_blank (DC__Map self, int x0, int y0, int w, int h)
350{ 396{
351 int x, y; 397 int x, y;
352 maprow *row; 398 maprow *row;
353 mapcell *cell; 399 mapcell *cell;
354 400
366 if (x >= row->c1) 412 if (x >= row->c1)
367 break; 413 break;
368 414
369 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
370 416
371 cell->darkness = 0; 417 CELL_CLEAR (cell);
372 cell->stat_hp = 0;
373 cell->flags = 0;
374 cell->player = 0;
375 } 418 }
376 } 419 }
377} 420}
378 421
379typedef struct { 422typedef struct {
433 n |= n >> 16; 476 n |= n >> 16;
434 477
435 return n + 1; 478 return n + 1;
436} 479}
437 480
481static unsigned int
482popcount (unsigned int n)
483{
484 n -= (n >> 1) & 0x55555555U;
485 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
486 n = ((n >> 4) + n) & 0x0f0f0f0fU;
487 n *= 0x01010101U;
488
489 return n >> 24;
490}
491
438/* SDL should provide this, really. */ 492/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 493#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 494#define SDLK_MODIFIER_MAX 314
441 495
442/******************************************************************************/ 496/******************************************************************************/
480 return 0; 534 return 0;
481 535
482 return 1; 536 return 1;
483} 537}
484 538
485MODULE = CFPlus PACKAGE = CFPlus 539/******************************************************************************/
540
541/* process keyboard modifiers */
542static int
543mod_munge (int mod)
544{
545 mod &= MOD_MASK;
546
547 if (mod & (KMOD_META | KMOD_ALT))
548 mod |= KMOD_LRAM;
549
550 return mod;
551}
552
553static void
554deliantra_main ()
555{
556 char *argv[] = { 0 };
557 call_argv ("::main", G_DISCARD | G_VOID, argv);
558}
559
560#ifdef __MACOSX__
561 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back.
566 */
567 extern C_LINKAGE int
568 main (int argc, char *argv[])
569 {
570 deliantra_main ();
571 }
572
573 #undef main
574
575 extern C_LINKAGE int main (int argc, char *argv[]);
576
577 static void
578 SDL_braino (void)
579 {
580 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv);
582 }
583#else
584 static void
585 SDL_braino (void)
586 {
587 deliantra_main ();
588 }
589#endif
590
591MODULE = Deliantra::Client PACKAGE = DC
486 592
487PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
488 594
489BOOT: 595BOOT:
490{ 596{
491 HV *stash = gv_stashpv ("CFPlus", 1); 597 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 598 static const struct {
493 const char *name; 599 const char *name;
494 IV iv; 600 IV iv;
495 } *civ, const_iv[] = { 601 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 602# define const_iv(name) { # name, (IV)name }
518 624
519 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
522 628
629
630 const_iv (SDLK_UNKNOWN),
631 const_iv (SDLK_FIRST),
632 const_iv (SDLK_BACKSPACE),
633 const_iv (SDLK_TAB),
634 const_iv (SDLK_CLEAR),
635 const_iv (SDLK_RETURN),
636 const_iv (SDLK_PAUSE),
637 const_iv (SDLK_ESCAPE),
638 const_iv (SDLK_SPACE),
639 const_iv (SDLK_EXCLAIM),
640 const_iv (SDLK_QUOTEDBL),
641 const_iv (SDLK_HASH),
642 const_iv (SDLK_DOLLAR),
643 const_iv (SDLK_AMPERSAND),
644 const_iv (SDLK_QUOTE),
645 const_iv (SDLK_LEFTPAREN),
646 const_iv (SDLK_RIGHTPAREN),
647 const_iv (SDLK_ASTERISK),
648 const_iv (SDLK_PLUS),
649 const_iv (SDLK_COMMA),
650 const_iv (SDLK_MINUS),
651 const_iv (SDLK_PERIOD),
652 const_iv (SDLK_SLASH),
653 const_iv (SDLK_0),
654 const_iv (SDLK_1),
655 const_iv (SDLK_2),
656 const_iv (SDLK_3),
657 const_iv (SDLK_4),
658 const_iv (SDLK_5),
659 const_iv (SDLK_6),
660 const_iv (SDLK_7),
661 const_iv (SDLK_8),
662 const_iv (SDLK_9),
663 const_iv (SDLK_COLON),
664 const_iv (SDLK_SEMICOLON),
665 const_iv (SDLK_LESS),
666 const_iv (SDLK_EQUALS),
667 const_iv (SDLK_GREATER),
668 const_iv (SDLK_QUESTION),
669 const_iv (SDLK_AT),
670
671 const_iv (SDLK_LEFTBRACKET),
672 const_iv (SDLK_BACKSLASH),
673 const_iv (SDLK_RIGHTBRACKET),
674 const_iv (SDLK_CARET),
675 const_iv (SDLK_UNDERSCORE),
676 const_iv (SDLK_BACKQUOTE),
677 const_iv (SDLK_DELETE),
678
679 const_iv (SDLK_FIRST),
680 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 683 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 684 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 685 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 757 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
762
763 const_iv (KMOD_LRAM),
764
765 const_iv (MIX_DEFAULT_FORMAT),
766
767 const_iv (SDL_INIT_TIMER),
768 const_iv (SDL_INIT_AUDIO),
769 const_iv (SDL_INIT_VIDEO),
770 const_iv (SDL_INIT_CDROM),
771 const_iv (SDL_INIT_JOYSTICK),
772 const_iv (SDL_INIT_EVERYTHING),
773 const_iv (SDL_INIT_NOPARACHUTE),
774 const_iv (SDL_INIT_EVENTTHREAD),
775
776 const_iv (SDL_GL_RED_SIZE),
777 const_iv (SDL_GL_GREEN_SIZE),
778 const_iv (SDL_GL_BLUE_SIZE),
779 const_iv (SDL_GL_ALPHA_SIZE),
780 const_iv (SDL_GL_DOUBLEBUFFER),
781 const_iv (SDL_GL_BUFFER_SIZE),
782 const_iv (SDL_GL_DEPTH_SIZE),
783 const_iv (SDL_GL_STENCIL_SIZE),
784 const_iv (SDL_GL_ACCUM_RED_SIZE),
785 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
786 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
787 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
788 const_iv (SDL_GL_STEREO),
789 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
790 const_iv (SDL_GL_MULTISAMPLESAMPLES),
791 const_iv (SDL_GL_ACCELERATED_VISUAL),
792 const_iv (SDL_GL_SWAP_CONTROL),
793
794 const_iv (FOW_DARKNESS)
604# undef const_iv 795# undef const_iv
605 }; 796 };
606 797
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 817
627NV floor (NV x) 818NV floor (NV x)
628 819
629NV ceil (NV x) 820NV ceil (NV x)
630 821
822IV minpot (UV n)
823
824IV popcount (UV n)
825
631void 826void
632pango_init () 827pango_init ()
633 CODE: 828 CODE:
634{ 829{
635 opengl_fontmap = pango_opengl_font_map_new (); 830 opengl_fontmap = pango_opengl_font_map_new ();
636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 831 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); 832 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
833 /*pango_context_set_font_description (opengl_context, default_font);*/
834#if PANGO_VERSION_CHECK (1, 15, 2)
835 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
836 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
837#endif
638} 838}
639 839
640char *
641SDL_GetError () 840char *SDL_GetError ()
642 841
643int 842void SDL_braino ()
644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
645 843
646void 844int SDL_Init (U32 flags)
845
846int SDL_InitSubSystem (U32 flags)
847
848void SDL_QuitSubSystem (U32 flags)
849
647SDL_Quit () 850void SDL_Quit ()
851
852int SDL_GL_SetAttribute (int attr, int value)
853
854int SDL_GL_GetAttribute (int attr)
855 CODE:
856 if (SDL_GL_GetAttribute (attr, &RETVAL))
857 XSRETURN_UNDEF;
858 OUTPUT:
859 RETVAL
648 860
649void 861void
650SDL_ListModes (int rgb, int alpha) 862SDL_ListModes (int rgb, int alpha)
651 PPCODE: 863 PPCODE:
652{ 864{
664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 876 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667 879
668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 880 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); 881 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672#endif
673 882
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 883 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 884
676 if (m && m != (SDL_Rect **)-1) 885 if (m && m != (SDL_Rect **)-1)
677 while (*m) 886 while (*m)
678 { 887 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 888 if ((*m)->w >= 400 && (*m)->h >= 300)
680 { 889 {
681 AV *av = newAV (); 890 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 891 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 892 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 893 av_push (av, newSViv (rgb));
708 917
709 if (RETVAL) 918 if (RETVAL)
710 { 919 {
711 av_clear (texture_av); 920 av_clear (texture_av);
712 921
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 922 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 923#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 924#include "glfunc.h"
716#undef GL_FUNC 925#undef GL_FUNC
717 } 926 }
718} 927}
725char * 934char *
726SDL_GetKeyName (int sym) 935SDL_GetKeyName (int sym)
727 936
728int 937int
729SDL_GetAppState () 938SDL_GetAppState ()
939
940int
941SDL_GetModState ()
730 942
731void 943void
732poll_events () 944poll_events ()
733 PPCODE: 945 PPCODE:
734{ 946{
744 { 956 {
745 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
746 case SDL_KEYUP: 958 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 961 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 */ 962 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); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 964 break;
753 965
754 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 985 x = ev.motion.x;
774 y = ev.motion.y; 986 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 988 }
777 989
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 996 }
785 break; 997 break;
786 998
787 case SDL_MOUSEBUTTONDOWN: 999 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 1000 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1001 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 1002
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1003 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1004 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1005 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1006 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1011 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1012 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 1013 break;
802 } 1014 }
803 1015
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1016 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 1017 }
806} 1018}
807 1019
808int 1020int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1021Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 1022 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 1023 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 1024 Mix_ChannelFinished (channel_finished);
1025
1026void
1027Mix_QuerySpec ()
1028 PPCODE:
1029{
1030 int freq, channels;
1031 Uint16 format;
1032
1033 if (Mix_QuerySpec (&freq, &format, &channels))
1034 {
1035 EXTEND (SP, 3);
1036 PUSHs (sv_2mortal (newSViv (freq)));
1037 PUSHs (sv_2mortal (newSViv (format)));
1038 PUSHs (sv_2mortal (newSViv (channels)));
1039 }
1040}
813 1041
814void 1042void
815Mix_CloseAudio () 1043Mix_CloseAudio ()
816 1044
817int 1045int
852 } 1080 }
853 } 1081 }
854#endif 1082#endif
855} 1083}
856 1084
857void 1085int
858add_font (char *file) 1086add_font (char *file)
859 CODE: 1087 CODE:
860 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT:
1090 RETVAL
861 1091
862void 1092void
863load_image_inline (SV *image_) 1093load_image_inline (SV *image_)
864 ALIAS: 1094 ALIAS:
865 load_image_file = 1 1095 load_image_file = 1
951void 1181void
952error (char *message) 1182error (char *message)
953 CODE: 1183 CODE:
954 fprintf (stderr, "ERROR: %s\n", message); 1184 fprintf (stderr, "ERROR: %s\n", message);
955#ifdef _WIN32 1185#ifdef _WIN32
956 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1186 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957#endif 1187#endif
958 1188
959void 1189void
960fatal (char *message) 1190fatal (char *message)
961 CODE: 1191 CODE:
962 fprintf (stderr, "FATAL: %s\n", message); 1192 fprintf (stderr, "FATAL: %s\n", message);
963#ifdef _WIN32 1193#ifdef _WIN32
964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1194 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965#endif 1195#endif
966 _exit (1); 1196 _exit (1);
967 1197
968void 1198void
969_exit (int retval = 0) 1199_exit (int retval = 0)
981#if DEBUG 1211#if DEBUG
982 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
983#endif 1213#endif
984} 1214}
985 1215
986MODULE = CFPlus PACKAGE = CFPlus::Font 1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
1223MODULE = Deliantra::Client PACKAGE = DC::Font
987 1224
988PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
989 1226
990CFPlus::Font 1227DC::Font
991new_from_file (SV *class, char *path, int id = 0) 1228new_from_file (SV *class, char *path, int id = 0)
992 CODE: 1229 CODE:
993{ 1230{
994 int count; 1231 int count;
995 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1232 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
998} 1235}
999 OUTPUT: 1236 OUTPUT:
1000 RETVAL 1237 RETVAL
1001 1238
1002void 1239void
1003DESTROY (CFPlus::Font self) 1240DESTROY (DC::Font self)
1004 CODE: 1241 CODE:
1005 pango_font_description_free (self); 1242 pango_font_description_free (self);
1006 1243
1007void 1244void
1008make_default (CFPlus::Font self) 1245make_default (DC::Font self)
1009 PROTOTYPE: $ 1246 PROTOTYPE: $
1010 CODE: 1247 CODE:
1011 default_font = self; 1248 default_font = self;
1012 1249
1013MODULE = CFPlus PACKAGE = CFPlus::Layout 1250MODULE = Deliantra::Client PACKAGE = DC::Layout
1014 1251
1015PROTOTYPES: DISABLE 1252PROTOTYPES: DISABLE
1016 1253
1017void 1254void
1018reset_glyph_cache () 1255glyph_cache_backup ()
1019 PROTOTYPE: 1256 PROTOTYPE:
1020 CODE: 1257 CODE:
1258 tc_backup ();
1259
1260void
1261glyph_cache_restore ()
1262 PROTOTYPE:
1263 CODE:
1021 tc_clear (); 1264 tc_restore ();
1022 1265
1023CFPlus::Layout 1266DC::Layout
1024new (SV *class) 1267new (SV *class)
1025 CODE: 1268 CODE:
1026 New (0, RETVAL, 1, struct cf_layout); 1269 New (0, RETVAL, 1, struct cf_layout);
1027 1270
1028 RETVAL->pl = pango_layout_new (opengl_context); 1271 RETVAL->pl = pango_layout_new (opengl_context);
1030 RETVAL->g = 1.; 1273 RETVAL->g = 1.;
1031 RETVAL->b = 1.; 1274 RETVAL->b = 1.;
1032 RETVAL->a = 1.; 1275 RETVAL->a = 1.;
1033 RETVAL->base_height = MIN_FONT_HEIGHT; 1276 RETVAL->base_height = MIN_FONT_HEIGHT;
1034 RETVAL->font = 0; 1277 RETVAL->font = 0;
1278 RETVAL->rc = rc_alloc ();
1035 1279
1036 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1280 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037 layout_update_font (RETVAL); 1281 layout_update_font (RETVAL);
1038 OUTPUT: 1282 OUTPUT:
1039 RETVAL 1283 RETVAL
1040 1284
1041void 1285void
1042DESTROY (CFPlus::Layout self) 1286DESTROY (DC::Layout self)
1043 CODE: 1287 CODE:
1044 g_object_unref (self->pl); 1288 g_object_unref (self->pl);
1289 rc_free (self->rc);
1045 Safefree (self); 1290 Safefree (self);
1046 1291
1047void 1292void
1048set_text (CFPlus::Layout self, SV *text_) 1293set_text (DC::Layout self, SV *text_)
1049 CODE: 1294 CODE:
1050{ 1295{
1051 STRLEN textlen; 1296 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1297 char *text = SvPVutf8 (text_, textlen);
1053 1298
1054 pango_layout_set_text (self->pl, text, textlen); 1299 pango_layout_set_text (self->pl, text, textlen);
1055} 1300}
1056 1301
1057void 1302void
1058set_markup (CFPlus::Layout self, SV *text_) 1303set_markup (DC::Layout self, SV *text_)
1059 CODE: 1304 CODE:
1060{ 1305{
1061 STRLEN textlen; 1306 STRLEN textlen;
1062 char *text = SvPVutf8 (text_, textlen); 1307 char *text = SvPVutf8 (text_, textlen);
1063 1308
1064 pango_layout_set_markup (self->pl, text, textlen); 1309 pango_layout_set_markup (self->pl, text, textlen);
1065} 1310}
1066 1311
1067void 1312void
1068set_shapes (CFPlus::Layout self, ...) 1313set_shapes (DC::Layout self, ...)
1069 CODE: 1314 CODE:
1070{ 1315{
1071 PangoAttrList *attrs = 0; 1316 PangoAttrList *attrs = 0;
1072 const char *text = pango_layout_get_text (self->pl); 1317 const char *text = pango_layout_get_text (self->pl);
1073 const char *pos = text; 1318 const char *pos = text;
1108 if (attrs) 1353 if (attrs)
1109 pango_layout_set_attributes (self->pl, attrs); 1354 pango_layout_set_attributes (self->pl, attrs);
1110} 1355}
1111 1356
1112void 1357void
1113get_shapes (CFPlus::Layout self) 1358get_shapes (DC::Layout self)
1114 PPCODE: 1359 PPCODE:
1115{ 1360{
1116 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1361 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117 1362
1118 do 1363 do
1119 { 1364 {
1120 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1365 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121 1366
1122 if (run && shape_attr_p (run)) 1367 if (run && shape_attr_p (run))
1123 { 1368 {
1124 PangoRectangle extents; 1369 PangoRectangle extents;
1125 pango_layout_iter_get_run_extents (iter, 0, &extents); 1370 pango_layout_iter_get_run_extents (iter, 0, &extents);
1133 1378
1134 pango_layout_iter_free (iter); 1379 pango_layout_iter_free (iter);
1135} 1380}
1136 1381
1137int 1382int
1138has_wrapped (CFPlus::Layout self) 1383has_wrapped (DC::Layout self)
1139 CODE: 1384 CODE:
1140{ 1385{
1141 int lines = 1; 1386 int lines = 1;
1142 const char *text = pango_layout_get_text (self->pl); 1387 const char *text = pango_layout_get_text (self->pl);
1143 1388
1148} 1393}
1149 OUTPUT: 1394 OUTPUT:
1150 RETVAL 1395 RETVAL
1151 1396
1152SV * 1397SV *
1153get_text (CFPlus::Layout self) 1398get_text (DC::Layout self)
1154 CODE: 1399 CODE:
1155 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1400 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156 sv_utf8_decode (RETVAL); 1401 sv_utf8_decode (RETVAL);
1157 OUTPUT: 1402 OUTPUT:
1158 RETVAL 1403 RETVAL
1159 1404
1160void 1405void
1161set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1406set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1162 CODE: 1407 CODE:
1163 self->r = r; 1408 self->r = r;
1164 self->g = g; 1409 self->g = g;
1165 self->b = b; 1410 self->b = b;
1166 self->a = a; 1411 self->a = a;
1167 1412
1168void 1413void
1169set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1414set_font (DC::Layout self, DC::Font font = 0)
1170 CODE: 1415 CODE:
1171 if (self->font != font) 1416 if (self->font != font)
1172 { 1417 {
1173 self->font = font; 1418 self->font = font;
1174 layout_update_font (self); 1419 layout_update_font (self);
1175 } 1420 }
1176 1421
1177void 1422void
1178set_height (CFPlus::Layout self, int base_height) 1423set_height (DC::Layout self, int base_height)
1179 CODE: 1424 CODE:
1180 if (self->base_height != base_height) 1425 if (self->base_height != base_height)
1181 { 1426 {
1182 self->base_height = base_height; 1427 self->base_height = base_height;
1183 layout_update_font (self); 1428 layout_update_font (self);
1184 } 1429 }
1185 1430
1186void 1431void
1187set_width (CFPlus::Layout self, int max_width = -1) 1432set_width (DC::Layout self, int max_width = -1)
1188 CODE: 1433 CODE:
1189 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1434 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1190 1435
1191void 1436void
1192set_indent (CFPlus::Layout self, int indent) 1437set_indent (DC::Layout self, int indent)
1193 CODE: 1438 CODE:
1194 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1439 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195 1440
1196void 1441void
1197set_spacing (CFPlus::Layout self, int spacing) 1442set_spacing (DC::Layout self, int spacing)
1198 CODE: 1443 CODE:
1199 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1444 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200 1445
1201void 1446void
1202set_ellipsise (CFPlus::Layout self, int ellipsise) 1447set_ellipsise (DC::Layout self, int ellipsise)
1203 CODE: 1448 CODE:
1204 pango_layout_set_ellipsize (self->pl, 1449 pango_layout_set_ellipsize (self->pl,
1205 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1450 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1451 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1452 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208 : PANGO_ELLIPSIZE_NONE 1453 : PANGO_ELLIPSIZE_NONE
1209 ); 1454 );
1210 1455
1211void 1456void
1212set_single_paragraph_mode (CFPlus::Layout self, int spm) 1457set_single_paragraph_mode (DC::Layout self, int spm)
1213 CODE: 1458 CODE:
1214 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1459 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215 1460
1216void 1461void
1217size (CFPlus::Layout self) 1462size (DC::Layout self)
1218 PPCODE: 1463 PPCODE:
1219{ 1464{
1220 int w, h; 1465 int w, h;
1221 1466
1222 layout_get_pixel_size (self, &w, &h); 1467 layout_get_pixel_size (self, &w, &h);
1225 PUSHs (sv_2mortal (newSViv (w))); 1470 PUSHs (sv_2mortal (newSViv (w)));
1226 PUSHs (sv_2mortal (newSViv (h))); 1471 PUSHs (sv_2mortal (newSViv (h)));
1227} 1472}
1228 1473
1229int 1474int
1230descent (CFPlus::Layout self) 1475descent (DC::Layout self)
1231 CODE: 1476 CODE:
1232{ 1477{
1233 PangoRectangle rect; 1478 PangoRectangle rect;
1234 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1479 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235 pango_layout_line_get_pixel_extents (line, 0, &rect); 1480 pango_layout_line_get_pixel_extents (line, 0, &rect);
1236 RETVAL = PANGO_DESCENT (rect); 1481 RETVAL = PANGO_DESCENT (rect);
1237} 1482}
1238 OUTPUT: 1483 OUTPUT:
1239 RETVAL 1484 RETVAL
1240 1485
1241int 1486int
1242xy_to_index (CFPlus::Layout self, int x, int y) 1487xy_to_index (DC::Layout self, int x, int y)
1243 CODE: 1488 CODE:
1244{ 1489{
1245 int index, trailing; 1490 int index, trailing;
1246 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1491 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1247 RETVAL = index + trailing; 1492 RETVAL = index + trailing;
1248} 1493}
1249 OUTPUT: 1494 OUTPUT:
1250 RETVAL 1495 RETVAL
1251 1496
1252void 1497void
1253cursor_pos (CFPlus::Layout self, int index) 1498cursor_pos (DC::Layout self, int index)
1254 PPCODE: 1499 PPCODE:
1255{ 1500{
1256 PangoRectangle strong_pos; 1501 PangoRectangle pos;
1257 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1502 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258 1503
1259 EXTEND (SP, 3); 1504 EXTEND (SP, 3);
1260 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1505 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1506 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1507 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263} 1508}
1264 1509
1265void 1510void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1511index_to_line_x (DC::Layout self, int index, int trailing = 0)
1267 PPCODE: 1512 PPCODE:
1268{ 1513{
1269 int line, x; 1514 int line, x;
1270 1515
1271 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1516 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1517#if !PANGO_VERSION_CHECK (1, 17, 3)
1272 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1518 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273 1519 --line;
1520#endif
1274 EXTEND (SP, 2); 1521 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (newSViv (line - 1))); 1522 PUSHs (sv_2mortal (newSViv (line)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1523 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277} 1524}
1278 1525
1279void 1526void
1280line_x_to_index (CFPlus::Layout self, int line, int x) 1527line_x_to_index (DC::Layout self, int line, int x)
1281 PPCODE: 1528 PPCODE:
1282{ 1529{
1283 PangoLayoutLine *lp; 1530 PangoLayoutLine *lp;
1284 int index, trailing; 1531 int index, trailing;
1285 1532
1286 if (line < 0) 1533 if (line < 0)
1287 XSRETURN_EMPTY; 1534 XSRETURN_EMPTY;
1288 1535
1289 if (!(lp = pango_layout_get_line (self->pl, line))) 1536 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290 XSRETURN_EMPTY; /* do better */ 1537 XSRETURN_EMPTY; /* do better */
1291 1538
1292 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1539 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1293 1540
1294 EXTEND (SP, 2); 1541 EXTEND (SP, 2);
1300 PUSHs (sv_2mortal (newSViv (trailing))); 1547 PUSHs (sv_2mortal (newSViv (trailing)));
1301 } 1548 }
1302} 1549}
1303 1550
1304void 1551void
1305render (CFPlus::Layout self, float x, float y, int flags = 0) 1552render (DC::Layout self, float x, float y, int flags = 0)
1306 PPCODE: 1553 CODE:
1554 rc_clear (self->rc);
1307 pango_opengl_render_layout_subpixel ( 1555 pango_opengl_render_layout_subpixel (
1308 self->pl, 1556 self->pl,
1557 self->rc,
1309 x * PANGO_SCALE, y * PANGO_SCALE, 1558 x * PANGO_SCALE, y * PANGO_SCALE,
1310 self->r, self->g, self->b, self->a, 1559 self->r, self->g, self->b, self->a,
1311 flags 1560 flags
1312 ); 1561 );
1562 // we assume that context_change actually clears/frees stuff
1563 // and does not do any recomputation...
1564 pango_layout_context_changed (self->pl);
1313 1565
1314MODULE = CFPlus PACKAGE = CFPlus::Texture 1566void
1567draw (DC::Layout self)
1568 CODE:
1569{
1570 glEnable (GL_TEXTURE_2D);
1571 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1572 glEnable (GL_BLEND);
1573 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1574 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1575 glEnable (GL_ALPHA_TEST);
1576 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1577
1578 rc_draw (self->rc);
1579
1580 glDisable (GL_ALPHA_TEST);
1581 glDisable (GL_BLEND);
1582 glDisable (GL_TEXTURE_2D);
1583}
1584
1585MODULE = Deliantra::Client PACKAGE = DC::Texture
1315 1586
1316PROTOTYPES: ENABLE 1587PROTOTYPES: ENABLE
1317
1318int minpot (int n)
1319 1588
1320void 1589void
1321pad (SV *data_, int ow, int oh, int nw, int nh) 1590pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE: 1591 CODE:
1323{ 1592{
1400 RETVAL = width > 0; 1669 RETVAL = width > 0;
1401} 1670}
1402 OUTPUT: 1671 OUTPUT:
1403 RETVAL 1672 RETVAL
1404 1673
1405MODULE = CFPlus PACKAGE = CFPlus::Map 1674MODULE = Deliantra::Client PACKAGE = DC::Map
1406 1675
1407PROTOTYPES: DISABLE 1676PROTOTYPES: DISABLE
1408 1677
1409CFPlus::Map 1678DC::Map
1410new (SV *class) 1679new (SV *class)
1411 CODE: 1680 CODE:
1412 New (0, RETVAL, 1, struct map); 1681 New (0, RETVAL, 1, struct map);
1413 RETVAL->x = 0; 1682 RETVAL->x = 0;
1414 RETVAL->y = 0; 1683 RETVAL->y = 0;
1422 RETVAL->row = 0; 1691 RETVAL->row = 0;
1423 OUTPUT: 1692 OUTPUT:
1424 RETVAL 1693 RETVAL
1425 1694
1426void 1695void
1427DESTROY (CFPlus::Map self) 1696DESTROY (DC::Map self)
1428 CODE: 1697 CODE:
1429{ 1698{
1430 map_clear (self); 1699 map_clear (self);
1431 Safefree (self->face2tile); 1700 Safefree (self->face2tile);
1432 Safefree (self->tex); 1701 Safefree (self->tex);
1433 Safefree (self); 1702 Safefree (self);
1434} 1703}
1435 1704
1436void 1705void
1437resize (CFPlus::Map self, int map_width, int map_height) 1706resize (DC::Map self, int map_width, int map_height)
1438 CODE: 1707 CODE:
1439 self->w = map_width; 1708 self->w = map_width;
1440 self->h = map_height; 1709 self->h = map_height;
1441 1710
1442void 1711void
1443clear (CFPlus::Map self) 1712clear (DC::Map self)
1444 CODE: 1713 CODE:
1445 map_clear (self); 1714 map_clear (self);
1446 1715
1447void 1716void
1448set_tileid (CFPlus::Map self, int face, int tile) 1717set_tileid (DC::Map self, int face, int tile)
1449 CODE: 1718 CODE:
1450{ 1719{
1451 need_facenum (self, face); self->face2tile [face] = tile; 1720 need_facenum (self, face); self->face2tile [face] = tile;
1452 need_texid (self, tile); 1721 need_texid (self, tile);
1453} 1722}
1454 1723
1455void 1724void
1456set_smooth (CFPlus::Map self, int face, int smooth, int level) 1725set_smooth (DC::Map self, int face, int smooth, int level)
1457 CODE: 1726 CODE:
1458{ 1727{
1459 tileid texid; 1728 tileid texid;
1460 maptex *tex; 1729 maptex *tex;
1461 1730
1474 tex->smoothtile = self->face2tile [smooth]; 1743 tex->smoothtile = self->face2tile [smooth];
1475 tex->smoothlevel = level; 1744 tex->smoothlevel = level;
1476} 1745}
1477 1746
1478void 1747void
1479set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1748set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1480 CODE: 1749 CODE:
1481{ 1750{
1482 need_texid (self, texid); 1751 need_texid (self, texid);
1483 1752
1484 { 1753 {
1503 // use uglier nearest interpolation because linear suffers 1772 // use uglier nearest interpolation because linear suffers
1504 // from transparent color bleeding and ugly wrapping effects. 1773 // from transparent color bleeding and ugly wrapping effects.
1505 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1774 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1506} 1775}
1507 1776
1777void
1778expire_textures (DC::Map self, int texid, int count)
1779 PPCODE:
1780 for (; texid < self->texs && count; ++texid, --count)
1781 {
1782 maptex *tex = self->tex + texid;
1783
1784 if (tex->name)
1785 {
1786 if (tex->unused)
1787 {
1788 tex->name = 0;
1789 tex->unused = 0;
1790 XPUSHs (sv_2mortal (newSViv (texid)));
1791 }
1792 else
1793 tex->unused = 1;
1794 }
1795 }
1796
1508int 1797int
1509ox (CFPlus::Map self) 1798ox (DC::Map self)
1510 ALIAS: 1799 ALIAS:
1511 oy = 1 1800 oy = 1
1512 x = 2 1801 x = 2
1513 y = 3 1802 y = 3
1514 w = 4 1803 w = 4
1525 } 1814 }
1526 OUTPUT: 1815 OUTPUT:
1527 RETVAL 1816 RETVAL
1528 1817
1529void 1818void
1530scroll (CFPlus::Map self, int dx, int dy) 1819scroll (DC::Map self, int dx, int dy)
1531 CODE: 1820 CODE:
1532{ 1821{
1533 if (dx > 0) 1822 if (dx > 0)
1534 map_blank (self, self->x, self->y, dx, self->h); 1823 map_blank (self, self->x, self->y, dx, self->h);
1535 else if (dx < 0) 1824 else if (dx < 0)
1551 self->y += MAP_EXTEND_Y; 1840 self->y += MAP_EXTEND_Y;
1552 } 1841 }
1553} 1842}
1554 1843
1555SV * 1844SV *
1556map1a_update (CFPlus::Map self, SV *data_, int extmap) 1845map1a_update (DC::Map self, SV *data_, int extmap)
1557 CODE: 1846 CODE:
1558{ 1847{
1559 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1848 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1560 uint8_t *data_end = (uint8_t *)SvEND (data_); 1849 uint8_t *data_end = (uint8_t *)SvEND (data_);
1561 mapcell *cell; 1850 mapcell *cell;
1589 uint8_t ext, cmd; 1878 uint8_t ext, cmd;
1590 1879
1591 do 1880 do
1592 { 1881 {
1593 ext = *data++; 1882 ext = *data++;
1594 cmd = ext & 0x3f; 1883 cmd = ext & 0x7f;
1595 1884
1596 if (cmd < 4) 1885 if (cmd < 4)
1597 cell->darkness = 255 - ext * 64 + 1; 1886 cell->darkness = 255 - ext * 64 + 1;
1598 else if (cmd == 5) // health 1887 else if (cmd == 5) // health
1599 { 1888 {
1602 } 1891 }
1603 else if (cmd == 6) // monster width 1892 else if (cmd == 6) // monster width
1604 cell->stat_width = *data++ + 1; 1893 cell->stat_width = *data++ + 1;
1605 else if (cmd == 0x47) 1894 else if (cmd == 0x47)
1606 { 1895 {
1607 if (*data == 4) 1896 if (*data == 1) cell->player = data [1];
1608 ; // decode player count 1897 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1898 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1899 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1609 1900
1610 data += *data + 1; 1901 data += *data + 1;
1611 } 1902 }
1612 else if (cmd == 8) // cell flags 1903 else if (cmd == 8) // cell flags
1613 cell->flags = *data++; 1904 cell->flags = *data++;
1630 cell->tile [z] = self->face2tile [face]; 1921 cell->tile [z] = self->face2tile [face];
1631 1922
1632 if (cell->tile [z]) 1923 if (cell->tile [z])
1633 { 1924 {
1634 maptex *tex = self->tex + cell->tile [z]; 1925 maptex *tex = self->tex + cell->tile [z];
1926 tex->unused = 0;
1635 if (!tex->name) 1927 if (!tex->name)
1636 av_push (missing, newSViv (cell->tile [z])); 1928 av_push (missing, newSViv (cell->tile [z]));
1637 1929
1638 if (tex->smoothtile) 1930 if (tex->smoothtile)
1639 { 1931 {
1640 maptex *smooth = self->tex + tex->smoothtile; 1932 maptex *smooth = self->tex + tex->smoothtile;
1933 smooth->unused = 0;
1641 if (!smooth->name) 1934 if (!smooth->name)
1642 av_push (missing, newSViv (tex->smoothtile)); 1935 av_push (missing, newSViv (tex->smoothtile));
1643 } 1936 }
1644 } 1937 }
1645 } 1938 }
1646 } 1939 }
1647 else 1940 else
1648 cell->darkness = 0; 1941 CELL_CLEAR (cell);
1649 } 1942 }
1650} 1943}
1651 OUTPUT: 1944 OUTPUT:
1652 RETVAL 1945 RETVAL
1653 1946
1654SV * 1947SV *
1655mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1948mapmap (DC::Map self, int x0, int y0, int w, int h)
1656 CODE: 1949 CODE:
1657{ 1950{
1658 int x1, x; 1951 int x1, x;
1659 int y1, y; 1952 int y1, y;
1660 int z; 1953 int z;
1705} 1998}
1706 OUTPUT: 1999 OUTPUT:
1707 RETVAL 2000 RETVAL
1708 2001
1709void 2002void
1710draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2003draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1711 CODE: 2004 CODE:
1712{ 2005{
2006 int x, y, z;
2007
1713 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2008 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1714 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2009 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1715 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2010 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1716 smooth_key skey; 2011 smooth_key skey;
1717 int x, y, z; 2012 int pl_x, pl_y;
1718 int last_name; 2013 maptex pl_tex;
2014 rc_t *rc = rc_alloc ();
2015 rc_t *rc_ov = rc_alloc ();
2016 rc_key_t key;
2017 rc_array_t *arr, *arr_hidden;
2018
2019 pl_tex.name = 0;
1719 2020
1720 // thats current max. sorry. 2021 // thats current max. sorry.
1721 if (sw > 255) sw = 255; 2022 if (sw > 255) sw = 255;
1722 if (sh > 255) sh = 255; 2023 if (sh > 255) sh = 255;
1723 2024
1724 // clear key, in case of extra padding 2025 // clear key, in case of extra padding
1725 memset (&skey, 0, sizeof (skey)); 2026 memset (&skey, 0, sizeof (skey));
1726 2027
1727 glColor4ub (255, 255, 255, 255); 2028 memset (&key, 0, sizeof (key));
1728 2029 key.r = 255;
1729 glEnable (GL_BLEND); 2030 key.g = 255;
1730 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2031 key.b = 255;
1731 glEnable (GL_TEXTURE_2D); 2032 key.a = 255;
1732 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2033 key.mode = GL_QUADS;
1733 2034 key.format = GL_T2F_V3F;
1734 glBegin (GL_QUADS);
1735
1736 last_name = -1;
1737 2035
1738 mx += self->x; 2036 mx += self->x;
1739 my += self->y; 2037 my += self->y;
1740 2038
1741 // first pass: determine smooth_max 2039 // first pass: determine smooth_max
1758 MAX (self->tex [cell->tile [1]].smoothlevel, 2056 MAX (self->tex [cell->tile [1]].smoothlevel,
1759 self->tex [cell->tile [2]].smoothlevel)); 2057 self->tex [cell->tile [2]].smoothlevel));
1760 } 2058 }
1761 } 2059 }
1762 2060
2061 glEnable (GL_BLEND);
2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2064
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067
1763 for (z = 0; z <= 2; z++) 2068 for (z = 0; z <= 2; z++)
1764 { 2069 {
1765 memset (smooth_level, 0, sizeof (smooth_level)); 2070 memset (smooth_level, 0, sizeof (smooth_level));
2071 key.texname = -1;
1766 2072
1767 for (y = 0; y < sh; y++) 2073 for (y = 0; y < sh; y++)
1768 if (0 <= y + my && y + my < self->rows) 2074 if (0 <= y + my && y + my < self->rows)
1769 { 2075 {
1770 maprow *row = self->row + (y + my); 2076 maprow *row = self->row + (y + my);
1778 if (tile) 2084 if (tile)
1779 { 2085 {
1780 maptex tex = self->tex [tile]; 2086 maptex tex = self->tex [tile];
1781 int px, py; 2087 int px, py;
1782 2088
1783 // suppressing texture state switches here
1784 // is only moderately effective, but worth the extra effort
1785 if (last_name != tex.name) 2089 if (key.texname != tex.name)
1786 { 2090 {
2091 self->tex [tile].unused = 0;
2092
1787 if (!tex.name) 2093 if (!tex.name)
1788 tex = self->tex [2]; /* missing, replace by noface */ 2094 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1789 2095
1790 glEnd (); 2096 key.texname = tex.name;
1791 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2097 arr = rc_array (rc, &key);
1792 glBegin (GL_QUADS);
1793 } 2098 }
1794 2099
1795 px = (x + 1) * T - tex.w; 2100 px = (x + 1) * T - tex.w;
1796 py = (y + 1) * T - tex.h; 2101 py = (y + 1) * T - tex.h;
1797 2102
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2103 if (expect_false (cell->player == player) && expect_false (z == 2))
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1802
1803 if (cell->flags && z == 2)
1804 { 2104 {
1805 if (cell->flags & 1) 2105 pl_x = px;
2106 pl_y = py;
2107 pl_tex = tex;
1806 { 2108 continue;
1807 maptex tex = self->tex [1];
1808 int px = x * T + T * 2 / 32;
1809 int py = y * T - T * 6 / 32;
1810
1811 glEnd ();
1812 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1813 glBegin (GL_QUADS);
1814
1815 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1816 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1817 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1818 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1819 }
1820 } 2109 }
2110
2111 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2112 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2113 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2114 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1821 2115
1822 // update smooth hash 2116 // update smooth hash
1823 if (tex.smoothtile) 2117 if (tex.smoothtile)
1824 { 2118 {
1825 skey.tile = tex.smoothtile; 2119 skey.tile = tex.smoothtile;
1856 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2150 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1857 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2151 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1858 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2152 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1859 } 2153 }
1860 } 2154 }
2155
2156 if (expect_false (z == 2))
2157 {
2158 /* draw question marks on top of hidden spaces */
2159 if (!cell->darkness)
2160 {
2161 maptex tex = self->tex [TEXID_HIDDEN];
2162 int px = (x + 1) * T - tex.w;
2163 int py = (y + 1) * T - tex.h;
2164
2165 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2166 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2167 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2169 }
2170
2171 if (expect_false (cell->flags))
2172 {
2173 // overlays such as the speech bubble, probably more to come
2174 if (cell->flags & 1)
2175 {
2176 rc_key_t key_ov = key;
2177 maptex tex = self->tex [TEXID_SPEECH];
2178 rc_array_t *arr;
2179
2180 key_ov.texname = tex.name;
2181 arr = rc_array (rc_ov, &key_ov);
2182
2183 int px = x * T + T * 2 / 32;
2184 int py = y * T - T * 6 / 32;
2185
2186 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2187 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2188 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2189 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2190 }
2191 }
2192 }
1861 } 2193 }
1862 } 2194 }
2195
2196 rc_draw (rc);
2197 rc_clear (rc);
1863 2198
1864 // go through all smoothlevels, lowest to highest, then draw. 2199 // go through all smoothlevels, lowest to highest, then draw.
1865 // this is basically counting sort 2200 // this is basically counting sort
1866 { 2201 {
1867 int w, b; 2202 int w, b;
1868 2203
2204 glEnable (GL_TEXTURE_2D);
2205 glBegin (GL_QUADS);
1869 for (w = 0; w < 256 / 32; ++w) 2206 for (w = 0; w < 256 / 32; ++w)
1870 { 2207 {
1871 uint32_t smask = smooth_level [w]; 2208 uint32_t smask = smooth_level [w];
1872 if (smask) 2209 if (smask)
1873 for (b = 0; b < 32; ++b) 2210 for (b = 0; b < 32; ++b)
1892 int border = bits & 15; 2229 int border = bits & 15;
1893 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2230 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1894 float dx = tex.s * .0625f; // 16 images/row 2231 float dx = tex.s * .0625f; // 16 images/row
1895 float dy = tex.t * .5f ; // 2 images/column 2232 float dy = tex.t * .5f ; // 2 images/column
1896 2233
1897 // this time naively avoiding texture state changes
1898 // save gobs of state changes.
1899 if (last_name != tex.name) 2234 if (tex.name)
1900 { 2235 {
2236 // this time avoiding texture state changes
2237 // save gobs of state changes.
1901 if (!tex.name) 2238 if (key.texname != tex.name)
1902 continue; // smoothing not yet available 2239 {
2240 self->tex [skey->tile].unused = 0;
1903 2241
1904 glEnd (); 2242 glEnd ();
1905 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2243 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1906 glBegin (GL_QUADS); 2244 glBegin (GL_QUADS);
1907 } 2245 }
1908 2246
1909 if (border) 2247 if (border)
1910 { 2248 {
1911 float ox = border * dx; 2249 float ox = border * dx;
1912 2250
1913 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2251 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1914 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2252 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1915 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2253 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1916 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2254 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1917 } 2255 }
1918 2256
1919 if (corner) 2257 if (corner)
1920 { 2258 {
1921 float ox = corner * dx; 2259 float ox = corner * dx;
1922 2260
1923 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2261 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1924 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2262 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1925 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2263 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1926 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2264 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2265 }
1927 } 2266 }
1928 } 2267 }
1929 } 2268 }
1930 } 2269 }
1931 } 2270 }
2271
2272 glEnd ();
2273 glDisable (GL_TEXTURE_2D);
2274 key.texname = -1;
1932 } 2275 }
1933 2276
1934 hv_clear (smooth); 2277 hv_clear (smooth);
1935 } 2278 }
1936 2279
1937 glEnd (); 2280 if (pl_tex.name)
2281 {
2282 maptex tex = pl_tex;
2283 int px = pl_x + sdx;
2284 int py = pl_y + sdy;
1938 2285
1939 glDisable (GL_TEXTURE_2D); 2286 key.texname = tex.name;
2287 arr = rc_array (rc, &key);
2288
2289 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2290 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2291 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2292 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2293
2294 rc_draw (rc);
2295 }
2296
2297 rc_draw (rc_ov);
2298 rc_clear (rc_ov);
2299
1940 glDisable (GL_BLEND); 2300 glDisable (GL_BLEND);
2301 rc_free (rc);
2302 rc_free (rc_ov);
1941 2303
1942 // top layer: overlays such as the health bar 2304 // top layer: overlays such as the health bar
1943 for (y = 0; y < sh; y++) 2305 for (y = 0; y < sh; y++)
1944 if (0 <= y + my && y + my < self->rows) 2306 if (0 <= y + my && y + my < self->rows)
1945 { 2307 {
1950 { 2312 {
1951 mapcell *cell = row->col + (x + mx - row->c0); 2313 mapcell *cell = row->col + (x + mx - row->c0);
1952 2314
1953 int px = x * T; 2315 int px = x * T;
1954 int py = y * T; 2316 int py = y * T;
2317
2318 if (expect_false (cell->player == player))
2319 {
2320 px += sdx;
2321 py += sdy;
2322 }
1955 2323
1956 if (cell->stat_hp) 2324 if (cell->stat_hp)
1957 { 2325 {
1958 int width = cell->stat_width * T; 2326 int width = cell->stat_width * T;
1959 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2327 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1970 } 2338 }
1971 } 2339 }
1972} 2340}
1973 2341
1974void 2342void
1975draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2343draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1976 CODE: 2344 CODE:
1977{ 2345{
1978 static float color[16][3] = { 2346 static float color[16][3] = {
1979 { 0.00F, 0.00F, 0.00F }, 2347 { 0.00F, 0.00F, 0.00F },
1980 { 1.00F, 1.00F, 1.00F }, 2348 { 1.00F, 1.00F, 1.00F },
2030 glDisable (GL_BLEND); 2398 glDisable (GL_BLEND);
2031 glDisable (GL_TEXTURE_2D); 2399 glDisable (GL_TEXTURE_2D);
2032} 2400}
2033 2401
2034void 2402void
2035fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2403fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2036 PPCODE: 2404 PPCODE:
2037{ 2405{
2038 int x, y; 2406 int x, y;
2039 int sw1 = sw + 2; 2407 int sw1 = sw + 2;
2040 int sh1 = sh + 2; 2408 int sh1 = sh + 2;
2048 SvCUR_set (darkness3_sv, sw34 * sh3); 2416 SvCUR_set (darkness3_sv, sw34 * sh3);
2049 2417
2050 mx += self->x - 1; 2418 mx += self->x - 1;
2051 my += self->y - 1; 2419 my += self->y - 1;
2052 2420
2053 memset (darkness1, 255, sw1 * sh1); 2421 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2054 2422
2055 for (y = 0; y < sh1; y++) 2423 for (y = 0; y < sh1; y++)
2056 if (0 <= y + my && y + my < self->rows) 2424 if (0 <= y + my && y + my < self->rows)
2057 { 2425 {
2058 maprow *row = self->row + (y + my); 2426 maprow *row = self->row + (y + my);
2111 PUSHs (sv_2mortal (newSViv (sh3))); 2479 PUSHs (sv_2mortal (newSViv (sh3)));
2112 PUSHs (darkness3_sv); 2480 PUSHs (darkness3_sv);
2113} 2481}
2114 2482
2115SV * 2483SV *
2116get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2484get_rect (DC::Map self, int x0, int y0, int w, int h)
2117 CODE: 2485 CODE:
2118{ 2486{
2119 int x, y, x1, y1; 2487 int x, y, x1, y1;
2120 SV *data_sv = newSV (w * h * 7 + 5); 2488 SV *data_sv = newSV (w * h * 7 + 5);
2121 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2489 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2178 else 2546 else
2179 *data++ = 0; 2547 *data++ = 0;
2180 } 2548 }
2181 } 2549 }
2182 2550
2551 /* if size is w*h + 5 then no data has been found */
2552 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2553 {
2183 SvPOK_only (data_sv); 2554 SvPOK_only (data_sv);
2184 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2555 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2556 }
2557
2185 RETVAL = data_sv; 2558 RETVAL = data_sv;
2186} 2559}
2187 OUTPUT: 2560 OUTPUT:
2188 RETVAL 2561 RETVAL
2189 2562
2190void 2563void
2191set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2564set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2192 PPCODE: 2565 PPCODE:
2193{ 2566{
2194 int x, y, z; 2567 int x, y, z;
2195 int w, h; 2568 int w, h;
2196 int x1, y1; 2569 int x1, y1;
2570 STRLEN len;
2571 uint8_t *data, *end;
2572
2573 len = SvLEN (data_sv);
2574 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2575 data = SvPVbyte_nolen (data_sv);
2576 end = data + len + 8;
2577
2578 if (len < 5)
2579 XSRETURN_EMPTY;
2197 2580
2198 if (*data++ != 0) 2581 if (*data++ != 0)
2199 return; /* version mismatch */ 2582 XSRETURN_EMPTY; /* version mismatch */
2200 2583
2201 w = *data++ << 8; w |= *data++; 2584 w = *data++ << 8; w |= *data++;
2202 h = *data++ << 8; h |= *data++; 2585 h = *data++ << 8; h |= *data++;
2203 2586
2204 // we need to do this 'cause we don't keep an absolute coord system for rows 2587 // we need to do this 'cause we don't keep an absolute coord system for rows
2216 { 2599 {
2217 maprow *row = map_get_row (self, y); 2600 maprow *row = map_get_row (self, y);
2218 2601
2219 for (x = x0; x < x1; x++) 2602 for (x = x0; x < x1; x++)
2220 { 2603 {
2604 uint8_t flags;
2605
2606 if (data + 7 >= end)
2607 XSRETURN_EMPTY;
2608
2221 uint8_t flags = *data++; 2609 flags = *data++;
2222 2610
2223 if (flags) 2611 if (flags)
2224 { 2612 {
2225 mapcell *cell = row_get_cell (row, x); 2613 mapcell *cell = row_get_cell (row, x);
2226 tileid tile[3] = { 0, 0, 0 }; 2614 tileid tile[3] = { 0, 0, 0 };
2229 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2617 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2230 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2618 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2231 2619
2232 if (cell->darkness == 0) 2620 if (cell->darkness == 0)
2233 { 2621 {
2234 cell->darkness = 0; 2622 /*cell->darkness = 0;*/
2623 EXTEND (SP, 3);
2235 2624
2236 for (z = 0; z <= 2; z++) 2625 for (z = 0; z <= 2; z++)
2237 { 2626 {
2238 tileid t = tile [z]; 2627 tileid t = tile [z];
2239 2628
2240 if (t >= self->texs || (t && !self->tex [t].name)) 2629 if (t >= self->texs || (t && !self->tex [t].name))
2241 { 2630 {
2242 XPUSHs (sv_2mortal (newSViv (t))); 2631 PUSHs (sv_2mortal (newSViv (t)));
2243 need_texid (self, t); 2632 need_texid (self, t);
2244 } 2633 }
2245 2634
2246 cell->tile [z] = t; 2635 cell->tile [z] = t;
2247 } 2636 }
2249 } 2638 }
2250 } 2639 }
2251 } 2640 }
2252} 2641}
2253 2642
2254MODULE = CFPlus PACKAGE = CFPlus::RW 2643MODULE = Deliantra::Client PACKAGE = DC::RW
2255 2644
2256CFPlus::RW 2645DC::RW
2257new (SV *class, SV *data_sv) 2646new (SV *class, SV *data_sv)
2258 CODE: 2647 CODE:
2259{ 2648{
2260 STRLEN datalen; 2649 STRLEN datalen;
2261 char *data = SvPVbyte (data_sv, datalen); 2650 char *data = SvPVbyte (data_sv, datalen);
2263 RETVAL = SDL_RWFromConstMem (data, datalen); 2652 RETVAL = SDL_RWFromConstMem (data, datalen);
2264} 2653}
2265 OUTPUT: 2654 OUTPUT:
2266 RETVAL 2655 RETVAL
2267 2656
2268CFPlus::RW 2657DC::RW
2269new_from_file (SV *class, const char *path, const char *mode = "rb") 2658new_from_file (SV *class, const char *path, const char *mode = "rb")
2270 CODE: 2659 CODE:
2271 RETVAL = SDL_RWFromFile (path, mode); 2660 RETVAL = SDL_RWFromFile (path, mode);
2272 OUTPUT: 2661 OUTPUT:
2273 RETVAL 2662 RETVAL
2274 2663
2275# fails on win32: 2664# fails on win32:
2276# CFPlus.xs(2268) : error C2059: syntax error : '(' 2665# dc.xs(2268) : error C2059: syntax error : '('
2277#void 2666#void
2278#close (CFPlus::RW self) 2667#close (DC::RW self)
2279# CODE: 2668# CODE:
2280# (self->(close)) (self); 2669# (self->(close)) (self);
2281 2670
2282MODULE = CFPlus PACKAGE = CFPlus::Channel 2671MODULE = Deliantra::Client PACKAGE = DC::Channel
2283 2672
2284PROTOTYPES: DISABLE 2673PROTOTYPES: DISABLE
2285 2674
2286CFPlus::Channel 2675DC::Channel
2287find () 2676find ()
2288 CODE: 2677 CODE:
2289{ 2678{
2290 RETVAL = Mix_GroupAvailable (-1); 2679 RETVAL = Mix_GroupAvailable (-1);
2291 2680
2304} 2693}
2305 OUTPUT: 2694 OUTPUT:
2306 RETVAL 2695 RETVAL
2307 2696
2308void 2697void
2309halt (CFPlus::Channel self) 2698halt (DC::Channel self)
2310 CODE: 2699 CODE:
2311 Mix_HaltChannel (self); 2700 Mix_HaltChannel (self);
2312 2701
2313void 2702void
2314expire (CFPlus::Channel self, int ticks = -1) 2703expire (DC::Channel self, int ticks = -1)
2315 CODE: 2704 CODE:
2316 Mix_ExpireChannel (self, ticks); 2705 Mix_ExpireChannel (self, ticks);
2317 2706
2318void 2707void
2319fade_out (CFPlus::Channel self, int ticks = -1) 2708fade_out (DC::Channel self, int ticks = -1)
2320 CODE: 2709 CODE:
2321 Mix_FadeOutChannel (self, ticks); 2710 Mix_FadeOutChannel (self, ticks);
2322 2711
2323int 2712int
2324volume (CFPlus::Channel self, int volume) 2713volume (DC::Channel self, int volume)
2325 CODE: 2714 CODE:
2326 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2715 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2327 OUTPUT: 2716 OUTPUT:
2328 RETVAL 2717 RETVAL
2329 2718
2330void 2719void
2331unregister_all_effects (CFPlus::Channel self) 2720unregister_all_effects (DC::Channel self)
2332 CODE: 2721 CODE:
2333 Mix_UnregisterAllEffects (self); 2722 Mix_UnregisterAllEffects (self);
2334 2723
2335void 2724void
2336set_panning (CFPlus::Channel self, int left, int right) 2725set_panning (DC::Channel self, int left, int right)
2337 CODE: 2726 CODE:
2338 left = CLAMP (left , 0, 255); 2727 left = CLAMP (left , 0, 255);
2339 right = CLAMP (right, 0, 255); 2728 right = CLAMP (right, 0, 255);
2340 Mix_SetPanning (self, left, right); 2729 Mix_SetPanning (self, left, right);
2341 2730
2342void 2731void
2343set_distance (CFPlus::Channel self, int distance) 2732set_distance (DC::Channel self, int distance)
2344 CODE: 2733 CODE:
2345 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2734 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2346 2735
2347void 2736void
2348set_position (CFPlus::Channel self, int angle, int distance) 2737set_position (DC::Channel self, int angle, int distance)
2349 CODE: 2738 CODE:
2350 2739
2351void 2740void
2352set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2741set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2353 CODE: 2742 CODE:
2354{ 2743{
2355 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2744 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2356 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2745 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2357 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2746 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2358} 2747}
2359 2748
2360void 2749void
2361set_reverse_stereo (CFPlus::Channel self, int flip) 2750set_reverse_stereo (DC::Channel self, int flip)
2362 CODE: 2751 CODE:
2363 Mix_SetReverseStereo (self, flip); 2752 Mix_SetReverseStereo (self, flip);
2364 2753
2365MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2754MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2366 2755
2367PROTOTYPES: DISABLE 2756PROTOTYPES: DISABLE
2368 2757
2369CFPlus::MixChunk 2758DC::MixChunk
2370new (SV *class, CFPlus::RW rwops) 2759new (SV *class, DC::RW rwops)
2371 CODE: 2760 CODE:
2372 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2761 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2373 OUTPUT: 2762 OUTPUT:
2374 RETVAL 2763 RETVAL
2375 2764
2376void 2765void
2377DESTROY (CFPlus::MixChunk self) 2766DESTROY (DC::MixChunk self)
2378 CODE: 2767 CODE:
2379 Mix_FreeChunk (self); 2768 Mix_FreeChunk (self);
2380 2769
2381int 2770int
2382volume (CFPlus::MixChunk self, int volume = -1) 2771volume (DC::MixChunk self, int volume = -1)
2383 CODE: 2772 CODE:
2384 if (items > 1) 2773 if (items > 1)
2385 volume = CLAMP (volume, 0, 128); 2774 volume = CLAMP (volume, 0, 128);
2386 RETVAL = Mix_VolumeChunk (self, volume); 2775 RETVAL = Mix_VolumeChunk (self, volume);
2387 OUTPUT: 2776 OUTPUT:
2388 RETVAL 2777 RETVAL
2389 2778
2390CFPlus::Channel 2779DC::Channel
2391play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2780play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2392 CODE: 2781 CODE:
2393{ 2782{
2394 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2783 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2395 2784
2396 if (RETVAL < 0) 2785 if (RETVAL < 0)
2403 } 2792 }
2404} 2793}
2405 OUTPUT: 2794 OUTPUT:
2406 RETVAL 2795 RETVAL
2407 2796
2408MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2797MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2409 2798
2410int 2799int
2411volume (int volume = -1) 2800volume (int volume = -1)
2412 PROTOTYPE: ;$ 2801 PROTOTYPE: ;$
2413 CODE: 2802 CODE:
2425void 2814void
2426halt () 2815halt ()
2427 CODE: 2816 CODE:
2428 Mix_HaltMusic (); 2817 Mix_HaltMusic ();
2429 2818
2430CFPlus::MixMusic 2819DC::MixMusic
2431new (SV *class, CFPlus::RW rwops) 2820new (SV *class, DC::RW rwops)
2432 CODE: 2821 CODE:
2433 RETVAL = Mix_LoadMUS_RW (rwops); 2822 RETVAL = Mix_LoadMUS_RW (rwops);
2434 OUTPUT: 2823 OUTPUT:
2435 RETVAL 2824 RETVAL
2436 2825
2437void 2826void
2438DESTROY (CFPlus::MixMusic self) 2827DESTROY (DC::MixMusic self)
2439 CODE: 2828 CODE:
2440 Mix_FreeMusic (self); 2829 Mix_FreeMusic (self);
2441 2830
2442int 2831int
2443play (CFPlus::MixMusic self, int loops = -1) 2832play (DC::MixMusic self, int loops = -1)
2444 CODE: 2833 CODE:
2445 RETVAL = Mix_PlayMusic (self, loops); 2834 RETVAL = Mix_PlayMusic (self, loops);
2446 OUTPUT: 2835 OUTPUT:
2447 RETVAL 2836 RETVAL
2448 2837
2449void 2838void
2450fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2839fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2451 CODE: 2840 CODE:
2452 Mix_FadeInMusicPos (self, loops, ms, position); 2841 Mix_FadeInMusicPos (self, loops, ms, position);
2453 2842
2454MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2843MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2455 2844
2456PROTOTYPES: ENABLE 2845PROTOTYPES: ENABLE
2457 2846
2458BOOT: 2847BOOT:
2459{ 2848{
2460 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2849 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2461 static const struct { 2850 static const struct {
2462 const char *name; 2851 const char *name;
2463 IV iv; 2852 IV iv;
2464 } *civ, const_iv[] = { 2853 } *civ, const_iv[] = {
2465# define const_iv(name) { # name, (IV)name } 2854# define const_iv(name) { # name, (IV)name }
2500 const_iv (GL_INTENSITY), 2889 const_iv (GL_INTENSITY),
2501 const_iv (GL_LUMINANCE), 2890 const_iv (GL_LUMINANCE),
2502 const_iv (GL_LUMINANCE_ALPHA), 2891 const_iv (GL_LUMINANCE_ALPHA),
2503 const_iv (GL_FLOAT), 2892 const_iv (GL_FLOAT),
2504 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2893 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2894 const_iv (GL_COMPRESSED_ALPHA_ARB),
2895 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2896 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2897 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2898 const_iv (GL_COMPRESSED_RGB_ARB),
2899 const_iv (GL_COMPRESSED_RGBA_ARB),
2505 const_iv (GL_COMPILE), 2900 const_iv (GL_COMPILE),
2506 const_iv (GL_PROXY_TEXTURE_1D), 2901 const_iv (GL_PROXY_TEXTURE_1D),
2507 const_iv (GL_PROXY_TEXTURE_2D), 2902 const_iv (GL_PROXY_TEXTURE_2D),
2508 const_iv (GL_TEXTURE_1D), 2903 const_iv (GL_TEXTURE_1D),
2509 const_iv (GL_TEXTURE_2D), 2904 const_iv (GL_TEXTURE_2D),
2548 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2943 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2549 const_iv (GL_POINT_SMOOTH_HINT), 2944 const_iv (GL_POINT_SMOOTH_HINT),
2550 const_iv (GL_LINE_SMOOTH_HINT), 2945 const_iv (GL_LINE_SMOOTH_HINT),
2551 const_iv (GL_POLYGON_SMOOTH_HINT), 2946 const_iv (GL_POLYGON_SMOOTH_HINT),
2552 const_iv (GL_GENERATE_MIPMAP_HINT), 2947 const_iv (GL_GENERATE_MIPMAP_HINT),
2948 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2553 const_iv (GL_FASTEST), 2949 const_iv (GL_FASTEST),
2554 const_iv (GL_DONT_CARE), 2950 const_iv (GL_DONT_CARE),
2555 const_iv (GL_NICEST), 2951 const_iv (GL_NICEST),
2556 const_iv (GL_V2F), 2952 const_iv (GL_V2F),
2557 const_iv (GL_V3F), 2953 const_iv (GL_V3F),
2565 2961
2566 texture_av = newAV (); 2962 texture_av = newAV ();
2567 AvREAL_off (texture_av); 2963 AvREAL_off (texture_av);
2568} 2964}
2569 2965
2966void
2967disable_GL_EXT_blend_func_separate ()
2968 CODE:
2969 gl.BlendFuncSeparate = 0;
2970 gl.BlendFuncSeparateEXT = 0;
2971
2570char * 2972char *
2571gl_vendor () 2973gl_vendor ()
2572 CODE: 2974 CODE:
2573 RETVAL = (char *)glGetString (GL_VENDOR); 2975 RETVAL = (char *)glGetString (GL_VENDOR);
2574 OUTPUT: 2976 OUTPUT:
2666void glRotate (float angle, float x, float y, float z) 3068void glRotate (float angle, float x, float y, float z)
2667 CODE: 3069 CODE:
2668 glRotatef (angle, x, y, z); 3070 glRotatef (angle, x, y, z);
2669 3071
2670void glColor (float r, float g, float b, float a = 1.0) 3072void glColor (float r, float g, float b, float a = 1.0)
3073 PROTOTYPE: @
2671 ALIAS: 3074 ALIAS:
2672 glColor_premultiply = 1 3075 glColor_premultiply = 1
2673 CODE: 3076 CODE:
2674 if (ix) 3077 if (ix)
2675 { 3078 {
2695 3098
2696void glRect (float x1, float y1, float x2, float y2) 3099void glRect (float x1, float y1, float x2, float y2)
2697 CODE: 3100 CODE:
2698 glRectf (x1, y1, x2, y2); 3101 glRectf (x1, y1, x2, y2);
2699 3102
3103void glRect_lineloop (float x1, float y1, float x2, float y2)
3104 CODE:
3105 glBegin (GL_LINE_LOOP);
3106 glVertex2f (x1, y1);
3107 glVertex2f (x2, y1);
3108 glVertex2f (x2, y2);
3109 glVertex2f (x1, y2);
3110 glEnd ();
3111
2700PROTOTYPES: ENABLE 3112PROTOTYPES: ENABLE
2701 3113
2702void glBegin (int mode) 3114void glBegin (int mode)
2703 3115
2704void glEnd () 3116void glEnd ()
2736void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3148void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2737 CODE: 3149 CODE:
2738 if (gl.SeparableFilter2D) 3150 if (gl.SeparableFilter2D)
2739 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3151 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2740 3152
2741void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3153void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2742 3154
2743void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3155void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2744 3156
2745void glDrawPixels (int width, int height, int format, int type, char *pixels) 3157void glDrawPixels (int width, int height, int format, int type, char *pixels)
2746 3158
2772 3184
2773void glEndList () 3185void glEndList ()
2774 3186
2775void glCallList (int list) 3187void glCallList (int list)
2776 3188
2777MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3189MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2778 3190
2779PROTOTYPES: DISABLE 3191PROTOTYPES: DISABLE
2780 3192
2781void 3193void
2782find_widget (SV *self, NV x, NV y) 3194find_widget (SV *self, NV x, NV y)
2786 XPUSHs (self); 3198 XPUSHs (self);
2787} 3199}
2788 3200
2789BOOT: 3201BOOT:
2790{ 3202{
2791 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3203 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2792 3204
2793 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3205 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2794 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3206 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2795 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3207 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2796 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3208 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2797} 3209}
2798 3210
2799void 3211void
2800draw (SV *self) 3212draw (SV *self)
2801 CODE: 3213 CODE:
2805 NV x, y, w, h; 3217 NV x, y, w, h;
2806 SV *draw_x_sv = GvSV (draw_x_gv); 3218 SV *draw_x_sv = GvSV (draw_x_gv);
2807 SV *draw_y_sv = GvSV (draw_y_gv); 3219 SV *draw_y_sv = GvSV (draw_y_gv);
2808 SV *draw_w_sv = GvSV (draw_w_gv); 3220 SV *draw_w_sv = GvSV (draw_w_gv);
2809 SV *draw_h_sv = GvSV (draw_h_gv); 3221 SV *draw_h_sv = GvSV (draw_h_gv);
2810 SV *hover;
2811 double draw_x, draw_y, draw_w, draw_h; 3222 double draw_x, draw_y;
2812 3223
2813 if (!SvROK (self)) 3224 if (!SvROK (self))
2814 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3225 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2815 3226
2816 hv = (HV *)SvRV (self); 3227 hv = (HV *)SvRV (self);
2817 3228
2818 if (SvTYPE (hv) != SVt_PVHV) 3229 if (SvTYPE (hv) != SVt_PVHV)
2819 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3230 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2820 3231
2821 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3232 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2822 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3233 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2823 3234
2824 if (!h || !w) 3235 if (!h || !w)
2844 { 3255 {
2845 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3256 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2846 3257
2847 if (svp && SvTRUE (*svp)) 3258 if (svp && SvTRUE (*svp))
2848 { 3259 {
2849 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3260 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2850 glEnable (GL_BLEND); 3261 glEnable (GL_BLEND);
2851 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3262 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2852 glBegin (GL_QUADS); 3263 glBegin (GL_QUADS);
2853 glVertex2f (0, 0); 3264 glVertex2f (0, 0);
2854 glVertex2f (w, 0); 3265 glVertex2f (w, 0);
2857 glEnd (); 3268 glEnd ();
2858 glDisable (GL_BLEND); 3269 glDisable (GL_BLEND);
2859 } 3270 }
2860 } 3271 }
2861#if 0 3272#if 0
2862 if ($ENV{CFPLUS_DEBUG} & 1) { 3273 // draw borders, for debugging
2863 glPushMatrix; 3274 glPushMatrix ();
2864 glColor 1, 1, 0, 1; 3275 glColor4f (1., 1., 0., 1.);
2865 glTranslate 0.375, 0.375; 3276 glTranslatef (.5, .5, 0.);
2866 glBegin GL_LINE_LOOP; 3277 glBegin (GL_LINE_LOOP);
2867 glVertex 0 , 0; 3278 glVertex2f (0 , 0);
2868 glVertex $self->{w} - 1, 0; 3279 glVertex2f (w - 1, 0);
2869 glVertex $self->{w} - 1, $self->{h} - 1; 3280 glVertex2f (w - 1, h - 1);
2870 glVertex 0 , $self->{h} - 1; 3281 glVertex2f (0 , h - 1);
2871 glEnd; 3282 glEnd ();
2872 glPopMatrix; 3283 glPopMatrix ();
2873 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2874 }
2875#endif 3284#endif
2876 PUSHMARK (SP); 3285 PUSHMARK (SP);
2877 XPUSHs (self); 3286 XPUSHs (self);
2878 PUTBACK; 3287 PUTBACK;
2879 call_method ("_draw", G_VOID | G_DISCARD); 3288 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines