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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines