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.224 by root, Sat Aug 11 11:21:46 2007 UTC vs.
Revision 1.295 by root, Mon Dec 21 03:30:22 2009 UTC

19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46#endif
47
44#define PANGO_ENABLE_BACKEND 48#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 49#define G_DISABLE_CAST_CHECKS
46 50
47#include <glib/gmacros.h> 51#include <glib/gmacros.h>
48 52
49#include <pango/pango.h> 53#include <pango/pango.h>
54
55#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0
57#endif
58
59#if !PANGO_VERSION_CHECK (1, 15, 2)
60# define pango_layout_get_line_readonly pango_layout_get_line
61# define pango_layout_get_lines_readonly pango_layout_get_lines
62# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
63# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
64#endif
50 65
51#ifndef _WIN32 66#ifndef _WIN32
52# include <sys/types.h> 67# include <sys/types.h>
53# include <sys/socket.h> 68# include <sys/socket.h>
54# include <netinet/in.h> 69# include <netinet/in.h>
55# include <netinet/tcp.h> 70# include <netinet/tcp.h>
56# include <inttypes.h> 71# include <inttypes.h>
57#endif 72#endif
58 73
74#if __GNUC__ >= 4
75# define expect(expr,value) __builtin_expect ((expr),(value))
76#else
77# define expect(expr,value) (expr)
78#endif
79
80#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1)
82
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 84
61#define FOW_DARKNESS 32 85#define FOW_DARKNESS 64
86#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */
62 87
63#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
65 90
66#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
67 92
68#if 0 93/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 95
71# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
72#endif 97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
73 101
74static AV *texture_av; 102static AV *texture_av;
75 103
76static struct 104static struct
77{ 105{
120 148
121#include "pango-font.c" 149#include "pango-font.c"
122#include "pango-fontmap.c" 150#include "pango-fontmap.c"
123#include "pango-render.c" 151#include "pango-render.c"
124 152
125typedef IV CFPlus__Channel; 153typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 154typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 155typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 156typedef Mix_Music *DC__MixMusic;
129 157
130typedef PangoFontDescription *CFPlus__Font; 158typedef PangoFontDescription *DC__Font;
131 159
132static int 160static int
133shape_attr_p (PangoLayoutRun *run) 161shape_attr_p (PangoLayoutRun *run)
134{ 162{
135 GSList *attrs = run->item->analysis.extra_attrs; 163 GSList *attrs = run->item->analysis.extra_attrs;
149 177
150typedef struct cf_layout { 178typedef struct cf_layout {
151 PangoLayout *pl; 179 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 180 float r, g, b, a; // default color for rgba mode
153 int base_height; 181 int base_height;
154 CFPlus__Font font; 182 DC__Font font;
183 rc_t *rc;
155} *CFPlus__Layout; 184} *DC__Layout;
156 185
157static CFPlus__Font default_font; 186static DC__Font default_font;
158static PangoContext *opengl_context; 187static PangoContext *opengl_context;
159static PangoFontMap *opengl_fontmap; 188static PangoFontMap *opengl_fontmap;
160 189
161static void 190static void
162substitute_func (FcPattern *pattern, gpointer data) 191substitute_func (FcPattern *pattern, gpointer data)
167#endif 196#endif
168 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 197 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169} 198}
170 199
171static void 200static void
172layout_update_font (CFPlus__Layout self) 201layout_update_font (DC__Layout self)
173{ 202{
174 /* 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
175 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
176 */ 205 */
177 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
178 207
179 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
180 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
181 210
182 pango_layout_set_font_description (self->pl, font); 211 pango_layout_set_font_description (self->pl, font);
183} 212}
184 213
185static void 214static void
186layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 215layout_get_pixel_size (DC__Layout self, int *w, int *h)
187{ 216{
188 PangoRectangle rect; 217 PangoRectangle rect;
189 218
190 // get_pixel_* wrongly rounds down 219 // get_pixel_* wrongly rounds down
191 pango_layout_get_extents (self->pl, 0, &rect); 220 pango_layout_get_extents (self->pl, 0, &rect);
202 231
203typedef uint16_t tileid; 232typedef uint16_t tileid;
204typedef uint16_t faceid; 233typedef uint16_t faceid;
205 234
206typedef struct { 235typedef struct {
207 int name; 236 GLuint name;
208 int w, h; 237 int w, h;
209 float s, t; 238 float s, t;
210 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
211 tileid smoothtile; 240 tileid smoothtile;
212 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
213} maptex; 243} maptex;
214 244
215typedef struct { 245typedef struct {
216 uint32_t player; 246 uint32_t player;
217 tileid tile[3]; 247 tileid tile[3];
230 int faces; tileid *face2tile; // [faceid] 260 int faces; tileid *face2tile; // [faceid]
231 int texs; maptex *tex; // [tileid] 261 int texs; maptex *tex; // [tileid]
232 262
233 int32_t rows; 263 int32_t rows;
234 maprow *row; 264 maprow *row;
235} *CFPlus__Map; 265} *DC__Map;
236 266
237static char * 267static char *
238prepend (char *ptr, int sze, int inc) 268prepend (char *ptr, int sze, int inc)
239{ 269{
240 char *p; 270 char *p;
278 self->texs *= 2; 308 self->texs *= 2;
279 } 309 }
280} 310}
281 311
282static maprow * 312static maprow *
283map_get_row (CFPlus__Map self, int y) 313map_get_row (DC__Map self, int y)
284{ 314{
285 if (0 > y) 315 if (0 > y)
286 { 316 {
287 int extend = - y + MAP_EXTEND_Y; 317 int extend = - y + MAP_EXTEND_Y;
288 Prepend (maprow, self->row, self->rows, extend); 318 Prepend (maprow, self->row, self->rows, extend);
326 356
327 return row->col + (x - row->c0); 357 return row->col + (x - row->c0);
328} 358}
329 359
330static mapcell * 360static mapcell *
331map_get_cell (CFPlus__Map self, int x, int y) 361map_get_cell (DC__Map self, int x, int y)
332{ 362{
333 return row_get_cell (map_get_row (self, y), x); 363 return row_get_cell (map_get_row (self, y), x);
334} 364}
335 365
336static void 366static void
337map_clear (CFPlus__Map self) 367map_clear (DC__Map self)
338{ 368{
339 int r; 369 int r;
340 370
341 for (r = 0; r < self->rows; r++) 371 for (r = 0; r < self->rows; r++)
342 Safefree (self->row[r].col); 372 Safefree (self->row[r].col);
349 self->oy = 0; 379 self->oy = 0;
350 self->row = 0; 380 self->row = 0;
351 self->rows = 0; 381 self->rows = 0;
352} 382}
353 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
354static void 394static void
355map_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)
356{ 396{
357 int x, y; 397 int x, y;
358 maprow *row; 398 maprow *row;
359 mapcell *cell; 399 mapcell *cell;
360 400
372 if (x >= row->c1) 412 if (x >= row->c1)
373 break; 413 break;
374 414
375 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
376 416
377 cell->darkness = 0; 417 CELL_CLEAR (cell);
378 cell->stat_hp = 0;
379 cell->flags = 0;
380 cell->player = 0;
381 } 418 }
382 } 419 }
383} 420}
384 421
385typedef struct { 422typedef struct {
439 n |= n >> 16; 476 n |= n >> 16;
440 477
441 return n + 1; 478 return n + 1;
442} 479}
443 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
444/* SDL should provide this, really. */ 492/* SDL should provide this, really. */
445#define SDLK_MODIFIER_MIN 300 493#define SDLK_MODIFIER_MIN 300
446#define SDLK_MODIFIER_MAX 314 494#define SDLK_MODIFIER_MAX 314
447 495
448/******************************************************************************/ 496/******************************************************************************/
486 return 0; 534 return 0;
487 535
488 return 1; 536 return 1;
489} 537}
490 538
491MODULE = 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
492 592
493PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
494 594
495BOOT: 595BOOT:
496{ 596{
497 HV *stash = gv_stashpv ("CFPlus", 1); 597 HV *stash = gv_stashpv ("DC", 1);
498 static const struct { 598 static const struct {
499 const char *name; 599 const char *name;
500 IV iv; 600 IV iv;
501 } *civ, const_iv[] = { 601 } *civ, const_iv[] = {
502# define const_iv(name) { # name, (IV)name } 602# define const_iv(name) { # name, (IV)name }
524 624
525 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
526 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
527 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
528 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),
529 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
530 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
531 const_iv (SDLK_KP2), 683 const_iv (SDLK_KP2),
532 const_iv (SDLK_KP3), 684 const_iv (SDLK_KP3),
533 const_iv (SDLK_KP4), 685 const_iv (SDLK_KP4),
605 const_iv (KMOD_LMETA), 757 const_iv (KMOD_LMETA),
606 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
607 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
608 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
609 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)
610# undef const_iv 795# undef const_iv
611 }; 796 };
612 797
613 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; )
614 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
632 817
633NV floor (NV x) 818NV floor (NV x)
634 819
635NV ceil (NV x) 820NV ceil (NV x)
636 821
822IV minpot (UV n)
823
824IV popcount (UV n)
825
826NV distance (NV dx, NV dy)
827 CODE:
828 RETVAL = pow (dx * dx + dy * dy, 0.5);
829 OUTPUT:
830 RETVAL
831
637void 832void
638pango_init () 833pango_init ()
639 CODE: 834 CODE:
640{ 835{
641 opengl_fontmap = pango_opengl_font_map_new (); 836 opengl_fontmap = pango_opengl_font_map_new ();
642 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 837 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
643 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 838 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
839 /*pango_context_set_font_description (opengl_context, default_font);*/
840#if PANGO_VERSION_CHECK (1, 15, 2)
841 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
842 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
843#endif
644} 844}
645 845
646char *
647SDL_GetError () 846char *SDL_GetError ()
648 847
649int 848void SDL_braino ()
650SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
651 849
652void 850int SDL_Init (U32 flags)
851
852int SDL_InitSubSystem (U32 flags)
853
854void SDL_QuitSubSystem (U32 flags)
855
653SDL_Quit () 856void SDL_Quit ()
857
858int SDL_GL_SetAttribute (int attr, int value)
859
860int SDL_GL_GetAttribute (int attr)
861 CODE:
862 if (SDL_GL_GetAttribute (attr, &RETVAL))
863 XSRETURN_UNDEF;
864 OUTPUT:
865 RETVAL
654 866
655void 867void
656SDL_ListModes (int rgb, int alpha) 868SDL_ListModes (int rgb, int alpha)
657 PPCODE: 869 PPCODE:
658{ 870{
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 882 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 883 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
673 885
674 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 886 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
675#if SDL_VERSION_ATLEAST(1,2,10)
676 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
677 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 887 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
678#endif
679 888
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 889 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 890
682 if (m && m != (SDL_Rect **)-1) 891 if (m && m != (SDL_Rect **)-1)
683 while (*m) 892 while (*m)
684 { 893 {
685 if ((*m)->w >= 640 && (*m)->h >= 480) 894 if ((*m)->w >= 400 && (*m)->h >= 300)
686 { 895 {
687 AV *av = newAV (); 896 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 897 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 898 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 899 av_push (av, newSViv (rgb));
714 923
715 if (RETVAL) 924 if (RETVAL)
716 { 925 {
717 av_clear (texture_av); 926 av_clear (texture_av);
718 927
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 928 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 929#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
721#include "glfunc.h" 930#include "glfunc.h"
722#undef GL_FUNC 931#undef GL_FUNC
723 } 932 }
724} 933}
731char * 940char *
732SDL_GetKeyName (int sym) 941SDL_GetKeyName (int sym)
733 942
734int 943int
735SDL_GetAppState () 944SDL_GetAppState ()
945
946int
947SDL_GetModState ()
736 948
737void 949void
738poll_events () 950poll_events ()
739 PPCODE: 951 PPCODE:
740{ 952{
750 { 962 {
751 case SDL_KEYDOWN: 963 case SDL_KEYDOWN:
752 case SDL_KEYUP: 964 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 965 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 966 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 967 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
756 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 968 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
757 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 969 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 970 break;
759 971
760 case SDL_ACTIVEEVENT: 972 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 973 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
779 x = ev.motion.x; 991 x = ev.motion.x;
780 y = ev.motion.y; 992 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 993 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 994 }
783 995
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 997 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 998 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 999 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1000 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1001 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 1002 }
791 break; 1003 break;
792 1004
793 case SDL_MOUSEBUTTONDOWN: 1005 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 1006 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1007 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 1008
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1009 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1011 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1012 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1017 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1018 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 1019 break;
808 } 1020 }
809 1021
810 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1022 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
811 } 1023 }
812} 1024}
813 1025
814int 1026int
815Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1027Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816 POSTCALL: 1028 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 1029 Mix_HookMusicFinished (music_finished);
818 Mix_ChannelFinished (channel_finished); 1030 Mix_ChannelFinished (channel_finished);
1031
1032void
1033Mix_QuerySpec ()
1034 PPCODE:
1035{
1036 int freq, channels;
1037 Uint16 format;
1038
1039 if (Mix_QuerySpec (&freq, &format, &channels))
1040 {
1041 EXTEND (SP, 3);
1042 PUSHs (sv_2mortal (newSViv (freq)));
1043 PUSHs (sv_2mortal (newSViv (format)));
1044 PUSHs (sv_2mortal (newSViv (channels)));
1045 }
1046}
819 1047
820void 1048void
821Mix_CloseAudio () 1049Mix_CloseAudio ()
822 1050
823int 1051int
858 } 1086 }
859 } 1087 }
860#endif 1088#endif
861} 1089}
862 1090
863void 1091int
864add_font (char *file) 1092add_font (char *file)
865 CODE: 1093 CODE:
866 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1094 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095 OUTPUT:
1096 RETVAL
867 1097
868void 1098void
869load_image_inline (SV *image_) 1099load_image_inline (SV *image_)
870 ALIAS: 1100 ALIAS:
871 load_image_file = 1 1101 load_image_file = 1
957void 1187void
958error (char *message) 1188error (char *message)
959 CODE: 1189 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1190 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1191#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1192 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1193#endif
964 1194
965void 1195void
966fatal (char *message) 1196fatal (char *message)
967 CODE: 1197 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1198 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1199#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1200 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1201#endif
972 _exit (1); 1202 _exit (1);
973 1203
974void 1204void
975_exit (int retval = 0) 1205_exit (int retval = 0)
987#if DEBUG 1217#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1218 VALGRIND_DO_LEAK_CHECK;
989#endif 1219#endif
990} 1220}
991 1221
992MODULE = CFPlus PACKAGE = CFPlus::Font 1222int
1223SvREFCNT (SV *sv)
1224 CODE:
1225 RETVAL = SvREFCNT (sv);
1226 OUTPUT:
1227 RETVAL
1228
1229MODULE = Deliantra::Client PACKAGE = DC::Font
993 1230
994PROTOTYPES: DISABLE 1231PROTOTYPES: DISABLE
995 1232
996CFPlus::Font 1233DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1234new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1235 CODE:
999{ 1236{
1000 int count; 1237 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1238 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1004} 1241}
1005 OUTPUT: 1242 OUTPUT:
1006 RETVAL 1243 RETVAL
1007 1244
1008void 1245void
1009DESTROY (CFPlus::Font self) 1246DESTROY (DC::Font self)
1010 CODE: 1247 CODE:
1011 pango_font_description_free (self); 1248 pango_font_description_free (self);
1012 1249
1013void 1250void
1014make_default (CFPlus::Font self) 1251make_default (DC::Font self)
1015 PROTOTYPE: $ 1252 PROTOTYPE: $
1016 CODE: 1253 CODE:
1017 default_font = self; 1254 default_font = self;
1018 1255
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1256MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1257
1021PROTOTYPES: DISABLE 1258PROTOTYPES: DISABLE
1022 1259
1023void 1260void
1024reset_glyph_cache () 1261glyph_cache_backup ()
1025 PROTOTYPE: 1262 PROTOTYPE:
1026 CODE: 1263 CODE:
1264 tc_backup ();
1265
1266void
1267glyph_cache_restore ()
1268 PROTOTYPE:
1269 CODE:
1027 tc_clear (); 1270 tc_restore ();
1028 1271
1029CFPlus::Layout 1272DC::Layout
1030new (SV *class) 1273new (SV *class)
1031 CODE: 1274 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1275 New (0, RETVAL, 1, struct cf_layout);
1033 1276
1034 RETVAL->pl = pango_layout_new (opengl_context); 1277 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->g = 1.; 1279 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1280 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1281 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1282 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1283 RETVAL->font = 0;
1284 RETVAL->rc = rc_alloc ();
1041 1285
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1286 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1287 layout_update_font (RETVAL);
1044 OUTPUT: 1288 OUTPUT:
1045 RETVAL 1289 RETVAL
1046 1290
1047void 1291void
1048DESTROY (CFPlus::Layout self) 1292DESTROY (DC::Layout self)
1049 CODE: 1293 CODE:
1050 g_object_unref (self->pl); 1294 g_object_unref (self->pl);
1295 rc_free (self->rc);
1051 Safefree (self); 1296 Safefree (self);
1052 1297
1053void 1298void
1054set_text (CFPlus::Layout self, SV *text_) 1299set_text (DC::Layout self, SV *text_)
1055 CODE: 1300 CODE:
1056{ 1301{
1057 STRLEN textlen; 1302 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1303 char *text = SvPVutf8 (text_, textlen);
1059 1304
1060 pango_layout_set_text (self->pl, text, textlen); 1305 pango_layout_set_text (self->pl, text, textlen);
1061} 1306}
1062 1307
1063void 1308void
1064set_markup (CFPlus::Layout self, SV *text_) 1309set_markup (DC::Layout self, SV *text_)
1065 CODE: 1310 CODE:
1066{ 1311{
1067 STRLEN textlen; 1312 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1313 char *text = SvPVutf8 (text_, textlen);
1069 1314
1070 pango_layout_set_markup (self->pl, text, textlen); 1315 pango_layout_set_markup (self->pl, text, textlen);
1071} 1316}
1072 1317
1073void 1318void
1074set_shapes (CFPlus::Layout self, ...) 1319set_shapes (DC::Layout self, ...)
1075 CODE: 1320 CODE:
1076{ 1321{
1077 PangoAttrList *attrs = 0; 1322 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1323 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1324 const char *pos = text;
1114 if (attrs) 1359 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1360 pango_layout_set_attributes (self->pl, attrs);
1116} 1361}
1117 1362
1118void 1363void
1119get_shapes (CFPlus::Layout self) 1364get_shapes (DC::Layout self)
1120 PPCODE: 1365 PPCODE:
1121{ 1366{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1367 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1368
1124 do 1369 do
1125 { 1370 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1371 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1372
1128 if (run && shape_attr_p (run)) 1373 if (run && shape_attr_p (run))
1129 { 1374 {
1130 PangoRectangle extents; 1375 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1376 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1384
1140 pango_layout_iter_free (iter); 1385 pango_layout_iter_free (iter);
1141} 1386}
1142 1387
1143int 1388int
1144has_wrapped (CFPlus::Layout self) 1389has_wrapped (DC::Layout self)
1145 CODE: 1390 CODE:
1146{ 1391{
1147 int lines = 1; 1392 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1393 const char *text = pango_layout_get_text (self->pl);
1149 1394
1154} 1399}
1155 OUTPUT: 1400 OUTPUT:
1156 RETVAL 1401 RETVAL
1157 1402
1158SV * 1403SV *
1159get_text (CFPlus::Layout self) 1404get_text (DC::Layout self)
1160 CODE: 1405 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1406 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1407 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1408 OUTPUT:
1164 RETVAL 1409 RETVAL
1165 1410
1166void 1411void
1167set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1412set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1168 CODE: 1413 CODE:
1169 self->r = r; 1414 self->r = r;
1170 self->g = g; 1415 self->g = g;
1171 self->b = b; 1416 self->b = b;
1172 self->a = a; 1417 self->a = a;
1173 1418
1174void 1419void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1420set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1421 CODE:
1177 if (self->font != font) 1422 if (self->font != font)
1178 { 1423 {
1179 self->font = font; 1424 self->font = font;
1180 layout_update_font (self); 1425 layout_update_font (self);
1181 } 1426 }
1182 1427
1183void 1428void
1184set_height (CFPlus::Layout self, int base_height) 1429set_height (DC::Layout self, int base_height)
1185 CODE: 1430 CODE:
1186 if (self->base_height != base_height) 1431 if (self->base_height != base_height)
1187 { 1432 {
1188 self->base_height = base_height; 1433 self->base_height = base_height;
1189 layout_update_font (self); 1434 layout_update_font (self);
1190 } 1435 }
1191 1436
1192void 1437void
1193set_width (CFPlus::Layout self, int max_width = -1) 1438set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1439 CODE:
1195 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1440 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1196 1441
1197void 1442void
1198set_indent (CFPlus::Layout self, int indent) 1443set_indent (DC::Layout self, int indent)
1199 CODE: 1444 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1445 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1446
1202void 1447void
1203set_spacing (CFPlus::Layout self, int spacing) 1448set_spacing (DC::Layout self, int spacing)
1204 CODE: 1449 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1450 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1451
1207void 1452void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1453set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1454 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1455 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1456 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1457 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1458 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1459 : PANGO_ELLIPSIZE_NONE
1215 ); 1460 );
1216 1461
1217void 1462void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1463set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1464 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1465 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1466
1222void 1467void
1223size (CFPlus::Layout self) 1468size (DC::Layout self)
1224 PPCODE: 1469 PPCODE:
1225{ 1470{
1226 int w, h; 1471 int w, h;
1227 1472
1228 layout_get_pixel_size (self, &w, &h); 1473 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1476 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1477 PUSHs (sv_2mortal (newSViv (h)));
1233} 1478}
1234 1479
1235int 1480int
1236descent (CFPlus::Layout self) 1481descent (DC::Layout self)
1237 CODE: 1482 CODE:
1238{ 1483{
1239 PangoRectangle rect; 1484 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1485 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1486 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1487 RETVAL = PANGO_DESCENT (rect);
1243} 1488}
1244 OUTPUT: 1489 OUTPUT:
1245 RETVAL 1490 RETVAL
1246 1491
1247int 1492int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1493xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1494 CODE:
1250{ 1495{
1251 int index, trailing; 1496 int index, trailing;
1252 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1497 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1253 RETVAL = index + trailing; 1498 RETVAL = index + trailing;
1254} 1499}
1255 OUTPUT: 1500 OUTPUT:
1256 RETVAL 1501 RETVAL
1257 1502
1258void 1503void
1259cursor_pos (CFPlus::Layout self, int index) 1504cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1505 PPCODE:
1261{ 1506{
1262 PangoRectangle strong_pos; 1507 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1508 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1509
1265 EXTEND (SP, 3); 1510 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1512 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1513 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1514}
1270 1515
1271void 1516void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1517index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1518 PPCODE:
1274{ 1519{
1275 int line, x; 1520 int line, x;
1276 1521
1277 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1522 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1523#if !PANGO_VERSION_CHECK (1, 17, 3)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1524 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1525 --line;
1526#endif
1280 EXTEND (SP, 2); 1527 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1528 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1529 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1530}
1284 1531
1285void 1532void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1533line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1534 PPCODE:
1288{ 1535{
1289 PangoLayoutLine *lp; 1536 PangoLayoutLine *lp;
1290 int index, trailing; 1537 int index, trailing;
1291 1538
1292 if (line < 0) 1539 if (line < 0)
1293 XSRETURN_EMPTY; 1540 XSRETURN_EMPTY;
1294 1541
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1542 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1543 XSRETURN_EMPTY; /* do better */
1297 1544
1298 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1545 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1299 1546
1300 EXTEND (SP, 2); 1547 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1553 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1554 }
1308} 1555}
1309 1556
1310void 1557void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1558render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1559 CODE:
1560 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1561 pango_opengl_render_layout_subpixel (
1314 self->pl, 1562 self->pl,
1563 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1564 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1565 self->r, self->g, self->b, self->a,
1317 flags 1566 flags
1318 ); 1567 );
1568 // we assume that context_change actually clears/frees stuff
1569 // and does not do any recomputation...
1570 pango_layout_context_changed (self->pl);
1319 1571
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1572void
1573draw (DC::Layout self)
1574 CODE:
1575{
1576 glEnable (GL_TEXTURE_2D);
1577 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1578 glEnable (GL_BLEND);
1579 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1580 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1581 glEnable (GL_ALPHA_TEST);
1582 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1583
1584 rc_draw (self->rc);
1585
1586 glDisable (GL_ALPHA_TEST);
1587 glDisable (GL_BLEND);
1588 glDisable (GL_TEXTURE_2D);
1589}
1590
1591MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1592
1322PROTOTYPES: ENABLE 1593PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1594
1326void 1595void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1596pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1597 CODE:
1329{ 1598{
1395 glDisable (GL_ALPHA_TEST); 1664 glDisable (GL_ALPHA_TEST);
1396 glDisable (GL_BLEND); 1665 glDisable (GL_BLEND);
1397 } 1666 }
1398} 1667}
1399 1668
1669void
1670draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f)
1671 PROTOTYPE: @
1672 CODE:
1673{
1674 glEnable (GL_TEXTURE_2D);
1675 glEnable (GL_BLEND);
1676 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677 glBindTexture (GL_TEXTURE_2D, name1);
1678
1679 glColor3f (intensity, intensity, intensity);
1680 glPushMatrix ();
1681 glScalef (1./3, 1./3, 1.);
1682
1683 if (blend > 0.f)
1684 {
1685 float S2, T2; /* 0. 0. for texture 2 */
1686 float w = w1 > w2 ? w1 : w2;
1687 float h = h1 > h2 ? h1 : h2;
1688 GLfloat env_color[4] = { 0., 0., 0., blend };
1689
1690 /* interpolate the two shadow textures */
1691 /* stage 0 == rgb(glcolor) + alpha(t0) */
1692 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1693
1694 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1695 gl.ActiveTexture (GL_TEXTURE1);
1696 glEnable (GL_TEXTURE_2D);
1697 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699
1700 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704
1705 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707
1708 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1709 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1710 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1711
1712 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1713 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714
1715 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717
1718 s1 *= w / w1;
1719 t1 *= h / h1;
1720
1721 dx *= -3.f / w2;
1722 dy *= -3.f / h2;
1723 dx *= w / w2;
1724 dy *= h / h2;
1725
1726 s2 *= w / w2;
1727 t2 *= h / h2;
1728
1729 glBegin (GL_QUADS);
1730 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);
1731 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);
1732 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);
1733 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);
1734 glEnd ();
1735
1736 glDisable (GL_TEXTURE_2D);
1737 gl.ActiveTexture (GL_TEXTURE0);
1738 }
1739 else
1740 {
1741 /* simple blending of one texture, also opengl <1.3 path */
1742 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1743
1744 glBegin (GL_QUADS);
1745 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1746 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1747 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1748 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1749 glEnd ();
1750 }
1751
1752 glPopMatrix ();
1753
1754 glDisable (GL_TEXTURE_2D);
1755 glDisable (GL_BLEND);
1756}
1757
1400IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1758IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1401 CODE: 1759 CODE:
1402{ 1760{
1403 GLint width; 1761 GLint width;
1404 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1762 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1406 RETVAL = width > 0; 1764 RETVAL = width > 0;
1407} 1765}
1408 OUTPUT: 1766 OUTPUT:
1409 RETVAL 1767 RETVAL
1410 1768
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1769MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1770
1413PROTOTYPES: DISABLE 1771PROTOTYPES: DISABLE
1414 1772
1415CFPlus::Map 1773DC::Map
1416new (SV *class) 1774new (SV *class)
1417 CODE: 1775 CODE:
1418 New (0, RETVAL, 1, struct map); 1776 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1777 RETVAL->x = 0;
1420 RETVAL->y = 0; 1778 RETVAL->y = 0;
1428 RETVAL->row = 0; 1786 RETVAL->row = 0;
1429 OUTPUT: 1787 OUTPUT:
1430 RETVAL 1788 RETVAL
1431 1789
1432void 1790void
1433DESTROY (CFPlus::Map self) 1791DESTROY (DC::Map self)
1434 CODE: 1792 CODE:
1435{ 1793{
1436 map_clear (self); 1794 map_clear (self);
1437 Safefree (self->face2tile); 1795 Safefree (self->face2tile);
1438 Safefree (self->tex); 1796 Safefree (self->tex);
1439 Safefree (self); 1797 Safefree (self);
1440} 1798}
1441 1799
1442void 1800void
1443resize (CFPlus::Map self, int map_width, int map_height) 1801resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1802 CODE:
1445 self->w = map_width; 1803 self->w = map_width;
1446 self->h = map_height; 1804 self->h = map_height;
1447 1805
1448void 1806void
1449clear (CFPlus::Map self) 1807clear (DC::Map self)
1450 CODE: 1808 CODE:
1451 map_clear (self); 1809 map_clear (self);
1452 1810
1453void 1811void
1454set_tileid (CFPlus::Map self, int face, int tile) 1812set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1813 CODE:
1456{ 1814{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1815 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1816 need_texid (self, tile);
1459} 1817}
1460 1818
1461void 1819void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1820set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1821 CODE:
1464{ 1822{
1465 tileid texid; 1823 tileid texid;
1466 maptex *tex; 1824 maptex *tex;
1467 1825
1480 tex->smoothtile = self->face2tile [smooth]; 1838 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1839 tex->smoothlevel = level;
1482} 1840}
1483 1841
1484void 1842void
1485set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1843set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1486 CODE: 1844 CODE:
1487{ 1845{
1488 need_texid (self, texid); 1846 need_texid (self, texid);
1489 1847
1490 { 1848 {
1509 // use uglier nearest interpolation because linear suffers 1867 // use uglier nearest interpolation because linear suffers
1510 // from transparent color bleeding and ugly wrapping effects. 1868 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1869 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1870}
1513 1871
1872void
1873expire_textures (DC::Map self, int texid, int count)
1874 PPCODE:
1875 for (; texid < self->texs && count; ++texid, --count)
1876 {
1877 maptex *tex = self->tex + texid;
1878
1879 if (tex->name)
1880 {
1881 if (tex->unused)
1882 {
1883 tex->name = 0;
1884 tex->unused = 0;
1885 XPUSHs (sv_2mortal (newSViv (texid)));
1886 }
1887 else
1888 tex->unused = 1;
1889 }
1890 }
1891
1514int 1892int
1515ox (CFPlus::Map self) 1893ox (DC::Map self)
1516 ALIAS: 1894 ALIAS:
1517 oy = 1 1895 oy = 1
1518 x = 2 1896 x = 2
1519 y = 3 1897 y = 3
1520 w = 4 1898 w = 4
1531 } 1909 }
1532 OUTPUT: 1910 OUTPUT:
1533 RETVAL 1911 RETVAL
1534 1912
1535void 1913void
1536scroll (CFPlus::Map self, int dx, int dy) 1914scroll (DC::Map self, int dx, int dy)
1537 CODE: 1915 CODE:
1538{ 1916{
1539 if (dx > 0) 1917 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 1918 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 1919 else if (dx < 0)
1557 self->y += MAP_EXTEND_Y; 1935 self->y += MAP_EXTEND_Y;
1558 } 1936 }
1559} 1937}
1560 1938
1561SV * 1939SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 1940map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 1941 CODE:
1564{ 1942{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1943 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 1944 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 1945 mapcell *cell;
1595 uint8_t ext, cmd; 1973 uint8_t ext, cmd;
1596 1974
1597 do 1975 do
1598 { 1976 {
1599 ext = *data++; 1977 ext = *data++;
1600 cmd = ext & 0x3f; 1978 cmd = ext & 0x7f;
1601 1979
1602 if (cmd < 4) 1980 if (cmd < 4)
1603 cell->darkness = 255 - ext * 64 + 1; 1981 cell->darkness = 255 - ext * 64 + 1;
1604 else if (cmd == 5) // health 1982 else if (cmd == 5) // health
1605 { 1983 {
1608 } 1986 }
1609 else if (cmd == 6) // monster width 1987 else if (cmd == 6) // monster width
1610 cell->stat_width = *data++ + 1; 1988 cell->stat_width = *data++ + 1;
1611 else if (cmd == 0x47) 1989 else if (cmd == 0x47)
1612 { 1990 {
1613 if (*data == 4) 1991 if (*data == 1) cell->player = data [1];
1614 ; // decode player count 1992 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1993 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1994 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1615 1995
1616 data += *data + 1; 1996 data += *data + 1;
1617 } 1997 }
1618 else if (cmd == 8) // cell flags 1998 else if (cmd == 8) // cell flags
1619 cell->flags = *data++; 1999 cell->flags = *data++;
1636 cell->tile [z] = self->face2tile [face]; 2016 cell->tile [z] = self->face2tile [face];
1637 2017
1638 if (cell->tile [z]) 2018 if (cell->tile [z])
1639 { 2019 {
1640 maptex *tex = self->tex + cell->tile [z]; 2020 maptex *tex = self->tex + cell->tile [z];
2021 tex->unused = 0;
1641 if (!tex->name) 2022 if (!tex->name)
1642 av_push (missing, newSViv (cell->tile [z])); 2023 av_push (missing, newSViv (cell->tile [z]));
1643 2024
1644 if (tex->smoothtile) 2025 if (tex->smoothtile)
1645 { 2026 {
1646 maptex *smooth = self->tex + tex->smoothtile; 2027 maptex *smooth = self->tex + tex->smoothtile;
2028 smooth->unused = 0;
1647 if (!smooth->name) 2029 if (!smooth->name)
1648 av_push (missing, newSViv (tex->smoothtile)); 2030 av_push (missing, newSViv (tex->smoothtile));
1649 } 2031 }
1650 } 2032 }
1651 } 2033 }
1652 } 2034 }
1653 else 2035 else
1654 cell->darkness = 0; 2036 CELL_CLEAR (cell);
1655 } 2037 }
1656} 2038}
1657 OUTPUT: 2039 OUTPUT:
1658 RETVAL 2040 RETVAL
1659 2041
1660SV * 2042SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2043mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 2044 CODE:
1663{ 2045{
1664 int x1, x; 2046 int x1, x;
1665 int y1, y; 2047 int y1, y;
1666 int z; 2048 int z;
1711} 2093}
1712 OUTPUT: 2094 OUTPUT:
1713 RETVAL 2095 RETVAL
1714 2096
1715void 2097void
1716draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2098draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1717 CODE: 2099 CODE:
1718{ 2100{
1719 int x, y, z; 2101 int x, y, z;
1720 2102
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2103 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2104 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1723 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2105 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724 smooth_key skey; 2106 smooth_key skey;
1725 2107 int pl_x, pl_y;
2108 maptex pl_tex;
1726 rc_t *rc = rc_alloc (); 2109 rc_t *rc = rc_alloc ();
2110 rc_t *rc_ov = rc_alloc ();
1727 rc_key_t key; 2111 rc_key_t key;
1728 rc_array_t *arr; 2112 rc_array_t *arr, *arr_hidden;
1729 2113
2114 pl_tex.name = 0;
2115
1730 // thats current max. sorry. 2116 // that's current max. sorry.
1731 if (sw > 255) sw = 255; 2117 if (sw > 255) sw = 255;
1732 if (sh > 255) sh = 255; 2118 if (sh > 255) sh = 255;
1733 2119
1734 // clear key, in case of extra padding 2120 // clear key, in case of extra padding
1735 memset (&skey, 0, sizeof (skey)); 2121 memset (&skey, 0, sizeof (skey));
1739 key.g = 255; 2125 key.g = 255;
1740 key.b = 255; 2126 key.b = 255;
1741 key.a = 255; 2127 key.a = 255;
1742 key.mode = GL_QUADS; 2128 key.mode = GL_QUADS;
1743 key.format = GL_T2F_V3F; 2129 key.format = GL_T2F_V3F;
1744 key.texname = -1;
1745 2130
1746 mx += self->x; 2131 mx += self->x;
1747 my += self->y; 2132 my += self->y;
1748 2133
1749 // first pass: determine smooth_max 2134 // first pass: determine smooth_max
1770 2155
1771 glEnable (GL_BLEND); 2156 glEnable (GL_BLEND);
1772 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1773 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2158 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1774 2159
2160 key.texname = self->tex [TEXID_HIDDEN].name;
2161 arr_hidden = rc_array (rc_ov, &key);
2162
1775 for (z = 0; z <= 2; z++) 2163 for (z = 0; z <= 2; z++)
1776 { 2164 {
1777 memset (smooth_level, 0, sizeof (smooth_level)); 2165 memset (smooth_level, 0, sizeof (smooth_level));
2166 key.texname = -1;
1778 2167
1779 for (y = 0; y < sh; y++) 2168 for (y = 0; y < sh; y++)
1780 if (0 <= y + my && y + my < self->rows) 2169 if (0 <= y + my && y + my < self->rows)
1781 { 2170 {
1782 maprow *row = self->row + (y + my); 2171 maprow *row = self->row + (y + my);
1790 if (tile) 2179 if (tile)
1791 { 2180 {
1792 maptex tex = self->tex [tile]; 2181 maptex tex = self->tex [tile];
1793 int px, py; 2182 int px, py;
1794 2183
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 2184 if (key.texname != tex.name)
1798 { 2185 {
2186 self->tex [tile].unused = 0;
2187
1799 if (!tex.name) 2188 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 2189 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1801 2190
1802 key.texname = tex.name; 2191 key.texname = tex.name;
1803 arr = rc_array (rc, &key); 2192 arr = rc_array (rc, &key);
1804 } 2193 }
1805 2194
1806 px = (x + 1) * T - tex.w; 2195 px = (x + 1) * T - tex.w;
1807 py = (y + 1) * T - tex.h; 2196 py = (y + 1) * T - tex.h;
2197
2198 if (expect_false (cell->player == player) && expect_false (z == 2))
2199 {
2200 pl_x = px;
2201 pl_y = py;
2202 pl_tex = tex;
2203 continue;
2204 }
1808 2205
1809 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2206 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2207 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1811 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2208 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1812 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2209 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1813
1814 if (cell->flags && z == 2)
1815 {
1816 // overlays such as the speech bubble, probably more to come
1817 if (cell->flags & 1)
1818 {
1819 maptex tex = self->tex [1];
1820 int px = x * T + T * 2 / 32;
1821 int py = y * T - T * 6 / 32;
1822
1823 if (tex.name)
1824 {
1825 if (key.texname != tex.name)
1826 {
1827 key.texname = tex.name;
1828 arr = rc_array (rc, &key);
1829 }
1830
1831 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1832 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1833 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1834 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1835 }
1836 }
1837 }
1838 2210
1839 // update smooth hash 2211 // update smooth hash
1840 if (tex.smoothtile) 2212 if (tex.smoothtile)
1841 { 2213 {
1842 skey.tile = tex.smoothtile; 2214 skey.tile = tex.smoothtile;
1873 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2245 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1874 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2246 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1875 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2247 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1876 } 2248 }
1877 } 2249 }
2250
2251 if (expect_false (z == 2))
2252 {
2253 /* draw question marks on top of hidden spaces */
2254 if (!cell->darkness)
2255 {
2256 maptex tex = self->tex [TEXID_HIDDEN];
2257 int px = (x + 1) * T - tex.w;
2258 int py = (y + 1) * T - tex.h;
2259
2260 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2261 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2262 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2263 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2264 }
2265
2266 if (expect_false (cell->flags))
2267 {
2268 // overlays such as the speech bubble, probably more to come
2269 if (cell->flags & 1)
2270 {
2271 rc_key_t key_ov = key;
2272 maptex tex = self->tex [TEXID_SPEECH];
2273 rc_array_t *arr;
2274 int px = x * T + T * 2 / 32;
2275 int py = y * T - T * 6 / 32;
2276
2277 key_ov.texname = tex.name;
2278 arr = rc_array (rc_ov, &key_ov);
2279
2280 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2281 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2282 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2283 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2284 }
2285 }
2286 }
1878 } 2287 }
1879 } 2288 }
1880 2289
1881 rc_draw (rc); 2290 rc_draw (rc);
1882 rc_clear (rc); 2291 rc_clear (rc);
1884 // go through all smoothlevels, lowest to highest, then draw. 2293 // go through all smoothlevels, lowest to highest, then draw.
1885 // this is basically counting sort 2294 // this is basically counting sort
1886 { 2295 {
1887 int w, b; 2296 int w, b;
1888 2297
2298 glEnable (GL_TEXTURE_2D);
2299 glBegin (GL_QUADS);
1889 for (w = 0; w < 256 / 32; ++w) 2300 for (w = 0; w < 256 / 32; ++w)
1890 { 2301 {
1891 uint32_t smask = smooth_level [w]; 2302 uint32_t smask = smooth_level [w];
1892 if (smask) 2303 if (smask)
1893 for (b = 0; b < 32; ++b) 2304 for (b = 0; b < 32; ++b)
1918 { 2329 {
1919 // this time avoiding texture state changes 2330 // this time avoiding texture state changes
1920 // save gobs of state changes. 2331 // save gobs of state changes.
1921 if (key.texname != tex.name) 2332 if (key.texname != tex.name)
1922 { 2333 {
2334 self->tex [skey->tile].unused = 0;
2335
2336 glEnd ();
1923 key.texname = tex.name; 2337 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1924 arr = rc_array (rc, &key); 2338 glBegin (GL_QUADS);
1925 } 2339 }
1926 2340
1927 if (border) 2341 if (border)
1928 { 2342 {
1929 float ox = border * dx; 2343 float ox = border * dx;
1930 2344
1931 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2345 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1932 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2346 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1933 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2347 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1934 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2348 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1935 } 2349 }
1936 2350
1937 if (corner) 2351 if (corner)
1938 { 2352 {
1939 float ox = corner * dx; 2353 float ox = corner * dx;
1940 2354
1941 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2355 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1942 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2356 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1943 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2357 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1944 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2358 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1945 } 2359 }
1946 } 2360 }
1947 } 2361 }
1948 } 2362 }
1949 } 2363 }
1950 } 2364 }
2365
2366 glEnd ();
2367 glDisable (GL_TEXTURE_2D);
2368 key.texname = -1;
1951 } 2369 }
1952 2370
1953 hv_clear (smooth); 2371 hv_clear (smooth);
2372 }
2373
2374 if (pl_tex.name)
2375 {
2376 maptex tex = pl_tex;
2377 int px = pl_x + sdx;
2378 int py = pl_y + sdy;
2379
2380 key.texname = tex.name;
2381 arr = rc_array (rc, &key);
2382
2383 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2384 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2385 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2386 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2387
1954 rc_draw (rc); 2388 rc_draw (rc);
1955 rc_clear (rc);
1956 } 2389 }
2390
2391 rc_draw (rc_ov);
2392 rc_clear (rc_ov);
1957 2393
1958 glDisable (GL_BLEND); 2394 glDisable (GL_BLEND);
1959 rc_free (rc); 2395 rc_free (rc);
2396 rc_free (rc_ov);
1960 2397
1961 // top layer: overlays such as the health bar 2398 // top layer: overlays such as the health bar
1962 for (y = 0; y < sh; y++) 2399 for (y = 0; y < sh; y++)
1963 if (0 <= y + my && y + my < self->rows) 2400 if (0 <= y + my && y + my < self->rows)
1964 { 2401 {
1969 { 2406 {
1970 mapcell *cell = row->col + (x + mx - row->c0); 2407 mapcell *cell = row->col + (x + mx - row->c0);
1971 2408
1972 int px = x * T; 2409 int px = x * T;
1973 int py = y * T; 2410 int py = y * T;
2411
2412 if (expect_false (cell->player == player))
2413 {
2414 px += sdx;
2415 py += sdy;
2416 }
1974 2417
1975 if (cell->stat_hp) 2418 if (cell->stat_hp)
1976 { 2419 {
1977 int width = cell->stat_width * T; 2420 int width = cell->stat_width * T;
1978 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2421 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1989 } 2432 }
1990 } 2433 }
1991} 2434}
1992 2435
1993void 2436void
1994draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2437draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1995 CODE: 2438 CODE:
1996{ 2439{
1997 static float color[16][3] = { 2440 static float color[16][3] = {
1998 { 0.00F, 0.00F, 0.00F }, 2441 { 0.00f, 0.00f, 0.00f },
1999 { 1.00F, 1.00F, 1.00F }, 2442 { 1.00f, 1.00f, 1.00f },
2000 { 0.00F, 0.00F, 0.55F }, 2443 { 0.00f, 0.00f, 0.55f },
2001 { 1.00F, 0.00F, 0.00F }, 2444 { 1.00f, 0.00f, 0.00f },
2002 2445
2003 { 1.00F, 0.54F, 0.00F }, 2446 { 1.00f, 0.54f, 0.00f },
2004 { 0.11F, 0.56F, 1.00F }, 2447 { 0.11f, 0.56f, 1.00f },
2005 { 0.93F, 0.46F, 0.00F }, 2448 { 0.93f, 0.46f, 0.00f },
2006 { 0.18F, 0.54F, 0.34F }, 2449 { 0.18f, 0.54f, 0.34f },
2007 2450
2008 { 0.56F, 0.73F, 0.56F }, 2451 { 0.56f, 0.73f, 0.56f },
2009 { 0.80F, 0.80F, 0.80F }, 2452 { 0.80f, 0.80f, 0.80f },
2010 { 0.55F, 0.41F, 0.13F }, 2453 { 0.55f, 0.41f, 0.13f },
2011 { 0.99F, 0.77F, 0.26F }, 2454 { 0.99f, 0.77f, 0.26f },
2012 2455
2013 { 0.74F, 0.65F, 0.41F }, 2456 { 0.74f, 0.65f, 0.41f },
2014 2457
2015 { 0.00F, 1.00F, 1.00F }, 2458 { 0.00f, 1.00f, 1.00f },
2016 { 1.00F, 0.00F, 1.00F }, 2459 { 1.00f, 0.00f, 1.00f },
2017 { 1.00F, 1.00F, 0.00F }, 2460 { 1.00f, 1.00f, 0.00f },
2018 }; 2461 };
2019 2462
2020 int x, y; 2463 int x, y;
2021 2464
2022 glEnable (GL_TEXTURE_2D); 2465 glEnable (GL_TEXTURE_2D);
2466 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2467 * but the nvidia driver (185.18.14) mishandles alpha textures
2468 * ansd takes the colour from god knows where instead of using
2469 * Cp. MODULATE results in the same colour, but slightly different
2470 * alpha, but atcually gives us the correct colour with nvidia.
2471 */
2023 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2472 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2024 glEnable (GL_BLEND); 2473 glEnable (GL_BLEND);
2025 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2474 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2026 glBegin (GL_QUADS); 2475 glBegin (GL_QUADS);
2027 2476
2028 for (y = 0; y < h; y++) 2477 for (y = 0; y < h; y++)
2032 2481
2033 if (m) 2482 if (m)
2034 { 2483 {
2035 float *c = color [m & 15]; 2484 float *c = color [m & 15];
2036 2485
2037 float tx1 = m & 0x40 ? 0.5 : 0.; 2486 float tx1 = m & 0x40 ? 0.5f : 0.f;
2038 float tx2 = tx1 + 0.5; 2487 float tx2 = tx1 + 0.5f;
2039 2488
2040 glColor4f (c[0], c[1], c[2], 0.75); 2489 glColor4f (c[0], c[1], c[2], 1);
2041 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2490 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2042 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2491 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2043 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2492 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2044 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2493 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2045 } 2494 }
2049 glDisable (GL_BLEND); 2498 glDisable (GL_BLEND);
2050 glDisable (GL_TEXTURE_2D); 2499 glDisable (GL_TEXTURE_2D);
2051} 2500}
2052 2501
2053void 2502void
2054fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2503fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2055 PPCODE: 2504 PPCODE:
2056{ 2505{
2057 int x, y; 2506 int x, y;
2058 int sw1 = sw + 2; 2507 int sw1 = sw + 2;
2059 int sh1 = sh + 2; 2508 int sh1 = sh + 2;
2067 SvCUR_set (darkness3_sv, sw34 * sh3); 2516 SvCUR_set (darkness3_sv, sw34 * sh3);
2068 2517
2069 mx += self->x - 1; 2518 mx += self->x - 1;
2070 my += self->y - 1; 2519 my += self->y - 1;
2071 2520
2072 memset (darkness1, 255, sw1 * sh1); 2521 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2073 2522
2074 for (y = 0; y < sh1; y++) 2523 for (y = 0; y < sh1; y++)
2075 if (0 <= y + my && y + my < self->rows) 2524 if (0 <= y + my && y + my < self->rows)
2076 { 2525 {
2077 maprow *row = self->row + (y + my); 2526 maprow *row = self->row + (y + my);
2080 if (row->c0 <= x + mx && x + mx < row->c1) 2529 if (row->c0 <= x + mx && x + mx < row->c1)
2081 { 2530 {
2082 mapcell *cell = row->col + (x + mx - row->c0); 2531 mapcell *cell = row->col + (x + mx - row->c0);
2083 2532
2084 darkness1 [y * sw1 + x] = cell->darkness 2533 darkness1 [y * sw1 + x] = cell->darkness
2085 ? 255 - (cell->darkness - 1) 2534 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2086 : 255 - FOW_DARKNESS; 2535 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2087 } 2536 }
2088 } 2537 }
2089 2538
2090 for (y = 0; y < sh; ++y) 2539 for (y = 0; y < sh; ++y)
2091 for (x = 0; x < sw; ++x) 2540 for (x = 0; x < sw; ++x)
2130 PUSHs (sv_2mortal (newSViv (sh3))); 2579 PUSHs (sv_2mortal (newSViv (sh3)));
2131 PUSHs (darkness3_sv); 2580 PUSHs (darkness3_sv);
2132} 2581}
2133 2582
2134SV * 2583SV *
2135get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2584get_rect (DC::Map self, int x0, int y0, int w, int h)
2136 CODE: 2585 CODE:
2137{ 2586{
2138 int x, y, x1, y1; 2587 int x, y, x1, y1;
2139 SV *data_sv = newSV (w * h * 7 + 5); 2588 SV *data_sv = newSV (w * h * 7 + 5);
2140 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2589 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2197 else 2646 else
2198 *data++ = 0; 2647 *data++ = 0;
2199 } 2648 }
2200 } 2649 }
2201 2650
2651 /* if size is w*h + 5 then no data has been found */
2652 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2653 {
2202 SvPOK_only (data_sv); 2654 SvPOK_only (data_sv);
2203 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2655 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2656 }
2657
2204 RETVAL = data_sv; 2658 RETVAL = data_sv;
2205} 2659}
2206 OUTPUT: 2660 OUTPUT:
2207 RETVAL 2661 RETVAL
2208 2662
2209void 2663void
2210set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2664set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2211 PPCODE: 2665 PPCODE:
2212{ 2666{
2213 int x, y, z; 2667 int x, y, z;
2214 int w, h; 2668 int w, h;
2215 int x1, y1; 2669 int x1, y1;
2670 STRLEN len;
2671 uint8_t *data, *end;
2672
2673 len = SvLEN (data_sv);
2674 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2675 data = SvPVbyte_nolen (data_sv);
2676 end = data + len + 8;
2677
2678 if (len < 5)
2679 XSRETURN_EMPTY;
2216 2680
2217 if (*data++ != 0) 2681 if (*data++ != 0)
2218 return; /* version mismatch */ 2682 XSRETURN_EMPTY; /* version mismatch */
2219 2683
2220 w = *data++ << 8; w |= *data++; 2684 w = *data++ << 8; w |= *data++;
2221 h = *data++ << 8; h |= *data++; 2685 h = *data++ << 8; h |= *data++;
2222 2686
2223 // we need to do this 'cause we don't keep an absolute coord system for rows 2687 // we need to do this 'cause we don't keep an absolute coord system for rows
2235 { 2699 {
2236 maprow *row = map_get_row (self, y); 2700 maprow *row = map_get_row (self, y);
2237 2701
2238 for (x = x0; x < x1; x++) 2702 for (x = x0; x < x1; x++)
2239 { 2703 {
2704 uint8_t flags;
2705
2706 if (data + 7 >= end)
2707 XSRETURN_EMPTY;
2708
2240 uint8_t flags = *data++; 2709 flags = *data++;
2241 2710
2242 if (flags) 2711 if (flags)
2243 { 2712 {
2244 mapcell *cell = row_get_cell (row, x); 2713 mapcell *cell = row_get_cell (row, x);
2245 tileid tile[3] = { 0, 0, 0 }; 2714 tileid tile[3] = { 0, 0, 0 };
2248 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2717 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2249 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2718 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2250 2719
2251 if (cell->darkness == 0) 2720 if (cell->darkness == 0)
2252 { 2721 {
2253 cell->darkness = 0; 2722 /*cell->darkness = 0;*/
2723 EXTEND (SP, 3);
2254 2724
2255 for (z = 0; z <= 2; z++) 2725 for (z = 0; z <= 2; z++)
2256 { 2726 {
2257 tileid t = tile [z]; 2727 tileid t = tile [z];
2258 2728
2259 if (t >= self->texs || (t && !self->tex [t].name)) 2729 if (t >= self->texs || (t && !self->tex [t].name))
2260 { 2730 {
2261 XPUSHs (sv_2mortal (newSViv (t))); 2731 PUSHs (sv_2mortal (newSViv (t)));
2262 need_texid (self, t); 2732 need_texid (self, t);
2263 } 2733 }
2264 2734
2265 cell->tile [z] = t; 2735 cell->tile [z] = t;
2266 } 2736 }
2268 } 2738 }
2269 } 2739 }
2270 } 2740 }
2271} 2741}
2272 2742
2273MODULE = CFPlus PACKAGE = CFPlus::RW 2743MODULE = Deliantra::Client PACKAGE = DC::RW
2274 2744
2275CFPlus::RW 2745DC::RW
2276new (SV *class, SV *data_sv) 2746new (SV *class, SV *data_sv)
2277 CODE: 2747 CODE:
2278{ 2748{
2279 STRLEN datalen; 2749 STRLEN datalen;
2280 char *data = SvPVbyte (data_sv, datalen); 2750 char *data = SvPVbyte (data_sv, datalen);
2282 RETVAL = SDL_RWFromConstMem (data, datalen); 2752 RETVAL = SDL_RWFromConstMem (data, datalen);
2283} 2753}
2284 OUTPUT: 2754 OUTPUT:
2285 RETVAL 2755 RETVAL
2286 2756
2287CFPlus::RW 2757DC::RW
2288new_from_file (SV *class, const char *path, const char *mode = "rb") 2758new_from_file (SV *class, const char *path, const char *mode = "rb")
2289 CODE: 2759 CODE:
2290 RETVAL = SDL_RWFromFile (path, mode); 2760 RETVAL = SDL_RWFromFile (path, mode);
2291 OUTPUT: 2761 OUTPUT:
2292 RETVAL 2762 RETVAL
2293 2763
2294# fails on win32: 2764# fails on win32:
2295# CFPlus.xs(2268) : error C2059: syntax error : '(' 2765# dc.xs(2268) : error C2059: syntax error : '('
2296#void 2766#void
2297#close (CFPlus::RW self) 2767#close (DC::RW self)
2298# CODE: 2768# CODE:
2299# (self->(close)) (self); 2769# (self->(close)) (self);
2300 2770
2301MODULE = CFPlus PACKAGE = CFPlus::Channel 2771MODULE = Deliantra::Client PACKAGE = DC::Channel
2302 2772
2303PROTOTYPES: DISABLE 2773PROTOTYPES: DISABLE
2304 2774
2305CFPlus::Channel 2775DC::Channel
2306find () 2776find ()
2307 CODE: 2777 CODE:
2308{ 2778{
2309 RETVAL = Mix_GroupAvailable (-1); 2779 RETVAL = Mix_GroupAvailable (-1);
2310 2780
2323} 2793}
2324 OUTPUT: 2794 OUTPUT:
2325 RETVAL 2795 RETVAL
2326 2796
2327void 2797void
2328halt (CFPlus::Channel self) 2798halt (DC::Channel self)
2329 CODE: 2799 CODE:
2330 Mix_HaltChannel (self); 2800 Mix_HaltChannel (self);
2331 2801
2332void 2802void
2333expire (CFPlus::Channel self, int ticks = -1) 2803expire (DC::Channel self, int ticks = -1)
2334 CODE: 2804 CODE:
2335 Mix_ExpireChannel (self, ticks); 2805 Mix_ExpireChannel (self, ticks);
2336 2806
2337void 2807void
2338fade_out (CFPlus::Channel self, int ticks = -1) 2808fade_out (DC::Channel self, int ticks = -1)
2339 CODE: 2809 CODE:
2340 Mix_FadeOutChannel (self, ticks); 2810 Mix_FadeOutChannel (self, ticks);
2341 2811
2342int 2812int
2343volume (CFPlus::Channel self, int volume) 2813volume (DC::Channel self, int volume)
2344 CODE: 2814 CODE:
2345 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2815 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2346 OUTPUT: 2816 OUTPUT:
2347 RETVAL 2817 RETVAL
2348 2818
2349void 2819void
2350unregister_all_effects (CFPlus::Channel self) 2820unregister_all_effects (DC::Channel self)
2351 CODE: 2821 CODE:
2352 Mix_UnregisterAllEffects (self); 2822 Mix_UnregisterAllEffects (self);
2353 2823
2354void 2824void
2355set_panning (CFPlus::Channel self, int left, int right) 2825set_panning (DC::Channel self, int left, int right)
2356 CODE: 2826 CODE:
2357 left = CLAMP (left , 0, 255); 2827 left = CLAMP (left , 0, 255);
2358 right = CLAMP (right, 0, 255); 2828 right = CLAMP (right, 0, 255);
2359 Mix_SetPanning (self, left, right); 2829 Mix_SetPanning (self, left, right);
2360 2830
2361void 2831void
2362set_distance (CFPlus::Channel self, int distance) 2832set_distance (DC::Channel self, int distance)
2363 CODE: 2833 CODE:
2364 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2834 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2365 2835
2366void 2836void
2367set_position (CFPlus::Channel self, int angle, int distance) 2837set_position (DC::Channel self, int angle, int distance)
2368 CODE: 2838 CODE:
2369 2839
2370void 2840void
2371set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2841set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2372 CODE: 2842 CODE:
2373{ 2843{
2374 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2844 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2375 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2845 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2376 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2846 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2377} 2847}
2378 2848
2379void 2849void
2380set_reverse_stereo (CFPlus::Channel self, int flip) 2850set_reverse_stereo (DC::Channel self, int flip)
2381 CODE: 2851 CODE:
2382 Mix_SetReverseStereo (self, flip); 2852 Mix_SetReverseStereo (self, flip);
2383 2853
2384MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2854MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2385 2855
2386PROTOTYPES: DISABLE 2856PROTOTYPES: DISABLE
2387 2857
2388CFPlus::MixChunk 2858DC::MixChunk
2389new (SV *class, CFPlus::RW rwops) 2859new (SV *class, DC::RW rwops)
2390 CODE: 2860 CODE:
2391 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2861 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2392 OUTPUT: 2862 OUTPUT:
2393 RETVAL 2863 RETVAL
2394 2864
2395void 2865void
2396DESTROY (CFPlus::MixChunk self) 2866DESTROY (DC::MixChunk self)
2397 CODE: 2867 CODE:
2398 Mix_FreeChunk (self); 2868 Mix_FreeChunk (self);
2399 2869
2400int 2870int
2401volume (CFPlus::MixChunk self, int volume = -1) 2871volume (DC::MixChunk self, int volume = -1)
2402 CODE: 2872 CODE:
2403 if (items > 1) 2873 if (items > 1)
2404 volume = CLAMP (volume, 0, 128); 2874 volume = CLAMP (volume, 0, 128);
2405 RETVAL = Mix_VolumeChunk (self, volume); 2875 RETVAL = Mix_VolumeChunk (self, volume);
2406 OUTPUT: 2876 OUTPUT:
2407 RETVAL 2877 RETVAL
2408 2878
2409CFPlus::Channel 2879DC::Channel
2410play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2880play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2411 CODE: 2881 CODE:
2412{ 2882{
2413 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2883 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2414 2884
2415 if (RETVAL < 0) 2885 if (RETVAL < 0)
2422 } 2892 }
2423} 2893}
2424 OUTPUT: 2894 OUTPUT:
2425 RETVAL 2895 RETVAL
2426 2896
2427MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2897MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2428 2898
2429int 2899int
2430volume (int volume = -1) 2900volume (int volume = -1)
2431 PROTOTYPE: ;$ 2901 PROTOTYPE: ;$
2432 CODE: 2902 CODE:
2444void 2914void
2445halt () 2915halt ()
2446 CODE: 2916 CODE:
2447 Mix_HaltMusic (); 2917 Mix_HaltMusic ();
2448 2918
2449CFPlus::MixMusic 2919DC::MixMusic
2450new (SV *class, CFPlus::RW rwops) 2920new (SV *class, DC::RW rwops)
2451 CODE: 2921 CODE:
2452 RETVAL = Mix_LoadMUS_RW (rwops); 2922 RETVAL = Mix_LoadMUS_RW (rwops);
2453 OUTPUT: 2923 OUTPUT:
2454 RETVAL 2924 RETVAL
2455 2925
2456void 2926void
2457DESTROY (CFPlus::MixMusic self) 2927DESTROY (DC::MixMusic self)
2458 CODE: 2928 CODE:
2459 Mix_FreeMusic (self); 2929 Mix_FreeMusic (self);
2460 2930
2461int 2931int
2462play (CFPlus::MixMusic self, int loops = -1) 2932play (DC::MixMusic self, int loops = -1)
2463 CODE: 2933 CODE:
2464 RETVAL = Mix_PlayMusic (self, loops); 2934 RETVAL = Mix_PlayMusic (self, loops);
2465 OUTPUT: 2935 OUTPUT:
2466 RETVAL 2936 RETVAL
2467 2937
2468void 2938void
2469fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2939fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2470 CODE: 2940 CODE:
2471 Mix_FadeInMusicPos (self, loops, ms, position); 2941 Mix_FadeInMusicPos (self, loops, ms, position);
2472 2942
2473MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2943MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2474 2944
2475PROTOTYPES: ENABLE 2945PROTOTYPES: ENABLE
2476 2946
2477BOOT: 2947BOOT:
2478{ 2948{
2479 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2949 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2480 static const struct { 2950 static const struct {
2481 const char *name; 2951 const char *name;
2482 IV iv; 2952 IV iv;
2483 } *civ, const_iv[] = { 2953 } *civ, const_iv[] = {
2484# define const_iv(name) { # name, (IV)name } 2954# define const_iv(name) { # name, (IV)name }
2485 const_iv (GL_VENDOR), 2955 const_iv (GL_VENDOR),
2486 const_iv (GL_VERSION), 2956 const_iv (GL_VERSION),
2487 const_iv (GL_EXTENSIONS), 2957 const_iv (GL_EXTENSIONS),
2958 const_iv (GL_MAX_TEXTURE_UNITS),
2488 const_iv (GL_COLOR_MATERIAL), 2959 const_iv (GL_COLOR_MATERIAL),
2489 const_iv (GL_SMOOTH), 2960 const_iv (GL_SMOOTH),
2490 const_iv (GL_FLAT), 2961 const_iv (GL_FLAT),
2491 const_iv (GL_DITHER), 2962 const_iv (GL_DITHER),
2492 const_iv (GL_BLEND), 2963 const_iv (GL_BLEND),
2504 const_iv (GL_ZERO), 2975 const_iv (GL_ZERO),
2505 const_iv (GL_SRC_ALPHA), 2976 const_iv (GL_SRC_ALPHA),
2506 const_iv (GL_DST_ALPHA), 2977 const_iv (GL_DST_ALPHA),
2507 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2978 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2508 const_iv (GL_ONE_MINUS_DST_ALPHA), 2979 const_iv (GL_ONE_MINUS_DST_ALPHA),
2980 const_iv (GL_SRC_COLOR),
2981 const_iv (GL_DST_COLOR),
2982 const_iv (GL_ONE_MINUS_SRC_COLOR),
2983 const_iv (GL_ONE_MINUS_DST_COLOR),
2509 const_iv (GL_SRC_ALPHA_SATURATE), 2984 const_iv (GL_SRC_ALPHA_SATURATE),
2510 const_iv (GL_RGB), 2985 const_iv (GL_RGB),
2511 const_iv (GL_RGBA), 2986 const_iv (GL_RGBA),
2512 const_iv (GL_RGBA4), 2987 const_iv (GL_RGBA4),
2513 const_iv (GL_RGBA8), 2988 const_iv (GL_RGBA8),
2519 const_iv (GL_INTENSITY), 2994 const_iv (GL_INTENSITY),
2520 const_iv (GL_LUMINANCE), 2995 const_iv (GL_LUMINANCE),
2521 const_iv (GL_LUMINANCE_ALPHA), 2996 const_iv (GL_LUMINANCE_ALPHA),
2522 const_iv (GL_FLOAT), 2997 const_iv (GL_FLOAT),
2523 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2998 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2999 const_iv (GL_COMPRESSED_ALPHA_ARB),
3000 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3001 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3002 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3003 const_iv (GL_COMPRESSED_RGB_ARB),
3004 const_iv (GL_COMPRESSED_RGBA_ARB),
2524 const_iv (GL_COMPILE), 3005 const_iv (GL_COMPILE),
2525 const_iv (GL_PROXY_TEXTURE_1D), 3006 const_iv (GL_PROXY_TEXTURE_1D),
2526 const_iv (GL_PROXY_TEXTURE_2D), 3007 const_iv (GL_PROXY_TEXTURE_2D),
2527 const_iv (GL_TEXTURE_1D), 3008 const_iv (GL_TEXTURE_1D),
2528 const_iv (GL_TEXTURE_2D), 3009 const_iv (GL_TEXTURE_2D),
2567 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3048 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2568 const_iv (GL_POINT_SMOOTH_HINT), 3049 const_iv (GL_POINT_SMOOTH_HINT),
2569 const_iv (GL_LINE_SMOOTH_HINT), 3050 const_iv (GL_LINE_SMOOTH_HINT),
2570 const_iv (GL_POLYGON_SMOOTH_HINT), 3051 const_iv (GL_POLYGON_SMOOTH_HINT),
2571 const_iv (GL_GENERATE_MIPMAP_HINT), 3052 const_iv (GL_GENERATE_MIPMAP_HINT),
3053 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2572 const_iv (GL_FASTEST), 3054 const_iv (GL_FASTEST),
2573 const_iv (GL_DONT_CARE), 3055 const_iv (GL_DONT_CARE),
2574 const_iv (GL_NICEST), 3056 const_iv (GL_NICEST),
2575 const_iv (GL_V2F), 3057 const_iv (GL_V2F),
2576 const_iv (GL_V3F), 3058 const_iv (GL_V3F),
2577 const_iv (GL_T2F_V3F), 3059 const_iv (GL_T2F_V3F),
2578 const_iv (GL_T2F_N3F_V3F), 3060 const_iv (GL_T2F_N3F_V3F),
3061 const_iv (GL_FUNC_ADD),
3062 const_iv (GL_FUNC_SUBTRACT),
3063 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2579# undef const_iv 3064# undef const_iv
2580 }; 3065 };
2581 3066
2582 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3067 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2583 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3068 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2584 3069
2585 texture_av = newAV (); 3070 texture_av = newAV ();
2586 AvREAL_off (texture_av); 3071 AvREAL_off (texture_av);
2587} 3072}
2588 3073
3074void
3075disable_GL_EXT_blend_func_separate ()
3076 CODE:
3077 gl.BlendFuncSeparate = 0;
3078 gl.BlendFuncSeparateEXT = 0;
3079
3080void
3081apple_nvidia_bug (int enable)
3082
2589char * 3083char *
2590gl_vendor () 3084gl_vendor ()
2591 CODE: 3085 CODE:
2592 RETVAL = (char *)glGetString (GL_VENDOR); 3086 RETVAL = (char *)glGetString (GL_VENDOR);
2593 OUTPUT: 3087 OUTPUT:
2642 3136
2643void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3137void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2644 CODE: 3138 CODE:
2645 gl_BlendFuncSeparate (sa, da, saa, daa); 3139 gl_BlendFuncSeparate (sa, da, saa, daa);
2646 3140
3141# void glBlendEquation (int se)
3142
2647void glDepthMask (int flag) 3143void glDepthMask (int flag)
2648 3144
2649void glLogicOp (int opcode) 3145void glLogicOp (int opcode)
2650 3146
2651void glColorMask (int red, int green, int blue, int alpha) 3147void glColorMask (int red, int green, int blue, int alpha)
2685void glRotate (float angle, float x, float y, float z) 3181void glRotate (float angle, float x, float y, float z)
2686 CODE: 3182 CODE:
2687 glRotatef (angle, x, y, z); 3183 glRotatef (angle, x, y, z);
2688 3184
2689void glColor (float r, float g, float b, float a = 1.0) 3185void glColor (float r, float g, float b, float a = 1.0)
3186 PROTOTYPE: @
2690 ALIAS: 3187 ALIAS:
2691 glColor_premultiply = 1 3188 glColor_premultiply = 1
2692 CODE: 3189 CODE:
2693 if (ix) 3190 if (ix)
2694 { 3191 {
2714 3211
2715void glRect (float x1, float y1, float x2, float y2) 3212void glRect (float x1, float y1, float x2, float y2)
2716 CODE: 3213 CODE:
2717 glRectf (x1, y1, x2, y2); 3214 glRectf (x1, y1, x2, y2);
2718 3215
3216void glRect_lineloop (float x1, float y1, float x2, float y2)
3217 CODE:
3218 glBegin (GL_LINE_LOOP);
3219 glVertex2f (x1, y1);
3220 glVertex2f (x2, y1);
3221 glVertex2f (x2, y2);
3222 glVertex2f (x1, y2);
3223 glEnd ();
3224
2719PROTOTYPES: ENABLE 3225PROTOTYPES: ENABLE
2720 3226
2721void glBegin (int mode) 3227void glBegin (int mode)
2722 3228
2723void glEnd () 3229void glEnd ()
2755void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3261void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2756 CODE: 3262 CODE:
2757 if (gl.SeparableFilter2D) 3263 if (gl.SeparableFilter2D)
2758 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3264 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2759 3265
2760void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3266void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2761 3267
2762void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3268void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2763 3269
2764void glDrawPixels (int width, int height, int format, int type, char *pixels) 3270void glDrawPixels (int width, int height, int format, int type, char *pixels)
2765 3271
2791 3297
2792void glEndList () 3298void glEndList ()
2793 3299
2794void glCallList (int list) 3300void glCallList (int list)
2795 3301
2796MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3302MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2797 3303
2798PROTOTYPES: DISABLE 3304PROTOTYPES: DISABLE
2799 3305
2800void 3306void
2801find_widget (SV *self, NV x, NV y) 3307find_widget (SV *self, NV x, NV y)
2805 XPUSHs (self); 3311 XPUSHs (self);
2806} 3312}
2807 3313
2808BOOT: 3314BOOT:
2809{ 3315{
2810 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3316 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2811 3317
2812 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3318 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2813 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3319 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2814 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3320 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2815 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3321 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2816} 3322}
2817 3323
2818void 3324void
2819draw (SV *self) 3325draw (SV *self)
2820 CODE: 3326 CODE:
2824 NV x, y, w, h; 3330 NV x, y, w, h;
2825 SV *draw_x_sv = GvSV (draw_x_gv); 3331 SV *draw_x_sv = GvSV (draw_x_gv);
2826 SV *draw_y_sv = GvSV (draw_y_gv); 3332 SV *draw_y_sv = GvSV (draw_y_gv);
2827 SV *draw_w_sv = GvSV (draw_w_gv); 3333 SV *draw_w_sv = GvSV (draw_w_gv);
2828 SV *draw_h_sv = GvSV (draw_h_gv); 3334 SV *draw_h_sv = GvSV (draw_h_gv);
2829 SV *hover;
2830 double draw_x, draw_y, draw_w, draw_h; 3335 double draw_x, draw_y;
2831 3336
2832 if (!SvROK (self)) 3337 if (!SvROK (self))
2833 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3338 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2834 3339
2835 hv = (HV *)SvRV (self); 3340 hv = (HV *)SvRV (self);
2836 3341
2837 if (SvTYPE (hv) != SVt_PVHV) 3342 if (SvTYPE (hv) != SVt_PVHV)
2838 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3343 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2839 3344
2840 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3345 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2841 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3346 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2842 3347
2843 if (!h || !w) 3348 if (!h || !w)
2863 { 3368 {
2864 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3369 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2865 3370
2866 if (svp && SvTRUE (*svp)) 3371 if (svp && SvTRUE (*svp))
2867 { 3372 {
2868 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3373 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2869 glEnable (GL_BLEND); 3374 glEnable (GL_BLEND);
2870 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3375 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2871 glBegin (GL_QUADS); 3376 glBegin (GL_QUADS);
2872 glVertex2f (0, 0); 3377 glVertex2f (0, 0);
2873 glVertex2f (w, 0); 3378 glVertex2f (w, 0);
2876 glEnd (); 3381 glEnd ();
2877 glDisable (GL_BLEND); 3382 glDisable (GL_BLEND);
2878 } 3383 }
2879 } 3384 }
2880#if 0 3385#if 0
2881 if ($ENV{CFPLUS_DEBUG} & 1) { 3386 // draw borders, for debugging
2882 glPushMatrix; 3387 glPushMatrix ();
2883 glColor 1, 1, 0, 1; 3388 glColor4f (1., 1., 0., 1.);
2884 glTranslate 0.375, 0.375; 3389 glTranslatef (.5, .5, 0.);
2885 glBegin GL_LINE_LOOP; 3390 glBegin (GL_LINE_LOOP);
2886 glVertex 0 , 0; 3391 glVertex2f (0 , 0);
2887 glVertex $self->{w} - 1, 0; 3392 glVertex2f (w - 1, 0);
2888 glVertex $self->{w} - 1, $self->{h} - 1; 3393 glVertex2f (w - 1, h - 1);
2889 glVertex 0 , $self->{h} - 1; 3394 glVertex2f (0 , h - 1);
2890 glEnd; 3395 glEnd ();
2891 glPopMatrix; 3396 glPopMatrix ();
2892 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2893 }
2894#endif 3397#endif
2895 PUSHMARK (SP); 3398 PUSHMARK (SP);
2896 XPUSHs (self); 3399 XPUSHs (self);
2897 PUTBACK; 3400 PUTBACK;
2898 call_method ("_draw", G_VOID | G_DISCARD); 3401 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines