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.232 by root, Sun Aug 19 15:57:40 2007 UTC vs.
Revision 1.305 by root, Sun May 2 21:22:20 2010 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);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib/gmacros.h>
48 54
49#include <pango/pango.h> 55#include <pango/pango.h>
56
57#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0
59#endif
60
61#if !PANGO_VERSION_CHECK (1, 15, 2)
62# define pango_layout_get_line_readonly pango_layout_get_line
63# define pango_layout_get_lines_readonly pango_layout_get_lines
64# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
65# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
66#endif
50 67
51#ifndef _WIN32 68#ifndef _WIN32
52# include <sys/types.h> 69# include <sys/types.h>
53# include <sys/socket.h> 70# include <sys/socket.h>
54# include <netinet/in.h> 71# include <netinet/in.h>
55# include <netinet/tcp.h> 72# include <netinet/tcp.h>
56# include <inttypes.h> 73# include <inttypes.h>
57#endif 74#endif
58 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
61#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
62 91
63#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
65 94
66#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
67 96
68#if 0 97/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 99
71# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
72#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
73 104
74static AV *texture_av; 105static AV *texture_av;
75 106
76static struct 107static struct
77{ 108{
120 151
121#include "pango-font.c" 152#include "pango-font.c"
122#include "pango-fontmap.c" 153#include "pango-fontmap.c"
123#include "pango-render.c" 154#include "pango-render.c"
124 155
125typedef IV CFPlus__Channel; 156typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 157typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 158typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 159typedef Mix_Music *DC__MixMusic;
129 160
130typedef PangoFontDescription *CFPlus__Font; 161typedef PangoFontDescription *DC__Font;
131 162
132static int 163static int
133shape_attr_p (PangoLayoutRun *run) 164shape_attr_p (PangoLayoutRun *run)
134{ 165{
135 GSList *attrs = run->item->analysis.extra_attrs; 166 GSList *attrs = run->item->analysis.extra_attrs;
149 180
150typedef struct cf_layout { 181typedef struct cf_layout {
151 PangoLayout *pl; 182 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 183 float r, g, b, a; // default color for rgba mode
153 int base_height; 184 int base_height;
154 CFPlus__Font font; 185 DC__Font font;
155 rc_t *rc; 186 rc_t *rc;
156} *CFPlus__Layout; 187} *DC__Layout;
157 188
158static CFPlus__Font default_font; 189static DC__Font default_font;
159static PangoContext *opengl_context; 190static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 191static PangoFontMap *opengl_fontmap;
161 192
162static void 193static void
163substitute_func (FcPattern *pattern, gpointer data) 194substitute_func (FcPattern *pattern, gpointer data)
168#endif 199#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 200 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 201}
171 202
172static void 203static void
173layout_update_font (CFPlus__Layout self) 204layout_update_font (DC__Layout self)
174{ 205{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 206 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 207 * reasonably well with dejavu/bistream fonts
177 */ 208 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 209 PangoFontDescription *font = self->font ? self->font : default_font;
179 210
180 pango_font_description_set_absolute_size (font, 211 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 212 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 213
183 pango_layout_set_font_description (self->pl, font); 214 pango_layout_set_font_description (self->pl, font);
184} 215}
185 216
186static void 217static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 218layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 219{
189 PangoRectangle rect; 220 PangoRectangle rect;
190 221
191 // get_pixel_* wrongly rounds down 222 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 223 pango_layout_get_extents (self->pl, 0, &rect);
209 int w, h; 240 int w, h;
210 float s, t; 241 float s, t;
211 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
212 tileid smoothtile; 243 tileid smoothtile;
213 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
214} maptex; 246} maptex;
215 247
216typedef struct { 248typedef struct {
217 uint32_t player; 249 uint32_t player;
218 tileid tile[3]; 250 tileid tile[3];
231 int faces; tileid *face2tile; // [faceid] 263 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 264 int texs; maptex *tex; // [tileid]
233 265
234 int32_t rows; 266 int32_t rows;
235 maprow *row; 267 maprow *row;
236} *CFPlus__Map; 268} *DC__Map;
237 269
238static char * 270static char *
239prepend (char *ptr, int sze, int inc) 271prepend (char *ptr, int sze, int inc)
240{ 272{
241 char *p; 273 char *p;
279 self->texs *= 2; 311 self->texs *= 2;
280 } 312 }
281} 313}
282 314
283static maprow * 315static maprow *
284map_get_row (CFPlus__Map self, int y) 316map_get_row (DC__Map self, int y)
285{ 317{
286 if (0 > y) 318 if (0 > y)
287 { 319 {
288 int extend = - y + MAP_EXTEND_Y; 320 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 321 Prepend (maprow, self->row, self->rows, extend);
327 359
328 return row->col + (x - row->c0); 360 return row->col + (x - row->c0);
329} 361}
330 362
331static mapcell * 363static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 364map_get_cell (DC__Map self, int x, int y)
333{ 365{
334 return row_get_cell (map_get_row (self, y), x); 366 return row_get_cell (map_get_row (self, y), x);
335} 367}
336 368
337static void 369static void
338map_clear (CFPlus__Map self) 370map_clear (DC__Map self)
339{ 371{
340 int r; 372 int r;
341 373
342 for (r = 0; r < self->rows; r++) 374 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 375 Safefree (self->row[r].col);
350 self->oy = 0; 382 self->oy = 0;
351 self->row = 0; 383 self->row = 0;
352 self->rows = 0; 384 self->rows = 0;
353} 385}
354 386
387#define CELL_CLEAR(cell) \
388 do { \
389 if ((cell)->player) \
390 (cell)->tile [2] = 0; \
391 (cell)->darkness = 0; \
392 (cell)->stat_hp = 0; \
393 (cell)->flags = 0; \
394 (cell)->player = 0; \
395 } while (0)
396
355static void 397static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 398map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 399{
358 int x, y; 400 int x, y;
359 maprow *row; 401 maprow *row;
360 mapcell *cell; 402 mapcell *cell;
361 403
373 if (x >= row->c1) 415 if (x >= row->c1)
374 break; 416 break;
375 417
376 cell = row->col + x - row->c0; 418 cell = row->col + x - row->c0;
377 419
378 cell->darkness = 0; 420 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 421 }
383 } 422 }
384} 423}
385 424
386typedef struct { 425typedef struct {
440 n |= n >> 16; 479 n |= n >> 16;
441 480
442 return n + 1; 481 return n + 1;
443} 482}
444 483
484static unsigned int
485popcount (unsigned int n)
486{
487 n -= (n >> 1) & 0x55555555U;
488 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
489 n = ((n >> 4) + n) & 0x0f0f0f0fU;
490 n *= 0x01010101U;
491
492 return n >> 24;
493}
494
445/* SDL should provide this, really. */ 495/* SDL should provide this, really. */
446#define SDLK_MODIFIER_MIN 300 496#define SDLK_MODIFIER_MIN 300
447#define SDLK_MODIFIER_MAX 314 497#define SDLK_MODIFIER_MAX 314
448 498
449/******************************************************************************/ 499/******************************************************************************/
487 return 0; 537 return 0;
488 538
489 return 1; 539 return 1;
490} 540}
491 541
492MODULE = CFPlus PACKAGE = CFPlus 542/******************************************************************************/
543
544/* process keyboard modifiers */
545static int
546mod_munge (int mod)
547{
548 mod &= MOD_MASK;
549
550 if (mod & (KMOD_META | KMOD_ALT))
551 mod |= KMOD_LRAM;
552
553 return mod;
554}
555
556static void
557deliantra_main ()
558{
559 char *argv[] = { 0 };
560 call_argv ("::main", G_DISCARD | G_VOID, argv);
561}
562
563#ifdef __MACOSX__
564 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back.
569 */
570 extern C_LINKAGE int
571 main (int argc, char *argv[])
572 {
573 deliantra_main ();
574 }
575
576 #undef main
577
578 extern C_LINKAGE int main (int argc, char *argv[]);
579
580 static void
581 SDL_braino (void)
582 {
583 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv);
585 }
586#else
587 static void
588 SDL_braino (void)
589 {
590 deliantra_main ();
591 }
592#endif
593
594MODULE = Deliantra::Client PACKAGE = DC
493 595
494PROTOTYPES: ENABLE 596PROTOTYPES: ENABLE
495 597
496BOOT: 598BOOT:
497{ 599{
498 HV *stash = gv_stashpv ("CFPlus", 1); 600 HV *stash = gv_stashpv ("DC", 1);
499 static const struct { 601 static const struct {
500 const char *name; 602 const char *name;
501 IV iv; 603 IV iv;
502 } *civ, const_iv[] = { 604 } *civ, const_iv[] = {
503# define const_iv(name) { # name, (IV)name } 605# define const_iv(name) { # name, (IV)name }
525 627
526 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE), 630 const_iv (SDL_APPACTIVE),
529 631
632
633 const_iv (SDLK_UNKNOWN),
634 const_iv (SDLK_FIRST),
635 const_iv (SDLK_BACKSPACE),
636 const_iv (SDLK_TAB),
637 const_iv (SDLK_CLEAR),
638 const_iv (SDLK_RETURN),
639 const_iv (SDLK_PAUSE),
640 const_iv (SDLK_ESCAPE),
641 const_iv (SDLK_SPACE),
642 const_iv (SDLK_EXCLAIM),
643 const_iv (SDLK_QUOTEDBL),
644 const_iv (SDLK_HASH),
645 const_iv (SDLK_DOLLAR),
646 const_iv (SDLK_AMPERSAND),
647 const_iv (SDLK_QUOTE),
648 const_iv (SDLK_LEFTPAREN),
649 const_iv (SDLK_RIGHTPAREN),
650 const_iv (SDLK_ASTERISK),
651 const_iv (SDLK_PLUS),
652 const_iv (SDLK_COMMA),
653 const_iv (SDLK_MINUS),
654 const_iv (SDLK_PERIOD),
655 const_iv (SDLK_SLASH),
656 const_iv (SDLK_0),
657 const_iv (SDLK_1),
658 const_iv (SDLK_2),
659 const_iv (SDLK_3),
660 const_iv (SDLK_4),
661 const_iv (SDLK_5),
662 const_iv (SDLK_6),
663 const_iv (SDLK_7),
664 const_iv (SDLK_8),
665 const_iv (SDLK_9),
666 const_iv (SDLK_COLON),
667 const_iv (SDLK_SEMICOLON),
668 const_iv (SDLK_LESS),
669 const_iv (SDLK_EQUALS),
670 const_iv (SDLK_GREATER),
671 const_iv (SDLK_QUESTION),
672 const_iv (SDLK_AT),
673
674 const_iv (SDLK_LEFTBRACKET),
675 const_iv (SDLK_BACKSLASH),
676 const_iv (SDLK_RIGHTBRACKET),
677 const_iv (SDLK_CARET),
678 const_iv (SDLK_UNDERSCORE),
679 const_iv (SDLK_BACKQUOTE),
680 const_iv (SDLK_DELETE),
681
682 const_iv (SDLK_FIRST),
683 const_iv (SDLK_LAST),
530 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
531 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
532 const_iv (SDLK_KP2), 686 const_iv (SDLK_KP2),
533 const_iv (SDLK_KP3), 687 const_iv (SDLK_KP3),
534 const_iv (SDLK_KP4), 688 const_iv (SDLK_KP4),
606 const_iv (KMOD_LMETA), 760 const_iv (KMOD_LMETA),
607 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
608 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
609 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
610 const_iv (KMOD_MODE), 764 const_iv (KMOD_MODE),
765
766 const_iv (KMOD_LRAM),
767
768 const_iv (MIX_DEFAULT_FORMAT),
769
770 const_iv (SDL_INIT_TIMER),
771 const_iv (SDL_INIT_AUDIO),
772 const_iv (SDL_INIT_VIDEO),
773 const_iv (SDL_INIT_CDROM),
774 const_iv (SDL_INIT_JOYSTICK),
775 const_iv (SDL_INIT_EVERYTHING),
776 const_iv (SDL_INIT_NOPARACHUTE),
777 const_iv (SDL_INIT_EVENTTHREAD),
778
779 const_iv (SDL_GL_RED_SIZE),
780 const_iv (SDL_GL_GREEN_SIZE),
781 const_iv (SDL_GL_BLUE_SIZE),
782 const_iv (SDL_GL_ALPHA_SIZE),
783 const_iv (SDL_GL_DOUBLEBUFFER),
784 const_iv (SDL_GL_BUFFER_SIZE),
785 const_iv (SDL_GL_DEPTH_SIZE),
786 const_iv (SDL_GL_STENCIL_SIZE),
787 const_iv (SDL_GL_ACCUM_RED_SIZE),
788 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
789 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
790 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
791 const_iv (SDL_GL_STEREO),
792 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
793 const_iv (SDL_GL_MULTISAMPLESAMPLES),
794 const_iv (SDL_GL_ACCELERATED_VISUAL),
795 const_iv (SDL_GL_SWAP_CONTROL),
796
797 const_iv (FOW_DARKNESS)
611# undef const_iv 798# undef const_iv
612 }; 799 };
613 800
614 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
633 820
634NV floor (NV x) 821NV floor (NV x)
635 822
636NV ceil (NV x) 823NV ceil (NV x)
637 824
825IV minpot (UV n)
826
827IV popcount (UV n)
828
829NV distance (NV dx, NV dy)
830 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT:
833 RETVAL
834
638void 835void
639pango_init () 836pango_init ()
640 CODE: 837 CODE:
641{ 838{
642 opengl_fontmap = pango_opengl_font_map_new (); 839 opengl_fontmap = pango_opengl_font_map_new ();
643 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 840 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); 841 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
842 /*pango_context_set_font_description (opengl_context, default_font);*/
843#if PANGO_VERSION_CHECK (1, 15, 2)
844 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
845 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
846#endif
645} 847}
646 848
647char *
648SDL_GetError () 849char *SDL_GetError ()
649 850
650int 851void SDL_braino ()
651SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
652 852
653void 853int SDL_Init (U32 flags)
854
855int SDL_InitSubSystem (U32 flags)
856
857void SDL_QuitSubSystem (U32 flags)
858
654SDL_Quit () 859void SDL_Quit ()
860
861int SDL_GL_SetAttribute (int attr, int value)
862
863int SDL_GL_GetAttribute (int attr)
864 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL))
866 XSRETURN_UNDEF;
867 OUTPUT:
868 RETVAL
655 869
656void 870void
657SDL_ListModes (int rgb, int alpha) 871SDL_ListModes (int rgb, int alpha)
658 PPCODE: 872 PPCODE:
659{ 873{
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 887 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674 888
675 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 889 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); 890 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679#endif
680 891
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 892 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 893
683 if (m && m != (SDL_Rect **)-1) 894 if (m && m != (SDL_Rect **)-1)
684 while (*m) 895 while (*m)
685 { 896 {
686 if ((*m)->w >= 640 && (*m)->h >= 480) 897 if ((*m)->w >= 400 && (*m)->h >= 300)
687 { 898 {
688 AV *av = newAV (); 899 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 900 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 901 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 902 av_push (av, newSViv (rgb));
715 926
716 if (RETVAL) 927 if (RETVAL)
717 { 928 {
718 av_clear (texture_av); 929 av_clear (texture_av);
719 930
720 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 932#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
722#include "glfunc.h" 933#include "glfunc.h"
723#undef GL_FUNC 934#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
724 } 938 }
725} 939}
726 OUTPUT: 940 OUTPUT:
727 RETVAL 941 RETVAL
728 942
732char * 946char *
733SDL_GetKeyName (int sym) 947SDL_GetKeyName (int sym)
734 948
735int 949int
736SDL_GetAppState () 950SDL_GetAppState ()
951
952int
953SDL_GetModState ()
737 954
738void 955void
739poll_events () 956poll_events ()
740 PPCODE: 957 PPCODE:
741{ 958{
751 { 968 {
752 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
753 case SDL_KEYUP: 970 case SDL_KEYUP:
754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 973 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 */ 974 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); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759 break; 976 break;
760 977
761 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
780 x = ev.motion.x; 997 x = ev.motion.x;
781 y = ev.motion.y; 998 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 } 1000 }
784 1001
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
786 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
787 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
788 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
789 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 } 1008 }
792 break; 1009 break;
793 1010
794 case SDL_MOUSEBUTTONDOWN: 1011 case SDL_MOUSEBUTTONDOWN:
795 case SDL_MOUSEBUTTONUP: 1012 case SDL_MOUSEBUTTONUP:
796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1013 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797 1014
798 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1015 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1016 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1017 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1018 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1023 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1024 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 1025 break;
809 } 1026 }
810 1027
811 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1028 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
812 } 1029 }
813} 1030}
814 1031
1032char *
1033SDL_AudioDriverName ()
1034 CODE:
1035{
1036 char buf [256];
1037 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1038 XSRETURN_UNDEF;
1039
1040 RETVAL = buf;
1041}
1042 OUTPUT:
1043 RETVAL
1044
815int 1045int
816Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1046Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817 POSTCALL: 1047 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 1048 Mix_HookMusicFinished (music_finished);
819 Mix_ChannelFinished (channel_finished); 1049 Mix_ChannelFinished (channel_finished);
1050
1051void
1052Mix_QuerySpec ()
1053 PPCODE:
1054{
1055 int freq, channels;
1056 Uint16 format;
1057
1058 if (Mix_QuerySpec (&freq, &format, &channels))
1059 {
1060 EXTEND (SP, 3);
1061 PUSHs (sv_2mortal (newSViv (freq)));
1062 PUSHs (sv_2mortal (newSViv (format)));
1063 PUSHs (sv_2mortal (newSViv (channels)));
1064 }
1065}
820 1066
821void 1067void
822Mix_CloseAudio () 1068Mix_CloseAudio ()
823 1069
824int 1070int
859 } 1105 }
860 } 1106 }
861#endif 1107#endif
862} 1108}
863 1109
864void 1110int
865add_font (char *file) 1111add_font (char *file)
866 CODE: 1112 CODE:
867 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1113 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1114 OUTPUT:
1115 RETVAL
1116
1117void
1118IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
868 1119
869void 1120void
870load_image_inline (SV *image_) 1121load_image_inline (SV *image_)
871 ALIAS: 1122 ALIAS:
872 load_image_file = 1 1123 load_image_file = 1
958void 1209void
959error (char *message) 1210error (char *message)
960 CODE: 1211 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1212 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1213#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1214 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1215#endif
965 1216
966void 1217void
967fatal (char *message) 1218fatal (char *message)
968 CODE: 1219 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1220 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1221#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1222 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1223#endif
973 _exit (1); 1224 _exit (1);
974 1225
975void 1226void
976_exit (int retval = 0) 1227_exit (int retval = 0)
988#if DEBUG 1239#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1240 VALGRIND_DO_LEAK_CHECK;
990#endif 1241#endif
991} 1242}
992 1243
993MODULE = CFPlus PACKAGE = CFPlus::Font 1244int
1245SvREFCNT (SV *sv)
1246 CODE:
1247 RETVAL = SvREFCNT (sv);
1248 OUTPUT:
1249 RETVAL
1250
1251MODULE = Deliantra::Client PACKAGE = DC::Font
994 1252
995PROTOTYPES: DISABLE 1253PROTOTYPES: DISABLE
996 1254
997CFPlus::Font 1255DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1256new_from_file (SV *class, char *path, int id = 0)
999 CODE: 1257 CODE:
1000{ 1258{
1001 int count; 1259 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1260 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1005} 1263}
1006 OUTPUT: 1264 OUTPUT:
1007 RETVAL 1265 RETVAL
1008 1266
1009void 1267void
1010DESTROY (CFPlus::Font self) 1268DESTROY (DC::Font self)
1011 CODE: 1269 CODE:
1012 pango_font_description_free (self); 1270 pango_font_description_free (self);
1013 1271
1014void 1272void
1015make_default (CFPlus::Font self) 1273make_default (DC::Font self)
1016 PROTOTYPE: $ 1274 PROTOTYPE: $
1017 CODE: 1275 CODE:
1018 default_font = self; 1276 default_font = self;
1019 1277
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1278MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1279
1022PROTOTYPES: DISABLE 1280PROTOTYPES: DISABLE
1023 1281
1024void 1282void
1025reset_glyph_cache () 1283glyph_cache_backup ()
1026 PROTOTYPE: 1284 PROTOTYPE:
1027 CODE: 1285 CODE:
1286 tc_backup ();
1287
1288void
1289glyph_cache_restore ()
1290 PROTOTYPE:
1291 CODE:
1028 tc_clear (); 1292 tc_restore ();
1029 1293
1030CFPlus::Layout 1294DC::Layout
1031new (SV *class) 1295new (SV *class)
1032 CODE: 1296 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1297 New (0, RETVAL, 1, struct cf_layout);
1034 1298
1035 RETVAL->pl = pango_layout_new (opengl_context); 1299 RETVAL->pl = pango_layout_new (opengl_context);
1045 layout_update_font (RETVAL); 1309 layout_update_font (RETVAL);
1046 OUTPUT: 1310 OUTPUT:
1047 RETVAL 1311 RETVAL
1048 1312
1049void 1313void
1050DESTROY (CFPlus::Layout self) 1314DESTROY (DC::Layout self)
1051 CODE: 1315 CODE:
1052 g_object_unref (self->pl); 1316 g_object_unref (self->pl);
1053 rc_free (self->rc); 1317 rc_free (self->rc);
1054 Safefree (self); 1318 Safefree (self);
1055 1319
1056void 1320void
1057set_text (CFPlus::Layout self, SV *text_) 1321set_text (DC::Layout self, SV *text_)
1058 CODE: 1322 CODE:
1059{ 1323{
1060 STRLEN textlen; 1324 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1325 char *text = SvPVutf8 (text_, textlen);
1062 1326
1063 pango_layout_set_text (self->pl, text, textlen); 1327 pango_layout_set_text (self->pl, text, textlen);
1064} 1328}
1065 1329
1066void 1330void
1067set_markup (CFPlus::Layout self, SV *text_) 1331set_markup (DC::Layout self, SV *text_)
1068 CODE: 1332 CODE:
1069{ 1333{
1070 STRLEN textlen; 1334 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1335 char *text = SvPVutf8 (text_, textlen);
1072 1336
1073 pango_layout_set_markup (self->pl, text, textlen); 1337 pango_layout_set_markup (self->pl, text, textlen);
1074} 1338}
1075 1339
1076void 1340void
1077set_shapes (CFPlus::Layout self, ...) 1341set_shapes (DC::Layout self, ...)
1078 CODE: 1342 CODE:
1079{ 1343{
1080 PangoAttrList *attrs = 0; 1344 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1345 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1346 const char *pos = text;
1117 if (attrs) 1381 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1382 pango_layout_set_attributes (self->pl, attrs);
1119} 1383}
1120 1384
1121void 1385void
1122get_shapes (CFPlus::Layout self) 1386get_shapes (DC::Layout self)
1123 PPCODE: 1387 PPCODE:
1124{ 1388{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1389 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1390
1127 do 1391 do
1128 { 1392 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1393 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1394
1131 if (run && shape_attr_p (run)) 1395 if (run && shape_attr_p (run))
1132 { 1396 {
1133 PangoRectangle extents; 1397 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1398 pango_layout_iter_get_run_extents (iter, 0, &extents);
1142 1406
1143 pango_layout_iter_free (iter); 1407 pango_layout_iter_free (iter);
1144} 1408}
1145 1409
1146int 1410int
1147has_wrapped (CFPlus::Layout self) 1411has_wrapped (DC::Layout self)
1148 CODE: 1412 CODE:
1149{ 1413{
1150 int lines = 1; 1414 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1415 const char *text = pango_layout_get_text (self->pl);
1152 1416
1157} 1421}
1158 OUTPUT: 1422 OUTPUT:
1159 RETVAL 1423 RETVAL
1160 1424
1161SV * 1425SV *
1162get_text (CFPlus::Layout self) 1426get_text (DC::Layout self)
1163 CODE: 1427 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1428 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1429 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1430 OUTPUT:
1167 RETVAL 1431 RETVAL
1168 1432
1169void 1433void
1170set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1434set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1171 CODE: 1435 CODE:
1172 self->r = r; 1436 self->r = r;
1173 self->g = g; 1437 self->g = g;
1174 self->b = b; 1438 self->b = b;
1175 self->a = a; 1439 self->a = a;
1176 1440
1177void 1441void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1442set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1443 CODE:
1180 if (self->font != font) 1444 if (self->font != font)
1181 { 1445 {
1182 self->font = font; 1446 self->font = font;
1183 layout_update_font (self); 1447 layout_update_font (self);
1184 } 1448 }
1185 1449
1186void 1450void
1187set_height (CFPlus::Layout self, int base_height) 1451set_height (DC::Layout self, int base_height)
1188 CODE: 1452 CODE:
1189 if (self->base_height != base_height) 1453 if (self->base_height != base_height)
1190 { 1454 {
1191 self->base_height = base_height; 1455 self->base_height = base_height;
1192 layout_update_font (self); 1456 layout_update_font (self);
1193 } 1457 }
1194 1458
1195void 1459void
1196set_width (CFPlus::Layout self, int max_width = -1) 1460set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1461 CODE:
1198 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1462 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1199 1463
1200void 1464void
1201set_indent (CFPlus::Layout self, int indent) 1465set_indent (DC::Layout self, int indent)
1202 CODE: 1466 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1467 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1468
1205void 1469void
1206set_spacing (CFPlus::Layout self, int spacing) 1470set_spacing (DC::Layout self, int spacing)
1207 CODE: 1471 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1472 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1473
1210void 1474void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1475set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1476 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1477 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1478 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1479 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1480 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1481 : PANGO_ELLIPSIZE_NONE
1218 ); 1482 );
1219 1483
1220void 1484void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1485set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1486 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1487 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1488
1225void 1489void
1226size (CFPlus::Layout self) 1490size (DC::Layout self)
1227 PPCODE: 1491 PPCODE:
1228{ 1492{
1229 int w, h; 1493 int w, h;
1230 1494
1231 layout_get_pixel_size (self, &w, &h); 1495 layout_get_pixel_size (self, &w, &h);
1234 PUSHs (sv_2mortal (newSViv (w))); 1498 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1499 PUSHs (sv_2mortal (newSViv (h)));
1236} 1500}
1237 1501
1238int 1502int
1239descent (CFPlus::Layout self) 1503descent (DC::Layout self)
1240 CODE: 1504 CODE:
1241{ 1505{
1242 PangoRectangle rect; 1506 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1507 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1508 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1509 RETVAL = PANGO_DESCENT (rect);
1246} 1510}
1247 OUTPUT: 1511 OUTPUT:
1248 RETVAL 1512 RETVAL
1249 1513
1250int 1514int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1515xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1516 CODE:
1253{ 1517{
1254 int index, trailing; 1518 int index, trailing;
1255 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1519 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1256 RETVAL = index + trailing; 1520 RETVAL = index + trailing;
1257} 1521}
1258 OUTPUT: 1522 OUTPUT:
1259 RETVAL 1523 RETVAL
1260 1524
1261void 1525void
1262cursor_pos (CFPlus::Layout self, int index) 1526cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1527 PPCODE:
1264{ 1528{
1265 PangoRectangle strong_pos; 1529 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1530 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1531
1268 EXTEND (SP, 3); 1532 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1533 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1534 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1535 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1536}
1273 1537
1274void 1538void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1539index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1540 PPCODE:
1277{ 1541{
1278 int line, x; 1542 int line, x;
1279 1543
1280 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1544 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1545#if !PANGO_VERSION_CHECK (1, 17, 3)
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1546 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1547 --line;
1548#endif
1283 EXTEND (SP, 2); 1549 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1550 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1551 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1552}
1287 1553
1288void 1554void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1555line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1556 PPCODE:
1291{ 1557{
1292 PangoLayoutLine *lp; 1558 PangoLayoutLine *lp;
1293 int index, trailing; 1559 int index, trailing;
1294 1560
1295 if (line < 0) 1561 if (line < 0)
1296 XSRETURN_EMPTY; 1562 XSRETURN_EMPTY;
1297 1563
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1564 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1565 XSRETURN_EMPTY; /* do better */
1300 1566
1301 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1567 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1302 1568
1303 EXTEND (SP, 2); 1569 EXTEND (SP, 2);
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1575 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1576 }
1311} 1577}
1312 1578
1313void 1579void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1580render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1581 CODE:
1316 rc_clear (self->rc); 1582 rc_clear (self->rc);
1317 pango_opengl_render_layout_subpixel ( 1583 pango_opengl_render_layout_subpixel (
1318 self->pl, 1584 self->pl,
1319 self->rc, 1585 self->rc,
1324 // we assume that context_change actually clears/frees stuff 1590 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1591 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1592 pango_layout_context_changed (self->pl);
1327 1593
1328void 1594void
1329draw (CFPlus::Layout self) 1595draw (DC::Layout self)
1330 CODE: 1596 CODE:
1331{ 1597{
1332 glEnable (GL_TEXTURE_2D); 1598 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1599 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1600 glEnable (GL_BLEND);
1342 glDisable (GL_ALPHA_TEST); 1608 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1609 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1610 glDisable (GL_TEXTURE_2D);
1345} 1611}
1346 1612
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1613MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1614
1349PROTOTYPES: ENABLE 1615PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1616
1353void 1617void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1618pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1619 CODE:
1356{ 1620{
1422 glDisable (GL_ALPHA_TEST); 1686 glDisable (GL_ALPHA_TEST);
1423 glDisable (GL_BLEND); 1687 glDisable (GL_BLEND);
1424 } 1688 }
1425} 1689}
1426 1690
1691void
1692draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1693 PROTOTYPE: @
1694 CODE:
1695{
1696 glEnable (GL_BLEND);
1697 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1698 glEnable (GL_TEXTURE_2D);
1699 glBindTexture (GL_TEXTURE_2D, name1);
1700
1701 glColor3f (intensity, intensity, intensity);
1702 glPushMatrix ();
1703 glScalef (1./3, 1./3, 1.);
1704
1705 if (blend > 0.f)
1706 {
1707 float dx3 = dx * -3.f / w;
1708 float dy3 = dy * -3.f / h;
1709 GLfloat env_color[4] = { 0., 0., 0., blend };
1710
1711 /* interpolate the two shadow textures */
1712 /* stage 0 == rgb(glcolor) + alpha(t0) */
1713 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1714
1715 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1716 gl.ActiveTexture (GL_TEXTURE1);
1717 glEnable (GL_TEXTURE_2D);
1718 glBindTexture (GL_TEXTURE_2D, name2);
1719 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1720
1721 /* rgb == rgb(glcolor) */
1722 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1723 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1724 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1725
1726 /* alpha = interpolate t0, t1 by env_alpha */
1727 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1728
1729 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1730 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1731 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1732
1733 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1734 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1735
1736 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1737 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1738
1739 glBegin (GL_QUADS);
1740 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1741 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1742 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1743 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1744 glEnd ();
1745
1746 glDisable (GL_TEXTURE_2D);
1747 gl.ActiveTexture (GL_TEXTURE0);
1748 }
1749 else
1750 {
1751 /* simple blending of one texture, also opengl <1.3 path */
1752 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1753
1754 glBegin (GL_QUADS);
1755 glTexCoord2f (0, 0); glVertex2f (0, 0);
1756 glTexCoord2f (0, t); glVertex2f (0, h);
1757 glTexCoord2f (s, t); glVertex2f (w, h);
1758 glTexCoord2f (s, 0); glVertex2f (w, 0);
1759 glEnd ();
1760 }
1761
1762 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1763 {
1764 int x, y;
1765 int dx3 = dx * 3;
1766 int dy3 = dy * 3;
1767
1768 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1769 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1770 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1771 glTranslatef (-1., -1., 0);
1772 glBegin (GL_QUADS);
1773
1774 for (y = 1; y < h; y += 3)
1775 {
1776 int y1 = y - dy3;
1777 int y1valid = y1 >= 0 && y1 < h;
1778
1779 for (x = 1; x < w; x += 3)
1780 {
1781 int x1 = x - dx3;
1782 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1783 uint8_t h2;
1784
1785 if (y1valid && x1 >= 0 && x1 < w)
1786 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1787 else
1788 h2 = 1; /* out of range == invisible */
1789
1790 if (h1 || h2)
1791 {
1792 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1793 glColor4f (1., 1., 1., alpha);
1794
1795 glTexCoord2f (0, 0.); glVertex2i (x , y );
1796 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1797 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1798 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1799 }
1800 }
1801 }
1802 }
1803
1804 glEnd ();
1805
1806 glPopMatrix ();
1807
1808 glDisable (GL_TEXTURE_2D);
1809 glDisable (GL_BLEND);
1810}
1811
1427IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1812IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1428 CODE: 1813 CODE:
1429{ 1814{
1430 GLint width; 1815 GLint width;
1431 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1816 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1433 RETVAL = width > 0; 1818 RETVAL = width > 0;
1434} 1819}
1435 OUTPUT: 1820 OUTPUT:
1436 RETVAL 1821 RETVAL
1437 1822
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1823MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1824
1440PROTOTYPES: DISABLE 1825PROTOTYPES: DISABLE
1441 1826
1442CFPlus::Map 1827DC::Map
1443new (SV *class) 1828new (SV *class)
1444 CODE: 1829 CODE:
1445 New (0, RETVAL, 1, struct map); 1830 New (0, RETVAL, 1, struct map);
1446 RETVAL->x = 0; 1831 RETVAL->x = 0;
1447 RETVAL->y = 0; 1832 RETVAL->y = 0;
1455 RETVAL->row = 0; 1840 RETVAL->row = 0;
1456 OUTPUT: 1841 OUTPUT:
1457 RETVAL 1842 RETVAL
1458 1843
1459void 1844void
1460DESTROY (CFPlus::Map self) 1845DESTROY (DC::Map self)
1461 CODE: 1846 CODE:
1462{ 1847{
1463 map_clear (self); 1848 map_clear (self);
1464 Safefree (self->face2tile); 1849 Safefree (self->face2tile);
1465 Safefree (self->tex); 1850 Safefree (self->tex);
1466 Safefree (self); 1851 Safefree (self);
1467} 1852}
1468 1853
1469void 1854void
1470resize (CFPlus::Map self, int map_width, int map_height) 1855resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1856 CODE:
1472 self->w = map_width; 1857 self->w = map_width;
1473 self->h = map_height; 1858 self->h = map_height;
1474 1859
1475void 1860void
1476clear (CFPlus::Map self) 1861clear (DC::Map self)
1477 CODE: 1862 CODE:
1478 map_clear (self); 1863 map_clear (self);
1479 1864
1480void 1865void
1481set_tileid (CFPlus::Map self, int face, int tile) 1866set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1867 CODE:
1483{ 1868{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1869 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1870 need_texid (self, tile);
1486} 1871}
1487 1872
1488void 1873void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1874set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1875 CODE:
1491{ 1876{
1492 tileid texid; 1877 tileid texid;
1493 maptex *tex; 1878 maptex *tex;
1494 1879
1507 tex->smoothtile = self->face2tile [smooth]; 1892 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1893 tex->smoothlevel = level;
1509} 1894}
1510 1895
1511void 1896void
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) 1897set_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: 1898 CODE:
1514{ 1899{
1515 need_texid (self, texid); 1900 need_texid (self, texid);
1516 1901
1517 { 1902 {
1536 // use uglier nearest interpolation because linear suffers 1921 // use uglier nearest interpolation because linear suffers
1537 // from transparent color bleeding and ugly wrapping effects. 1922 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1923 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1924}
1540 1925
1926void
1927expire_textures (DC::Map self, int texid, int count)
1928 PPCODE:
1929 for (; texid < self->texs && count; ++texid, --count)
1930 {
1931 maptex *tex = self->tex + texid;
1932
1933 if (tex->name)
1934 {
1935 if (tex->unused)
1936 {
1937 tex->name = 0;
1938 tex->unused = 0;
1939 XPUSHs (sv_2mortal (newSViv (texid)));
1940 }
1941 else
1942 tex->unused = 1;
1943 }
1944 }
1945
1541int 1946int
1542ox (CFPlus::Map self) 1947ox (DC::Map self)
1543 ALIAS: 1948 ALIAS:
1544 oy = 1 1949 oy = 1
1545 x = 2 1950 x = 2
1546 y = 3 1951 y = 3
1547 w = 4 1952 w = 4
1558 } 1963 }
1559 OUTPUT: 1964 OUTPUT:
1560 RETVAL 1965 RETVAL
1561 1966
1562void 1967void
1563scroll (CFPlus::Map self, int dx, int dy) 1968scroll (DC::Map self, int dx, int dy)
1564 CODE: 1969 CODE:
1565{ 1970{
1566 if (dx > 0) 1971 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 1972 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 1973 else if (dx < 0)
1584 self->y += MAP_EXTEND_Y; 1989 self->y += MAP_EXTEND_Y;
1585 } 1990 }
1586} 1991}
1587 1992
1588SV * 1993SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 1994map1a_update (DC::Map self, SV *data_, int extmap)
1590 CODE: 1995 CODE:
1591{ 1996{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1997 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 1998 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 1999 mapcell *cell;
1622 uint8_t ext, cmd; 2027 uint8_t ext, cmd;
1623 2028
1624 do 2029 do
1625 { 2030 {
1626 ext = *data++; 2031 ext = *data++;
1627 cmd = ext & 0x3f; 2032 cmd = ext & 0x7f;
1628 2033
1629 if (cmd < 4) 2034 if (cmd < 4)
1630 cell->darkness = 255 - ext * 64 + 1; 2035 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1631 else if (cmd == 5) // health 2036 else if (cmd == 5) // health
1632 { 2037 {
1633 cell->stat_width = 1; 2038 cell->stat_width = 1;
1634 cell->stat_hp = *data++; 2039 cell->stat_hp = *data++;
1635 } 2040 }
1636 else if (cmd == 6) // monster width 2041 else if (cmd == 6) // monster width
1637 cell->stat_width = *data++ + 1; 2042 cell->stat_width = *data++ + 1;
1638 else if (cmd == 0x47) 2043 else if (cmd == 0x47)
1639 { 2044 {
1640 if (*data == 4) 2045 if (*data == 1) cell->player = data [1];
1641 ; // decode player count 2046 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2047 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2048 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1642 2049
1643 data += *data + 1; 2050 data += *data + 1;
1644 } 2051 }
1645 else if (cmd == 8) // cell flags 2052 else if (cmd == 8) // cell flags
1646 cell->flags = *data++; 2053 cell->flags = *data++;
1663 cell->tile [z] = self->face2tile [face]; 2070 cell->tile [z] = self->face2tile [face];
1664 2071
1665 if (cell->tile [z]) 2072 if (cell->tile [z])
1666 { 2073 {
1667 maptex *tex = self->tex + cell->tile [z]; 2074 maptex *tex = self->tex + cell->tile [z];
2075 tex->unused = 0;
1668 if (!tex->name) 2076 if (!tex->name)
1669 av_push (missing, newSViv (cell->tile [z])); 2077 av_push (missing, newSViv (cell->tile [z]));
1670 2078
1671 if (tex->smoothtile) 2079 if (tex->smoothtile)
1672 { 2080 {
1673 maptex *smooth = self->tex + tex->smoothtile; 2081 maptex *smooth = self->tex + tex->smoothtile;
2082 smooth->unused = 0;
1674 if (!smooth->name) 2083 if (!smooth->name)
1675 av_push (missing, newSViv (tex->smoothtile)); 2084 av_push (missing, newSViv (tex->smoothtile));
1676 } 2085 }
1677 } 2086 }
1678 } 2087 }
1679 } 2088 }
1680 else 2089 else
1681 cell->darkness = 0; 2090 CELL_CLEAR (cell);
1682 } 2091 }
1683} 2092}
1684 OUTPUT: 2093 OUTPUT:
1685 RETVAL 2094 RETVAL
1686 2095
1687SV * 2096SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2097mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 2098 CODE:
1690{ 2099{
1691 int x1, x; 2100 int x1, x;
1692 int y1, y; 2101 int y1, y;
1693 int z; 2102 int z;
1738} 2147}
1739 OUTPUT: 2148 OUTPUT:
1740 RETVAL 2149 RETVAL
1741 2150
1742void 2151void
1743draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2152draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1744 CODE: 2153 CODE:
1745{ 2154{
1746 int x, y, z; 2155 int x, y, z;
1747 2156
1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2157 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2158 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) 2159 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751 smooth_key skey; 2160 smooth_key skey;
1752 2161 int pl_x, pl_y;
2162 maptex pl_tex;
1753 rc_t *rc = rc_alloc (); 2163 rc_t *rc = rc_alloc ();
2164 rc_t *rc_ov = rc_alloc ();
1754 rc_key_t key; 2165 rc_key_t key;
1755 rc_array_t *arr; 2166 rc_array_t *arr;
1756 2167
2168 pl_tex.name = 0;
2169
1757 // thats current max. sorry. 2170 // that's current max. sorry.
1758 if (sw > 255) sw = 255; 2171 if (sw > 255) sw = 255;
1759 if (sh > 255) sh = 255; 2172 if (sh > 255) sh = 255;
1760 2173
1761 // clear key, in case of extra padding 2174 // clear key, in case of extra padding
1762 memset (&skey, 0, sizeof (skey)); 2175 memset (&skey, 0, sizeof (skey));
1766 key.g = 255; 2179 key.g = 255;
1767 key.b = 255; 2180 key.b = 255;
1768 key.a = 255; 2181 key.a = 255;
1769 key.mode = GL_QUADS; 2182 key.mode = GL_QUADS;
1770 key.format = GL_T2F_V3F; 2183 key.format = GL_T2F_V3F;
1771 key.texname = -1;
1772 2184
1773 mx += self->x; 2185 mx += self->x;
1774 my += self->y; 2186 my += self->y;
1775 2187
1776 // first pass: determine smooth_max 2188 // first pass: determine smooth_max
1800 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2212 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1801 2213
1802 for (z = 0; z <= 2; z++) 2214 for (z = 0; z <= 2; z++)
1803 { 2215 {
1804 memset (smooth_level, 0, sizeof (smooth_level)); 2216 memset (smooth_level, 0, sizeof (smooth_level));
2217 key.texname = -1;
1805 2218
1806 for (y = 0; y < sh; y++) 2219 for (y = 0; y < sh; y++)
1807 if (0 <= y + my && y + my < self->rows) 2220 if (0 <= y + my && y + my < self->rows)
1808 { 2221 {
1809 maprow *row = self->row + (y + my); 2222 maprow *row = self->row + (y + my);
1819 maptex tex = self->tex [tile]; 2232 maptex tex = self->tex [tile];
1820 int px, py; 2233 int px, py;
1821 2234
1822 if (key.texname != tex.name) 2235 if (key.texname != tex.name)
1823 { 2236 {
2237 self->tex [tile].unused = 0;
2238
1824 if (!tex.name) 2239 if (!tex.name)
1825 tex = self->tex [2]; /* missing, replace by noface */ 2240 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1826 2241
1827 key.texname = tex.name; 2242 key.texname = tex.name;
1828 arr = rc_array (rc, &key); 2243 arr = rc_array (rc, &key);
1829 } 2244 }
1830 2245
1831 px = (x + 1) * T - tex.w; 2246 px = (x + 1) * T - tex.w;
1832 py = (y + 1) * T - tex.h; 2247 py = (y + 1) * T - tex.h;
2248
2249 if (expect_false (cell->player == player) && expect_false (z == 2))
2250 {
2251 pl_x = px;
2252 pl_y = py;
2253 pl_tex = tex;
2254 continue;
2255 }
1833 2256
1834 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2257 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1835 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2258 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); 2259 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); 2260 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 2261
1864 // update smooth hash 2262 // update smooth hash
1865 if (tex.smoothtile) 2263 if (tex.smoothtile)
1866 { 2264 {
1867 skey.tile = tex.smoothtile; 2265 skey.tile = tex.smoothtile;
1896 // corners 2294 // corners
1897 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2295 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); 2296 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); 2297 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); 2298 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2299 }
2300 }
2301
2302 if (expect_false (z == 2) && expect_false (cell->flags))
2303 {
2304 // overlays such as the speech bubble, probably more to come
2305 if (cell->flags & 1)
2306 {
2307 rc_key_t key_ov = key;
2308 maptex tex = self->tex [TEXID_SPEECH];
2309 rc_array_t *arr;
2310 int px = x * T + T * 2 / 32;
2311 int py = y * T - T * 6 / 32;
2312
2313 key_ov.texname = tex.name;
2314 arr = rc_array (rc_ov, &key_ov);
2315
2316 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2317 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2318 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2319 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1901 } 2320 }
1902 } 2321 }
1903 } 2322 }
1904 } 2323 }
1905 2324
1945 { 2364 {
1946 // this time avoiding texture state changes 2365 // this time avoiding texture state changes
1947 // save gobs of state changes. 2366 // save gobs of state changes.
1948 if (key.texname != tex.name) 2367 if (key.texname != tex.name)
1949 { 2368 {
2369 self->tex [skey->tile].unused = 0;
2370
1950 glEnd (); 2371 glEnd ();
1951 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2372 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1952 glBegin (GL_QUADS); 2373 glBegin (GL_QUADS);
1953 } 2374 }
1954 2375
1983 } 2404 }
1984 2405
1985 hv_clear (smooth); 2406 hv_clear (smooth);
1986 } 2407 }
1987 2408
2409 if (pl_tex.name)
2410 {
2411 maptex tex = pl_tex;
2412 int px = pl_x + sdx;
2413 int py = pl_y + sdy;
2414
2415 key.texname = tex.name;
2416 arr = rc_array (rc, &key);
2417
2418 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2419 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2420 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2421 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2422
2423 rc_draw (rc);
2424 }
2425
2426 rc_draw (rc_ov);
2427 rc_clear (rc_ov);
2428
1988 glDisable (GL_BLEND); 2429 glDisable (GL_BLEND);
1989 rc_free (rc); 2430 rc_free (rc);
2431 rc_free (rc_ov);
1990 2432
1991 // top layer: overlays such as the health bar 2433 // top layer: overlays such as the health bar
1992 for (y = 0; y < sh; y++) 2434 for (y = 0; y < sh; y++)
1993 if (0 <= y + my && y + my < self->rows) 2435 if (0 <= y + my && y + my < self->rows)
1994 { 2436 {
1999 { 2441 {
2000 mapcell *cell = row->col + (x + mx - row->c0); 2442 mapcell *cell = row->col + (x + mx - row->c0);
2001 2443
2002 int px = x * T; 2444 int px = x * T;
2003 int py = y * T; 2445 int py = y * T;
2446
2447 if (expect_false (cell->player == player))
2448 {
2449 px += sdx;
2450 py += sdy;
2451 }
2004 2452
2005 if (cell->stat_hp) 2453 if (cell->stat_hp)
2006 { 2454 {
2007 int width = cell->stat_width * T; 2455 int width = cell->stat_width * T;
2008 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2456 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2019 } 2467 }
2020 } 2468 }
2021} 2469}
2022 2470
2023void 2471void
2024draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2472draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2025 CODE: 2473 CODE:
2026{ 2474{
2027 static float color[16][3] = { 2475 static float color[16][3] = {
2028 { 0.00F, 0.00F, 0.00F }, 2476 { 0.00f, 0.00f, 0.00f },
2029 { 1.00F, 1.00F, 1.00F }, 2477 { 1.00f, 1.00f, 1.00f },
2030 { 0.00F, 0.00F, 0.55F }, 2478 { 0.00f, 0.00f, 0.55f },
2031 { 1.00F, 0.00F, 0.00F }, 2479 { 1.00f, 0.00f, 0.00f },
2032 2480
2033 { 1.00F, 0.54F, 0.00F }, 2481 { 1.00f, 0.54f, 0.00f },
2034 { 0.11F, 0.56F, 1.00F }, 2482 { 0.11f, 0.56f, 1.00f },
2035 { 0.93F, 0.46F, 0.00F }, 2483 { 0.93f, 0.46f, 0.00f },
2036 { 0.18F, 0.54F, 0.34F }, 2484 { 0.18f, 0.54f, 0.34f },
2037 2485
2038 { 0.56F, 0.73F, 0.56F }, 2486 { 0.56f, 0.73f, 0.56f },
2039 { 0.80F, 0.80F, 0.80F }, 2487 { 0.80f, 0.80f, 0.80f },
2040 { 0.55F, 0.41F, 0.13F }, 2488 { 0.55f, 0.41f, 0.13f },
2041 { 0.99F, 0.77F, 0.26F }, 2489 { 0.99f, 0.77f, 0.26f },
2042 2490
2043 { 0.74F, 0.65F, 0.41F }, 2491 { 0.74f, 0.65f, 0.41f },
2044 2492
2045 { 0.00F, 1.00F, 1.00F }, 2493 { 0.00f, 1.00f, 1.00f },
2046 { 1.00F, 0.00F, 1.00F }, 2494 { 1.00f, 0.00f, 1.00f },
2047 { 1.00F, 1.00F, 0.00F }, 2495 { 1.00f, 1.00f, 0.00f },
2048 }; 2496 };
2049 2497
2050 int x, y; 2498 int x, y;
2051 2499
2052 glEnable (GL_TEXTURE_2D); 2500 glEnable (GL_TEXTURE_2D);
2501 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2502 * but the nvidia driver (185.18.14) mishandles alpha textures
2503 * and takes the colour from god knows where instead of using
2504 * Cp. MODULATE results in the same colour, but slightly different
2505 * alpha, but atcually gives us the correct colour with nvidia.
2506 */
2053 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2507 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2054 glEnable (GL_BLEND); 2508 glEnable (GL_BLEND);
2055 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2509 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2056 glBegin (GL_QUADS); 2510 glBegin (GL_QUADS);
2057 2511
2058 for (y = 0; y < h; y++) 2512 for (y = 0; y < h; y++)
2062 2516
2063 if (m) 2517 if (m)
2064 { 2518 {
2065 float *c = color [m & 15]; 2519 float *c = color [m & 15];
2066 2520
2067 float tx1 = m & 0x40 ? 0.5 : 0.; 2521 float tx1 = m & 0x40 ? 0.5f : 0.f;
2068 float tx2 = tx1 + 0.5; 2522 float tx2 = tx1 + 0.5f;
2069 2523
2070 glColor4f (c[0], c[1], c[2], 0.75); 2524 glColor4f (c[0], c[1], c[2], 1);
2071 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2525 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2072 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2526 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2073 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2527 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2074 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2528 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2075 } 2529 }
2079 glDisable (GL_BLEND); 2533 glDisable (GL_BLEND);
2080 glDisable (GL_TEXTURE_2D); 2534 glDisable (GL_TEXTURE_2D);
2081} 2535}
2082 2536
2083void 2537void
2084fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2538fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2085 PPCODE: 2539 PPCODE:
2086{ 2540{
2087 int x, y; 2541 int x, y;
2088 int sw1 = sw + 2; 2542 int sw1 = sw + 2;
2089 int sh1 = sh + 2; 2543 int sh1 = sh + 2;
2090 int sh3 = sh * 3; 2544 int sh3 = sh * 3;
2091 int sw34 = (sw * 3 + 3) & ~3; 2545 int sw3 = sw * 3;
2092 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2546 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2093 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2547 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2094 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2548 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2095 2549
2096 SvPOK_only (darkness3_sv); 2550 SvPOK_only (darkness3_sv);
2097 SvCUR_set (darkness3_sv, sw34 * sh3); 2551 SvCUR_set (darkness3_sv, sw3 * sh3);
2098 2552
2099 mx += self->x - 1; 2553 mx += self->x - 1;
2100 my += self->y - 1; 2554 my += self->y - 1;
2101
2102 memset (darkness1, 255, sw1 * sh1);
2103 2555
2104 for (y = 0; y < sh1; y++) 2556 for (y = 0; y < sh1; y++)
2105 if (0 <= y + my && y + my < self->rows) 2557 if (0 <= y + my && y + my < self->rows)
2106 { 2558 {
2107 maprow *row = self->row + (y + my); 2559 maprow *row = self->row + (y + my);
2110 if (row->c0 <= x + mx && x + mx < row->c1) 2562 if (row->c0 <= x + mx && x + mx < row->c1)
2111 { 2563 {
2112 mapcell *cell = row->col + (x + mx - row->c0); 2564 mapcell *cell = row->col + (x + mx - row->c0);
2113 2565
2114 darkness1 [y * sw1 + x] = cell->darkness 2566 darkness1 [y * sw1 + x] = cell->darkness
2115 ? 255 - (cell->darkness - 1) 2567 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2116 : 255 - FOW_DARKNESS; 2568 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2117 } 2569 }
2118 } 2570 }
2119 2571
2120 for (y = 0; y < sh; ++y) 2572 for (y = 0; y < sh; ++y)
2121 for (x = 0; x < sw; ++x) 2573 for (x = 0; x < sw; ++x)
2140 2592
2141 uint8_t r13 = (d13 + d23 + d12) / 3; 2593 uint8_t r13 = (d13 + d23 + d12) / 3;
2142 uint8_t r23 = d23; 2594 uint8_t r23 = d23;
2143 uint8_t r33 = (d23 + d33 + d32) / 3; 2595 uint8_t r33 = (d23 + d33 + d32) / 3;
2144 2596
2145 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2597 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2146 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2598 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2147 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2599 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2148 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2600 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2149 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2601 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2150 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2602 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2151 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2603 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2152 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2604 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2153 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2605 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2154 } 2606 }
2155 2607
2156 free (darkness1); 2608 free (darkness1);
2157 2609
2158 EXTEND (SP, 3); 2610 EXTEND (SP, 3);
2159 PUSHs (sv_2mortal (newSViv (sw34))); 2611 PUSHs (sv_2mortal (newSViv (sw3)));
2160 PUSHs (sv_2mortal (newSViv (sh3))); 2612 PUSHs (sv_2mortal (newSViv (sh3)));
2161 PUSHs (darkness3_sv); 2613 PUSHs (darkness3_sv);
2162} 2614}
2163 2615
2164SV * 2616SV *
2165get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2617get_rect (DC::Map self, int x0, int y0, int w, int h)
2166 CODE: 2618 CODE:
2167{ 2619{
2168 int x, y, x1, y1; 2620 int x, y, x1, y1;
2169 SV *data_sv = newSV (w * h * 7 + 5); 2621 SV *data_sv = newSV (w * h * 7 + 5);
2170 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2622 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2227 else 2679 else
2228 *data++ = 0; 2680 *data++ = 0;
2229 } 2681 }
2230 } 2682 }
2231 2683
2684 /* if size is w*h + 5 then no data has been found */
2685 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2686 {
2232 SvPOK_only (data_sv); 2687 SvPOK_only (data_sv);
2233 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2688 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2689 }
2690
2234 RETVAL = data_sv; 2691 RETVAL = data_sv;
2235} 2692}
2236 OUTPUT: 2693 OUTPUT:
2237 RETVAL 2694 RETVAL
2238 2695
2239void 2696void
2240set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2697set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2241 PPCODE: 2698 PPCODE:
2242{ 2699{
2243 int x, y, z; 2700 int x, y, z;
2244 int w, h; 2701 int w, h;
2245 int x1, y1; 2702 int x1, y1;
2703 STRLEN len;
2704 uint8_t *data, *end;
2705
2706 len = SvLEN (data_sv);
2707 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2708 data = SvPVbyte_nolen (data_sv);
2709 end = data + len + 8;
2710
2711 if (len < 5)
2712 XSRETURN_EMPTY;
2246 2713
2247 if (*data++ != 0) 2714 if (*data++ != 0)
2248 XSRETURN_EMPTY; /* version mismatch */ 2715 XSRETURN_EMPTY; /* version mismatch */
2249 2716
2250 w = *data++ << 8; w |= *data++; 2717 w = *data++ << 8; w |= *data++;
2265 { 2732 {
2266 maprow *row = map_get_row (self, y); 2733 maprow *row = map_get_row (self, y);
2267 2734
2268 for (x = x0; x < x1; x++) 2735 for (x = x0; x < x1; x++)
2269 { 2736 {
2737 uint8_t flags;
2738
2739 if (data + 7 >= end)
2740 XSRETURN_EMPTY;
2741
2270 uint8_t flags = *data++; 2742 flags = *data++;
2271 2743
2272 if (flags) 2744 if (flags)
2273 { 2745 {
2274 mapcell *cell = row_get_cell (row, x); 2746 mapcell *cell = row_get_cell (row, x);
2275 tileid tile[3] = { 0, 0, 0 }; 2747 tileid tile[3] = { 0, 0, 0 };
2278 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2750 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2279 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2751 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2280 2752
2281 if (cell->darkness == 0) 2753 if (cell->darkness == 0)
2282 { 2754 {
2283 cell->darkness = 0; 2755 /*cell->darkness = 0;*/
2756 EXTEND (SP, 3);
2284 2757
2285 for (z = 0; z <= 2; z++) 2758 for (z = 0; z <= 2; z++)
2286 { 2759 {
2287 tileid t = tile [z]; 2760 tileid t = tile [z];
2288 2761
2289 if (t >= self->texs || (t && !self->tex [t].name)) 2762 if (t >= self->texs || (t && !self->tex [t].name))
2290 { 2763 {
2291 XPUSHs (sv_2mortal (newSViv (t))); 2764 PUSHs (sv_2mortal (newSViv (t)));
2292 need_texid (self, t); 2765 need_texid (self, t);
2293 } 2766 }
2294 2767
2295 cell->tile [z] = t; 2768 cell->tile [z] = t;
2296 } 2769 }
2298 } 2771 }
2299 } 2772 }
2300 } 2773 }
2301} 2774}
2302 2775
2303MODULE = CFPlus PACKAGE = CFPlus::RW 2776MODULE = Deliantra::Client PACKAGE = DC::RW
2304 2777
2305CFPlus::RW 2778DC::RW
2306new (SV *class, SV *data_sv) 2779new (SV *class, SV *data_sv)
2307 CODE: 2780 CODE:
2308{ 2781{
2309 STRLEN datalen; 2782 STRLEN datalen;
2310 char *data = SvPVbyte (data_sv, datalen); 2783 char *data = SvPVbyte (data_sv, datalen);
2312 RETVAL = SDL_RWFromConstMem (data, datalen); 2785 RETVAL = SDL_RWFromConstMem (data, datalen);
2313} 2786}
2314 OUTPUT: 2787 OUTPUT:
2315 RETVAL 2788 RETVAL
2316 2789
2317CFPlus::RW 2790DC::RW
2318new_from_file (SV *class, const char *path, const char *mode = "rb") 2791new_from_file (SV *class, const char *path, const char *mode = "rb")
2319 CODE: 2792 CODE:
2320 RETVAL = SDL_RWFromFile (path, mode); 2793 RETVAL = SDL_RWFromFile (path, mode);
2321 OUTPUT: 2794 OUTPUT:
2322 RETVAL 2795 RETVAL
2323 2796
2324# fails on win32: 2797# fails on win32:
2325# CFPlus.xs(2268) : error C2059: syntax error : '(' 2798# dc.xs(2268) : error C2059: syntax error : '('
2326#void 2799#void
2327#close (CFPlus::RW self) 2800#close (DC::RW self)
2328# CODE: 2801# CODE:
2329# (self->(close)) (self); 2802# (self->(close)) (self);
2330 2803
2331MODULE = CFPlus PACKAGE = CFPlus::Channel 2804MODULE = Deliantra::Client PACKAGE = DC::Channel
2332 2805
2333PROTOTYPES: DISABLE 2806PROTOTYPES: DISABLE
2334 2807
2335CFPlus::Channel 2808DC::Channel
2336find () 2809find ()
2337 CODE: 2810 CODE:
2338{ 2811{
2339 RETVAL = Mix_GroupAvailable (-1); 2812 RETVAL = Mix_GroupAvailable (-1);
2340 2813
2341 if (RETVAL < 0) 2814 if (RETVAL < 0)
2342 { 2815 {
2343 RETVAL = Mix_GroupOldest (-1); 2816 RETVAL = Mix_GroupOldest (-1);
2344 2817
2345 if (RETVAL < 0) 2818 if (RETVAL < 0)
2819 {
2820 // happens sometimes, maybe it just stopped playing(?)
2821 RETVAL = Mix_GroupAvailable (-1);
2822
2823 if (RETVAL < 0)
2346 XSRETURN_UNDEF; 2824 XSRETURN_UNDEF;
2347 2825 }
2826 else
2348 Mix_HaltChannel (RETVAL); 2827 Mix_HaltChannel (RETVAL);
2349 } 2828 }
2350 2829
2351 Mix_UnregisterAllEffects (RETVAL); 2830 Mix_UnregisterAllEffects (RETVAL);
2352 Mix_Volume (RETVAL, 128); 2831 Mix_Volume (RETVAL, 128);
2353} 2832}
2354 OUTPUT: 2833 OUTPUT:
2355 RETVAL 2834 RETVAL
2356 2835
2357void 2836void
2358halt (CFPlus::Channel self) 2837halt (DC::Channel self)
2359 CODE: 2838 CODE:
2360 Mix_HaltChannel (self); 2839 Mix_HaltChannel (self);
2361 2840
2362void 2841void
2363expire (CFPlus::Channel self, int ticks = -1) 2842expire (DC::Channel self, int ticks = -1)
2364 CODE: 2843 CODE:
2365 Mix_ExpireChannel (self, ticks); 2844 Mix_ExpireChannel (self, ticks);
2366 2845
2367void 2846void
2368fade_out (CFPlus::Channel self, int ticks = -1) 2847fade_out (DC::Channel self, int ticks = -1)
2369 CODE: 2848 CODE:
2370 Mix_FadeOutChannel (self, ticks); 2849 Mix_FadeOutChannel (self, ticks);
2371 2850
2372int 2851int
2373volume (CFPlus::Channel self, int volume) 2852volume (DC::Channel self, int volume)
2374 CODE: 2853 CODE:
2375 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2854 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2376 OUTPUT: 2855 OUTPUT:
2377 RETVAL 2856 RETVAL
2378 2857
2379void 2858void
2380unregister_all_effects (CFPlus::Channel self) 2859unregister_all_effects (DC::Channel self)
2381 CODE: 2860 CODE:
2382 Mix_UnregisterAllEffects (self); 2861 Mix_UnregisterAllEffects (self);
2383 2862
2384void 2863void
2385set_panning (CFPlus::Channel self, int left, int right) 2864set_panning (DC::Channel self, int left, int right)
2386 CODE: 2865 CODE:
2387 left = CLAMP (left , 0, 255); 2866 left = CLAMP (left , 0, 255);
2388 right = CLAMP (right, 0, 255); 2867 right = CLAMP (right, 0, 255);
2389 Mix_SetPanning (self, left, right); 2868 Mix_SetPanning (self, left, right);
2390 2869
2391void 2870void
2392set_distance (CFPlus::Channel self, int distance) 2871set_distance (DC::Channel self, int distance)
2393 CODE: 2872 CODE:
2394 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2873 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2395 2874
2396void 2875void
2397set_position (CFPlus::Channel self, int angle, int distance) 2876set_position (DC::Channel self, int angle, int distance)
2398 CODE: 2877 CODE:
2399 2878
2400void 2879void
2401set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2880set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2402 CODE: 2881 CODE:
2403{ 2882{
2404 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2883 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); 2884 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2406 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2885 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2407} 2886}
2408 2887
2409void 2888void
2410set_reverse_stereo (CFPlus::Channel self, int flip) 2889set_reverse_stereo (DC::Channel self, int flip)
2411 CODE: 2890 CODE:
2412 Mix_SetReverseStereo (self, flip); 2891 Mix_SetReverseStereo (self, flip);
2413 2892
2414MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2893MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2415 2894
2416PROTOTYPES: DISABLE 2895PROTOTYPES: DISABLE
2417 2896
2897void
2898decoders ()
2899 PPCODE:
2900#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2901 int i, num = Mix_GetNumChunkDecoders ();
2902 EXTEND (SP, num);
2903 for (i = 0; i < num; ++i)
2904 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2905#else
2906 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2907#endif
2908
2418CFPlus::MixChunk 2909DC::MixChunk
2419new (SV *class, CFPlus::RW rwops) 2910new (SV *class, DC::RW rwops)
2420 CODE: 2911 CODE:
2421 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2912 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2422 OUTPUT: 2913 OUTPUT:
2423 RETVAL 2914 RETVAL
2424 2915
2425void 2916void
2426DESTROY (CFPlus::MixChunk self) 2917DESTROY (DC::MixChunk self)
2427 CODE: 2918 CODE:
2428 Mix_FreeChunk (self); 2919 Mix_FreeChunk (self);
2429 2920
2430int 2921int
2431volume (CFPlus::MixChunk self, int volume = -1) 2922volume (DC::MixChunk self, int volume = -1)
2432 CODE: 2923 CODE:
2433 if (items > 1) 2924 if (items > 1)
2434 volume = CLAMP (volume, 0, 128); 2925 volume = CLAMP (volume, 0, 128);
2435 RETVAL = Mix_VolumeChunk (self, volume); 2926 RETVAL = Mix_VolumeChunk (self, volume);
2436 OUTPUT: 2927 OUTPUT:
2437 RETVAL 2928 RETVAL
2438 2929
2439CFPlus::Channel 2930DC::Channel
2440play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2931play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2441 CODE: 2932 CODE:
2442{ 2933{
2443 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2934 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2444 2935
2445 if (RETVAL < 0) 2936 if (RETVAL < 0)
2452 } 2943 }
2453} 2944}
2454 OUTPUT: 2945 OUTPUT:
2455 RETVAL 2946 RETVAL
2456 2947
2457MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2948MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2949
2950void
2951decoders ()
2952 PPCODE:
2953#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2954 int i, num = Mix_GetNumMusicDecoders ();
2955 EXTEND (SP, num);
2956 for (i = 0; i < num; ++i)
2957 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2958#else
2959 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2960#endif
2458 2961
2459int 2962int
2460volume (int volume = -1) 2963volume (int volume = -1)
2461 PROTOTYPE: ;$ 2964 PROTOTYPE: ;$
2462 CODE: 2965 CODE:
2474void 2977void
2475halt () 2978halt ()
2476 CODE: 2979 CODE:
2477 Mix_HaltMusic (); 2980 Mix_HaltMusic ();
2478 2981
2982int
2983playing ()
2984 CODE:
2985 RETVAL = Mix_PlayingMusic ();
2986 OUTPUT:
2987 RETVAL
2988
2479CFPlus::MixMusic 2989DC::MixMusic
2480new (SV *class, CFPlus::RW rwops) 2990new (SV *class, DC::RW rwops)
2481 CODE: 2991 CODE:
2482 RETVAL = Mix_LoadMUS_RW (rwops); 2992 RETVAL = Mix_LoadMUS_RW (rwops);
2483 OUTPUT: 2993 OUTPUT:
2484 RETVAL 2994 RETVAL
2485 2995
2486void 2996void
2487DESTROY (CFPlus::MixMusic self) 2997DESTROY (DC::MixMusic self)
2488 CODE: 2998 CODE:
2489 Mix_FreeMusic (self); 2999 Mix_FreeMusic (self);
2490 3000
2491int 3001int
2492play (CFPlus::MixMusic self, int loops = -1) 3002play (DC::MixMusic self, int loops = -1)
2493 CODE: 3003 CODE:
2494 RETVAL = Mix_PlayMusic (self, loops); 3004 RETVAL = Mix_PlayMusic (self, loops);
2495 OUTPUT: 3005 OUTPUT:
2496 RETVAL 3006 RETVAL
2497 3007
2498void 3008void
2499fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3009fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2500 CODE: 3010 CODE:
2501 Mix_FadeInMusicPos (self, loops, ms, position); 3011 Mix_FadeInMusicPos (self, loops, ms, position);
2502 3012
2503MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3013MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2504 3014
2505PROTOTYPES: ENABLE 3015PROTOTYPES: ENABLE
2506 3016
2507BOOT: 3017BOOT:
2508{ 3018{
2509 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3019 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2510 static const struct { 3020 static const struct {
2511 const char *name; 3021 const char *name;
2512 IV iv; 3022 IV iv;
2513 } *civ, const_iv[] = { 3023 } *civ, const_iv[] = {
2514# define const_iv(name) { # name, (IV)name } 3024# define const_iv(name) { # name, (IV)name }
2515 const_iv (GL_VENDOR), 3025 const_iv (GL_VENDOR),
2516 const_iv (GL_VERSION), 3026 const_iv (GL_VERSION),
2517 const_iv (GL_EXTENSIONS), 3027 const_iv (GL_EXTENSIONS),
3028 const_iv (GL_MAX_TEXTURE_UNITS),
2518 const_iv (GL_COLOR_MATERIAL), 3029 const_iv (GL_COLOR_MATERIAL),
2519 const_iv (GL_SMOOTH), 3030 const_iv (GL_SMOOTH),
2520 const_iv (GL_FLAT), 3031 const_iv (GL_FLAT),
2521 const_iv (GL_DITHER), 3032 const_iv (GL_DITHER),
2522 const_iv (GL_BLEND), 3033 const_iv (GL_BLEND),
2534 const_iv (GL_ZERO), 3045 const_iv (GL_ZERO),
2535 const_iv (GL_SRC_ALPHA), 3046 const_iv (GL_SRC_ALPHA),
2536 const_iv (GL_DST_ALPHA), 3047 const_iv (GL_DST_ALPHA),
2537 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3048 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2538 const_iv (GL_ONE_MINUS_DST_ALPHA), 3049 const_iv (GL_ONE_MINUS_DST_ALPHA),
3050 const_iv (GL_SRC_COLOR),
3051 const_iv (GL_DST_COLOR),
3052 const_iv (GL_ONE_MINUS_SRC_COLOR),
3053 const_iv (GL_ONE_MINUS_DST_COLOR),
2539 const_iv (GL_SRC_ALPHA_SATURATE), 3054 const_iv (GL_SRC_ALPHA_SATURATE),
2540 const_iv (GL_RGB), 3055 const_iv (GL_RGB),
2541 const_iv (GL_RGBA), 3056 const_iv (GL_RGBA),
2542 const_iv (GL_RGBA4), 3057 const_iv (GL_RGBA4),
2543 const_iv (GL_RGBA8), 3058 const_iv (GL_RGBA8),
2611 const_iv (GL_NICEST), 3126 const_iv (GL_NICEST),
2612 const_iv (GL_V2F), 3127 const_iv (GL_V2F),
2613 const_iv (GL_V3F), 3128 const_iv (GL_V3F),
2614 const_iv (GL_T2F_V3F), 3129 const_iv (GL_T2F_V3F),
2615 const_iv (GL_T2F_N3F_V3F), 3130 const_iv (GL_T2F_N3F_V3F),
3131 const_iv (GL_FUNC_ADD),
3132 const_iv (GL_FUNC_SUBTRACT),
3133 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2616# undef const_iv 3134# undef const_iv
2617 }; 3135 };
2618 3136
2619 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3137 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2620 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3138 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2627disable_GL_EXT_blend_func_separate () 3145disable_GL_EXT_blend_func_separate ()
2628 CODE: 3146 CODE:
2629 gl.BlendFuncSeparate = 0; 3147 gl.BlendFuncSeparate = 0;
2630 gl.BlendFuncSeparateEXT = 0; 3148 gl.BlendFuncSeparateEXT = 0;
2631 3149
3150void
3151apple_nvidia_bug (int enable)
3152
2632char * 3153char *
2633gl_vendor () 3154gl_vendor ()
2634 CODE: 3155 CODE:
2635 RETVAL = (char *)glGetString (GL_VENDOR); 3156 RETVAL = (char *)glGetString (GL_VENDOR);
2636 OUTPUT: 3157 OUTPUT:
2666 3187
2667int glGetError () 3188int glGetError ()
2668 3189
2669void glFinish () 3190void glFinish ()
2670 3191
3192void glFlush ()
3193
2671void glClear (int mask) 3194void glClear (int mask)
2672 3195
2673void glClearColor (float r, float g, float b, float a = 1.0) 3196void glClearColor (float r, float g, float b, float a = 1.0)
2674 PROTOTYPE: @ 3197 PROTOTYPE: @
2675 3198
2684void glBlendFunc (int sfactor, int dfactor) 3207void glBlendFunc (int sfactor, int dfactor)
2685 3208
2686void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3209void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2687 CODE: 3210 CODE:
2688 gl_BlendFuncSeparate (sa, da, saa, daa); 3211 gl_BlendFuncSeparate (sa, da, saa, daa);
3212
3213# void glBlendEquation (int se)
2689 3214
2690void glDepthMask (int flag) 3215void glDepthMask (int flag)
2691 3216
2692void glLogicOp (int opcode) 3217void glLogicOp (int opcode)
2693 3218
2728void glRotate (float angle, float x, float y, float z) 3253void glRotate (float angle, float x, float y, float z)
2729 CODE: 3254 CODE:
2730 glRotatef (angle, x, y, z); 3255 glRotatef (angle, x, y, z);
2731 3256
2732void glColor (float r, float g, float b, float a = 1.0) 3257void glColor (float r, float g, float b, float a = 1.0)
3258 PROTOTYPE: @
2733 ALIAS: 3259 ALIAS:
2734 glColor_premultiply = 1 3260 glColor_premultiply = 1
2735 CODE: 3261 CODE:
2736 if (ix) 3262 if (ix)
2737 { 3263 {
2757 3283
2758void glRect (float x1, float y1, float x2, float y2) 3284void glRect (float x1, float y1, float x2, float y2)
2759 CODE: 3285 CODE:
2760 glRectf (x1, y1, x2, y2); 3286 glRectf (x1, y1, x2, y2);
2761 3287
3288void glRect_lineloop (float x1, float y1, float x2, float y2)
3289 CODE:
3290 glBegin (GL_LINE_LOOP);
3291 glVertex2f (x1, y1);
3292 glVertex2f (x2, y1);
3293 glVertex2f (x2, y2);
3294 glVertex2f (x1, y2);
3295 glEnd ();
3296
2762PROTOTYPES: ENABLE 3297PROTOTYPES: ENABLE
2763 3298
2764void glBegin (int mode) 3299void glBegin (int mode)
2765 3300
2766void glEnd () 3301void glEnd ()
2798void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3333void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2799 CODE: 3334 CODE:
2800 if (gl.SeparableFilter2D) 3335 if (gl.SeparableFilter2D)
2801 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3336 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2802 3337
2803void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3338void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2804 3339
2805void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3340void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2806 3341
2807void glDrawPixels (int width, int height, int format, int type, char *pixels) 3342void glDrawPixels (int width, int height, int format, int type, char *pixels)
2808 3343
2834 3369
2835void glEndList () 3370void glEndList ()
2836 3371
2837void glCallList (int list) 3372void glCallList (int list)
2838 3373
2839MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3374void c_init ()
3375 CODE:
3376 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3377 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3378
3379MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2840 3380
2841PROTOTYPES: DISABLE 3381PROTOTYPES: DISABLE
2842 3382
2843void 3383void
2844find_widget (SV *self, NV x, NV y) 3384find_widget (SV *self, NV x, NV y)
2848 XPUSHs (self); 3388 XPUSHs (self);
2849} 3389}
2850 3390
2851BOOT: 3391BOOT:
2852{ 3392{
2853 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3393 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2854 3394
2855 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3395 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2856 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3396 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2857 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3397 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2858 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3398 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2859} 3399}
2860 3400
2861void 3401void
2862draw (SV *self) 3402draw (SV *self)
2863 CODE: 3403 CODE:
2870 SV *draw_w_sv = GvSV (draw_w_gv); 3410 SV *draw_w_sv = GvSV (draw_w_gv);
2871 SV *draw_h_sv = GvSV (draw_h_gv); 3411 SV *draw_h_sv = GvSV (draw_h_gv);
2872 double draw_x, draw_y; 3412 double draw_x, draw_y;
2873 3413
2874 if (!SvROK (self)) 3414 if (!SvROK (self))
2875 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3415 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2876 3416
2877 hv = (HV *)SvRV (self); 3417 hv = (HV *)SvRV (self);
2878 3418
2879 if (SvTYPE (hv) != SVt_PVHV) 3419 if (SvTYPE (hv) != SVt_PVHV)
2880 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3420 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2881 3421
2882 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3422 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2883 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3423 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2884 3424
2885 if (!h || !w) 3425 if (!h || !w)
2918 glEnd (); 3458 glEnd ();
2919 glDisable (GL_BLEND); 3459 glDisable (GL_BLEND);
2920 } 3460 }
2921 } 3461 }
2922#if 0 3462#if 0
2923 if ($ENV{CFPLUS_DEBUG} & 1) { 3463 // draw borders, for debugging
2924 glPushMatrix; 3464 glPushMatrix ();
2925 glColor 1, 1, 0, 1; 3465 glColor4f (1., 1., 0., 1.);
2926 glTranslate 0.375, 0.375; 3466 glTranslatef (.5, .5, 0.);
2927 glBegin GL_LINE_LOOP; 3467 glBegin (GL_LINE_LOOP);
2928 glVertex 0 , 0; 3468 glVertex2f (0 , 0);
2929 glVertex $self->{w} - 1, 0; 3469 glVertex2f (w - 1, 0);
2930 glVertex $self->{w} - 1, $self->{h} - 1; 3470 glVertex2f (w - 1, h - 1);
2931 glVertex 0 , $self->{h} - 1; 3471 glVertex2f (0 , h - 1);
2932 glEnd; 3472 glEnd ();
2933 glPopMatrix; 3473 glPopMatrix ();
2934 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2935 }
2936#endif 3474#endif
2937 PUSHMARK (SP); 3475 PUSHMARK (SP);
2938 XPUSHs (self); 3476 XPUSHs (self);
2939 PUTBACK; 3477 PUTBACK;
2940 call_method ("_draw", G_VOID | G_DISCARD); 3478 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines