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