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.227 by root, Mon Aug 13 14:15:09 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;
155 rc_t *rc; 183 rc_t *rc;
156} *CFPlus__Layout; 184} *DC__Layout;
157 185
158static CFPlus__Font default_font; 186static DC__Font default_font;
159static PangoContext *opengl_context; 187static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 188static PangoFontMap *opengl_fontmap;
161 189
162static void 190static void
163substitute_func (FcPattern *pattern, gpointer data) 191substitute_func (FcPattern *pattern, gpointer data)
168#endif 196#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 197 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 198}
171 199
172static void 200static void
173layout_update_font (CFPlus__Layout self) 201layout_update_font (DC__Layout self)
174{ 202{
175 /* 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
176 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
177 */ 205 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
179 207
180 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 210
183 pango_layout_set_font_description (self->pl, font); 211 pango_layout_set_font_description (self->pl, font);
184} 212}
185 213
186static void 214static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 215layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 216{
189 PangoRectangle rect; 217 PangoRectangle rect;
190 218
191 // get_pixel_* wrongly rounds down 219 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 220 pango_layout_get_extents (self->pl, 0, &rect);
203 231
204typedef uint16_t tileid; 232typedef uint16_t tileid;
205typedef uint16_t faceid; 233typedef uint16_t faceid;
206 234
207typedef struct { 235typedef struct {
208 int name; 236 GLuint name;
209 int w, h; 237 int w, h;
210 float s, t; 238 float s, t;
211 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
212 tileid smoothtile; 240 tileid smoothtile;
213 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
214} maptex; 243} maptex;
215 244
216typedef struct { 245typedef struct {
217 uint32_t player; 246 uint32_t player;
218 tileid tile[3]; 247 tileid tile[3];
231 int faces; tileid *face2tile; // [faceid] 260 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 261 int texs; maptex *tex; // [tileid]
233 262
234 int32_t rows; 263 int32_t rows;
235 maprow *row; 264 maprow *row;
236} *CFPlus__Map; 265} *DC__Map;
237 266
238static char * 267static char *
239prepend (char *ptr, int sze, int inc) 268prepend (char *ptr, int sze, int inc)
240{ 269{
241 char *p; 270 char *p;
279 self->texs *= 2; 308 self->texs *= 2;
280 } 309 }
281} 310}
282 311
283static maprow * 312static maprow *
284map_get_row (CFPlus__Map self, int y) 313map_get_row (DC__Map self, int y)
285{ 314{
286 if (0 > y) 315 if (0 > y)
287 { 316 {
288 int extend = - y + MAP_EXTEND_Y; 317 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 318 Prepend (maprow, self->row, self->rows, extend);
327 356
328 return row->col + (x - row->c0); 357 return row->col + (x - row->c0);
329} 358}
330 359
331static mapcell * 360static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 361map_get_cell (DC__Map self, int x, int y)
333{ 362{
334 return row_get_cell (map_get_row (self, y), x); 363 return row_get_cell (map_get_row (self, y), x);
335} 364}
336 365
337static void 366static void
338map_clear (CFPlus__Map self) 367map_clear (DC__Map self)
339{ 368{
340 int r; 369 int r;
341 370
342 for (r = 0; r < self->rows; r++) 371 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 372 Safefree (self->row[r].col);
350 self->oy = 0; 379 self->oy = 0;
351 self->row = 0; 380 self->row = 0;
352 self->rows = 0; 381 self->rows = 0;
353} 382}
354 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
355static void 394static void
356map_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)
357{ 396{
358 int x, y; 397 int x, y;
359 maprow *row; 398 maprow *row;
360 mapcell *cell; 399 mapcell *cell;
361 400
373 if (x >= row->c1) 412 if (x >= row->c1)
374 break; 413 break;
375 414
376 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
377 416
378 cell->darkness = 0; 417 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 418 }
383 } 419 }
384} 420}
385 421
386typedef struct { 422typedef struct {
440 n |= n >> 16; 476 n |= n >> 16;
441 477
442 return n + 1; 478 return n + 1;
443} 479}
444 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
445/* SDL should provide this, really. */ 492/* SDL should provide this, really. */
446#define SDLK_MODIFIER_MIN 300 493#define SDLK_MODIFIER_MIN 300
447#define SDLK_MODIFIER_MAX 314 494#define SDLK_MODIFIER_MAX 314
448 495
449/******************************************************************************/ 496/******************************************************************************/
487 return 0; 534 return 0;
488 535
489 return 1; 536 return 1;
490} 537}
491 538
492MODULE = 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
493 592
494PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
495 594
496BOOT: 595BOOT:
497{ 596{
498 HV *stash = gv_stashpv ("CFPlus", 1); 597 HV *stash = gv_stashpv ("DC", 1);
499 static const struct { 598 static const struct {
500 const char *name; 599 const char *name;
501 IV iv; 600 IV iv;
502 } *civ, const_iv[] = { 601 } *civ, const_iv[] = {
503# define const_iv(name) { # name, (IV)name } 602# define const_iv(name) { # name, (IV)name }
525 624
526 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
529 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),
530 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
531 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
532 const_iv (SDLK_KP2), 683 const_iv (SDLK_KP2),
533 const_iv (SDLK_KP3), 684 const_iv (SDLK_KP3),
534 const_iv (SDLK_KP4), 685 const_iv (SDLK_KP4),
606 const_iv (KMOD_LMETA), 757 const_iv (KMOD_LMETA),
607 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
608 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
609 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
610 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)
611# undef const_iv 795# undef const_iv
612 }; 796 };
613 797
614 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; )
615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
633 817
634NV floor (NV x) 818NV floor (NV x)
635 819
636NV ceil (NV x) 820NV ceil (NV x)
637 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
638void 832void
639pango_init () 833pango_init ()
640 CODE: 834 CODE:
641{ 835{
642 opengl_fontmap = pango_opengl_font_map_new (); 836 opengl_fontmap = pango_opengl_font_map_new ();
643 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);
644 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
645} 844}
646 845
647char *
648SDL_GetError () 846char *SDL_GetError ()
649 847
650int 848void SDL_braino ()
651SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
652 849
653void 850int SDL_Init (U32 flags)
851
852int SDL_InitSubSystem (U32 flags)
853
854void SDL_QuitSubSystem (U32 flags)
855
654SDL_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
655 866
656void 867void
657SDL_ListModes (int rgb, int alpha) 868SDL_ListModes (int rgb, int alpha)
658 PPCODE: 869 PPCODE:
659{ 870{
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 882 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 883 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674 885
675 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 886 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
676#if SDL_VERSION_ATLEAST(1,2,10)
677 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
678 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 887 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679#endif
680 888
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 889 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 890
683 if (m && m != (SDL_Rect **)-1) 891 if (m && m != (SDL_Rect **)-1)
684 while (*m) 892 while (*m)
685 { 893 {
686 if ((*m)->w >= 640 && (*m)->h >= 480) 894 if ((*m)->w >= 400 && (*m)->h >= 300)
687 { 895 {
688 AV *av = newAV (); 896 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 897 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 898 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 899 av_push (av, newSViv (rgb));
715 923
716 if (RETVAL) 924 if (RETVAL)
717 { 925 {
718 av_clear (texture_av); 926 av_clear (texture_av);
719 927
720 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 928 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721#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);
722#include "glfunc.h" 930#include "glfunc.h"
723#undef GL_FUNC 931#undef GL_FUNC
724 } 932 }
725} 933}
732char * 940char *
733SDL_GetKeyName (int sym) 941SDL_GetKeyName (int sym)
734 942
735int 943int
736SDL_GetAppState () 944SDL_GetAppState ()
945
946int
947SDL_GetModState ()
737 948
738void 949void
739poll_events () 950poll_events ()
740 PPCODE: 951 PPCODE:
741{ 952{
751 { 962 {
752 case SDL_KEYDOWN: 963 case SDL_KEYDOWN:
753 case SDL_KEYUP: 964 case SDL_KEYUP:
754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 965 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 966 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756 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);
757 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 */
758 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 969 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759 break; 970 break;
760 971
761 case SDL_ACTIVEEVENT: 972 case SDL_ACTIVEEVENT:
762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 973 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
780 x = ev.motion.x; 991 x = ev.motion.x;
781 y = ev.motion.y; 992 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 993 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 } 994 }
784 995
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
786 hv_store (hv, "state", 5, newSViv (state), 0); 997 hv_store (hv, "state", 5, newSViv (state), 0);
787 hv_store (hv, "x", 1, newSViv (x), 0); 998 hv_store (hv, "x", 1, newSViv (x), 0);
788 hv_store (hv, "y", 1, newSViv (y), 0); 999 hv_store (hv, "y", 1, newSViv (y), 0);
789 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1000 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1001 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 } 1002 }
792 break; 1003 break;
793 1004
794 case SDL_MOUSEBUTTONDOWN: 1005 case SDL_MOUSEBUTTONDOWN:
795 case SDL_MOUSEBUTTONUP: 1006 case SDL_MOUSEBUTTONUP:
796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1007 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797 1008
798 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1009 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1011 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1012 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1017 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1018 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 1019 break;
809 } 1020 }
810 1021
811 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))));
812 } 1023 }
813} 1024}
814 1025
815int 1026int
816Mix_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)
817 POSTCALL: 1028 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 1029 Mix_HookMusicFinished (music_finished);
819 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}
820 1047
821void 1048void
822Mix_CloseAudio () 1049Mix_CloseAudio ()
823 1050
824int 1051int
859 } 1086 }
860 } 1087 }
861#endif 1088#endif
862} 1089}
863 1090
864void 1091int
865add_font (char *file) 1092add_font (char *file)
866 CODE: 1093 CODE:
867 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1094 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095 OUTPUT:
1096 RETVAL
868 1097
869void 1098void
870load_image_inline (SV *image_) 1099load_image_inline (SV *image_)
871 ALIAS: 1100 ALIAS:
872 load_image_file = 1 1101 load_image_file = 1
958void 1187void
959error (char *message) 1188error (char *message)
960 CODE: 1189 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1190 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1191#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1192 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1193#endif
965 1194
966void 1195void
967fatal (char *message) 1196fatal (char *message)
968 CODE: 1197 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1198 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1199#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1200 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1201#endif
973 _exit (1); 1202 _exit (1);
974 1203
975void 1204void
976_exit (int retval = 0) 1205_exit (int retval = 0)
988#if DEBUG 1217#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1218 VALGRIND_DO_LEAK_CHECK;
990#endif 1219#endif
991} 1220}
992 1221
993MODULE = 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
994 1230
995PROTOTYPES: DISABLE 1231PROTOTYPES: DISABLE
996 1232
997CFPlus::Font 1233DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1234new_from_file (SV *class, char *path, int id = 0)
999 CODE: 1235 CODE:
1000{ 1236{
1001 int count; 1237 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1238 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1005} 1241}
1006 OUTPUT: 1242 OUTPUT:
1007 RETVAL 1243 RETVAL
1008 1244
1009void 1245void
1010DESTROY (CFPlus::Font self) 1246DESTROY (DC::Font self)
1011 CODE: 1247 CODE:
1012 pango_font_description_free (self); 1248 pango_font_description_free (self);
1013 1249
1014void 1250void
1015make_default (CFPlus::Font self) 1251make_default (DC::Font self)
1016 PROTOTYPE: $ 1252 PROTOTYPE: $
1017 CODE: 1253 CODE:
1018 default_font = self; 1254 default_font = self;
1019 1255
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1256MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1257
1022PROTOTYPES: DISABLE 1258PROTOTYPES: DISABLE
1023 1259
1024void 1260void
1025reset_glyph_cache () 1261glyph_cache_backup ()
1026 PROTOTYPE: 1262 PROTOTYPE:
1027 CODE: 1263 CODE:
1264 tc_backup ();
1265
1266void
1267glyph_cache_restore ()
1268 PROTOTYPE:
1269 CODE:
1028 tc_clear (); 1270 tc_restore ();
1029 1271
1030CFPlus::Layout 1272DC::Layout
1031new (SV *class) 1273new (SV *class)
1032 CODE: 1274 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1275 New (0, RETVAL, 1, struct cf_layout);
1034 1276
1035 RETVAL->pl = pango_layout_new (opengl_context); 1277 RETVAL->pl = pango_layout_new (opengl_context);
1045 layout_update_font (RETVAL); 1287 layout_update_font (RETVAL);
1046 OUTPUT: 1288 OUTPUT:
1047 RETVAL 1289 RETVAL
1048 1290
1049void 1291void
1050DESTROY (CFPlus::Layout self) 1292DESTROY (DC::Layout self)
1051 CODE: 1293 CODE:
1052 g_object_unref (self->pl); 1294 g_object_unref (self->pl);
1053 rc_free (self->rc); 1295 rc_free (self->rc);
1054 Safefree (self); 1296 Safefree (self);
1055 1297
1056void 1298void
1057set_text (CFPlus::Layout self, SV *text_) 1299set_text (DC::Layout self, SV *text_)
1058 CODE: 1300 CODE:
1059{ 1301{
1060 STRLEN textlen; 1302 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1303 char *text = SvPVutf8 (text_, textlen);
1062 1304
1063 pango_layout_set_text (self->pl, text, textlen); 1305 pango_layout_set_text (self->pl, text, textlen);
1064} 1306}
1065 1307
1066void 1308void
1067set_markup (CFPlus::Layout self, SV *text_) 1309set_markup (DC::Layout self, SV *text_)
1068 CODE: 1310 CODE:
1069{ 1311{
1070 STRLEN textlen; 1312 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1313 char *text = SvPVutf8 (text_, textlen);
1072 1314
1073 pango_layout_set_markup (self->pl, text, textlen); 1315 pango_layout_set_markup (self->pl, text, textlen);
1074} 1316}
1075 1317
1076void 1318void
1077set_shapes (CFPlus::Layout self, ...) 1319set_shapes (DC::Layout self, ...)
1078 CODE: 1320 CODE:
1079{ 1321{
1080 PangoAttrList *attrs = 0; 1322 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1323 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1324 const char *pos = text;
1117 if (attrs) 1359 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1360 pango_layout_set_attributes (self->pl, attrs);
1119} 1361}
1120 1362
1121void 1363void
1122get_shapes (CFPlus::Layout self) 1364get_shapes (DC::Layout self)
1123 PPCODE: 1365 PPCODE:
1124{ 1366{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1367 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1368
1127 do 1369 do
1128 { 1370 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1371 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1372
1131 if (run && shape_attr_p (run)) 1373 if (run && shape_attr_p (run))
1132 { 1374 {
1133 PangoRectangle extents; 1375 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1376 pango_layout_iter_get_run_extents (iter, 0, &extents);
1142 1384
1143 pango_layout_iter_free (iter); 1385 pango_layout_iter_free (iter);
1144} 1386}
1145 1387
1146int 1388int
1147has_wrapped (CFPlus::Layout self) 1389has_wrapped (DC::Layout self)
1148 CODE: 1390 CODE:
1149{ 1391{
1150 int lines = 1; 1392 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1393 const char *text = pango_layout_get_text (self->pl);
1152 1394
1157} 1399}
1158 OUTPUT: 1400 OUTPUT:
1159 RETVAL 1401 RETVAL
1160 1402
1161SV * 1403SV *
1162get_text (CFPlus::Layout self) 1404get_text (DC::Layout self)
1163 CODE: 1405 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1406 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1407 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1408 OUTPUT:
1167 RETVAL 1409 RETVAL
1168 1410
1169void 1411void
1170set_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.)
1171 CODE: 1413 CODE:
1172 self->r = r; 1414 self->r = r;
1173 self->g = g; 1415 self->g = g;
1174 self->b = b; 1416 self->b = b;
1175 self->a = a; 1417 self->a = a;
1176 1418
1177void 1419void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1420set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1421 CODE:
1180 if (self->font != font) 1422 if (self->font != font)
1181 { 1423 {
1182 self->font = font; 1424 self->font = font;
1183 layout_update_font (self); 1425 layout_update_font (self);
1184 } 1426 }
1185 1427
1186void 1428void
1187set_height (CFPlus::Layout self, int base_height) 1429set_height (DC::Layout self, int base_height)
1188 CODE: 1430 CODE:
1189 if (self->base_height != base_height) 1431 if (self->base_height != base_height)
1190 { 1432 {
1191 self->base_height = base_height; 1433 self->base_height = base_height;
1192 layout_update_font (self); 1434 layout_update_font (self);
1193 } 1435 }
1194 1436
1195void 1437void
1196set_width (CFPlus::Layout self, int max_width = -1) 1438set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1439 CODE:
1198 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);
1199 1441
1200void 1442void
1201set_indent (CFPlus::Layout self, int indent) 1443set_indent (DC::Layout self, int indent)
1202 CODE: 1444 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1445 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1446
1205void 1447void
1206set_spacing (CFPlus::Layout self, int spacing) 1448set_spacing (DC::Layout self, int spacing)
1207 CODE: 1449 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1450 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1451
1210void 1452void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1453set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1454 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1455 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1456 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1457 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1458 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1459 : PANGO_ELLIPSIZE_NONE
1218 ); 1460 );
1219 1461
1220void 1462void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1463set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1464 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1465 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1466
1225void 1467void
1226size (CFPlus::Layout self) 1468size (DC::Layout self)
1227 PPCODE: 1469 PPCODE:
1228{ 1470{
1229 int w, h; 1471 int w, h;
1230 1472
1231 layout_get_pixel_size (self, &w, &h); 1473 layout_get_pixel_size (self, &w, &h);
1234 PUSHs (sv_2mortal (newSViv (w))); 1476 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1477 PUSHs (sv_2mortal (newSViv (h)));
1236} 1478}
1237 1479
1238int 1480int
1239descent (CFPlus::Layout self) 1481descent (DC::Layout self)
1240 CODE: 1482 CODE:
1241{ 1483{
1242 PangoRectangle rect; 1484 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1485 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1486 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1487 RETVAL = PANGO_DESCENT (rect);
1246} 1488}
1247 OUTPUT: 1489 OUTPUT:
1248 RETVAL 1490 RETVAL
1249 1491
1250int 1492int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1493xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1494 CODE:
1253{ 1495{
1254 int index, trailing; 1496 int index, trailing;
1255 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);
1256 RETVAL = index + trailing; 1498 RETVAL = index + trailing;
1257} 1499}
1258 OUTPUT: 1500 OUTPUT:
1259 RETVAL 1501 RETVAL
1260 1502
1261void 1503void
1262cursor_pos (CFPlus::Layout self, int index) 1504cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1505 PPCODE:
1264{ 1506{
1265 PangoRectangle strong_pos; 1507 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1508 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1509
1268 EXTEND (SP, 3); 1510 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1512 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1513 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1514}
1273 1515
1274void 1516void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1517index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1518 PPCODE:
1277{ 1519{
1278 int line, x; 1520 int line, x;
1279 1521
1280 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)
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1524 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1525 --line;
1526#endif
1283 EXTEND (SP, 2); 1527 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1528 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1529 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1530}
1287 1531
1288void 1532void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1533line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1534 PPCODE:
1291{ 1535{
1292 PangoLayoutLine *lp; 1536 PangoLayoutLine *lp;
1293 int index, trailing; 1537 int index, trailing;
1294 1538
1295 if (line < 0) 1539 if (line < 0)
1296 XSRETURN_EMPTY; 1540 XSRETURN_EMPTY;
1297 1541
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1542 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1543 XSRETURN_EMPTY; /* do better */
1300 1544
1301 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);
1302 1546
1303 EXTEND (SP, 2); 1547 EXTEND (SP, 2);
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1553 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1554 }
1311} 1555}
1312 1556
1313void 1557void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1558render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1559 CODE:
1316 rc_clear (self->rc); 1560 rc_clear (self->rc);
1317 pango_opengl_render_layout_subpixel ( 1561 pango_opengl_render_layout_subpixel (
1318 self->pl, 1562 self->pl,
1319 self->rc, 1563 self->rc,
1324 // we assume that context_change actually clears/frees stuff 1568 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1569 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1570 pango_layout_context_changed (self->pl);
1327 1571
1328void 1572void
1329draw (CFPlus::Layout self) 1573draw (DC::Layout self)
1330 CODE: 1574 CODE:
1331{ 1575{
1332 glEnable (GL_TEXTURE_2D); 1576 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1577 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1578 glEnable (GL_BLEND);
1342 glDisable (GL_ALPHA_TEST); 1586 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1587 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1588 glDisable (GL_TEXTURE_2D);
1345} 1589}
1346 1590
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1591MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1592
1349PROTOTYPES: ENABLE 1593PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1594
1353void 1595void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1596pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1597 CODE:
1356{ 1598{
1422 glDisable (GL_ALPHA_TEST); 1664 glDisable (GL_ALPHA_TEST);
1423 glDisable (GL_BLEND); 1665 glDisable (GL_BLEND);
1424 } 1666 }
1425} 1667}
1426 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
1427IV 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)
1428 CODE: 1759 CODE:
1429{ 1760{
1430 GLint width; 1761 GLint width;
1431 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);
1433 RETVAL = width > 0; 1764 RETVAL = width > 0;
1434} 1765}
1435 OUTPUT: 1766 OUTPUT:
1436 RETVAL 1767 RETVAL
1437 1768
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1769MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1770
1440PROTOTYPES: DISABLE 1771PROTOTYPES: DISABLE
1441 1772
1442CFPlus::Map 1773DC::Map
1443new (SV *class) 1774new (SV *class)
1444 CODE: 1775 CODE:
1445 New (0, RETVAL, 1, struct map); 1776 New (0, RETVAL, 1, struct map);
1446 RETVAL->x = 0; 1777 RETVAL->x = 0;
1447 RETVAL->y = 0; 1778 RETVAL->y = 0;
1455 RETVAL->row = 0; 1786 RETVAL->row = 0;
1456 OUTPUT: 1787 OUTPUT:
1457 RETVAL 1788 RETVAL
1458 1789
1459void 1790void
1460DESTROY (CFPlus::Map self) 1791DESTROY (DC::Map self)
1461 CODE: 1792 CODE:
1462{ 1793{
1463 map_clear (self); 1794 map_clear (self);
1464 Safefree (self->face2tile); 1795 Safefree (self->face2tile);
1465 Safefree (self->tex); 1796 Safefree (self->tex);
1466 Safefree (self); 1797 Safefree (self);
1467} 1798}
1468 1799
1469void 1800void
1470resize (CFPlus::Map self, int map_width, int map_height) 1801resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1802 CODE:
1472 self->w = map_width; 1803 self->w = map_width;
1473 self->h = map_height; 1804 self->h = map_height;
1474 1805
1475void 1806void
1476clear (CFPlus::Map self) 1807clear (DC::Map self)
1477 CODE: 1808 CODE:
1478 map_clear (self); 1809 map_clear (self);
1479 1810
1480void 1811void
1481set_tileid (CFPlus::Map self, int face, int tile) 1812set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1813 CODE:
1483{ 1814{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1815 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1816 need_texid (self, tile);
1486} 1817}
1487 1818
1488void 1819void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1820set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1821 CODE:
1491{ 1822{
1492 tileid texid; 1823 tileid texid;
1493 maptex *tex; 1824 maptex *tex;
1494 1825
1507 tex->smoothtile = self->face2tile [smooth]; 1838 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1839 tex->smoothlevel = level;
1509} 1840}
1510 1841
1511void 1842void
1512set_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)
1513 CODE: 1844 CODE:
1514{ 1845{
1515 need_texid (self, texid); 1846 need_texid (self, texid);
1516 1847
1517 { 1848 {
1536 // use uglier nearest interpolation because linear suffers 1867 // use uglier nearest interpolation because linear suffers
1537 // from transparent color bleeding and ugly wrapping effects. 1868 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1869 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1870}
1540 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
1541int 1892int
1542ox (CFPlus::Map self) 1893ox (DC::Map self)
1543 ALIAS: 1894 ALIAS:
1544 oy = 1 1895 oy = 1
1545 x = 2 1896 x = 2
1546 y = 3 1897 y = 3
1547 w = 4 1898 w = 4
1558 } 1909 }
1559 OUTPUT: 1910 OUTPUT:
1560 RETVAL 1911 RETVAL
1561 1912
1562void 1913void
1563scroll (CFPlus::Map self, int dx, int dy) 1914scroll (DC::Map self, int dx, int dy)
1564 CODE: 1915 CODE:
1565{ 1916{
1566 if (dx > 0) 1917 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 1918 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 1919 else if (dx < 0)
1584 self->y += MAP_EXTEND_Y; 1935 self->y += MAP_EXTEND_Y;
1585 } 1936 }
1586} 1937}
1587 1938
1588SV * 1939SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 1940map1a_update (DC::Map self, SV *data_, int extmap)
1590 CODE: 1941 CODE:
1591{ 1942{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1943 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 1944 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 1945 mapcell *cell;
1622 uint8_t ext, cmd; 1973 uint8_t ext, cmd;
1623 1974
1624 do 1975 do
1625 { 1976 {
1626 ext = *data++; 1977 ext = *data++;
1627 cmd = ext & 0x3f; 1978 cmd = ext & 0x7f;
1628 1979
1629 if (cmd < 4) 1980 if (cmd < 4)
1630 cell->darkness = 255 - ext * 64 + 1; 1981 cell->darkness = 255 - ext * 64 + 1;
1631 else if (cmd == 5) // health 1982 else if (cmd == 5) // health
1632 { 1983 {
1635 } 1986 }
1636 else if (cmd == 6) // monster width 1987 else if (cmd == 6) // monster width
1637 cell->stat_width = *data++ + 1; 1988 cell->stat_width = *data++ + 1;
1638 else if (cmd == 0x47) 1989 else if (cmd == 0x47)
1639 { 1990 {
1640 if (*data == 4) 1991 if (*data == 1) cell->player = data [1];
1641 ; // 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);
1642 1995
1643 data += *data + 1; 1996 data += *data + 1;
1644 } 1997 }
1645 else if (cmd == 8) // cell flags 1998 else if (cmd == 8) // cell flags
1646 cell->flags = *data++; 1999 cell->flags = *data++;
1663 cell->tile [z] = self->face2tile [face]; 2016 cell->tile [z] = self->face2tile [face];
1664 2017
1665 if (cell->tile [z]) 2018 if (cell->tile [z])
1666 { 2019 {
1667 maptex *tex = self->tex + cell->tile [z]; 2020 maptex *tex = self->tex + cell->tile [z];
2021 tex->unused = 0;
1668 if (!tex->name) 2022 if (!tex->name)
1669 av_push (missing, newSViv (cell->tile [z])); 2023 av_push (missing, newSViv (cell->tile [z]));
1670 2024
1671 if (tex->smoothtile) 2025 if (tex->smoothtile)
1672 { 2026 {
1673 maptex *smooth = self->tex + tex->smoothtile; 2027 maptex *smooth = self->tex + tex->smoothtile;
2028 smooth->unused = 0;
1674 if (!smooth->name) 2029 if (!smooth->name)
1675 av_push (missing, newSViv (tex->smoothtile)); 2030 av_push (missing, newSViv (tex->smoothtile));
1676 } 2031 }
1677 } 2032 }
1678 } 2033 }
1679 } 2034 }
1680 else 2035 else
1681 cell->darkness = 0; 2036 CELL_CLEAR (cell);
1682 } 2037 }
1683} 2038}
1684 OUTPUT: 2039 OUTPUT:
1685 RETVAL 2040 RETVAL
1686 2041
1687SV * 2042SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2043mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 2044 CODE:
1690{ 2045{
1691 int x1, x; 2046 int x1, x;
1692 int y1, y; 2047 int y1, y;
1693 int z; 2048 int z;
1738} 2093}
1739 OUTPUT: 2094 OUTPUT:
1740 RETVAL 2095 RETVAL
1741 2096
1742void 2097void
1743draw (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)
1744 CODE: 2099 CODE:
1745{ 2100{
1746 int x, y, z; 2101 int x, y, z;
1747 2102
1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2103 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749 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
1750 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2105 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751 smooth_key skey; 2106 smooth_key skey;
1752 2107 int pl_x, pl_y;
2108 maptex pl_tex;
1753 rc_t *rc = rc_alloc (); 2109 rc_t *rc = rc_alloc ();
2110 rc_t *rc_ov = rc_alloc ();
1754 rc_key_t key; 2111 rc_key_t key;
1755 rc_array_t *arr; 2112 rc_array_t *arr, *arr_hidden;
1756 2113
2114 pl_tex.name = 0;
2115
1757 // thats current max. sorry. 2116 // that's current max. sorry.
1758 if (sw > 255) sw = 255; 2117 if (sw > 255) sw = 255;
1759 if (sh > 255) sh = 255; 2118 if (sh > 255) sh = 255;
1760 2119
1761 // clear key, in case of extra padding 2120 // clear key, in case of extra padding
1762 memset (&skey, 0, sizeof (skey)); 2121 memset (&skey, 0, sizeof (skey));
1766 key.g = 255; 2125 key.g = 255;
1767 key.b = 255; 2126 key.b = 255;
1768 key.a = 255; 2127 key.a = 255;
1769 key.mode = GL_QUADS; 2128 key.mode = GL_QUADS;
1770 key.format = GL_T2F_V3F; 2129 key.format = GL_T2F_V3F;
1771 key.texname = -1;
1772 2130
1773 mx += self->x; 2131 mx += self->x;
1774 my += self->y; 2132 my += self->y;
1775 2133
1776 // first pass: determine smooth_max 2134 // first pass: determine smooth_max
1797 2155
1798 glEnable (GL_BLEND); 2156 glEnable (GL_BLEND);
1799 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2158 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1801 2159
2160 key.texname = self->tex [TEXID_HIDDEN].name;
2161 arr_hidden = rc_array (rc_ov, &key);
2162
1802 for (z = 0; z <= 2; z++) 2163 for (z = 0; z <= 2; z++)
1803 { 2164 {
1804 memset (smooth_level, 0, sizeof (smooth_level)); 2165 memset (smooth_level, 0, sizeof (smooth_level));
2166 key.texname = -1;
1805 2167
1806 for (y = 0; y < sh; y++) 2168 for (y = 0; y < sh; y++)
1807 if (0 <= y + my && y + my < self->rows) 2169 if (0 <= y + my && y + my < self->rows)
1808 { 2170 {
1809 maprow *row = self->row + (y + my); 2171 maprow *row = self->row + (y + my);
1819 maptex tex = self->tex [tile]; 2181 maptex tex = self->tex [tile];
1820 int px, py; 2182 int px, py;
1821 2183
1822 if (key.texname != tex.name) 2184 if (key.texname != tex.name)
1823 { 2185 {
2186 self->tex [tile].unused = 0;
2187
1824 if (!tex.name) 2188 if (!tex.name)
1825 tex = self->tex [2]; /* missing, replace by noface */ 2189 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1826 2190
1827 key.texname = tex.name; 2191 key.texname = tex.name;
1828 arr = rc_array (rc, &key); 2192 arr = rc_array (rc, &key);
1829 } 2193 }
1830 2194
1831 px = (x + 1) * T - tex.w; 2195 px = (x + 1) * T - tex.w;
1832 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 }
1833 2205
1834 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2206 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1835 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);
1836 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);
1837 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);
1838
1839 if (cell->flags && z == 2)
1840 {
1841 // overlays such as the speech bubble, probably more to come
1842 if (cell->flags & 1)
1843 {
1844 maptex tex = self->tex [1];
1845 int px = x * T + T * 2 / 32;
1846 int py = y * T - T * 6 / 32;
1847
1848 if (tex.name)
1849 {
1850 if (key.texname != tex.name)
1851 {
1852 key.texname = tex.name;
1853 arr = rc_array (rc, &key);
1854 }
1855
1856 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1857 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1858 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1859 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1860 }
1861 }
1862 }
1863 2210
1864 // update smooth hash 2211 // update smooth hash
1865 if (tex.smoothtile) 2212 if (tex.smoothtile)
1866 { 2213 {
1867 skey.tile = tex.smoothtile; 2214 skey.tile = tex.smoothtile;
1896 // corners 2243 // corners
1897 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2244 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1898 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);
1899 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);
1900 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);
2248 }
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 }
1901 } 2285 }
1902 } 2286 }
1903 } 2287 }
1904 } 2288 }
1905 2289
1945 { 2329 {
1946 // this time avoiding texture state changes 2330 // this time avoiding texture state changes
1947 // save gobs of state changes. 2331 // save gobs of state changes.
1948 if (key.texname != tex.name) 2332 if (key.texname != tex.name)
1949 { 2333 {
2334 self->tex [skey->tile].unused = 0;
2335
1950 glEnd (); 2336 glEnd ();
1951 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2337 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1952 glBegin (GL_QUADS); 2338 glBegin (GL_QUADS);
1953 } 2339 }
1954 2340
1983 } 2369 }
1984 2370
1985 hv_clear (smooth); 2371 hv_clear (smooth);
1986 } 2372 }
1987 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
2388 rc_draw (rc);
2389 }
2390
2391 rc_draw (rc_ov);
2392 rc_clear (rc_ov);
2393
1988 glDisable (GL_BLEND); 2394 glDisable (GL_BLEND);
1989 rc_free (rc); 2395 rc_free (rc);
2396 rc_free (rc_ov);
1990 2397
1991 // top layer: overlays such as the health bar 2398 // top layer: overlays such as the health bar
1992 for (y = 0; y < sh; y++) 2399 for (y = 0; y < sh; y++)
1993 if (0 <= y + my && y + my < self->rows) 2400 if (0 <= y + my && y + my < self->rows)
1994 { 2401 {
1999 { 2406 {
2000 mapcell *cell = row->col + (x + mx - row->c0); 2407 mapcell *cell = row->col + (x + mx - row->c0);
2001 2408
2002 int px = x * T; 2409 int px = x * T;
2003 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 }
2004 2417
2005 if (cell->stat_hp) 2418 if (cell->stat_hp)
2006 { 2419 {
2007 int width = cell->stat_width * T; 2420 int width = cell->stat_width * T;
2008 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2421 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2019 } 2432 }
2020 } 2433 }
2021} 2434}
2022 2435
2023void 2436void
2024draw_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)
2025 CODE: 2438 CODE:
2026{ 2439{
2027 static float color[16][3] = { 2440 static float color[16][3] = {
2028 { 0.00F, 0.00F, 0.00F }, 2441 { 0.00f, 0.00f, 0.00f },
2029 { 1.00F, 1.00F, 1.00F }, 2442 { 1.00f, 1.00f, 1.00f },
2030 { 0.00F, 0.00F, 0.55F }, 2443 { 0.00f, 0.00f, 0.55f },
2031 { 1.00F, 0.00F, 0.00F }, 2444 { 1.00f, 0.00f, 0.00f },
2032 2445
2033 { 1.00F, 0.54F, 0.00F }, 2446 { 1.00f, 0.54f, 0.00f },
2034 { 0.11F, 0.56F, 1.00F }, 2447 { 0.11f, 0.56f, 1.00f },
2035 { 0.93F, 0.46F, 0.00F }, 2448 { 0.93f, 0.46f, 0.00f },
2036 { 0.18F, 0.54F, 0.34F }, 2449 { 0.18f, 0.54f, 0.34f },
2037 2450
2038 { 0.56F, 0.73F, 0.56F }, 2451 { 0.56f, 0.73f, 0.56f },
2039 { 0.80F, 0.80F, 0.80F }, 2452 { 0.80f, 0.80f, 0.80f },
2040 { 0.55F, 0.41F, 0.13F }, 2453 { 0.55f, 0.41f, 0.13f },
2041 { 0.99F, 0.77F, 0.26F }, 2454 { 0.99f, 0.77f, 0.26f },
2042 2455
2043 { 0.74F, 0.65F, 0.41F }, 2456 { 0.74f, 0.65f, 0.41f },
2044 2457
2045 { 0.00F, 1.00F, 1.00F }, 2458 { 0.00f, 1.00f, 1.00f },
2046 { 1.00F, 0.00F, 1.00F }, 2459 { 1.00f, 0.00f, 1.00f },
2047 { 1.00F, 1.00F, 0.00F }, 2460 { 1.00f, 1.00f, 0.00f },
2048 }; 2461 };
2049 2462
2050 int x, y; 2463 int x, y;
2051 2464
2052 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 */
2053 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2472 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2054 glEnable (GL_BLEND); 2473 glEnable (GL_BLEND);
2055 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2474 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2056 glBegin (GL_QUADS); 2475 glBegin (GL_QUADS);
2057 2476
2058 for (y = 0; y < h; y++) 2477 for (y = 0; y < h; y++)
2062 2481
2063 if (m) 2482 if (m)
2064 { 2483 {
2065 float *c = color [m & 15]; 2484 float *c = color [m & 15];
2066 2485
2067 float tx1 = m & 0x40 ? 0.5 : 0.; 2486 float tx1 = m & 0x40 ? 0.5f : 0.f;
2068 float tx2 = tx1 + 0.5; 2487 float tx2 = tx1 + 0.5f;
2069 2488
2070 glColor4f (c[0], c[1], c[2], 0.75); 2489 glColor4f (c[0], c[1], c[2], 1);
2071 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2490 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2072 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2491 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2073 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2492 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2074 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2493 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2075 } 2494 }
2079 glDisable (GL_BLEND); 2498 glDisable (GL_BLEND);
2080 glDisable (GL_TEXTURE_2D); 2499 glDisable (GL_TEXTURE_2D);
2081} 2500}
2082 2501
2083void 2502void
2084fow_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)
2085 PPCODE: 2504 PPCODE:
2086{ 2505{
2087 int x, y; 2506 int x, y;
2088 int sw1 = sw + 2; 2507 int sw1 = sw + 2;
2089 int sh1 = sh + 2; 2508 int sh1 = sh + 2;
2097 SvCUR_set (darkness3_sv, sw34 * sh3); 2516 SvCUR_set (darkness3_sv, sw34 * sh3);
2098 2517
2099 mx += self->x - 1; 2518 mx += self->x - 1;
2100 my += self->y - 1; 2519 my += self->y - 1;
2101 2520
2102 memset (darkness1, 255, sw1 * sh1); 2521 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2103 2522
2104 for (y = 0; y < sh1; y++) 2523 for (y = 0; y < sh1; y++)
2105 if (0 <= y + my && y + my < self->rows) 2524 if (0 <= y + my && y + my < self->rows)
2106 { 2525 {
2107 maprow *row = self->row + (y + my); 2526 maprow *row = self->row + (y + my);
2110 if (row->c0 <= x + mx && x + mx < row->c1) 2529 if (row->c0 <= x + mx && x + mx < row->c1)
2111 { 2530 {
2112 mapcell *cell = row->col + (x + mx - row->c0); 2531 mapcell *cell = row->col + (x + mx - row->c0);
2113 2532
2114 darkness1 [y * sw1 + x] = cell->darkness 2533 darkness1 [y * sw1 + x] = cell->darkness
2115 ? 255 - (cell->darkness - 1) 2534 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2116 : 255 - FOW_DARKNESS; 2535 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2117 } 2536 }
2118 } 2537 }
2119 2538
2120 for (y = 0; y < sh; ++y) 2539 for (y = 0; y < sh; ++y)
2121 for (x = 0; x < sw; ++x) 2540 for (x = 0; x < sw; ++x)
2160 PUSHs (sv_2mortal (newSViv (sh3))); 2579 PUSHs (sv_2mortal (newSViv (sh3)));
2161 PUSHs (darkness3_sv); 2580 PUSHs (darkness3_sv);
2162} 2581}
2163 2582
2164SV * 2583SV *
2165get_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)
2166 CODE: 2585 CODE:
2167{ 2586{
2168 int x, y, x1, y1; 2587 int x, y, x1, y1;
2169 SV *data_sv = newSV (w * h * 7 + 5); 2588 SV *data_sv = newSV (w * h * 7 + 5);
2170 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2589 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2227 else 2646 else
2228 *data++ = 0; 2647 *data++ = 0;
2229 } 2648 }
2230 } 2649 }
2231 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 {
2232 SvPOK_only (data_sv); 2654 SvPOK_only (data_sv);
2233 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2655 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2656 }
2657
2234 RETVAL = data_sv; 2658 RETVAL = data_sv;
2235} 2659}
2236 OUTPUT: 2660 OUTPUT:
2237 RETVAL 2661 RETVAL
2238 2662
2239void 2663void
2240set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2664set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2241 PPCODE: 2665 PPCODE:
2242{ 2666{
2243 int x, y, z; 2667 int x, y, z;
2244 int w, h; 2668 int w, h;
2245 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;
2246 2680
2247 if (*data++ != 0) 2681 if (*data++ != 0)
2248 XSRETURN_EMPTY; /* version mismatch */ 2682 XSRETURN_EMPTY; /* version mismatch */
2249 2683
2250 w = *data++ << 8; w |= *data++; 2684 w = *data++ << 8; w |= *data++;
2265 { 2699 {
2266 maprow *row = map_get_row (self, y); 2700 maprow *row = map_get_row (self, y);
2267 2701
2268 for (x = x0; x < x1; x++) 2702 for (x = x0; x < x1; x++)
2269 { 2703 {
2704 uint8_t flags;
2705
2706 if (data + 7 >= end)
2707 XSRETURN_EMPTY;
2708
2270 uint8_t flags = *data++; 2709 flags = *data++;
2271 2710
2272 if (flags) 2711 if (flags)
2273 { 2712 {
2274 mapcell *cell = row_get_cell (row, x); 2713 mapcell *cell = row_get_cell (row, x);
2275 tileid tile[3] = { 0, 0, 0 }; 2714 tileid tile[3] = { 0, 0, 0 };
2278 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2717 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2279 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2718 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2280 2719
2281 if (cell->darkness == 0) 2720 if (cell->darkness == 0)
2282 { 2721 {
2283 cell->darkness = 0; 2722 /*cell->darkness = 0;*/
2723 EXTEND (SP, 3);
2284 2724
2285 for (z = 0; z <= 2; z++) 2725 for (z = 0; z <= 2; z++)
2286 { 2726 {
2287 tileid t = tile [z]; 2727 tileid t = tile [z];
2288 2728
2289 if (t >= self->texs || (t && !self->tex [t].name)) 2729 if (t >= self->texs || (t && !self->tex [t].name))
2290 { 2730 {
2291 XPUSHs (sv_2mortal (newSViv (t))); 2731 PUSHs (sv_2mortal (newSViv (t)));
2292 need_texid (self, t); 2732 need_texid (self, t);
2293 } 2733 }
2294 2734
2295 cell->tile [z] = t; 2735 cell->tile [z] = t;
2296 } 2736 }
2298 } 2738 }
2299 } 2739 }
2300 } 2740 }
2301} 2741}
2302 2742
2303MODULE = CFPlus PACKAGE = CFPlus::RW 2743MODULE = Deliantra::Client PACKAGE = DC::RW
2304 2744
2305CFPlus::RW 2745DC::RW
2306new (SV *class, SV *data_sv) 2746new (SV *class, SV *data_sv)
2307 CODE: 2747 CODE:
2308{ 2748{
2309 STRLEN datalen; 2749 STRLEN datalen;
2310 char *data = SvPVbyte (data_sv, datalen); 2750 char *data = SvPVbyte (data_sv, datalen);
2312 RETVAL = SDL_RWFromConstMem (data, datalen); 2752 RETVAL = SDL_RWFromConstMem (data, datalen);
2313} 2753}
2314 OUTPUT: 2754 OUTPUT:
2315 RETVAL 2755 RETVAL
2316 2756
2317CFPlus::RW 2757DC::RW
2318new_from_file (SV *class, const char *path, const char *mode = "rb") 2758new_from_file (SV *class, const char *path, const char *mode = "rb")
2319 CODE: 2759 CODE:
2320 RETVAL = SDL_RWFromFile (path, mode); 2760 RETVAL = SDL_RWFromFile (path, mode);
2321 OUTPUT: 2761 OUTPUT:
2322 RETVAL 2762 RETVAL
2323 2763
2324# fails on win32: 2764# fails on win32:
2325# CFPlus.xs(2268) : error C2059: syntax error : '(' 2765# dc.xs(2268) : error C2059: syntax error : '('
2326#void 2766#void
2327#close (CFPlus::RW self) 2767#close (DC::RW self)
2328# CODE: 2768# CODE:
2329# (self->(close)) (self); 2769# (self->(close)) (self);
2330 2770
2331MODULE = CFPlus PACKAGE = CFPlus::Channel 2771MODULE = Deliantra::Client PACKAGE = DC::Channel
2332 2772
2333PROTOTYPES: DISABLE 2773PROTOTYPES: DISABLE
2334 2774
2335CFPlus::Channel 2775DC::Channel
2336find () 2776find ()
2337 CODE: 2777 CODE:
2338{ 2778{
2339 RETVAL = Mix_GroupAvailable (-1); 2779 RETVAL = Mix_GroupAvailable (-1);
2340 2780
2353} 2793}
2354 OUTPUT: 2794 OUTPUT:
2355 RETVAL 2795 RETVAL
2356 2796
2357void 2797void
2358halt (CFPlus::Channel self) 2798halt (DC::Channel self)
2359 CODE: 2799 CODE:
2360 Mix_HaltChannel (self); 2800 Mix_HaltChannel (self);
2361 2801
2362void 2802void
2363expire (CFPlus::Channel self, int ticks = -1) 2803expire (DC::Channel self, int ticks = -1)
2364 CODE: 2804 CODE:
2365 Mix_ExpireChannel (self, ticks); 2805 Mix_ExpireChannel (self, ticks);
2366 2806
2367void 2807void
2368fade_out (CFPlus::Channel self, int ticks = -1) 2808fade_out (DC::Channel self, int ticks = -1)
2369 CODE: 2809 CODE:
2370 Mix_FadeOutChannel (self, ticks); 2810 Mix_FadeOutChannel (self, ticks);
2371 2811
2372int 2812int
2373volume (CFPlus::Channel self, int volume) 2813volume (DC::Channel self, int volume)
2374 CODE: 2814 CODE:
2375 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2815 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2376 OUTPUT: 2816 OUTPUT:
2377 RETVAL 2817 RETVAL
2378 2818
2379void 2819void
2380unregister_all_effects (CFPlus::Channel self) 2820unregister_all_effects (DC::Channel self)
2381 CODE: 2821 CODE:
2382 Mix_UnregisterAllEffects (self); 2822 Mix_UnregisterAllEffects (self);
2383 2823
2384void 2824void
2385set_panning (CFPlus::Channel self, int left, int right) 2825set_panning (DC::Channel self, int left, int right)
2386 CODE: 2826 CODE:
2387 left = CLAMP (left , 0, 255); 2827 left = CLAMP (left , 0, 255);
2388 right = CLAMP (right, 0, 255); 2828 right = CLAMP (right, 0, 255);
2389 Mix_SetPanning (self, left, right); 2829 Mix_SetPanning (self, left, right);
2390 2830
2391void 2831void
2392set_distance (CFPlus::Channel self, int distance) 2832set_distance (DC::Channel self, int distance)
2393 CODE: 2833 CODE:
2394 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2834 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2395 2835
2396void 2836void
2397set_position (CFPlus::Channel self, int angle, int distance) 2837set_position (DC::Channel self, int angle, int distance)
2398 CODE: 2838 CODE:
2399 2839
2400void 2840void
2401set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2841set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2402 CODE: 2842 CODE:
2403{ 2843{
2404 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));
2405 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;
2406 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2846 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2407} 2847}
2408 2848
2409void 2849void
2410set_reverse_stereo (CFPlus::Channel self, int flip) 2850set_reverse_stereo (DC::Channel self, int flip)
2411 CODE: 2851 CODE:
2412 Mix_SetReverseStereo (self, flip); 2852 Mix_SetReverseStereo (self, flip);
2413 2853
2414MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2854MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2415 2855
2416PROTOTYPES: DISABLE 2856PROTOTYPES: DISABLE
2417 2857
2418CFPlus::MixChunk 2858DC::MixChunk
2419new (SV *class, CFPlus::RW rwops) 2859new (SV *class, DC::RW rwops)
2420 CODE: 2860 CODE:
2421 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2861 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2422 OUTPUT: 2862 OUTPUT:
2423 RETVAL 2863 RETVAL
2424 2864
2425void 2865void
2426DESTROY (CFPlus::MixChunk self) 2866DESTROY (DC::MixChunk self)
2427 CODE: 2867 CODE:
2428 Mix_FreeChunk (self); 2868 Mix_FreeChunk (self);
2429 2869
2430int 2870int
2431volume (CFPlus::MixChunk self, int volume = -1) 2871volume (DC::MixChunk self, int volume = -1)
2432 CODE: 2872 CODE:
2433 if (items > 1) 2873 if (items > 1)
2434 volume = CLAMP (volume, 0, 128); 2874 volume = CLAMP (volume, 0, 128);
2435 RETVAL = Mix_VolumeChunk (self, volume); 2875 RETVAL = Mix_VolumeChunk (self, volume);
2436 OUTPUT: 2876 OUTPUT:
2437 RETVAL 2877 RETVAL
2438 2878
2439CFPlus::Channel 2879DC::Channel
2440play (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)
2441 CODE: 2881 CODE:
2442{ 2882{
2443 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2883 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2444 2884
2445 if (RETVAL < 0) 2885 if (RETVAL < 0)
2452 } 2892 }
2453} 2893}
2454 OUTPUT: 2894 OUTPUT:
2455 RETVAL 2895 RETVAL
2456 2896
2457MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2897MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2458 2898
2459int 2899int
2460volume (int volume = -1) 2900volume (int volume = -1)
2461 PROTOTYPE: ;$ 2901 PROTOTYPE: ;$
2462 CODE: 2902 CODE:
2474void 2914void
2475halt () 2915halt ()
2476 CODE: 2916 CODE:
2477 Mix_HaltMusic (); 2917 Mix_HaltMusic ();
2478 2918
2479CFPlus::MixMusic 2919DC::MixMusic
2480new (SV *class, CFPlus::RW rwops) 2920new (SV *class, DC::RW rwops)
2481 CODE: 2921 CODE:
2482 RETVAL = Mix_LoadMUS_RW (rwops); 2922 RETVAL = Mix_LoadMUS_RW (rwops);
2483 OUTPUT: 2923 OUTPUT:
2484 RETVAL 2924 RETVAL
2485 2925
2486void 2926void
2487DESTROY (CFPlus::MixMusic self) 2927DESTROY (DC::MixMusic self)
2488 CODE: 2928 CODE:
2489 Mix_FreeMusic (self); 2929 Mix_FreeMusic (self);
2490 2930
2491int 2931int
2492play (CFPlus::MixMusic self, int loops = -1) 2932play (DC::MixMusic self, int loops = -1)
2493 CODE: 2933 CODE:
2494 RETVAL = Mix_PlayMusic (self, loops); 2934 RETVAL = Mix_PlayMusic (self, loops);
2495 OUTPUT: 2935 OUTPUT:
2496 RETVAL 2936 RETVAL
2497 2937
2498void 2938void
2499fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2939fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2500 CODE: 2940 CODE:
2501 Mix_FadeInMusicPos (self, loops, ms, position); 2941 Mix_FadeInMusicPos (self, loops, ms, position);
2502 2942
2503MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2943MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2504 2944
2505PROTOTYPES: ENABLE 2945PROTOTYPES: ENABLE
2506 2946
2507BOOT: 2947BOOT:
2508{ 2948{
2509 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2949 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2510 static const struct { 2950 static const struct {
2511 const char *name; 2951 const char *name;
2512 IV iv; 2952 IV iv;
2513 } *civ, const_iv[] = { 2953 } *civ, const_iv[] = {
2514# define const_iv(name) { # name, (IV)name } 2954# define const_iv(name) { # name, (IV)name }
2515 const_iv (GL_VENDOR), 2955 const_iv (GL_VENDOR),
2516 const_iv (GL_VERSION), 2956 const_iv (GL_VERSION),
2517 const_iv (GL_EXTENSIONS), 2957 const_iv (GL_EXTENSIONS),
2958 const_iv (GL_MAX_TEXTURE_UNITS),
2518 const_iv (GL_COLOR_MATERIAL), 2959 const_iv (GL_COLOR_MATERIAL),
2519 const_iv (GL_SMOOTH), 2960 const_iv (GL_SMOOTH),
2520 const_iv (GL_FLAT), 2961 const_iv (GL_FLAT),
2521 const_iv (GL_DITHER), 2962 const_iv (GL_DITHER),
2522 const_iv (GL_BLEND), 2963 const_iv (GL_BLEND),
2534 const_iv (GL_ZERO), 2975 const_iv (GL_ZERO),
2535 const_iv (GL_SRC_ALPHA), 2976 const_iv (GL_SRC_ALPHA),
2536 const_iv (GL_DST_ALPHA), 2977 const_iv (GL_DST_ALPHA),
2537 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2978 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2538 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),
2539 const_iv (GL_SRC_ALPHA_SATURATE), 2984 const_iv (GL_SRC_ALPHA_SATURATE),
2540 const_iv (GL_RGB), 2985 const_iv (GL_RGB),
2541 const_iv (GL_RGBA), 2986 const_iv (GL_RGBA),
2542 const_iv (GL_RGBA4), 2987 const_iv (GL_RGBA4),
2543 const_iv (GL_RGBA8), 2988 const_iv (GL_RGBA8),
2549 const_iv (GL_INTENSITY), 2994 const_iv (GL_INTENSITY),
2550 const_iv (GL_LUMINANCE), 2995 const_iv (GL_LUMINANCE),
2551 const_iv (GL_LUMINANCE_ALPHA), 2996 const_iv (GL_LUMINANCE_ALPHA),
2552 const_iv (GL_FLOAT), 2997 const_iv (GL_FLOAT),
2553 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),
2554 const_iv (GL_COMPILE), 3005 const_iv (GL_COMPILE),
2555 const_iv (GL_PROXY_TEXTURE_1D), 3006 const_iv (GL_PROXY_TEXTURE_1D),
2556 const_iv (GL_PROXY_TEXTURE_2D), 3007 const_iv (GL_PROXY_TEXTURE_2D),
2557 const_iv (GL_TEXTURE_1D), 3008 const_iv (GL_TEXTURE_1D),
2558 const_iv (GL_TEXTURE_2D), 3009 const_iv (GL_TEXTURE_2D),
2597 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3048 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2598 const_iv (GL_POINT_SMOOTH_HINT), 3049 const_iv (GL_POINT_SMOOTH_HINT),
2599 const_iv (GL_LINE_SMOOTH_HINT), 3050 const_iv (GL_LINE_SMOOTH_HINT),
2600 const_iv (GL_POLYGON_SMOOTH_HINT), 3051 const_iv (GL_POLYGON_SMOOTH_HINT),
2601 const_iv (GL_GENERATE_MIPMAP_HINT), 3052 const_iv (GL_GENERATE_MIPMAP_HINT),
3053 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2602 const_iv (GL_FASTEST), 3054 const_iv (GL_FASTEST),
2603 const_iv (GL_DONT_CARE), 3055 const_iv (GL_DONT_CARE),
2604 const_iv (GL_NICEST), 3056 const_iv (GL_NICEST),
2605 const_iv (GL_V2F), 3057 const_iv (GL_V2F),
2606 const_iv (GL_V3F), 3058 const_iv (GL_V3F),
2607 const_iv (GL_T2F_V3F), 3059 const_iv (GL_T2F_V3F),
2608 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),
2609# undef const_iv 3064# undef const_iv
2610 }; 3065 };
2611 3066
2612 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; )
2613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3068 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2614 3069
2615 texture_av = newAV (); 3070 texture_av = newAV ();
2616 AvREAL_off (texture_av); 3071 AvREAL_off (texture_av);
2617} 3072}
2618 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
2619char * 3083char *
2620gl_vendor () 3084gl_vendor ()
2621 CODE: 3085 CODE:
2622 RETVAL = (char *)glGetString (GL_VENDOR); 3086 RETVAL = (char *)glGetString (GL_VENDOR);
2623 OUTPUT: 3087 OUTPUT:
2672 3136
2673void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3137void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2674 CODE: 3138 CODE:
2675 gl_BlendFuncSeparate (sa, da, saa, daa); 3139 gl_BlendFuncSeparate (sa, da, saa, daa);
2676 3140
3141# void glBlendEquation (int se)
3142
2677void glDepthMask (int flag) 3143void glDepthMask (int flag)
2678 3144
2679void glLogicOp (int opcode) 3145void glLogicOp (int opcode)
2680 3146
2681void glColorMask (int red, int green, int blue, int alpha) 3147void glColorMask (int red, int green, int blue, int alpha)
2715void glRotate (float angle, float x, float y, float z) 3181void glRotate (float angle, float x, float y, float z)
2716 CODE: 3182 CODE:
2717 glRotatef (angle, x, y, z); 3183 glRotatef (angle, x, y, z);
2718 3184
2719void 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: @
2720 ALIAS: 3187 ALIAS:
2721 glColor_premultiply = 1 3188 glColor_premultiply = 1
2722 CODE: 3189 CODE:
2723 if (ix) 3190 if (ix)
2724 { 3191 {
2744 3211
2745void glRect (float x1, float y1, float x2, float y2) 3212void glRect (float x1, float y1, float x2, float y2)
2746 CODE: 3213 CODE:
2747 glRectf (x1, y1, x2, y2); 3214 glRectf (x1, y1, x2, y2);
2748 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
2749PROTOTYPES: ENABLE 3225PROTOTYPES: ENABLE
2750 3226
2751void glBegin (int mode) 3227void glBegin (int mode)
2752 3228
2753void glEnd () 3229void glEnd ()
2785void 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)
2786 CODE: 3262 CODE:
2787 if (gl.SeparableFilter2D) 3263 if (gl.SeparableFilter2D)
2788 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3264 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2789 3265
2790void 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)
2791 3267
2792void 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)
2793 3269
2794void glDrawPixels (int width, int height, int format, int type, char *pixels) 3270void glDrawPixels (int width, int height, int format, int type, char *pixels)
2795 3271
2821 3297
2822void glEndList () 3298void glEndList ()
2823 3299
2824void glCallList (int list) 3300void glCallList (int list)
2825 3301
2826MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3302MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2827 3303
2828PROTOTYPES: DISABLE 3304PROTOTYPES: DISABLE
2829 3305
2830void 3306void
2831find_widget (SV *self, NV x, NV y) 3307find_widget (SV *self, NV x, NV y)
2835 XPUSHs (self); 3311 XPUSHs (self);
2836} 3312}
2837 3313
2838BOOT: 3314BOOT:
2839{ 3315{
2840 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3316 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2841 3317
2842 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);
2843 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);
2844 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);
2845 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);
2846} 3322}
2847 3323
2848void 3324void
2849draw (SV *self) 3325draw (SV *self)
2850 CODE: 3326 CODE:
2854 NV x, y, w, h; 3330 NV x, y, w, h;
2855 SV *draw_x_sv = GvSV (draw_x_gv); 3331 SV *draw_x_sv = GvSV (draw_x_gv);
2856 SV *draw_y_sv = GvSV (draw_y_gv); 3332 SV *draw_y_sv = GvSV (draw_y_gv);
2857 SV *draw_w_sv = GvSV (draw_w_gv); 3333 SV *draw_w_sv = GvSV (draw_w_gv);
2858 SV *draw_h_sv = GvSV (draw_h_gv); 3334 SV *draw_h_sv = GvSV (draw_h_gv);
2859 SV *hover;
2860 double draw_x, draw_y, draw_w, draw_h; 3335 double draw_x, draw_y;
2861 3336
2862 if (!SvROK (self)) 3337 if (!SvROK (self))
2863 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3338 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2864 3339
2865 hv = (HV *)SvRV (self); 3340 hv = (HV *)SvRV (self);
2866 3341
2867 if (SvTYPE (hv) != SVt_PVHV) 3342 if (SvTYPE (hv) != SVt_PVHV)
2868 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3343 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2869 3344
2870 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.;
2871 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.;
2872 3347
2873 if (!h || !w) 3348 if (!h || !w)
2893 { 3368 {
2894 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3369 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2895 3370
2896 if (svp && SvTRUE (*svp)) 3371 if (svp && SvTRUE (*svp))
2897 { 3372 {
2898 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);
2899 glEnable (GL_BLEND); 3374 glEnable (GL_BLEND);
2900 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3375 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2901 glBegin (GL_QUADS); 3376 glBegin (GL_QUADS);
2902 glVertex2f (0, 0); 3377 glVertex2f (0, 0);
2903 glVertex2f (w, 0); 3378 glVertex2f (w, 0);
2906 glEnd (); 3381 glEnd ();
2907 glDisable (GL_BLEND); 3382 glDisable (GL_BLEND);
2908 } 3383 }
2909 } 3384 }
2910#if 0 3385#if 0
2911 if ($ENV{CFPLUS_DEBUG} & 1) { 3386 // draw borders, for debugging
2912 glPushMatrix; 3387 glPushMatrix ();
2913 glColor 1, 1, 0, 1; 3388 glColor4f (1., 1., 0., 1.);
2914 glTranslate 0.375, 0.375; 3389 glTranslatef (.5, .5, 0.);
2915 glBegin GL_LINE_LOOP; 3390 glBegin (GL_LINE_LOOP);
2916 glVertex 0 , 0; 3391 glVertex2f (0 , 0);
2917 glVertex $self->{w} - 1, 0; 3392 glVertex2f (w - 1, 0);
2918 glVertex $self->{w} - 1, $self->{h} - 1; 3393 glVertex2f (w - 1, h - 1);
2919 glVertex 0 , $self->{h} - 1; 3394 glVertex2f (0 , h - 1);
2920 glEnd; 3395 glEnd ();
2921 glPopMatrix; 3396 glPopMatrix ();
2922 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2923 }
2924#endif 3397#endif
2925 PUSHMARK (SP); 3398 PUSHMARK (SP);
2926 XPUSHs (self); 3399 XPUSHs (self);
2927 PUTBACK; 3400 PUTBACK;
2928 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