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.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.294 by root, Sat Dec 19 05:06:56 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines