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.213 by root, Sun Jul 29 04:14:45 2007 UTC vs.
Revision 1.293 by root, Thu Dec 17 02:49:38 2009 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 64
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 = 4096) 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);
813 1025
814void 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}
1041
1042void
815Mix_CloseAudio () 1043Mix_CloseAudio ()
816 1044
817int 1045int
818Mix_AllocateChannels (int numchans = -1) 1046Mix_AllocateChannels (int numchans = -1)
1047
1048const char *
1049Mix_GetError ()
819 1050
820void 1051void
821lowdelay (int fd, int val = 1) 1052lowdelay (int fd, int val = 1)
822 CODE: 1053 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1054 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
849 } 1080 }
850 } 1081 }
851#endif 1082#endif
852} 1083}
853 1084
854void 1085int
855add_font (char *file) 1086add_font (char *file)
856 CODE: 1087 CODE:
857 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT:
1090 RETVAL
858 1091
859void 1092void
860load_image_inline (SV *image_) 1093load_image_inline (SV *image_)
861 ALIAS: 1094 ALIAS:
862 load_image_file = 1 1095 load_image_file = 1
948void 1181void
949error (char *message) 1182error (char *message)
950 CODE: 1183 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1184 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1185#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1186 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1187#endif
955 1188
956void 1189void
957fatal (char *message) 1190fatal (char *message)
958 CODE: 1191 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1192 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1193#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1194 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1195#endif
963 _exit (1); 1196 _exit (1);
964 1197
965void 1198void
966_exit (int retval = 0) 1199_exit (int retval = 0)
978#if DEBUG 1211#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
980#endif 1213#endif
981} 1214}
982 1215
983MODULE = 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
984 1224
985PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
986 1226
987CFPlus::Font 1227DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1228new_from_file (SV *class, char *path, int id = 0)
989 CODE: 1229 CODE:
990{ 1230{
991 int count; 1231 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1232 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
995} 1235}
996 OUTPUT: 1236 OUTPUT:
997 RETVAL 1237 RETVAL
998 1238
999void 1239void
1000DESTROY (CFPlus::Font self) 1240DESTROY (DC::Font self)
1001 CODE: 1241 CODE:
1002 pango_font_description_free (self); 1242 pango_font_description_free (self);
1003 1243
1004void 1244void
1005make_default (CFPlus::Font self) 1245make_default (DC::Font self)
1006 PROTOTYPE: $ 1246 PROTOTYPE: $
1007 CODE: 1247 CODE:
1008 default_font = self; 1248 default_font = self;
1009 1249
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1250MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1251
1012PROTOTYPES: DISABLE 1252PROTOTYPES: DISABLE
1013 1253
1014void 1254void
1015reset_glyph_cache () 1255glyph_cache_backup ()
1016 PROTOTYPE: 1256 PROTOTYPE:
1017 CODE: 1257 CODE:
1258 tc_backup ();
1259
1260void
1261glyph_cache_restore ()
1262 PROTOTYPE:
1263 CODE:
1018 tc_clear (); 1264 tc_restore ();
1019 1265
1020CFPlus::Layout 1266DC::Layout
1021new (SV *class) 1267new (SV *class)
1022 CODE: 1268 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1269 New (0, RETVAL, 1, struct cf_layout);
1024 1270
1025 RETVAL->pl = pango_layout_new (opengl_context); 1271 RETVAL->pl = pango_layout_new (opengl_context);
1027 RETVAL->g = 1.; 1273 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1274 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1275 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1276 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1277 RETVAL->font = 0;
1278 RETVAL->rc = rc_alloc ();
1032 1279
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1280 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1281 layout_update_font (RETVAL);
1035 OUTPUT: 1282 OUTPUT:
1036 RETVAL 1283 RETVAL
1037 1284
1038void 1285void
1039DESTROY (CFPlus::Layout self) 1286DESTROY (DC::Layout self)
1040 CODE: 1287 CODE:
1041 g_object_unref (self->pl); 1288 g_object_unref (self->pl);
1289 rc_free (self->rc);
1042 Safefree (self); 1290 Safefree (self);
1043 1291
1044void 1292void
1045set_text (CFPlus::Layout self, SV *text_) 1293set_text (DC::Layout self, SV *text_)
1046 CODE: 1294 CODE:
1047{ 1295{
1048 STRLEN textlen; 1296 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1297 char *text = SvPVutf8 (text_, textlen);
1050 1298
1051 pango_layout_set_text (self->pl, text, textlen); 1299 pango_layout_set_text (self->pl, text, textlen);
1052} 1300}
1053 1301
1054void 1302void
1055set_markup (CFPlus::Layout self, SV *text_) 1303set_markup (DC::Layout self, SV *text_)
1056 CODE: 1304 CODE:
1057{ 1305{
1058 STRLEN textlen; 1306 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1307 char *text = SvPVutf8 (text_, textlen);
1060 1308
1061 pango_layout_set_markup (self->pl, text, textlen); 1309 pango_layout_set_markup (self->pl, text, textlen);
1062} 1310}
1063 1311
1064void 1312void
1065set_shapes (CFPlus::Layout self, ...) 1313set_shapes (DC::Layout self, ...)
1066 CODE: 1314 CODE:
1067{ 1315{
1068 PangoAttrList *attrs = 0; 1316 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1317 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1318 const char *pos = text;
1105 if (attrs) 1353 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1354 pango_layout_set_attributes (self->pl, attrs);
1107} 1355}
1108 1356
1109void 1357void
1110get_shapes (CFPlus::Layout self) 1358get_shapes (DC::Layout self)
1111 PPCODE: 1359 PPCODE:
1112{ 1360{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1361 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1362
1115 do 1363 do
1116 { 1364 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1365 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1366
1119 if (run && shape_attr_p (run)) 1367 if (run && shape_attr_p (run))
1120 { 1368 {
1121 PangoRectangle extents; 1369 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1370 pango_layout_iter_get_run_extents (iter, 0, &extents);
1130 1378
1131 pango_layout_iter_free (iter); 1379 pango_layout_iter_free (iter);
1132} 1380}
1133 1381
1134int 1382int
1135has_wrapped (CFPlus::Layout self) 1383has_wrapped (DC::Layout self)
1136 CODE: 1384 CODE:
1137{ 1385{
1138 int lines = 1; 1386 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1387 const char *text = pango_layout_get_text (self->pl);
1140 1388
1145} 1393}
1146 OUTPUT: 1394 OUTPUT:
1147 RETVAL 1395 RETVAL
1148 1396
1149SV * 1397SV *
1150get_text (CFPlus::Layout self) 1398get_text (DC::Layout self)
1151 CODE: 1399 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1400 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1401 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1402 OUTPUT:
1155 RETVAL 1403 RETVAL
1156 1404
1157void 1405void
1158set_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.)
1159 CODE: 1407 CODE:
1160 self->r = r; 1408 self->r = r;
1161 self->g = g; 1409 self->g = g;
1162 self->b = b; 1410 self->b = b;
1163 self->a = a; 1411 self->a = a;
1164 1412
1165void 1413void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1414set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1415 CODE:
1168 if (self->font != font) 1416 if (self->font != font)
1169 { 1417 {
1170 self->font = font; 1418 self->font = font;
1171 layout_update_font (self); 1419 layout_update_font (self);
1172 } 1420 }
1173 1421
1174void 1422void
1175set_height (CFPlus::Layout self, int base_height) 1423set_height (DC::Layout self, int base_height)
1176 CODE: 1424 CODE:
1177 if (self->base_height != base_height) 1425 if (self->base_height != base_height)
1178 { 1426 {
1179 self->base_height = base_height; 1427 self->base_height = base_height;
1180 layout_update_font (self); 1428 layout_update_font (self);
1181 } 1429 }
1182 1430
1183void 1431void
1184set_width (CFPlus::Layout self, int max_width = -1) 1432set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1433 CODE:
1186 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);
1187 1435
1188void 1436void
1189set_indent (CFPlus::Layout self, int indent) 1437set_indent (DC::Layout self, int indent)
1190 CODE: 1438 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1439 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1440
1193void 1441void
1194set_spacing (CFPlus::Layout self, int spacing) 1442set_spacing (DC::Layout self, int spacing)
1195 CODE: 1443 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1444 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1445
1198void 1446void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1447set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1448 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1449 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1450 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1451 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1452 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1453 : PANGO_ELLIPSIZE_NONE
1206 ); 1454 );
1207 1455
1208void 1456void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1457set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1458 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1459 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1460
1213void 1461void
1214size (CFPlus::Layout self) 1462size (DC::Layout self)
1215 PPCODE: 1463 PPCODE:
1216{ 1464{
1217 int w, h; 1465 int w, h;
1218 1466
1219 layout_get_pixel_size (self, &w, &h); 1467 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1470 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1471 PUSHs (sv_2mortal (newSViv (h)));
1224} 1472}
1225 1473
1226int 1474int
1227descent (CFPlus::Layout self) 1475descent (DC::Layout self)
1228 CODE: 1476 CODE:
1229{ 1477{
1230 PangoRectangle rect; 1478 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1479 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1480 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1481 RETVAL = PANGO_DESCENT (rect);
1234} 1482}
1235 OUTPUT: 1483 OUTPUT:
1236 RETVAL 1484 RETVAL
1237 1485
1238int 1486int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1487xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1488 CODE:
1241{ 1489{
1242 int index, trailing; 1490 int index, trailing;
1243 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);
1244 RETVAL = index + trailing; 1492 RETVAL = index + trailing;
1245} 1493}
1246 OUTPUT: 1494 OUTPUT:
1247 RETVAL 1495 RETVAL
1248 1496
1249void 1497void
1250cursor_pos (CFPlus::Layout self, int index) 1498cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1499 PPCODE:
1252{ 1500{
1253 PangoRectangle strong_pos; 1501 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1502 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1503
1256 EXTEND (SP, 3); 1504 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1505 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1506 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1507 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1508}
1261 1509
1262void 1510void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1511index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1512 PPCODE:
1265{ 1513{
1266 int line, x; 1514 int line, x;
1267 1515
1268 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)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1518 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1519 --line;
1520#endif
1271 EXTEND (SP, 2); 1521 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1522 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1523 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1524}
1275 1525
1276void 1526void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1527line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1528 PPCODE:
1279{ 1529{
1280 PangoLayoutLine *lp; 1530 PangoLayoutLine *lp;
1281 int index, trailing; 1531 int index, trailing;
1282 1532
1283 if (line < 0) 1533 if (line < 0)
1284 XSRETURN_EMPTY; 1534 XSRETURN_EMPTY;
1285 1535
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1536 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1537 XSRETURN_EMPTY; /* do better */
1288 1538
1289 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);
1290 1540
1291 EXTEND (SP, 2); 1541 EXTEND (SP, 2);
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1547 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1548 }
1299} 1549}
1300 1550
1301void 1551void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1552render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1553 CODE:
1554 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1555 pango_opengl_render_layout_subpixel (
1305 self->pl, 1556 self->pl,
1557 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1558 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1559 self->r, self->g, self->b, self->a,
1308 flags 1560 flags
1309 ); 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);
1310 1565
1311MODULE = 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
1312 1586
1313PROTOTYPES: ENABLE 1587PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1588
1317void 1589void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1590pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1591 CODE:
1320{ 1592{
1347 HV *hv = (HV *)SvRV (self); 1619 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1620 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1621 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1622 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1623
1624 if (name <= 0)
1625 XSRETURN_EMPTY;
1626
1352 if (items < 5) 1627 if (items < 5)
1353 { 1628 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1629 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1630 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1631 }
1383 glDisable (GL_ALPHA_TEST); 1658 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1659 glDisable (GL_BLEND);
1385 } 1660 }
1386} 1661}
1387 1662
1663void
1664draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1)
1665 PROTOTYPE: @
1666 CODE:
1667{
1668 glEnable (GL_TEXTURE_2D);
1669 glEnable (GL_BLEND);
1670 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672
1673 glColor4f (intensity, intensity, intensity, 0.9);
1674 glPushMatrix ();
1675 glScalef (1./3, 1./3, 1.);
1676
1677 glBindTexture (GL_TEXTURE_2D, name1);
1678
1679 glBegin (GL_QUADS);
1680 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1681 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1682 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1683 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1684 glEnd ();
1685
1686 glPopMatrix ();
1687
1688 glDisable (GL_TEXTURE_2D);
1689 glDisable (GL_BLEND);
1690}
1691
1388IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1692IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1389 CODE: 1693 CODE:
1390{ 1694{
1391 GLint width; 1695 GLint width;
1392 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1696 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1394 RETVAL = width > 0; 1698 RETVAL = width > 0;
1395} 1699}
1396 OUTPUT: 1700 OUTPUT:
1397 RETVAL 1701 RETVAL
1398 1702
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1703MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1704
1401PROTOTYPES: DISABLE 1705PROTOTYPES: DISABLE
1402 1706
1403CFPlus::Map 1707DC::Map
1404new (SV *class) 1708new (SV *class)
1405 CODE: 1709 CODE:
1406 New (0, RETVAL, 1, struct map); 1710 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1711 RETVAL->x = 0;
1408 RETVAL->y = 0; 1712 RETVAL->y = 0;
1416 RETVAL->row = 0; 1720 RETVAL->row = 0;
1417 OUTPUT: 1721 OUTPUT:
1418 RETVAL 1722 RETVAL
1419 1723
1420void 1724void
1421DESTROY (CFPlus::Map self) 1725DESTROY (DC::Map self)
1422 CODE: 1726 CODE:
1423{ 1727{
1424 map_clear (self); 1728 map_clear (self);
1425 Safefree (self->face2tile); 1729 Safefree (self->face2tile);
1426 Safefree (self->tex); 1730 Safefree (self->tex);
1427 Safefree (self); 1731 Safefree (self);
1428} 1732}
1429 1733
1430void 1734void
1431resize (CFPlus::Map self, int map_width, int map_height) 1735resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1736 CODE:
1433 self->w = map_width; 1737 self->w = map_width;
1434 self->h = map_height; 1738 self->h = map_height;
1435 1739
1436void 1740void
1437clear (CFPlus::Map self) 1741clear (DC::Map self)
1438 CODE: 1742 CODE:
1439 map_clear (self); 1743 map_clear (self);
1440 1744
1441void 1745void
1442set_tileid (CFPlus::Map self, int face, int tile) 1746set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1747 CODE:
1444{ 1748{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1749 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1750 need_texid (self, tile);
1447} 1751}
1448 1752
1449void 1753void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1754set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1755 CODE:
1452{ 1756{
1453 tileid texid; 1757 tileid texid;
1454 maptex *tex; 1758 maptex *tex;
1455 1759
1468 tex->smoothtile = self->face2tile [smooth]; 1772 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1773 tex->smoothlevel = level;
1470} 1774}
1471 1775
1472void 1776void
1473set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1777set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1474 CODE: 1778 CODE:
1475{ 1779{
1476 need_texid (self, texid); 1780 need_texid (self, texid);
1477 1781
1478 { 1782 {
1497 // use uglier nearest interpolation because linear suffers 1801 // use uglier nearest interpolation because linear suffers
1498 // from transparent color bleeding and ugly wrapping effects. 1802 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1803 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1804}
1501 1805
1806void
1807expire_textures (DC::Map self, int texid, int count)
1808 PPCODE:
1809 for (; texid < self->texs && count; ++texid, --count)
1810 {
1811 maptex *tex = self->tex + texid;
1812
1813 if (tex->name)
1814 {
1815 if (tex->unused)
1816 {
1817 tex->name = 0;
1818 tex->unused = 0;
1819 XPUSHs (sv_2mortal (newSViv (texid)));
1820 }
1821 else
1822 tex->unused = 1;
1823 }
1824 }
1825
1502int 1826int
1503ox (CFPlus::Map self) 1827ox (DC::Map self)
1504 ALIAS: 1828 ALIAS:
1505 oy = 1 1829 oy = 1
1506 x = 2 1830 x = 2
1507 y = 3 1831 y = 3
1508 w = 4 1832 w = 4
1519 } 1843 }
1520 OUTPUT: 1844 OUTPUT:
1521 RETVAL 1845 RETVAL
1522 1846
1523void 1847void
1524scroll (CFPlus::Map self, int dx, int dy) 1848scroll (DC::Map self, int dx, int dy)
1525 CODE: 1849 CODE:
1526{ 1850{
1527 if (dx > 0) 1851 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1852 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1853 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 1868 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1869 self->y += MAP_EXTEND_Y;
1546 } 1870 }
1547} 1871}
1548 1872
1549void 1873SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1874map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1875 CODE:
1552{ 1876{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1877 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1878 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1879 mapcell *cell;
1556 int x, y, flags; 1880 int x, y, z, flags;
1881 AV *missing = newAV ();
1882 RETVAL = newRV_noinc ((SV *)missing);
1557 1883
1558 while (data < data_end - 1) 1884 while (data < data_end - 1)
1559 { 1885 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1886 flags = (data [0] << 8) + data [1]; data += 2;
1561 1887
1581 uint8_t ext, cmd; 1907 uint8_t ext, cmd;
1582 1908
1583 do 1909 do
1584 { 1910 {
1585 ext = *data++; 1911 ext = *data++;
1586 cmd = ext & 0x3f; 1912 cmd = ext & 0x7f;
1587 1913
1588 if (cmd < 4) 1914 if (cmd < 4)
1589 cell->darkness = 255 - ext * 64 + 1; 1915 cell->darkness = 255 - ext * 64 + 1;
1590 else if (cmd == 5) // health 1916 else if (cmd == 5) // health
1591 { 1917 {
1594 } 1920 }
1595 else if (cmd == 6) // monster width 1921 else if (cmd == 6) // monster width
1596 cell->stat_width = *data++ + 1; 1922 cell->stat_width = *data++ + 1;
1597 else if (cmd == 0x47) 1923 else if (cmd == 0x47)
1598 { 1924 {
1599 if (*data == 4) 1925 if (*data == 1) cell->player = data [1];
1600 ; // decode player count 1926 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1927 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1928 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1601 1929
1602 data += *data + 1; 1930 data += *data + 1;
1603 } 1931 }
1604 else if (cmd == 8) // cell flags 1932 else if (cmd == 8) // cell flags
1605 cell->flags = *data++; 1933 cell->flags = *data++;
1612 } 1940 }
1613 else 1941 else
1614 cell->darkness = *data++ + 1; 1942 cell->darkness = *data++ + 1;
1615 } 1943 }
1616 1944
1945 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 1946 if (flags & (4 >> z))
1618 { 1947 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 1948 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 1949 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 1950 cell->tile [z] = self->face2tile [face];
1951
1952 if (cell->tile [z])
1953 {
1954 maptex *tex = self->tex + cell->tile [z];
1955 tex->unused = 0;
1956 if (!tex->name)
1957 av_push (missing, newSViv (cell->tile [z]));
1958
1959 if (tex->smoothtile)
1960 {
1961 maptex *smooth = self->tex + tex->smoothtile;
1962 smooth->unused = 0;
1963 if (!smooth->name)
1964 av_push (missing, newSViv (tex->smoothtile));
1965 }
1966 }
1622 } 1967 }
1623
1624 if (flags & 2)
1625 {
1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [1] = self->face2tile [face];
1629 }
1630
1631 if (flags & 1)
1632 {
1633 faceid face = (data [0] << 8) + data [1]; data += 2;
1634 need_facenum (self, face);
1635 cell->tile [2] = self->face2tile [face];
1636 }
1637 } 1968 }
1638 else 1969 else
1639 cell->darkness = 0; 1970 CELL_CLEAR (cell);
1640 } 1971 }
1641} 1972}
1973 OUTPUT:
1974 RETVAL
1642 1975
1643SV * 1976SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1977mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 1978 CODE:
1646{ 1979{
1647 int x1, x; 1980 int x1, x;
1648 int y1, y; 1981 int y1, y;
1649 int z; 1982 int z;
1694} 2027}
1695 OUTPUT: 2028 OUTPUT:
1696 RETVAL 2029 RETVAL
1697 2030
1698void 2031void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2032draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1700 CODE: 2033 CODE:
1701{ 2034{
2035 int x, y, z;
2036
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2037 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2038 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1704 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2039 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705 smooth_key skey; 2040 smooth_key skey;
1706 int x, y, z; 2041 int pl_x, pl_y;
1707 int last_name; 2042 maptex pl_tex;
2043 rc_t *rc = rc_alloc ();
2044 rc_t *rc_ov = rc_alloc ();
2045 rc_key_t key;
2046 rc_array_t *arr, *arr_hidden;
1708 2047
2048 pl_tex.name = 0;
2049
1709 // thats current max. sorry. 2050 // that's current max. sorry.
1710 if (sw > 255) sw = 255; 2051 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 2052 if (sh > 255) sh = 255;
1712 2053
1713 // clear key, in case of extra padding 2054 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 2055 memset (&skey, 0, sizeof (skey));
1715 2056
1716 glColor4ub (255, 255, 255, 255); 2057 memset (&key, 0, sizeof (key));
1717 2058 key.r = 255;
1718 glEnable (GL_BLEND); 2059 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2060 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 2061 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2062 key.mode = GL_QUADS;
1722 2063 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS);
1724
1725 last_name = 0;
1726 2064
1727 mx += self->x; 2065 mx += self->x;
1728 my += self->y; 2066 my += self->y;
1729 2067
1730 // first pass: determine smooth_max 2068 // first pass: determine smooth_max
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 2085 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 2086 self->tex [cell->tile [2]].smoothlevel));
1749 } 2087 }
1750 } 2088 }
1751 2089
2090 glEnable (GL_BLEND);
2091 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2093
2094 key.texname = self->tex [TEXID_HIDDEN].name;
2095 arr_hidden = rc_array (rc_ov, &key);
2096
1752 for (z = 0; z <= 2; z++) 2097 for (z = 0; z <= 2; z++)
1753 { 2098 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 2099 memset (smooth_level, 0, sizeof (smooth_level));
2100 key.texname = -1;
1755 2101
1756 for (y = 0; y < sh; y++) 2102 for (y = 0; y < sh; y++)
1757 if (0 <= y + my && y + my < self->rows) 2103 if (0 <= y + my && y + my < self->rows)
1758 { 2104 {
1759 maprow *row = self->row + (y + my); 2105 maprow *row = self->row + (y + my);
1765 tileid tile = cell->tile [z]; 2111 tileid tile = cell->tile [z];
1766 2112
1767 if (tile) 2113 if (tile)
1768 { 2114 {
1769 maptex tex = self->tex [tile]; 2115 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 2116 int px, py;
1771 int py = (y + 1) * T - tex.h;
1772 2117
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 2118 if (key.texname != tex.name)
1776 { 2119 {
2120 self->tex [tile].unused = 0;
2121
1777 if (!tex.name) 2122 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 2123 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1779 2124
1780 glEnd (); 2125 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2126 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 2127 }
1784 2128
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2129 px = (x + 1) * T - tex.w;
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2130 py = (y + 1) * T - tex.h;
1787 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1788 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1789 2131
1790 if (cell->flags && z == 2) 2132 if (expect_false (cell->player == player) && expect_false (z == 2))
1791 { 2133 {
1792 if (cell->flags & 1) 2134 pl_x = px;
2135 pl_y = py;
2136 pl_tex = tex;
1793 { 2137 continue;
1794 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32;
1797
1798 glEnd ();
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1800 glBegin (GL_QUADS);
1801
1802 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1803 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1804 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1805 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1806 }
1807 } 2138 }
2139
2140 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2141 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2142 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2143 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1808 2144
1809 // update smooth hash 2145 // update smooth hash
1810 if (tex.smoothtile) 2146 if (tex.smoothtile)
1811 { 2147 {
1812 skey.tile = tex.smoothtile; 2148 skey.tile = tex.smoothtile;
1843 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2179 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1844 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2180 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1845 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2181 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1846 } 2182 }
1847 } 2183 }
2184
2185 if (expect_false (z == 2))
2186 {
2187 /* draw question marks on top of hidden spaces */
2188 if (!cell->darkness)
2189 {
2190 maptex tex = self->tex [TEXID_HIDDEN];
2191 int px = (x + 1) * T - tex.w;
2192 int py = (y + 1) * T - tex.h;
2193
2194 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2195 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2196 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2197 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2198 }
2199
2200 if (expect_false (cell->flags))
2201 {
2202 // overlays such as the speech bubble, probably more to come
2203 if (cell->flags & 1)
2204 {
2205 rc_key_t key_ov = key;
2206 maptex tex = self->tex [TEXID_SPEECH];
2207 rc_array_t *arr;
2208 int px = x * T + T * 2 / 32;
2209 int py = y * T - T * 6 / 32;
2210
2211 key_ov.texname = tex.name;
2212 arr = rc_array (rc_ov, &key_ov);
2213
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2218 }
2219 }
2220 }
1848 } 2221 }
1849 } 2222 }
2223
2224 rc_draw (rc);
2225 rc_clear (rc);
1850 2226
1851 // go through all smoothlevels, lowest to highest, then draw. 2227 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 2228 // this is basically counting sort
1853 { 2229 {
1854 int w, b; 2230 int w, b;
1855 2231
2232 glEnable (GL_TEXTURE_2D);
2233 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 2234 for (w = 0; w < 256 / 32; ++w)
1857 { 2235 {
1858 uint32_t smask = smooth_level [w]; 2236 uint32_t smask = smooth_level [w];
1859 if (smask) 2237 if (smask)
1860 for (b = 0; b < 32; ++b) 2238 for (b = 0; b < 32; ++b)
1879 int border = bits & 15; 2257 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2258 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 2259 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 2260 float dy = tex.t * .5f ; // 2 images/column
1883 2261
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 2262 if (tex.name)
1887 { 2263 {
2264 // this time avoiding texture state changes
2265 // save gobs of state changes.
1888 if (!tex.name) 2266 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 2267 {
2268 self->tex [skey->tile].unused = 0;
1890 2269
1891 glEnd (); 2270 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2271 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2272 glBegin (GL_QUADS);
1894 } 2273 }
1895 2274
1896 if (border) 2275 if (border)
1897 { 2276 {
1898 float ox = border * dx; 2277 float ox = border * dx;
1899 2278
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2279 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2280 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2281 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2282 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2283 }
1905 2284
1906 if (corner) 2285 if (corner)
1907 { 2286 {
1908 float ox = corner * dx; 2287 float ox = corner * dx;
1909 2288
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2289 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2290 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2291 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2292 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2293 }
1914 } 2294 }
1915 } 2295 }
1916 } 2296 }
1917 } 2297 }
1918 } 2298 }
2299
2300 glEnd ();
2301 glDisable (GL_TEXTURE_2D);
2302 key.texname = -1;
1919 } 2303 }
1920 2304
1921 hv_clear (smooth); 2305 hv_clear (smooth);
1922 } 2306 }
1923 2307
1924 glEnd (); 2308 if (pl_tex.name)
2309 {
2310 maptex tex = pl_tex;
2311 int px = pl_x + sdx;
2312 int py = pl_y + sdy;
1925 2313
1926 glDisable (GL_TEXTURE_2D); 2314 key.texname = tex.name;
2315 arr = rc_array (rc, &key);
2316
2317 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2318 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2319 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2320 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2321
2322 rc_draw (rc);
2323 }
2324
2325 rc_draw (rc_ov);
2326 rc_clear (rc_ov);
2327
1927 glDisable (GL_BLEND); 2328 glDisable (GL_BLEND);
2329 rc_free (rc);
2330 rc_free (rc_ov);
1928 2331
1929 // top layer: overlays such as the health bar 2332 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2333 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2334 if (0 <= y + my && y + my < self->rows)
1932 { 2335 {
1937 { 2340 {
1938 mapcell *cell = row->col + (x + mx - row->c0); 2341 mapcell *cell = row->col + (x + mx - row->c0);
1939 2342
1940 int px = x * T; 2343 int px = x * T;
1941 int py = y * T; 2344 int py = y * T;
2345
2346 if (expect_false (cell->player == player))
2347 {
2348 px += sdx;
2349 py += sdy;
2350 }
1942 2351
1943 if (cell->stat_hp) 2352 if (cell->stat_hp)
1944 { 2353 {
1945 int width = cell->stat_width * T; 2354 int width = cell->stat_width * T;
1946 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1957 } 2366 }
1958 } 2367 }
1959} 2368}
1960 2369
1961void 2370void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2371draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1963 CODE: 2372 CODE:
1964{ 2373{
1965 static float color[16][3] = { 2374 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2375 { 0.00F, 0.00F, 0.00F },
1967 { 1.00F, 1.00F, 1.00F }, 2376 { 1.00F, 1.00F, 1.00F },
1986 }; 2395 };
1987 2396
1988 int x, y; 2397 int x, y;
1989 2398
1990 glEnable (GL_TEXTURE_2D); 2399 glEnable (GL_TEXTURE_2D);
2400 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2401 * but the nvidia driver (185.18.14) mishandles alpha textures
2402 * ansd takes the colour from god knows where instead of using
2403 * Cp. MODULATE results in the same colour, but slightly different
2404 * alpha, but atcually gives us the correct colour with nvidia.
2405 */
1991 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1992 glEnable (GL_BLEND); 2407 glEnable (GL_BLEND);
1993 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2408 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1994 glBegin (GL_QUADS); 2409 glBegin (GL_QUADS);
1995 2410
1996 for (y = 0; y < h; y++) 2411 for (y = 0; y < h; y++)
2003 float *c = color [m & 15]; 2418 float *c = color [m & 15];
2004 2419
2005 float tx1 = m & 0x40 ? 0.5 : 0.; 2420 float tx1 = m & 0x40 ? 0.5 : 0.;
2006 float tx2 = tx1 + 0.5; 2421 float tx2 = tx1 + 0.5;
2007 2422
2008 glColor4f (c[0], c[1], c[2], 0.75); 2423 glColor4f (c[0], c[1], c[2], 1);
2009 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2010 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2011 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2012 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2427 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2013 } 2428 }
2017 glDisable (GL_BLEND); 2432 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2433 glDisable (GL_TEXTURE_2D);
2019} 2434}
2020 2435
2021void 2436void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2437fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2438 PPCODE:
2024{ 2439{
2025 int x, y; 2440 int x, y;
2026 int sw1 = sw + 2; 2441 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2442 int sh1 = sh + 2;
2035 SvCUR_set (darkness3_sv, sw34 * sh3); 2450 SvCUR_set (darkness3_sv, sw34 * sh3);
2036 2451
2037 mx += self->x - 1; 2452 mx += self->x - 1;
2038 my += self->y - 1; 2453 my += self->y - 1;
2039 2454
2040 memset (darkness1, 255, sw1 * sh1); 2455 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2041 2456
2042 for (y = 0; y < sh1; y++) 2457 for (y = 0; y < sh1; y++)
2043 if (0 <= y + my && y + my < self->rows) 2458 if (0 <= y + my && y + my < self->rows)
2044 { 2459 {
2045 maprow *row = self->row + (y + my); 2460 maprow *row = self->row + (y + my);
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2513 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2514 PUSHs (darkness3_sv);
2100} 2515}
2101 2516
2102SV * 2517SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2518get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2519 CODE:
2105{ 2520{
2106 int x, y, x1, y1; 2521 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2522 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2523 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2165 else 2580 else
2166 *data++ = 0; 2581 *data++ = 0;
2167 } 2582 }
2168 } 2583 }
2169 2584
2585 /* if size is w*h + 5 then no data has been found */
2586 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2587 {
2170 SvPOK_only (data_sv); 2588 SvPOK_only (data_sv);
2171 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2589 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2590 }
2591
2172 RETVAL = data_sv; 2592 RETVAL = data_sv;
2173} 2593}
2174 OUTPUT: 2594 OUTPUT:
2175 RETVAL 2595 RETVAL
2176 2596
2177void 2597void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2598set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2179 PPCODE: 2599 PPCODE:
2180{ 2600{
2181 int x, y, z; 2601 int x, y, z;
2182 int w, h; 2602 int w, h;
2183 int x1, y1; 2603 int x1, y1;
2604 STRLEN len;
2605 uint8_t *data, *end;
2606
2607 len = SvLEN (data_sv);
2608 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2609 data = SvPVbyte_nolen (data_sv);
2610 end = data + len + 8;
2611
2612 if (len < 5)
2613 XSRETURN_EMPTY;
2184 2614
2185 if (*data++ != 0) 2615 if (*data++ != 0)
2186 return; /* version mismatch */ 2616 XSRETURN_EMPTY; /* version mismatch */
2187 2617
2188 w = *data++ << 8; w |= *data++; 2618 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2619 h = *data++ << 8; h |= *data++;
2190 2620
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2621 // we need to do this 'cause we don't keep an absolute coord system for rows
2203 { 2633 {
2204 maprow *row = map_get_row (self, y); 2634 maprow *row = map_get_row (self, y);
2205 2635
2206 for (x = x0; x < x1; x++) 2636 for (x = x0; x < x1; x++)
2207 { 2637 {
2638 uint8_t flags;
2639
2640 if (data + 7 >= end)
2641 XSRETURN_EMPTY;
2642
2208 uint8_t flags = *data++; 2643 flags = *data++;
2209 2644
2210 if (flags) 2645 if (flags)
2211 { 2646 {
2212 mapcell *cell = row_get_cell (row, x); 2647 mapcell *cell = row_get_cell (row, x);
2213 tileid tile[3] = { 0, 0, 0 }; 2648 tileid tile[3] = { 0, 0, 0 };
2216 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2651 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2217 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2652 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2218 2653
2219 if (cell->darkness == 0) 2654 if (cell->darkness == 0)
2220 { 2655 {
2221 cell->darkness = 0; 2656 /*cell->darkness = 0;*/
2657 EXTEND (SP, 3);
2222 2658
2223 for (z = 0; z <= 2; z++) 2659 for (z = 0; z <= 2; z++)
2224 { 2660 {
2225 tileid t = tile [z]; 2661 tileid t = tile [z];
2226 2662
2227 if (t >= self->texs || (t && !self->tex [t].name)) 2663 if (t >= self->texs || (t && !self->tex [t].name))
2228 { 2664 {
2229 XPUSHs (sv_2mortal (newSViv (t))); 2665 PUSHs (sv_2mortal (newSViv (t)));
2230 need_texid (self, t); 2666 need_texid (self, t);
2231 } 2667 }
2232 2668
2233 cell->tile [z] = t; 2669 cell->tile [z] = t;
2234 } 2670 }
2236 } 2672 }
2237 } 2673 }
2238 } 2674 }
2239} 2675}
2240 2676
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2677MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2678
2243CFPlus::RW 2679DC::RW
2244new (SV *class, SV *data_sv) 2680new (SV *class, SV *data_sv)
2245 CODE: 2681 CODE:
2246{ 2682{
2247 STRLEN datalen; 2683 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2684 char *data = SvPVbyte (data_sv, datalen);
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2686 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2687}
2252 OUTPUT: 2688 OUTPUT:
2253 RETVAL 2689 RETVAL
2254 2690
2255CFPlus::RW 2691DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2692new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2693 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2694 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2695 OUTPUT:
2260 RETVAL 2696 RETVAL
2261 2697
2698# fails on win32:
2699# dc.xs(2268) : error C2059: syntax error : '('
2262void 2700#void
2263close (CFPlus::RW self) 2701#close (DC::RW self)
2264 CODE: 2702# CODE:
2265 SDL_RWclose (self); 2703# (self->(close)) (self);
2266 2704
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2705MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2706
2269PROTOTYPES: DISABLE 2707PROTOTYPES: DISABLE
2270 2708
2271void 2709DC::Channel
2272halt (CFPlus::Channel self) 2710find ()
2273 CODE: 2711 CODE:
2712{
2713 RETVAL = Mix_GroupAvailable (-1);
2714
2715 if (RETVAL < 0)
2716 {
2717 RETVAL = Mix_GroupOldest (-1);
2718
2719 if (RETVAL < 0)
2720 XSRETURN_UNDEF;
2721
2274 Mix_HaltChannel (self); 2722 Mix_HaltChannel (RETVAL);
2723 }
2275 2724
2276void 2725 Mix_UnregisterAllEffects (RETVAL);
2277expire (CFPlus::Channel self, int ticks = -1) 2726 Mix_Volume (RETVAL, 128);
2278 CODE: 2727}
2279 Mix_ExpireChannel (self, ticks);
2280
2281void
2282fade_out (CFPlus::Channel self, int ticks = -1)
2283 CODE:
2284 Mix_FadeOutChannel (self, ticks);
2285
2286int
2287volume (CFPlus::Channel self, int volume)
2288 CODE:
2289 RETVAL = Mix_Volume (self, volume);
2290 OUTPUT: 2728 OUTPUT:
2291 RETVAL 2729 RETVAL
2292 2730
2293void 2731void
2732halt (DC::Channel self)
2733 CODE:
2734 Mix_HaltChannel (self);
2735
2736void
2737expire (DC::Channel self, int ticks = -1)
2738 CODE:
2739 Mix_ExpireChannel (self, ticks);
2740
2741void
2742fade_out (DC::Channel self, int ticks = -1)
2743 CODE:
2744 Mix_FadeOutChannel (self, ticks);
2745
2746int
2747volume (DC::Channel self, int volume)
2748 CODE:
2749 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2750 OUTPUT:
2751 RETVAL
2752
2753void
2294unregister_all_effects (CFPlus::Channel self) 2754unregister_all_effects (DC::Channel self)
2295 CODE: 2755 CODE:
2296 Mix_UnregisterAllEffects (self); 2756 Mix_UnregisterAllEffects (self);
2297 2757
2298void 2758void
2299set_panning (CFPlus::Channel self, int left, int right) 2759set_panning (DC::Channel self, int left, int right)
2300 CODE: 2760 CODE:
2761 left = CLAMP (left , 0, 255);
2762 right = CLAMP (right, 0, 255);
2301 Mix_SetPanning (self, left, right); 2763 Mix_SetPanning (self, left, right);
2302 2764
2303void 2765void
2304set_distance (CFPlus::Channel self, int distance) 2766set_distance (DC::Channel self, int distance)
2305 CODE: 2767 CODE:
2306 Mix_SetDistance (self, distance); 2768 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2307 2769
2308void 2770void
2309set_position (CFPlus::Channel self, int angle, int distance) 2771set_position (DC::Channel self, int angle, int distance)
2310 CODE: 2772 CODE:
2773
2774void
2775set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2776 CODE:
2777{
2778 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2779 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2311 Mix_SetPosition (self, angle, distance); 2780 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2781}
2312 2782
2313void 2783void
2314set_reverse_stereo (CFPlus::Channel self, int flip) 2784set_reverse_stereo (DC::Channel self, int flip)
2315 CODE: 2785 CODE:
2316 Mix_SetReverseStereo (self, flip); 2786 Mix_SetReverseStereo (self, flip);
2317 2787
2318MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2788MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2319 2789
2320PROTOTYPES: DISABLE 2790PROTOTYPES: DISABLE
2321 2791
2322CFPlus::MixChunk 2792DC::MixChunk
2323new (SV *class, CFPlus::RW rwops) 2793new (SV *class, DC::RW rwops)
2324 CODE: 2794 CODE:
2325 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2795 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2326 OUTPUT: 2796 OUTPUT:
2327 RETVAL 2797 RETVAL
2328 2798
2329void 2799void
2330DESTROY (CFPlus::MixChunk self) 2800DESTROY (DC::MixChunk self)
2331 CODE: 2801 CODE:
2332 Mix_FreeChunk (self); 2802 Mix_FreeChunk (self);
2333 2803
2334int 2804int
2335volume (CFPlus::MixChunk self, int volume = -1) 2805volume (DC::MixChunk self, int volume = -1)
2336 CODE: 2806 CODE:
2807 if (items > 1)
2808 volume = CLAMP (volume, 0, 128);
2337 RETVAL = Mix_VolumeChunk (self, volume); 2809 RETVAL = Mix_VolumeChunk (self, volume);
2338 OUTPUT: 2810 OUTPUT:
2339 RETVAL 2811 RETVAL
2340 2812
2341CFPlus::Channel 2813DC::Channel
2342play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2814play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2343 CODE: 2815 CODE:
2816{
2344 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2817 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2818
2819 if (RETVAL < 0)
2820 XSRETURN_UNDEF;
2821
2822 if (channel < 0)
2823 {
2345 Mix_UnregisterAllEffects (RETVAL); 2824 Mix_UnregisterAllEffects (RETVAL);
2825 Mix_Volume (RETVAL, 128);
2826 }
2827}
2346 OUTPUT: 2828 OUTPUT:
2347 RETVAL 2829 RETVAL
2348 2830
2349MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2831MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2350 2832
2351int 2833int
2352volume (int volume = -1) 2834volume (int volume = -1)
2353 PROTOTYPE: ;$ 2835 PROTOTYPE: ;$
2354 CODE: 2836 CODE:
2837 if (items > 0)
2838 volume = CLAMP (volume, 0, 128);
2355 RETVAL = Mix_VolumeMusic (volume); 2839 RETVAL = Mix_VolumeMusic (volume);
2356 OUTPUT: 2840 OUTPUT:
2357 RETVAL 2841 RETVAL
2358 2842
2359void 2843void
2364void 2848void
2365halt () 2849halt ()
2366 CODE: 2850 CODE:
2367 Mix_HaltMusic (); 2851 Mix_HaltMusic ();
2368 2852
2369CFPlus::MixMusic 2853DC::MixMusic
2370new (SV *class, CFPlus::RW rwops) 2854new (SV *class, DC::RW rwops)
2371 CODE: 2855 CODE:
2372 RETVAL = Mix_LoadMUS_RW (rwops); 2856 RETVAL = Mix_LoadMUS_RW (rwops);
2373 OUTPUT: 2857 OUTPUT:
2374 RETVAL 2858 RETVAL
2375 2859
2376void 2860void
2377DESTROY (CFPlus::MixMusic self) 2861DESTROY (DC::MixMusic self)
2378 CODE: 2862 CODE:
2379 Mix_FreeMusic (self); 2863 Mix_FreeMusic (self);
2380 2864
2381int 2865int
2382play (CFPlus::MixMusic self, int loops = -1) 2866play (DC::MixMusic self, int loops = -1)
2383 CODE: 2867 CODE:
2384 RETVAL = Mix_PlayMusic (self, loops); 2868 RETVAL = Mix_PlayMusic (self, loops);
2385 OUTPUT: 2869 OUTPUT:
2386 RETVAL 2870 RETVAL
2387 2871
2388void 2872void
2389fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2873fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2390 CODE: 2874 CODE:
2391 Mix_FadeInMusicPos (self, loops, ms, position); 2875 Mix_FadeInMusicPos (self, loops, ms, position);
2392 2876
2393MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2877MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2394 2878
2395PROTOTYPES: ENABLE 2879PROTOTYPES: ENABLE
2396 2880
2397BOOT: 2881BOOT:
2398{ 2882{
2399 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2883 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2400 static const struct { 2884 static const struct {
2401 const char *name; 2885 const char *name;
2402 IV iv; 2886 IV iv;
2403 } *civ, const_iv[] = { 2887 } *civ, const_iv[] = {
2404# define const_iv(name) { # name, (IV)name } 2888# define const_iv(name) { # name, (IV)name }
2405 const_iv (GL_VENDOR), 2889 const_iv (GL_VENDOR),
2406 const_iv (GL_VERSION), 2890 const_iv (GL_VERSION),
2407 const_iv (GL_EXTENSIONS), 2891 const_iv (GL_EXTENSIONS),
2892 const_iv (GL_MAX_TEXTURE_UNITS),
2408 const_iv (GL_COLOR_MATERIAL), 2893 const_iv (GL_COLOR_MATERIAL),
2409 const_iv (GL_SMOOTH), 2894 const_iv (GL_SMOOTH),
2410 const_iv (GL_FLAT), 2895 const_iv (GL_FLAT),
2411 const_iv (GL_DITHER), 2896 const_iv (GL_DITHER),
2412 const_iv (GL_BLEND), 2897 const_iv (GL_BLEND),
2424 const_iv (GL_ZERO), 2909 const_iv (GL_ZERO),
2425 const_iv (GL_SRC_ALPHA), 2910 const_iv (GL_SRC_ALPHA),
2426 const_iv (GL_DST_ALPHA), 2911 const_iv (GL_DST_ALPHA),
2427 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2912 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2428 const_iv (GL_ONE_MINUS_DST_ALPHA), 2913 const_iv (GL_ONE_MINUS_DST_ALPHA),
2914 const_iv (GL_SRC_COLOR),
2915 const_iv (GL_DST_COLOR),
2916 const_iv (GL_ONE_MINUS_SRC_COLOR),
2917 const_iv (GL_ONE_MINUS_DST_COLOR),
2429 const_iv (GL_SRC_ALPHA_SATURATE), 2918 const_iv (GL_SRC_ALPHA_SATURATE),
2430 const_iv (GL_RGB), 2919 const_iv (GL_RGB),
2431 const_iv (GL_RGBA), 2920 const_iv (GL_RGBA),
2432 const_iv (GL_RGBA4), 2921 const_iv (GL_RGBA4),
2433 const_iv (GL_RGBA8), 2922 const_iv (GL_RGBA8),
2439 const_iv (GL_INTENSITY), 2928 const_iv (GL_INTENSITY),
2440 const_iv (GL_LUMINANCE), 2929 const_iv (GL_LUMINANCE),
2441 const_iv (GL_LUMINANCE_ALPHA), 2930 const_iv (GL_LUMINANCE_ALPHA),
2442 const_iv (GL_FLOAT), 2931 const_iv (GL_FLOAT),
2443 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2932 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2933 const_iv (GL_COMPRESSED_ALPHA_ARB),
2934 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2935 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2936 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2937 const_iv (GL_COMPRESSED_RGB_ARB),
2938 const_iv (GL_COMPRESSED_RGBA_ARB),
2444 const_iv (GL_COMPILE), 2939 const_iv (GL_COMPILE),
2445 const_iv (GL_PROXY_TEXTURE_1D), 2940 const_iv (GL_PROXY_TEXTURE_1D),
2446 const_iv (GL_PROXY_TEXTURE_2D), 2941 const_iv (GL_PROXY_TEXTURE_2D),
2447 const_iv (GL_TEXTURE_1D), 2942 const_iv (GL_TEXTURE_1D),
2448 const_iv (GL_TEXTURE_2D), 2943 const_iv (GL_TEXTURE_2D),
2487 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2982 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2488 const_iv (GL_POINT_SMOOTH_HINT), 2983 const_iv (GL_POINT_SMOOTH_HINT),
2489 const_iv (GL_LINE_SMOOTH_HINT), 2984 const_iv (GL_LINE_SMOOTH_HINT),
2490 const_iv (GL_POLYGON_SMOOTH_HINT), 2985 const_iv (GL_POLYGON_SMOOTH_HINT),
2491 const_iv (GL_GENERATE_MIPMAP_HINT), 2986 const_iv (GL_GENERATE_MIPMAP_HINT),
2987 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2492 const_iv (GL_FASTEST), 2988 const_iv (GL_FASTEST),
2493 const_iv (GL_DONT_CARE), 2989 const_iv (GL_DONT_CARE),
2494 const_iv (GL_NICEST), 2990 const_iv (GL_NICEST),
2495 const_iv (GL_V2F), 2991 const_iv (GL_V2F),
2496 const_iv (GL_V3F), 2992 const_iv (GL_V3F),
2497 const_iv (GL_T2F_V3F), 2993 const_iv (GL_T2F_V3F),
2498 const_iv (GL_T2F_N3F_V3F), 2994 const_iv (GL_T2F_N3F_V3F),
2995 const_iv (GL_FUNC_ADD),
2996 const_iv (GL_FUNC_SUBTRACT),
2997 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2499# undef const_iv 2998# undef const_iv
2500 }; 2999 };
2501 3000
2502 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3001 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2503 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2504 3003
2505 texture_av = newAV (); 3004 texture_av = newAV ();
2506 AvREAL_off (texture_av); 3005 AvREAL_off (texture_av);
2507} 3006}
2508 3007
3008void
3009disable_GL_EXT_blend_func_separate ()
3010 CODE:
3011 gl.BlendFuncSeparate = 0;
3012 gl.BlendFuncSeparateEXT = 0;
3013
3014void
3015apple_nvidia_bug (int enable)
3016
2509char * 3017char *
2510gl_vendor () 3018gl_vendor ()
2511 CODE: 3019 CODE:
2512 RETVAL = (char *)glGetString (GL_VENDOR); 3020 RETVAL = (char *)glGetString (GL_VENDOR);
2513 OUTPUT: 3021 OUTPUT:
2562 3070
2563void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3071void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2564 CODE: 3072 CODE:
2565 gl_BlendFuncSeparate (sa, da, saa, daa); 3073 gl_BlendFuncSeparate (sa, da, saa, daa);
2566 3074
3075# void glBlendEquation (int se)
3076
2567void glDepthMask (int flag) 3077void glDepthMask (int flag)
2568 3078
2569void glLogicOp (int opcode) 3079void glLogicOp (int opcode)
2570 3080
2571void glColorMask (int red, int green, int blue, int alpha) 3081void glColorMask (int red, int green, int blue, int alpha)
2605void glRotate (float angle, float x, float y, float z) 3115void glRotate (float angle, float x, float y, float z)
2606 CODE: 3116 CODE:
2607 glRotatef (angle, x, y, z); 3117 glRotatef (angle, x, y, z);
2608 3118
2609void glColor (float r, float g, float b, float a = 1.0) 3119void glColor (float r, float g, float b, float a = 1.0)
3120 PROTOTYPE: @
2610 ALIAS: 3121 ALIAS:
2611 glColor_premultiply = 1 3122 glColor_premultiply = 1
2612 CODE: 3123 CODE:
2613 if (ix) 3124 if (ix)
2614 { 3125 {
2634 3145
2635void glRect (float x1, float y1, float x2, float y2) 3146void glRect (float x1, float y1, float x2, float y2)
2636 CODE: 3147 CODE:
2637 glRectf (x1, y1, x2, y2); 3148 glRectf (x1, y1, x2, y2);
2638 3149
3150void glRect_lineloop (float x1, float y1, float x2, float y2)
3151 CODE:
3152 glBegin (GL_LINE_LOOP);
3153 glVertex2f (x1, y1);
3154 glVertex2f (x2, y1);
3155 glVertex2f (x2, y2);
3156 glVertex2f (x1, y2);
3157 glEnd ();
3158
2639PROTOTYPES: ENABLE 3159PROTOTYPES: ENABLE
2640 3160
2641void glBegin (int mode) 3161void glBegin (int mode)
2642 3162
2643void glEnd () 3163void glEnd ()
2675void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3195void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2676 CODE: 3196 CODE:
2677 if (gl.SeparableFilter2D) 3197 if (gl.SeparableFilter2D)
2678 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3198 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2679 3199
2680void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3200void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2681 3201
2682void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3202void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2683 3203
2684void glDrawPixels (int width, int height, int format, int type, char *pixels) 3204void glDrawPixels (int width, int height, int format, int type, char *pixels)
2685 3205
2711 3231
2712void glEndList () 3232void glEndList ()
2713 3233
2714void glCallList (int list) 3234void glCallList (int list)
2715 3235
2716MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3236MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2717 3237
2718PROTOTYPES: DISABLE 3238PROTOTYPES: DISABLE
2719 3239
2720void 3240void
2721find_widget (SV *self, NV x, NV y) 3241find_widget (SV *self, NV x, NV y)
2725 XPUSHs (self); 3245 XPUSHs (self);
2726} 3246}
2727 3247
2728BOOT: 3248BOOT:
2729{ 3249{
2730 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3250 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2731 3251
2732 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3252 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2733 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3253 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2734 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3254 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2735 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3255 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2736} 3256}
2737 3257
2738void 3258void
2739draw (SV *self) 3259draw (SV *self)
2740 CODE: 3260 CODE:
2744 NV x, y, w, h; 3264 NV x, y, w, h;
2745 SV *draw_x_sv = GvSV (draw_x_gv); 3265 SV *draw_x_sv = GvSV (draw_x_gv);
2746 SV *draw_y_sv = GvSV (draw_y_gv); 3266 SV *draw_y_sv = GvSV (draw_y_gv);
2747 SV *draw_w_sv = GvSV (draw_w_gv); 3267 SV *draw_w_sv = GvSV (draw_w_gv);
2748 SV *draw_h_sv = GvSV (draw_h_gv); 3268 SV *draw_h_sv = GvSV (draw_h_gv);
2749 SV *hover;
2750 double draw_x, draw_y, draw_w, draw_h; 3269 double draw_x, draw_y;
2751 3270
2752 if (!SvROK (self)) 3271 if (!SvROK (self))
2753 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3272 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2754 3273
2755 hv = (HV *)SvRV (self); 3274 hv = (HV *)SvRV (self);
2756 3275
2757 if (SvTYPE (hv) != SVt_PVHV) 3276 if (SvTYPE (hv) != SVt_PVHV)
2758 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3277 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2759 3278
2760 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3279 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2761 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3280 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2762 3281
2763 if (!h || !w) 3282 if (!h || !w)
2783 { 3302 {
2784 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3303 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2785 3304
2786 if (svp && SvTRUE (*svp)) 3305 if (svp && SvTRUE (*svp))
2787 { 3306 {
2788 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3307 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2789 glEnable (GL_BLEND); 3308 glEnable (GL_BLEND);
2790 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3309 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2791 glBegin (GL_QUADS); 3310 glBegin (GL_QUADS);
2792 glVertex2f (0, 0); 3311 glVertex2f (0, 0);
2793 glVertex2f (w, 0); 3312 glVertex2f (w, 0);
2796 glEnd (); 3315 glEnd ();
2797 glDisable (GL_BLEND); 3316 glDisable (GL_BLEND);
2798 } 3317 }
2799 } 3318 }
2800#if 0 3319#if 0
2801 if ($ENV{CFPLUS_DEBUG} & 1) { 3320 // draw borders, for debugging
2802 glPushMatrix; 3321 glPushMatrix ();
2803 glColor 1, 1, 0, 1; 3322 glColor4f (1., 1., 0., 1.);
2804 glTranslate 0.375, 0.375; 3323 glTranslatef (.5, .5, 0.);
2805 glBegin GL_LINE_LOOP; 3324 glBegin (GL_LINE_LOOP);
2806 glVertex 0 , 0; 3325 glVertex2f (0 , 0);
2807 glVertex $self->{w} - 1, 0; 3326 glVertex2f (w - 1, 0);
2808 glVertex $self->{w} - 1, $self->{h} - 1; 3327 glVertex2f (w - 1, h - 1);
2809 glVertex 0 , $self->{h} - 1; 3328 glVertex2f (0 , h - 1);
2810 glEnd; 3329 glEnd ();
2811 glPopMatrix; 3330 glPopMatrix ();
2812 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2813 }
2814#endif 3331#endif
2815 PUSHMARK (SP); 3332 PUSHMARK (SP);
2816 XPUSHs (self); 3333 XPUSHs (self);
2817 PUTBACK; 3334 PUTBACK;
2818 call_method ("_draw", G_VOID | G_DISCARD); 3335 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines