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.221 by root, Fri Aug 10 04:02:13 2007 UTC vs.
Revision 1.294 by root, Sat Dec 19 05:06:56 2009 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
34#include <SDL_endian.h> 39#include <SDL_endian.h>
35#include <SDL_image.h> 40#include <SDL_image.h>
36#include <SDL_mixer.h> 41#include <SDL_mixer.h>
37#include <SDL_opengl.h> 42#include <SDL_opengl.h>
38 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
39#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
40#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
41 51
42#include <glib/gmacros.h> 52#include <glib/gmacros.h>
43 53
44#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
45 66
46#ifndef _WIN32 67#ifndef _WIN32
47# include <sys/types.h> 68# include <sys/types.h>
48# include <sys/socket.h> 69# include <sys/socket.h>
49# include <netinet/in.h> 70# include <netinet/in.h>
50# include <netinet/tcp.h> 71# include <netinet/tcp.h>
51# include <inttypes.h> 72# include <inttypes.h>
52#endif 73#endif
53 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
54#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
55 85
56#define FOW_DARKNESS 32 86#define FOW_DARKNESS 64
87#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */
57 88
58#define MAP_EXTEND_X 32 89#define MAP_EXTEND_X 32
59#define MAP_EXTEND_Y 512 90#define MAP_EXTEND_Y 512
60 91
61#define MIN_FONT_HEIGHT 10 92#define MIN_FONT_HEIGHT 10
62 93
63#if 0 94/* mask out modifiers we are not interested in */
64# define PARACHUTE SDL_INIT_NOPARACHUTE 95#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
65#else 96
66# define PARACHUTE 0 97#define KMOD_LRAM 0x10000 // our extension
67#endif 98
99#define TEXID_SPEECH 1
100#define TEXID_NOFACE 2
101#define TEXID_HIDDEN 3
68 102
69static AV *texture_av; 103static AV *texture_av;
70 104
71static struct 105static struct
72{ 106{
109 av_push (texture_av, (SV *)(size_t)name); 143 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 144 glDeleteTextures (1, &name);
111} 145}
112 146
113#include "texcache.c" 147#include "texcache.c"
148#include "rendercache.c"
114 149
115#include "pango-font.c" 150#include "pango-font.c"
116#include "pango-fontmap.c" 151#include "pango-fontmap.c"
117#include "pango-render.c" 152#include "pango-render.c"
118 153
119typedef IV CFPlus__Channel; 154typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 155typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 156typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 157typedef Mix_Music *DC__MixMusic;
123 158
124typedef PangoFontDescription *CFPlus__Font; 159typedef PangoFontDescription *DC__Font;
125 160
126static int 161static int
127shape_attr_p (PangoLayoutRun *run) 162shape_attr_p (PangoLayoutRun *run)
128{ 163{
129 GSList *attrs = run->item->analysis.extra_attrs; 164 GSList *attrs = run->item->analysis.extra_attrs;
143 178
144typedef struct cf_layout { 179typedef struct cf_layout {
145 PangoLayout *pl; 180 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 181 float r, g, b, a; // default color for rgba mode
147 int base_height; 182 int base_height;
148 CFPlus__Font font; 183 DC__Font font;
184 rc_t *rc;
149} *CFPlus__Layout; 185} *DC__Layout;
150 186
151static CFPlus__Font default_font; 187static DC__Font default_font;
152static PangoContext *opengl_context; 188static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 189static PangoFontMap *opengl_fontmap;
154 190
155static void 191static void
156substitute_func (FcPattern *pattern, gpointer data) 192substitute_func (FcPattern *pattern, gpointer data)
161#endif 197#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 198 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 199}
164 200
165static void 201static void
166layout_update_font (CFPlus__Layout self) 202layout_update_font (DC__Layout self)
167{ 203{
168 /* 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
169 * reasonably well with bitstream vera 205 * reasonably well with dejavu/bistream fonts
170 */ 206 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 207 PangoFontDescription *font = self->font ? self->font : default_font;
172 208
173 pango_font_description_set_absolute_size (font, 209 pango_font_description_set_absolute_size (font,
174 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 210 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175 211
176 pango_layout_set_font_description (self->pl, font); 212 pango_layout_set_font_description (self->pl, font);
177} 213}
178 214
179static void 215static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 216layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 217{
182 PangoRectangle rect; 218 PangoRectangle rect;
183 219
184 // get_pixel_* wrongly rounds down 220 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 221 pango_layout_get_extents (self->pl, 0, &rect);
196 232
197typedef uint16_t tileid; 233typedef uint16_t tileid;
198typedef uint16_t faceid; 234typedef uint16_t faceid;
199 235
200typedef struct { 236typedef struct {
201 int name; 237 GLuint name;
202 int w, h; 238 int w, h;
203 float s, t; 239 float s, t;
204 uint8_t r, g, b, a; 240 uint8_t r, g, b, a;
205 tileid smoothtile; 241 tileid smoothtile;
206 uint8_t smoothlevel; 242 uint8_t smoothlevel;
243 uint8_t unused; /* set to zero on use */
207} maptex; 244} maptex;
208 245
209typedef struct { 246typedef struct {
210 uint32_t player; 247 uint32_t player;
211 tileid tile[3]; 248 tileid tile[3];
224 int faces; tileid *face2tile; // [faceid] 261 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 262 int texs; maptex *tex; // [tileid]
226 263
227 int32_t rows; 264 int32_t rows;
228 maprow *row; 265 maprow *row;
229} *CFPlus__Map; 266} *DC__Map;
230 267
231static char * 268static char *
232prepend (char *ptr, int sze, int inc) 269prepend (char *ptr, int sze, int inc)
233{ 270{
234 char *p; 271 char *p;
272 self->texs *= 2; 309 self->texs *= 2;
273 } 310 }
274} 311}
275 312
276static maprow * 313static maprow *
277map_get_row (CFPlus__Map self, int y) 314map_get_row (DC__Map self, int y)
278{ 315{
279 if (0 > y) 316 if (0 > y)
280 { 317 {
281 int extend = - y + MAP_EXTEND_Y; 318 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 319 Prepend (maprow, self->row, self->rows, extend);
320 357
321 return row->col + (x - row->c0); 358 return row->col + (x - row->c0);
322} 359}
323 360
324static mapcell * 361static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 362map_get_cell (DC__Map self, int x, int y)
326{ 363{
327 return row_get_cell (map_get_row (self, y), x); 364 return row_get_cell (map_get_row (self, y), x);
328} 365}
329 366
330static void 367static void
331map_clear (CFPlus__Map self) 368map_clear (DC__Map self)
332{ 369{
333 int r; 370 int r;
334 371
335 for (r = 0; r < self->rows; r++) 372 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 373 Safefree (self->row[r].col);
343 self->oy = 0; 380 self->oy = 0;
344 self->row = 0; 381 self->row = 0;
345 self->rows = 0; 382 self->rows = 0;
346} 383}
347 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
348static void 395static void
349map_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)
350{ 397{
351 int x, y; 398 int x, y;
352 maprow *row; 399 maprow *row;
353 mapcell *cell; 400 mapcell *cell;
354 401
366 if (x >= row->c1) 413 if (x >= row->c1)
367 break; 414 break;
368 415
369 cell = row->col + x - row->c0; 416 cell = row->col + x - row->c0;
370 417
371 cell->darkness = 0; 418 CELL_CLEAR (cell);
372 cell->stat_hp = 0;
373 cell->flags = 0;
374 cell->player = 0;
375 } 419 }
376 } 420 }
377} 421}
378 422
379typedef struct { 423typedef struct {
433 n |= n >> 16; 477 n |= n >> 16;
434 478
435 return n + 1; 479 return n + 1;
436} 480}
437 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
438/* SDL should provide this, really. */ 493/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 494#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 495#define SDLK_MODIFIER_MAX 314
441 496
442/******************************************************************************/ 497/******************************************************************************/
480 return 0; 535 return 0;
481 536
482 return 1; 537 return 1;
483} 538}
484 539
485MODULE = 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
486 593
487PROTOTYPES: ENABLE 594PROTOTYPES: ENABLE
488 595
489BOOT: 596BOOT:
490{ 597{
491 HV *stash = gv_stashpv ("CFPlus", 1); 598 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 599 static const struct {
493 const char *name; 600 const char *name;
494 IV iv; 601 IV iv;
495 } *civ, const_iv[] = { 602 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 603# define const_iv(name) { # name, (IV)name }
518 625
519 const_iv (SDL_APPINPUTFOCUS), 626 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 627 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 628 const_iv (SDL_APPACTIVE),
522 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),
523 const_iv (SDLK_KP0), 682 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 683 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 684 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 685 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 686 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 758 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 759 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 760 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 761 const_iv (KMOD_CAPS),
603 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)
604# undef const_iv 796# undef const_iv
605 }; 797 };
606 798
607 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; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 800 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 818
627NV floor (NV x) 819NV floor (NV x)
628 820
629NV ceil (NV x) 821NV ceil (NV x)
630 822
823IV minpot (UV n)
824
825IV popcount (UV n)
826
631void 827void
632pango_init () 828pango_init ()
633 CODE: 829 CODE:
634{ 830{
635 opengl_fontmap = pango_opengl_font_map_new (); 831 opengl_fontmap = pango_opengl_font_map_new ();
636 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);
637 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
638} 839}
639 840
640char *
641SDL_GetError () 841char *SDL_GetError ()
642 842
643int 843void SDL_braino ()
644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
645 844
646void 845int SDL_Init (U32 flags)
846
847int SDL_InitSubSystem (U32 flags)
848
849void SDL_QuitSubSystem (U32 flags)
850
647SDL_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
648 861
649void 862void
650SDL_ListModes (int rgb, int alpha) 863SDL_ListModes (int rgb, int alpha)
651 PPCODE: 864 PPCODE:
652{ 865{
664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 879 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667 880
668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 881 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
669#if SDL_VERSION_ATLEAST(1,2,10)
670 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
671 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 882 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672#endif
673 883
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 884 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 885
676 if (m && m != (SDL_Rect **)-1) 886 if (m && m != (SDL_Rect **)-1)
677 while (*m) 887 while (*m)
678 { 888 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 889 if ((*m)->w >= 400 && (*m)->h >= 300)
680 { 890 {
681 AV *av = newAV (); 891 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 892 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 893 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 894 av_push (av, newSViv (rgb));
708 918
709 if (RETVAL) 919 if (RETVAL)
710 { 920 {
711 av_clear (texture_av); 921 av_clear (texture_av);
712 922
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 923 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#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);
715#include "glfunc.h" 925#include "glfunc.h"
716#undef GL_FUNC 926#undef GL_FUNC
717 } 927 }
718} 928}
725char * 935char *
726SDL_GetKeyName (int sym) 936SDL_GetKeyName (int sym)
727 937
728int 938int
729SDL_GetAppState () 939SDL_GetAppState ()
940
941int
942SDL_GetModState ()
730 943
731void 944void
732poll_events () 945poll_events ()
733 PPCODE: 946 PPCODE:
734{ 947{
744 { 957 {
745 case SDL_KEYDOWN: 958 case SDL_KEYDOWN:
746 case SDL_KEYUP: 959 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 960 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 961 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 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);
750 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 */
751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 964 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 965 break;
753 966
754 case SDL_ACTIVEEVENT: 967 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 968 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 986 x = ev.motion.x;
774 y = ev.motion.y; 987 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 988 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 989 }
777 990
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 991 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 992 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 993 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 994 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 995 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 996 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 997 }
785 break; 998 break;
786 999
787 case SDL_MOUSEBUTTONDOWN: 1000 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 1001 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1002 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 1003
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1004 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1005 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1006 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1007 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1012 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1013 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 1014 break;
802 } 1015 }
803 1016
804 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))));
805 } 1018 }
806} 1019}
807 1020
808int 1021int
809Mix_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)
810 POSTCALL: 1023 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 1024 Mix_HookMusicFinished (music_finished);
812 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}
813 1042
814void 1043void
815Mix_CloseAudio () 1044Mix_CloseAudio ()
816 1045
817int 1046int
852 } 1081 }
853 } 1082 }
854#endif 1083#endif
855} 1084}
856 1085
857void 1086int
858add_font (char *file) 1087add_font (char *file)
859 CODE: 1088 CODE:
860 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1089 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1090 OUTPUT:
1091 RETVAL
861 1092
862void 1093void
863load_image_inline (SV *image_) 1094load_image_inline (SV *image_)
864 ALIAS: 1095 ALIAS:
865 load_image_file = 1 1096 load_image_file = 1
951void 1182void
952error (char *message) 1183error (char *message)
953 CODE: 1184 CODE:
954 fprintf (stderr, "ERROR: %s\n", message); 1185 fprintf (stderr, "ERROR: %s\n", message);
955#ifdef _WIN32 1186#ifdef _WIN32
956 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1187 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957#endif 1188#endif
958 1189
959void 1190void
960fatal (char *message) 1191fatal (char *message)
961 CODE: 1192 CODE:
962 fprintf (stderr, "FATAL: %s\n", message); 1193 fprintf (stderr, "FATAL: %s\n", message);
963#ifdef _WIN32 1194#ifdef _WIN32
964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1195 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965#endif 1196#endif
966 _exit (1); 1197 _exit (1);
967 1198
968void 1199void
969_exit (int retval = 0) 1200_exit (int retval = 0)
981#if DEBUG 1212#if DEBUG
982 VALGRIND_DO_LEAK_CHECK; 1213 VALGRIND_DO_LEAK_CHECK;
983#endif 1214#endif
984} 1215}
985 1216
986MODULE = 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
987 1225
988PROTOTYPES: DISABLE 1226PROTOTYPES: DISABLE
989 1227
990CFPlus::Font 1228DC::Font
991new_from_file (SV *class, char *path, int id = 0) 1229new_from_file (SV *class, char *path, int id = 0)
992 CODE: 1230 CODE:
993{ 1231{
994 int count; 1232 int count;
995 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1233 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
998} 1236}
999 OUTPUT: 1237 OUTPUT:
1000 RETVAL 1238 RETVAL
1001 1239
1002void 1240void
1003DESTROY (CFPlus::Font self) 1241DESTROY (DC::Font self)
1004 CODE: 1242 CODE:
1005 pango_font_description_free (self); 1243 pango_font_description_free (self);
1006 1244
1007void 1245void
1008make_default (CFPlus::Font self) 1246make_default (DC::Font self)
1009 PROTOTYPE: $ 1247 PROTOTYPE: $
1010 CODE: 1248 CODE:
1011 default_font = self; 1249 default_font = self;
1012 1250
1013MODULE = CFPlus PACKAGE = CFPlus::Layout 1251MODULE = Deliantra::Client PACKAGE = DC::Layout
1014 1252
1015PROTOTYPES: DISABLE 1253PROTOTYPES: DISABLE
1016 1254
1017void 1255void
1018reset_glyph_cache () 1256glyph_cache_backup ()
1019 PROTOTYPE: 1257 PROTOTYPE:
1020 CODE: 1258 CODE:
1259 tc_backup ();
1260
1261void
1262glyph_cache_restore ()
1263 PROTOTYPE:
1264 CODE:
1021 tc_clear (); 1265 tc_restore ();
1022 1266
1023CFPlus::Layout 1267DC::Layout
1024new (SV *class) 1268new (SV *class)
1025 CODE: 1269 CODE:
1026 New (0, RETVAL, 1, struct cf_layout); 1270 New (0, RETVAL, 1, struct cf_layout);
1027 1271
1028 RETVAL->pl = pango_layout_new (opengl_context); 1272 RETVAL->pl = pango_layout_new (opengl_context);
1030 RETVAL->g = 1.; 1274 RETVAL->g = 1.;
1031 RETVAL->b = 1.; 1275 RETVAL->b = 1.;
1032 RETVAL->a = 1.; 1276 RETVAL->a = 1.;
1033 RETVAL->base_height = MIN_FONT_HEIGHT; 1277 RETVAL->base_height = MIN_FONT_HEIGHT;
1034 RETVAL->font = 0; 1278 RETVAL->font = 0;
1279 RETVAL->rc = rc_alloc ();
1035 1280
1036 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1281 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037 layout_update_font (RETVAL); 1282 layout_update_font (RETVAL);
1038 OUTPUT: 1283 OUTPUT:
1039 RETVAL 1284 RETVAL
1040 1285
1041void 1286void
1042DESTROY (CFPlus::Layout self) 1287DESTROY (DC::Layout self)
1043 CODE: 1288 CODE:
1044 g_object_unref (self->pl); 1289 g_object_unref (self->pl);
1290 rc_free (self->rc);
1045 Safefree (self); 1291 Safefree (self);
1046 1292
1047void 1293void
1048set_text (CFPlus::Layout self, SV *text_) 1294set_text (DC::Layout self, SV *text_)
1049 CODE: 1295 CODE:
1050{ 1296{
1051 STRLEN textlen; 1297 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1298 char *text = SvPVutf8 (text_, textlen);
1053 1299
1054 pango_layout_set_text (self->pl, text, textlen); 1300 pango_layout_set_text (self->pl, text, textlen);
1055} 1301}
1056 1302
1057void 1303void
1058set_markup (CFPlus::Layout self, SV *text_) 1304set_markup (DC::Layout self, SV *text_)
1059 CODE: 1305 CODE:
1060{ 1306{
1061 STRLEN textlen; 1307 STRLEN textlen;
1062 char *text = SvPVutf8 (text_, textlen); 1308 char *text = SvPVutf8 (text_, textlen);
1063 1309
1064 pango_layout_set_markup (self->pl, text, textlen); 1310 pango_layout_set_markup (self->pl, text, textlen);
1065} 1311}
1066 1312
1067void 1313void
1068set_shapes (CFPlus::Layout self, ...) 1314set_shapes (DC::Layout self, ...)
1069 CODE: 1315 CODE:
1070{ 1316{
1071 PangoAttrList *attrs = 0; 1317 PangoAttrList *attrs = 0;
1072 const char *text = pango_layout_get_text (self->pl); 1318 const char *text = pango_layout_get_text (self->pl);
1073 const char *pos = text; 1319 const char *pos = text;
1108 if (attrs) 1354 if (attrs)
1109 pango_layout_set_attributes (self->pl, attrs); 1355 pango_layout_set_attributes (self->pl, attrs);
1110} 1356}
1111 1357
1112void 1358void
1113get_shapes (CFPlus::Layout self) 1359get_shapes (DC::Layout self)
1114 PPCODE: 1360 PPCODE:
1115{ 1361{
1116 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1362 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117 1363
1118 do 1364 do
1119 { 1365 {
1120 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1366 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121 1367
1122 if (run && shape_attr_p (run)) 1368 if (run && shape_attr_p (run))
1123 { 1369 {
1124 PangoRectangle extents; 1370 PangoRectangle extents;
1125 pango_layout_iter_get_run_extents (iter, 0, &extents); 1371 pango_layout_iter_get_run_extents (iter, 0, &extents);
1133 1379
1134 pango_layout_iter_free (iter); 1380 pango_layout_iter_free (iter);
1135} 1381}
1136 1382
1137int 1383int
1138has_wrapped (CFPlus::Layout self) 1384has_wrapped (DC::Layout self)
1139 CODE: 1385 CODE:
1140{ 1386{
1141 int lines = 1; 1387 int lines = 1;
1142 const char *text = pango_layout_get_text (self->pl); 1388 const char *text = pango_layout_get_text (self->pl);
1143 1389
1148} 1394}
1149 OUTPUT: 1395 OUTPUT:
1150 RETVAL 1396 RETVAL
1151 1397
1152SV * 1398SV *
1153get_text (CFPlus::Layout self) 1399get_text (DC::Layout self)
1154 CODE: 1400 CODE:
1155 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1401 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156 sv_utf8_decode (RETVAL); 1402 sv_utf8_decode (RETVAL);
1157 OUTPUT: 1403 OUTPUT:
1158 RETVAL 1404 RETVAL
1159 1405
1160void 1406void
1161set_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.)
1162 CODE: 1408 CODE:
1163 self->r = r; 1409 self->r = r;
1164 self->g = g; 1410 self->g = g;
1165 self->b = b; 1411 self->b = b;
1166 self->a = a; 1412 self->a = a;
1167 1413
1168void 1414void
1169set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1415set_font (DC::Layout self, DC::Font font = 0)
1170 CODE: 1416 CODE:
1171 if (self->font != font) 1417 if (self->font != font)
1172 { 1418 {
1173 self->font = font; 1419 self->font = font;
1174 layout_update_font (self); 1420 layout_update_font (self);
1175 } 1421 }
1176 1422
1177void 1423void
1178set_height (CFPlus::Layout self, int base_height) 1424set_height (DC::Layout self, int base_height)
1179 CODE: 1425 CODE:
1180 if (self->base_height != base_height) 1426 if (self->base_height != base_height)
1181 { 1427 {
1182 self->base_height = base_height; 1428 self->base_height = base_height;
1183 layout_update_font (self); 1429 layout_update_font (self);
1184 } 1430 }
1185 1431
1186void 1432void
1187set_width (CFPlus::Layout self, int max_width = -1) 1433set_width (DC::Layout self, int max_width = -1)
1188 CODE: 1434 CODE:
1189 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);
1190 1436
1191void 1437void
1192set_indent (CFPlus::Layout self, int indent) 1438set_indent (DC::Layout self, int indent)
1193 CODE: 1439 CODE:
1194 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1440 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195 1441
1196void 1442void
1197set_spacing (CFPlus::Layout self, int spacing) 1443set_spacing (DC::Layout self, int spacing)
1198 CODE: 1444 CODE:
1199 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1445 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200 1446
1201void 1447void
1202set_ellipsise (CFPlus::Layout self, int ellipsise) 1448set_ellipsise (DC::Layout self, int ellipsise)
1203 CODE: 1449 CODE:
1204 pango_layout_set_ellipsize (self->pl, 1450 pango_layout_set_ellipsize (self->pl,
1205 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1451 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1452 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1453 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208 : PANGO_ELLIPSIZE_NONE 1454 : PANGO_ELLIPSIZE_NONE
1209 ); 1455 );
1210 1456
1211void 1457void
1212set_single_paragraph_mode (CFPlus::Layout self, int spm) 1458set_single_paragraph_mode (DC::Layout self, int spm)
1213 CODE: 1459 CODE:
1214 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1460 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215 1461
1216void 1462void
1217size (CFPlus::Layout self) 1463size (DC::Layout self)
1218 PPCODE: 1464 PPCODE:
1219{ 1465{
1220 int w, h; 1466 int w, h;
1221 1467
1222 layout_get_pixel_size (self, &w, &h); 1468 layout_get_pixel_size (self, &w, &h);
1225 PUSHs (sv_2mortal (newSViv (w))); 1471 PUSHs (sv_2mortal (newSViv (w)));
1226 PUSHs (sv_2mortal (newSViv (h))); 1472 PUSHs (sv_2mortal (newSViv (h)));
1227} 1473}
1228 1474
1229int 1475int
1230descent (CFPlus::Layout self) 1476descent (DC::Layout self)
1231 CODE: 1477 CODE:
1232{ 1478{
1233 PangoRectangle rect; 1479 PangoRectangle rect;
1234 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1480 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235 pango_layout_line_get_pixel_extents (line, 0, &rect); 1481 pango_layout_line_get_pixel_extents (line, 0, &rect);
1236 RETVAL = PANGO_DESCENT (rect); 1482 RETVAL = PANGO_DESCENT (rect);
1237} 1483}
1238 OUTPUT: 1484 OUTPUT:
1239 RETVAL 1485 RETVAL
1240 1486
1241int 1487int
1242xy_to_index (CFPlus::Layout self, int x, int y) 1488xy_to_index (DC::Layout self, int x, int y)
1243 CODE: 1489 CODE:
1244{ 1490{
1245 int index, trailing; 1491 int index, trailing;
1246 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);
1247 RETVAL = index + trailing; 1493 RETVAL = index + trailing;
1248} 1494}
1249 OUTPUT: 1495 OUTPUT:
1250 RETVAL 1496 RETVAL
1251 1497
1252void 1498void
1253cursor_pos (CFPlus::Layout self, int index) 1499cursor_pos (DC::Layout self, int index)
1254 PPCODE: 1500 PPCODE:
1255{ 1501{
1256 PangoRectangle strong_pos; 1502 PangoRectangle pos;
1257 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1503 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258 1504
1259 EXTEND (SP, 3); 1505 EXTEND (SP, 3);
1260 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1506 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1507 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1508 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263} 1509}
1264 1510
1265void 1511void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1512index_to_line_x (DC::Layout self, int index, int trailing = 0)
1267 PPCODE: 1513 PPCODE:
1268{ 1514{
1269 int line, x; 1515 int line, x;
1270 1516
1271 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)
1272 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1519 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273 1520 --line;
1521#endif
1274 EXTEND (SP, 2); 1522 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (newSViv (line - 1))); 1523 PUSHs (sv_2mortal (newSViv (line)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1524 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277} 1525}
1278 1526
1279void 1527void
1280line_x_to_index (CFPlus::Layout self, int line, int x) 1528line_x_to_index (DC::Layout self, int line, int x)
1281 PPCODE: 1529 PPCODE:
1282{ 1530{
1283 PangoLayoutLine *lp; 1531 PangoLayoutLine *lp;
1284 int index, trailing; 1532 int index, trailing;
1285 1533
1286 if (line < 0) 1534 if (line < 0)
1287 XSRETURN_EMPTY; 1535 XSRETURN_EMPTY;
1288 1536
1289 if (!(lp = pango_layout_get_line (self->pl, line))) 1537 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290 XSRETURN_EMPTY; /* do better */ 1538 XSRETURN_EMPTY; /* do better */
1291 1539
1292 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);
1293 1541
1294 EXTEND (SP, 2); 1542 EXTEND (SP, 2);
1300 PUSHs (sv_2mortal (newSViv (trailing))); 1548 PUSHs (sv_2mortal (newSViv (trailing)));
1301 } 1549 }
1302} 1550}
1303 1551
1304void 1552void
1305render (CFPlus::Layout self, float x, float y, int flags = 0) 1553render (DC::Layout self, float x, float y, int flags = 0)
1306 PPCODE: 1554 CODE:
1555 rc_clear (self->rc);
1307 pango_opengl_render_layout_subpixel ( 1556 pango_opengl_render_layout_subpixel (
1308 self->pl, 1557 self->pl,
1558 self->rc,
1309 x * PANGO_SCALE, y * PANGO_SCALE, 1559 x * PANGO_SCALE, y * PANGO_SCALE,
1310 self->r, self->g, self->b, self->a, 1560 self->r, self->g, self->b, self->a,
1311 flags 1561 flags
1312 ); 1562 );
1563 // we assume that context_change actually clears/frees stuff
1564 // and does not do any recomputation...
1565 pango_layout_context_changed (self->pl);
1313 1566
1314MODULE = CFPlus PACKAGE = CFPlus::Texture 1567void
1568draw (DC::Layout self)
1569 CODE:
1570{
1571 glEnable (GL_TEXTURE_2D);
1572 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1573 glEnable (GL_BLEND);
1574 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1575 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1576 glEnable (GL_ALPHA_TEST);
1577 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1578
1579 rc_draw (self->rc);
1580
1581 glDisable (GL_ALPHA_TEST);
1582 glDisable (GL_BLEND);
1583 glDisable (GL_TEXTURE_2D);
1584}
1585
1586MODULE = Deliantra::Client PACKAGE = DC::Texture
1315 1587
1316PROTOTYPES: ENABLE 1588PROTOTYPES: ENABLE
1317
1318int minpot (int n)
1319 1589
1320void 1590void
1321pad (SV *data_, int ow, int oh, int nw, int nh) 1591pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE: 1592 CODE:
1323{ 1593{
1389 glDisable (GL_ALPHA_TEST); 1659 glDisable (GL_ALPHA_TEST);
1390 glDisable (GL_BLEND); 1660 glDisable (GL_BLEND);
1391 } 1661 }
1392} 1662}
1393 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
1394IV 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)
1395 CODE: 1754 CODE:
1396{ 1755{
1397 GLint width; 1756 GLint width;
1398 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);
1400 RETVAL = width > 0; 1759 RETVAL = width > 0;
1401} 1760}
1402 OUTPUT: 1761 OUTPUT:
1403 RETVAL 1762 RETVAL
1404 1763
1405MODULE = CFPlus PACKAGE = CFPlus::Map 1764MODULE = Deliantra::Client PACKAGE = DC::Map
1406 1765
1407PROTOTYPES: DISABLE 1766PROTOTYPES: DISABLE
1408 1767
1409CFPlus::Map 1768DC::Map
1410new (SV *class) 1769new (SV *class)
1411 CODE: 1770 CODE:
1412 New (0, RETVAL, 1, struct map); 1771 New (0, RETVAL, 1, struct map);
1413 RETVAL->x = 0; 1772 RETVAL->x = 0;
1414 RETVAL->y = 0; 1773 RETVAL->y = 0;
1422 RETVAL->row = 0; 1781 RETVAL->row = 0;
1423 OUTPUT: 1782 OUTPUT:
1424 RETVAL 1783 RETVAL
1425 1784
1426void 1785void
1427DESTROY (CFPlus::Map self) 1786DESTROY (DC::Map self)
1428 CODE: 1787 CODE:
1429{ 1788{
1430 map_clear (self); 1789 map_clear (self);
1431 Safefree (self->face2tile); 1790 Safefree (self->face2tile);
1432 Safefree (self->tex); 1791 Safefree (self->tex);
1433 Safefree (self); 1792 Safefree (self);
1434} 1793}
1435 1794
1436void 1795void
1437resize (CFPlus::Map self, int map_width, int map_height) 1796resize (DC::Map self, int map_width, int map_height)
1438 CODE: 1797 CODE:
1439 self->w = map_width; 1798 self->w = map_width;
1440 self->h = map_height; 1799 self->h = map_height;
1441 1800
1442void 1801void
1443clear (CFPlus::Map self) 1802clear (DC::Map self)
1444 CODE: 1803 CODE:
1445 map_clear (self); 1804 map_clear (self);
1446 1805
1447void 1806void
1448set_tileid (CFPlus::Map self, int face, int tile) 1807set_tileid (DC::Map self, int face, int tile)
1449 CODE: 1808 CODE:
1450{ 1809{
1451 need_facenum (self, face); self->face2tile [face] = tile; 1810 need_facenum (self, face); self->face2tile [face] = tile;
1452 need_texid (self, tile); 1811 need_texid (self, tile);
1453} 1812}
1454 1813
1455void 1814void
1456set_smooth (CFPlus::Map self, int face, int smooth, int level) 1815set_smooth (DC::Map self, int face, int smooth, int level)
1457 CODE: 1816 CODE:
1458{ 1817{
1459 tileid texid; 1818 tileid texid;
1460 maptex *tex; 1819 maptex *tex;
1461 1820
1474 tex->smoothtile = self->face2tile [smooth]; 1833 tex->smoothtile = self->face2tile [smooth];
1475 tex->smoothlevel = level; 1834 tex->smoothlevel = level;
1476} 1835}
1477 1836
1478void 1837void
1479set_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)
1480 CODE: 1839 CODE:
1481{ 1840{
1482 need_texid (self, texid); 1841 need_texid (self, texid);
1483 1842
1484 { 1843 {
1503 // use uglier nearest interpolation because linear suffers 1862 // use uglier nearest interpolation because linear suffers
1504 // from transparent color bleeding and ugly wrapping effects. 1863 // from transparent color bleeding and ugly wrapping effects.
1505 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1864 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1506} 1865}
1507 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
1508int 1887int
1509ox (CFPlus::Map self) 1888ox (DC::Map self)
1510 ALIAS: 1889 ALIAS:
1511 oy = 1 1890 oy = 1
1512 x = 2 1891 x = 2
1513 y = 3 1892 y = 3
1514 w = 4 1893 w = 4
1525 } 1904 }
1526 OUTPUT: 1905 OUTPUT:
1527 RETVAL 1906 RETVAL
1528 1907
1529void 1908void
1530scroll (CFPlus::Map self, int dx, int dy) 1909scroll (DC::Map self, int dx, int dy)
1531 CODE: 1910 CODE:
1532{ 1911{
1533 if (dx > 0) 1912 if (dx > 0)
1534 map_blank (self, self->x, self->y, dx, self->h); 1913 map_blank (self, self->x, self->y, dx, self->h);
1535 else if (dx < 0) 1914 else if (dx < 0)
1551 self->y += MAP_EXTEND_Y; 1930 self->y += MAP_EXTEND_Y;
1552 } 1931 }
1553} 1932}
1554 1933
1555SV * 1934SV *
1556map1a_update (CFPlus::Map self, SV *data_, int extmap) 1935map1a_update (DC::Map self, SV *data_, int extmap)
1557 CODE: 1936 CODE:
1558{ 1937{
1559 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1938 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1560 uint8_t *data_end = (uint8_t *)SvEND (data_); 1939 uint8_t *data_end = (uint8_t *)SvEND (data_);
1561 mapcell *cell; 1940 mapcell *cell;
1589 uint8_t ext, cmd; 1968 uint8_t ext, cmd;
1590 1969
1591 do 1970 do
1592 { 1971 {
1593 ext = *data++; 1972 ext = *data++;
1594 cmd = ext & 0x3f; 1973 cmd = ext & 0x7f;
1595 1974
1596 if (cmd < 4) 1975 if (cmd < 4)
1597 cell->darkness = 255 - ext * 64 + 1; 1976 cell->darkness = 255 - ext * 64 + 1;
1598 else if (cmd == 5) // health 1977 else if (cmd == 5) // health
1599 { 1978 {
1602 } 1981 }
1603 else if (cmd == 6) // monster width 1982 else if (cmd == 6) // monster width
1604 cell->stat_width = *data++ + 1; 1983 cell->stat_width = *data++ + 1;
1605 else if (cmd == 0x47) 1984 else if (cmd == 0x47)
1606 { 1985 {
1607 if (*data == 4) 1986 if (*data == 1) cell->player = data [1];
1608 ; // 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);
1609 1990
1610 data += *data + 1; 1991 data += *data + 1;
1611 } 1992 }
1612 else if (cmd == 8) // cell flags 1993 else if (cmd == 8) // cell flags
1613 cell->flags = *data++; 1994 cell->flags = *data++;
1630 cell->tile [z] = self->face2tile [face]; 2011 cell->tile [z] = self->face2tile [face];
1631 2012
1632 if (cell->tile [z]) 2013 if (cell->tile [z])
1633 { 2014 {
1634 maptex *tex = self->tex + cell->tile [z]; 2015 maptex *tex = self->tex + cell->tile [z];
2016 tex->unused = 0;
1635 if (!tex->name) 2017 if (!tex->name)
1636 av_push (missing, newSViv (cell->tile [z])); 2018 av_push (missing, newSViv (cell->tile [z]));
1637 2019
1638 if (tex->smoothtile) 2020 if (tex->smoothtile)
1639 { 2021 {
1640 maptex *smooth = self->tex + tex->smoothtile; 2022 maptex *smooth = self->tex + tex->smoothtile;
2023 smooth->unused = 0;
1641 if (!smooth->name) 2024 if (!smooth->name)
1642 av_push (missing, newSViv (tex->smoothtile)); 2025 av_push (missing, newSViv (tex->smoothtile));
1643 } 2026 }
1644 } 2027 }
1645 } 2028 }
1646 } 2029 }
1647 else 2030 else
1648 cell->darkness = 0; 2031 CELL_CLEAR (cell);
1649 } 2032 }
1650} 2033}
1651 OUTPUT: 2034 OUTPUT:
1652 RETVAL 2035 RETVAL
1653 2036
1654SV * 2037SV *
1655mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2038mapmap (DC::Map self, int x0, int y0, int w, int h)
1656 CODE: 2039 CODE:
1657{ 2040{
1658 int x1, x; 2041 int x1, x;
1659 int y1, y; 2042 int y1, y;
1660 int z; 2043 int z;
1705} 2088}
1706 OUTPUT: 2089 OUTPUT:
1707 RETVAL 2090 RETVAL
1708 2091
1709void 2092void
1710draw (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)
1711 CODE: 2094 CODE:
1712{ 2095{
2096 int x, y, z;
2097
1713 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2098 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1714 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
1715 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2100 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1716 smooth_key skey; 2101 smooth_key skey;
1717 int x, y, z; 2102 int pl_x, pl_y;
1718 int last_name; 2103 maptex pl_tex;
2104 rc_t *rc = rc_alloc ();
2105 rc_t *rc_ov = rc_alloc ();
2106 rc_key_t key;
2107 rc_array_t *arr, *arr_hidden;
1719 2108
2109 pl_tex.name = 0;
2110
1720 // thats current max. sorry. 2111 // that's current max. sorry.
1721 if (sw > 255) sw = 255; 2112 if (sw > 255) sw = 255;
1722 if (sh > 255) sh = 255; 2113 if (sh > 255) sh = 255;
1723 2114
1724 // clear key, in case of extra padding 2115 // clear key, in case of extra padding
1725 memset (&skey, 0, sizeof (skey)); 2116 memset (&skey, 0, sizeof (skey));
1726 2117
1727 glColor4ub (255, 255, 255, 255); 2118 memset (&key, 0, sizeof (key));
1728 2119 key.r = 255;
1729 glEnable (GL_BLEND); 2120 key.g = 255;
1730 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2121 key.b = 255;
1731 glEnable (GL_TEXTURE_2D); 2122 key.a = 255;
1732 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2123 key.mode = GL_QUADS;
1733 2124 key.format = GL_T2F_V3F;
1734 glBegin (GL_QUADS);
1735
1736 last_name = -1;
1737 2125
1738 mx += self->x; 2126 mx += self->x;
1739 my += self->y; 2127 my += self->y;
1740 2128
1741 // first pass: determine smooth_max 2129 // first pass: determine smooth_max
1758 MAX (self->tex [cell->tile [1]].smoothlevel, 2146 MAX (self->tex [cell->tile [1]].smoothlevel,
1759 self->tex [cell->tile [2]].smoothlevel)); 2147 self->tex [cell->tile [2]].smoothlevel));
1760 } 2148 }
1761 } 2149 }
1762 2150
2151 glEnable (GL_BLEND);
2152 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2153 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2154
2155 key.texname = self->tex [TEXID_HIDDEN].name;
2156 arr_hidden = rc_array (rc_ov, &key);
2157
1763 for (z = 0; z <= 2; z++) 2158 for (z = 0; z <= 2; z++)
1764 { 2159 {
1765 memset (smooth_level, 0, sizeof (smooth_level)); 2160 memset (smooth_level, 0, sizeof (smooth_level));
2161 key.texname = -1;
1766 2162
1767 for (y = 0; y < sh; y++) 2163 for (y = 0; y < sh; y++)
1768 if (0 <= y + my && y + my < self->rows) 2164 if (0 <= y + my && y + my < self->rows)
1769 { 2165 {
1770 maprow *row = self->row + (y + my); 2166 maprow *row = self->row + (y + my);
1778 if (tile) 2174 if (tile)
1779 { 2175 {
1780 maptex tex = self->tex [tile]; 2176 maptex tex = self->tex [tile];
1781 int px, py; 2177 int px, py;
1782 2178
1783 // suppressing texture state switches here
1784 // is only moderately effective, but worth the extra effort
1785 if (last_name != tex.name) 2179 if (key.texname != tex.name)
1786 { 2180 {
2181 self->tex [tile].unused = 0;
2182
1787 if (!tex.name) 2183 if (!tex.name)
1788 tex = self->tex [2]; /* missing, replace by noface */ 2184 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1789 2185
1790 glEnd (); 2186 key.texname = tex.name;
1791 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2187 arr = rc_array (rc, &key);
1792 glBegin (GL_QUADS);
1793 } 2188 }
1794 2189
1795 px = (x + 1) * T - tex.w; 2190 px = (x + 1) * T - tex.w;
1796 py = (y + 1) * T - tex.h; 2191 py = (y + 1) * T - tex.h;
1797 2192
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2193 if (expect_false (cell->player == player) && expect_false (z == 2))
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1802
1803 if (cell->flags && z == 2)
1804 { 2194 {
1805 if (cell->flags & 1) 2195 pl_x = px;
2196 pl_y = py;
2197 pl_tex = tex;
1806 { 2198 continue;
1807 maptex tex = self->tex [1];
1808 int px = x * T + T * 2 / 32;
1809 int py = y * T - T * 6 / 32;
1810
1811 glEnd ();
1812 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1813 glBegin (GL_QUADS);
1814
1815 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1816 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1817 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1818 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1819 }
1820 } 2199 }
2200
2201 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2202 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2203 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2204 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1821 2205
1822 // update smooth hash 2206 // update smooth hash
1823 if (tex.smoothtile) 2207 if (tex.smoothtile)
1824 { 2208 {
1825 skey.tile = tex.smoothtile; 2209 skey.tile = tex.smoothtile;
1856 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);
1857 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);
1858 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);
1859 } 2243 }
1860 } 2244 }
2245
2246 if (expect_false (z == 2))
2247 {
2248 /* draw question marks on top of hidden spaces */
2249 if (!cell->darkness)
2250 {
2251 maptex tex = self->tex [TEXID_HIDDEN];
2252 int px = (x + 1) * T - tex.w;
2253 int py = (y + 1) * T - tex.h;
2254
2255 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2256 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2257 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2258 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2259 }
2260
2261 if (expect_false (cell->flags))
2262 {
2263 // overlays such as the speech bubble, probably more to come
2264 if (cell->flags & 1)
2265 {
2266 rc_key_t key_ov = key;
2267 maptex tex = self->tex [TEXID_SPEECH];
2268 rc_array_t *arr;
2269 int px = x * T + T * 2 / 32;
2270 int py = y * T - T * 6 / 32;
2271
2272 key_ov.texname = tex.name;
2273 arr = rc_array (rc_ov, &key_ov);
2274
2275 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2276 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2277 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2278 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2279 }
2280 }
2281 }
1861 } 2282 }
1862 } 2283 }
2284
2285 rc_draw (rc);
2286 rc_clear (rc);
1863 2287
1864 // go through all smoothlevels, lowest to highest, then draw. 2288 // go through all smoothlevels, lowest to highest, then draw.
1865 // this is basically counting sort 2289 // this is basically counting sort
1866 { 2290 {
1867 int w, b; 2291 int w, b;
1868 2292
2293 glEnable (GL_TEXTURE_2D);
2294 glBegin (GL_QUADS);
1869 for (w = 0; w < 256 / 32; ++w) 2295 for (w = 0; w < 256 / 32; ++w)
1870 { 2296 {
1871 uint32_t smask = smooth_level [w]; 2297 uint32_t smask = smooth_level [w];
1872 if (smask) 2298 if (smask)
1873 for (b = 0; b < 32; ++b) 2299 for (b = 0; b < 32; ++b)
1892 int border = bits & 15; 2318 int border = bits & 15;
1893 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2319 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1894 float dx = tex.s * .0625f; // 16 images/row 2320 float dx = tex.s * .0625f; // 16 images/row
1895 float dy = tex.t * .5f ; // 2 images/column 2321 float dy = tex.t * .5f ; // 2 images/column
1896 2322
1897 // this time naively avoiding texture state changes
1898 // save gobs of state changes.
1899 if (last_name != tex.name) 2323 if (tex.name)
1900 { 2324 {
2325 // this time avoiding texture state changes
2326 // save gobs of state changes.
1901 if (!tex.name) 2327 if (key.texname != tex.name)
1902 continue; // smoothing not yet available 2328 {
2329 self->tex [skey->tile].unused = 0;
1903 2330
1904 glEnd (); 2331 glEnd ();
1905 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2332 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1906 glBegin (GL_QUADS); 2333 glBegin (GL_QUADS);
1907 } 2334 }
1908 2335
1909 if (border) 2336 if (border)
1910 { 2337 {
1911 float ox = border * dx; 2338 float ox = border * dx;
1912 2339
1913 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2340 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1914 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2341 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1915 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2342 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1916 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2343 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1917 } 2344 }
1918 2345
1919 if (corner) 2346 if (corner)
1920 { 2347 {
1921 float ox = corner * dx; 2348 float ox = corner * dx;
1922 2349
1923 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2350 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1924 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2351 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1925 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2352 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1926 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2353 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2354 }
1927 } 2355 }
1928 } 2356 }
1929 } 2357 }
1930 } 2358 }
1931 } 2359 }
2360
2361 glEnd ();
2362 glDisable (GL_TEXTURE_2D);
2363 key.texname = -1;
1932 } 2364 }
1933 2365
1934 hv_clear (smooth); 2366 hv_clear (smooth);
1935 } 2367 }
1936 2368
1937 glEnd (); 2369 if (pl_tex.name)
2370 {
2371 maptex tex = pl_tex;
2372 int px = pl_x + sdx;
2373 int py = pl_y + sdy;
1938 2374
1939 glDisable (GL_TEXTURE_2D); 2375 key.texname = tex.name;
2376 arr = rc_array (rc, &key);
2377
2378 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2379 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2380 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2381 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2382
2383 rc_draw (rc);
2384 }
2385
2386 rc_draw (rc_ov);
2387 rc_clear (rc_ov);
2388
1940 glDisable (GL_BLEND); 2389 glDisable (GL_BLEND);
2390 rc_free (rc);
2391 rc_free (rc_ov);
1941 2392
1942 // top layer: overlays such as the health bar 2393 // top layer: overlays such as the health bar
1943 for (y = 0; y < sh; y++) 2394 for (y = 0; y < sh; y++)
1944 if (0 <= y + my && y + my < self->rows) 2395 if (0 <= y + my && y + my < self->rows)
1945 { 2396 {
1950 { 2401 {
1951 mapcell *cell = row->col + (x + mx - row->c0); 2402 mapcell *cell = row->col + (x + mx - row->c0);
1952 2403
1953 int px = x * T; 2404 int px = x * T;
1954 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 }
1955 2412
1956 if (cell->stat_hp) 2413 if (cell->stat_hp)
1957 { 2414 {
1958 int width = cell->stat_width * T; 2415 int width = cell->stat_width * T;
1959 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2416 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1970 } 2427 }
1971 } 2428 }
1972} 2429}
1973 2430
1974void 2431void
1975draw_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)
1976 CODE: 2433 CODE:
1977{ 2434{
1978 static float color[16][3] = { 2435 static float color[16][3] = {
1979 { 0.00F, 0.00F, 0.00F }, 2436 { 0.00F, 0.00F, 0.00F },
1980 { 1.00F, 1.00F, 1.00F }, 2437 { 1.00F, 1.00F, 1.00F },
1999 }; 2456 };
2000 2457
2001 int x, y; 2458 int x, y;
2002 2459
2003 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 */
2004 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2467 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2005 glEnable (GL_BLEND); 2468 glEnable (GL_BLEND);
2006 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2469 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2007 glBegin (GL_QUADS); 2470 glBegin (GL_QUADS);
2008 2471
2009 for (y = 0; y < h; y++) 2472 for (y = 0; y < h; y++)
2016 float *c = color [m & 15]; 2479 float *c = color [m & 15];
2017 2480
2018 float tx1 = m & 0x40 ? 0.5 : 0.; 2481 float tx1 = m & 0x40 ? 0.5 : 0.;
2019 float tx2 = tx1 + 0.5; 2482 float tx2 = tx1 + 0.5;
2020 2483
2021 glColor4f (c[0], c[1], c[2], 0.75); 2484 glColor4f (c[0], c[1], c[2], 1);
2022 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2485 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2023 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2486 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2024 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2487 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2025 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2488 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2026 } 2489 }
2030 glDisable (GL_BLEND); 2493 glDisable (GL_BLEND);
2031 glDisable (GL_TEXTURE_2D); 2494 glDisable (GL_TEXTURE_2D);
2032} 2495}
2033 2496
2034void 2497void
2035fow_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)
2036 PPCODE: 2499 PPCODE:
2037{ 2500{
2038 int x, y; 2501 int x, y;
2039 int sw1 = sw + 2; 2502 int sw1 = sw + 2;
2040 int sh1 = sh + 2; 2503 int sh1 = sh + 2;
2048 SvCUR_set (darkness3_sv, sw34 * sh3); 2511 SvCUR_set (darkness3_sv, sw34 * sh3);
2049 2512
2050 mx += self->x - 1; 2513 mx += self->x - 1;
2051 my += self->y - 1; 2514 my += self->y - 1;
2052 2515
2053 memset (darkness1, 255, sw1 * sh1); 2516 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2054 2517
2055 for (y = 0; y < sh1; y++) 2518 for (y = 0; y < sh1; y++)
2056 if (0 <= y + my && y + my < self->rows) 2519 if (0 <= y + my && y + my < self->rows)
2057 { 2520 {
2058 maprow *row = self->row + (y + my); 2521 maprow *row = self->row + (y + my);
2061 if (row->c0 <= x + mx && x + mx < row->c1) 2524 if (row->c0 <= x + mx && x + mx < row->c1)
2062 { 2525 {
2063 mapcell *cell = row->col + (x + mx - row->c0); 2526 mapcell *cell = row->col + (x + mx - row->c0);
2064 2527
2065 darkness1 [y * sw1 + x] = cell->darkness 2528 darkness1 [y * sw1 + x] = cell->darkness
2066 ? 255 - (cell->darkness - 1) 2529 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2067 : 255 - FOW_DARKNESS; 2530 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2068 } 2531 }
2069 } 2532 }
2070 2533
2071 for (y = 0; y < sh; ++y) 2534 for (y = 0; y < sh; ++y)
2072 for (x = 0; x < sw; ++x) 2535 for (x = 0; x < sw; ++x)
2111 PUSHs (sv_2mortal (newSViv (sh3))); 2574 PUSHs (sv_2mortal (newSViv (sh3)));
2112 PUSHs (darkness3_sv); 2575 PUSHs (darkness3_sv);
2113} 2576}
2114 2577
2115SV * 2578SV *
2116get_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)
2117 CODE: 2580 CODE:
2118{ 2581{
2119 int x, y, x1, y1; 2582 int x, y, x1, y1;
2120 SV *data_sv = newSV (w * h * 7 + 5); 2583 SV *data_sv = newSV (w * h * 7 + 5);
2121 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2584 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2178 else 2641 else
2179 *data++ = 0; 2642 *data++ = 0;
2180 } 2643 }
2181 } 2644 }
2182 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 {
2183 SvPOK_only (data_sv); 2649 SvPOK_only (data_sv);
2184 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2650 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2651 }
2652
2185 RETVAL = data_sv; 2653 RETVAL = data_sv;
2186} 2654}
2187 OUTPUT: 2655 OUTPUT:
2188 RETVAL 2656 RETVAL
2189 2657
2190void 2658void
2191set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2659set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2192 PPCODE: 2660 PPCODE:
2193{ 2661{
2194 int x, y, z; 2662 int x, y, z;
2195 int w, h; 2663 int w, h;
2196 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;
2197 2675
2198 if (*data++ != 0) 2676 if (*data++ != 0)
2199 return; /* version mismatch */ 2677 XSRETURN_EMPTY; /* version mismatch */
2200 2678
2201 w = *data++ << 8; w |= *data++; 2679 w = *data++ << 8; w |= *data++;
2202 h = *data++ << 8; h |= *data++; 2680 h = *data++ << 8; h |= *data++;
2203 2681
2204 // we need to do this 'cause we don't keep an absolute coord system for rows 2682 // we need to do this 'cause we don't keep an absolute coord system for rows
2216 { 2694 {
2217 maprow *row = map_get_row (self, y); 2695 maprow *row = map_get_row (self, y);
2218 2696
2219 for (x = x0; x < x1; x++) 2697 for (x = x0; x < x1; x++)
2220 { 2698 {
2699 uint8_t flags;
2700
2701 if (data + 7 >= end)
2702 XSRETURN_EMPTY;
2703
2221 uint8_t flags = *data++; 2704 flags = *data++;
2222 2705
2223 if (flags) 2706 if (flags)
2224 { 2707 {
2225 mapcell *cell = row_get_cell (row, x); 2708 mapcell *cell = row_get_cell (row, x);
2226 tileid tile[3] = { 0, 0, 0 }; 2709 tileid tile[3] = { 0, 0, 0 };
2229 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2712 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2230 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2713 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2231 2714
2232 if (cell->darkness == 0) 2715 if (cell->darkness == 0)
2233 { 2716 {
2234 cell->darkness = 0; 2717 /*cell->darkness = 0;*/
2718 EXTEND (SP, 3);
2235 2719
2236 for (z = 0; z <= 2; z++) 2720 for (z = 0; z <= 2; z++)
2237 { 2721 {
2238 tileid t = tile [z]; 2722 tileid t = tile [z];
2239 2723
2240 if (t >= self->texs || (t && !self->tex [t].name)) 2724 if (t >= self->texs || (t && !self->tex [t].name))
2241 { 2725 {
2242 XPUSHs (sv_2mortal (newSViv (t))); 2726 PUSHs (sv_2mortal (newSViv (t)));
2243 need_texid (self, t); 2727 need_texid (self, t);
2244 } 2728 }
2245 2729
2246 cell->tile [z] = t; 2730 cell->tile [z] = t;
2247 } 2731 }
2249 } 2733 }
2250 } 2734 }
2251 } 2735 }
2252} 2736}
2253 2737
2254MODULE = CFPlus PACKAGE = CFPlus::RW 2738MODULE = Deliantra::Client PACKAGE = DC::RW
2255 2739
2256CFPlus::RW 2740DC::RW
2257new (SV *class, SV *data_sv) 2741new (SV *class, SV *data_sv)
2258 CODE: 2742 CODE:
2259{ 2743{
2260 STRLEN datalen; 2744 STRLEN datalen;
2261 char *data = SvPVbyte (data_sv, datalen); 2745 char *data = SvPVbyte (data_sv, datalen);
2263 RETVAL = SDL_RWFromConstMem (data, datalen); 2747 RETVAL = SDL_RWFromConstMem (data, datalen);
2264} 2748}
2265 OUTPUT: 2749 OUTPUT:
2266 RETVAL 2750 RETVAL
2267 2751
2268CFPlus::RW 2752DC::RW
2269new_from_file (SV *class, const char *path, const char *mode = "rb") 2753new_from_file (SV *class, const char *path, const char *mode = "rb")
2270 CODE: 2754 CODE:
2271 RETVAL = SDL_RWFromFile (path, mode); 2755 RETVAL = SDL_RWFromFile (path, mode);
2272 OUTPUT: 2756 OUTPUT:
2273 RETVAL 2757 RETVAL
2274 2758
2275# fails on win32: 2759# fails on win32:
2276# CFPlus.xs(2268) : error C2059: syntax error : '(' 2760# dc.xs(2268) : error C2059: syntax error : '('
2277#void 2761#void
2278#close (CFPlus::RW self) 2762#close (DC::RW self)
2279# CODE: 2763# CODE:
2280# (self->(close)) (self); 2764# (self->(close)) (self);
2281 2765
2282MODULE = CFPlus PACKAGE = CFPlus::Channel 2766MODULE = Deliantra::Client PACKAGE = DC::Channel
2283 2767
2284PROTOTYPES: DISABLE 2768PROTOTYPES: DISABLE
2285 2769
2286CFPlus::Channel 2770DC::Channel
2287find () 2771find ()
2288 CODE: 2772 CODE:
2289{ 2773{
2290 RETVAL = Mix_GroupAvailable (-1); 2774 RETVAL = Mix_GroupAvailable (-1);
2291 2775
2304} 2788}
2305 OUTPUT: 2789 OUTPUT:
2306 RETVAL 2790 RETVAL
2307 2791
2308void 2792void
2309halt (CFPlus::Channel self) 2793halt (DC::Channel self)
2310 CODE: 2794 CODE:
2311 Mix_HaltChannel (self); 2795 Mix_HaltChannel (self);
2312 2796
2313void 2797void
2314expire (CFPlus::Channel self, int ticks = -1) 2798expire (DC::Channel self, int ticks = -1)
2315 CODE: 2799 CODE:
2316 Mix_ExpireChannel (self, ticks); 2800 Mix_ExpireChannel (self, ticks);
2317 2801
2318void 2802void
2319fade_out (CFPlus::Channel self, int ticks = -1) 2803fade_out (DC::Channel self, int ticks = -1)
2320 CODE: 2804 CODE:
2321 Mix_FadeOutChannel (self, ticks); 2805 Mix_FadeOutChannel (self, ticks);
2322 2806
2323int 2807int
2324volume (CFPlus::Channel self, int volume) 2808volume (DC::Channel self, int volume)
2325 CODE: 2809 CODE:
2326 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2810 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2327 OUTPUT: 2811 OUTPUT:
2328 RETVAL 2812 RETVAL
2329 2813
2330void 2814void
2331unregister_all_effects (CFPlus::Channel self) 2815unregister_all_effects (DC::Channel self)
2332 CODE: 2816 CODE:
2333 Mix_UnregisterAllEffects (self); 2817 Mix_UnregisterAllEffects (self);
2334 2818
2335void 2819void
2336set_panning (CFPlus::Channel self, int left, int right) 2820set_panning (DC::Channel self, int left, int right)
2337 CODE: 2821 CODE:
2338 left = CLAMP (left , 0, 255); 2822 left = CLAMP (left , 0, 255);
2339 right = CLAMP (right, 0, 255); 2823 right = CLAMP (right, 0, 255);
2340 Mix_SetPanning (self, left, right); 2824 Mix_SetPanning (self, left, right);
2341 2825
2342void 2826void
2343set_distance (CFPlus::Channel self, int distance) 2827set_distance (DC::Channel self, int distance)
2344 CODE: 2828 CODE:
2345 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2829 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2346 2830
2347void 2831void
2348set_position (CFPlus::Channel self, int angle, int distance) 2832set_position (DC::Channel self, int angle, int distance)
2349 CODE: 2833 CODE:
2350 2834
2351void 2835void
2352set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2836set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2353 CODE: 2837 CODE:
2354{ 2838{
2355 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));
2356 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);
2357 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2841 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2358} 2842}
2359 2843
2360void 2844void
2361set_reverse_stereo (CFPlus::Channel self, int flip) 2845set_reverse_stereo (DC::Channel self, int flip)
2362 CODE: 2846 CODE:
2363 Mix_SetReverseStereo (self, flip); 2847 Mix_SetReverseStereo (self, flip);
2364 2848
2365MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2849MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2366 2850
2367PROTOTYPES: DISABLE 2851PROTOTYPES: DISABLE
2368 2852
2369CFPlus::MixChunk 2853DC::MixChunk
2370new (SV *class, CFPlus::RW rwops) 2854new (SV *class, DC::RW rwops)
2371 CODE: 2855 CODE:
2372 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2856 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2373 OUTPUT: 2857 OUTPUT:
2374 RETVAL 2858 RETVAL
2375 2859
2376void 2860void
2377DESTROY (CFPlus::MixChunk self) 2861DESTROY (DC::MixChunk self)
2378 CODE: 2862 CODE:
2379 Mix_FreeChunk (self); 2863 Mix_FreeChunk (self);
2380 2864
2381int 2865int
2382volume (CFPlus::MixChunk self, int volume = -1) 2866volume (DC::MixChunk self, int volume = -1)
2383 CODE: 2867 CODE:
2384 if (items > 1) 2868 if (items > 1)
2385 volume = CLAMP (volume, 0, 128); 2869 volume = CLAMP (volume, 0, 128);
2386 RETVAL = Mix_VolumeChunk (self, volume); 2870 RETVAL = Mix_VolumeChunk (self, volume);
2387 OUTPUT: 2871 OUTPUT:
2388 RETVAL 2872 RETVAL
2389 2873
2390CFPlus::Channel 2874DC::Channel
2391play (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)
2392 CODE: 2876 CODE:
2393{ 2877{
2394 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2878 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2395 2879
2396 if (RETVAL < 0) 2880 if (RETVAL < 0)
2403 } 2887 }
2404} 2888}
2405 OUTPUT: 2889 OUTPUT:
2406 RETVAL 2890 RETVAL
2407 2891
2408MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2892MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2409 2893
2410int 2894int
2411volume (int volume = -1) 2895volume (int volume = -1)
2412 PROTOTYPE: ;$ 2896 PROTOTYPE: ;$
2413 CODE: 2897 CODE:
2425void 2909void
2426halt () 2910halt ()
2427 CODE: 2911 CODE:
2428 Mix_HaltMusic (); 2912 Mix_HaltMusic ();
2429 2913
2430CFPlus::MixMusic 2914DC::MixMusic
2431new (SV *class, CFPlus::RW rwops) 2915new (SV *class, DC::RW rwops)
2432 CODE: 2916 CODE:
2433 RETVAL = Mix_LoadMUS_RW (rwops); 2917 RETVAL = Mix_LoadMUS_RW (rwops);
2434 OUTPUT: 2918 OUTPUT:
2435 RETVAL 2919 RETVAL
2436 2920
2437void 2921void
2438DESTROY (CFPlus::MixMusic self) 2922DESTROY (DC::MixMusic self)
2439 CODE: 2923 CODE:
2440 Mix_FreeMusic (self); 2924 Mix_FreeMusic (self);
2441 2925
2442int 2926int
2443play (CFPlus::MixMusic self, int loops = -1) 2927play (DC::MixMusic self, int loops = -1)
2444 CODE: 2928 CODE:
2445 RETVAL = Mix_PlayMusic (self, loops); 2929 RETVAL = Mix_PlayMusic (self, loops);
2446 OUTPUT: 2930 OUTPUT:
2447 RETVAL 2931 RETVAL
2448 2932
2449void 2933void
2450fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2934fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2451 CODE: 2935 CODE:
2452 Mix_FadeInMusicPos (self, loops, ms, position); 2936 Mix_FadeInMusicPos (self, loops, ms, position);
2453 2937
2454MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2938MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2455 2939
2456PROTOTYPES: ENABLE 2940PROTOTYPES: ENABLE
2457 2941
2458BOOT: 2942BOOT:
2459{ 2943{
2460 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2944 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2461 static const struct { 2945 static const struct {
2462 const char *name; 2946 const char *name;
2463 IV iv; 2947 IV iv;
2464 } *civ, const_iv[] = { 2948 } *civ, const_iv[] = {
2465# define const_iv(name) { # name, (IV)name } 2949# define const_iv(name) { # name, (IV)name }
2466 const_iv (GL_VENDOR), 2950 const_iv (GL_VENDOR),
2467 const_iv (GL_VERSION), 2951 const_iv (GL_VERSION),
2468 const_iv (GL_EXTENSIONS), 2952 const_iv (GL_EXTENSIONS),
2953 const_iv (GL_MAX_TEXTURE_UNITS),
2469 const_iv (GL_COLOR_MATERIAL), 2954 const_iv (GL_COLOR_MATERIAL),
2470 const_iv (GL_SMOOTH), 2955 const_iv (GL_SMOOTH),
2471 const_iv (GL_FLAT), 2956 const_iv (GL_FLAT),
2472 const_iv (GL_DITHER), 2957 const_iv (GL_DITHER),
2473 const_iv (GL_BLEND), 2958 const_iv (GL_BLEND),
2485 const_iv (GL_ZERO), 2970 const_iv (GL_ZERO),
2486 const_iv (GL_SRC_ALPHA), 2971 const_iv (GL_SRC_ALPHA),
2487 const_iv (GL_DST_ALPHA), 2972 const_iv (GL_DST_ALPHA),
2488 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2973 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2489 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),
2490 const_iv (GL_SRC_ALPHA_SATURATE), 2979 const_iv (GL_SRC_ALPHA_SATURATE),
2491 const_iv (GL_RGB), 2980 const_iv (GL_RGB),
2492 const_iv (GL_RGBA), 2981 const_iv (GL_RGBA),
2493 const_iv (GL_RGBA4), 2982 const_iv (GL_RGBA4),
2494 const_iv (GL_RGBA8), 2983 const_iv (GL_RGBA8),
2500 const_iv (GL_INTENSITY), 2989 const_iv (GL_INTENSITY),
2501 const_iv (GL_LUMINANCE), 2990 const_iv (GL_LUMINANCE),
2502 const_iv (GL_LUMINANCE_ALPHA), 2991 const_iv (GL_LUMINANCE_ALPHA),
2503 const_iv (GL_FLOAT), 2992 const_iv (GL_FLOAT),
2504 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),
2505 const_iv (GL_COMPILE), 3000 const_iv (GL_COMPILE),
2506 const_iv (GL_PROXY_TEXTURE_1D), 3001 const_iv (GL_PROXY_TEXTURE_1D),
2507 const_iv (GL_PROXY_TEXTURE_2D), 3002 const_iv (GL_PROXY_TEXTURE_2D),
2508 const_iv (GL_TEXTURE_1D), 3003 const_iv (GL_TEXTURE_1D),
2509 const_iv (GL_TEXTURE_2D), 3004 const_iv (GL_TEXTURE_2D),
2548 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3043 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2549 const_iv (GL_POINT_SMOOTH_HINT), 3044 const_iv (GL_POINT_SMOOTH_HINT),
2550 const_iv (GL_LINE_SMOOTH_HINT), 3045 const_iv (GL_LINE_SMOOTH_HINT),
2551 const_iv (GL_POLYGON_SMOOTH_HINT), 3046 const_iv (GL_POLYGON_SMOOTH_HINT),
2552 const_iv (GL_GENERATE_MIPMAP_HINT), 3047 const_iv (GL_GENERATE_MIPMAP_HINT),
3048 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2553 const_iv (GL_FASTEST), 3049 const_iv (GL_FASTEST),
2554 const_iv (GL_DONT_CARE), 3050 const_iv (GL_DONT_CARE),
2555 const_iv (GL_NICEST), 3051 const_iv (GL_NICEST),
2556 const_iv (GL_V2F), 3052 const_iv (GL_V2F),
2557 const_iv (GL_V3F), 3053 const_iv (GL_V3F),
2558 const_iv (GL_T2F_V3F), 3054 const_iv (GL_T2F_V3F),
2559 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),
2560# undef const_iv 3059# undef const_iv
2561 }; 3060 };
2562 3061
2563 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; )
2564 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3063 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2565 3064
2566 texture_av = newAV (); 3065 texture_av = newAV ();
2567 AvREAL_off (texture_av); 3066 AvREAL_off (texture_av);
2568} 3067}
2569 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
2570char * 3078char *
2571gl_vendor () 3079gl_vendor ()
2572 CODE: 3080 CODE:
2573 RETVAL = (char *)glGetString (GL_VENDOR); 3081 RETVAL = (char *)glGetString (GL_VENDOR);
2574 OUTPUT: 3082 OUTPUT:
2623 3131
2624void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3132void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2625 CODE: 3133 CODE:
2626 gl_BlendFuncSeparate (sa, da, saa, daa); 3134 gl_BlendFuncSeparate (sa, da, saa, daa);
2627 3135
3136# void glBlendEquation (int se)
3137
2628void glDepthMask (int flag) 3138void glDepthMask (int flag)
2629 3139
2630void glLogicOp (int opcode) 3140void glLogicOp (int opcode)
2631 3141
2632void glColorMask (int red, int green, int blue, int alpha) 3142void glColorMask (int red, int green, int blue, int alpha)
2666void glRotate (float angle, float x, float y, float z) 3176void glRotate (float angle, float x, float y, float z)
2667 CODE: 3177 CODE:
2668 glRotatef (angle, x, y, z); 3178 glRotatef (angle, x, y, z);
2669 3179
2670void 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: @
2671 ALIAS: 3182 ALIAS:
2672 glColor_premultiply = 1 3183 glColor_premultiply = 1
2673 CODE: 3184 CODE:
2674 if (ix) 3185 if (ix)
2675 { 3186 {
2695 3206
2696void glRect (float x1, float y1, float x2, float y2) 3207void glRect (float x1, float y1, float x2, float y2)
2697 CODE: 3208 CODE:
2698 glRectf (x1, y1, x2, y2); 3209 glRectf (x1, y1, x2, y2);
2699 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
2700PROTOTYPES: ENABLE 3220PROTOTYPES: ENABLE
2701 3221
2702void glBegin (int mode) 3222void glBegin (int mode)
2703 3223
2704void glEnd () 3224void glEnd ()
2736void 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)
2737 CODE: 3257 CODE:
2738 if (gl.SeparableFilter2D) 3258 if (gl.SeparableFilter2D)
2739 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3259 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2740 3260
2741void 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)
2742 3262
2743void 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)
2744 3264
2745void glDrawPixels (int width, int height, int format, int type, char *pixels) 3265void glDrawPixels (int width, int height, int format, int type, char *pixels)
2746 3266
2772 3292
2773void glEndList () 3293void glEndList ()
2774 3294
2775void glCallList (int list) 3295void glCallList (int list)
2776 3296
2777MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3297MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2778 3298
2779PROTOTYPES: DISABLE 3299PROTOTYPES: DISABLE
2780 3300
2781void 3301void
2782find_widget (SV *self, NV x, NV y) 3302find_widget (SV *self, NV x, NV y)
2786 XPUSHs (self); 3306 XPUSHs (self);
2787} 3307}
2788 3308
2789BOOT: 3309BOOT:
2790{ 3310{
2791 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3311 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2792 3312
2793 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);
2794 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);
2795 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);
2796 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);
2797} 3317}
2798 3318
2799void 3319void
2800draw (SV *self) 3320draw (SV *self)
2801 CODE: 3321 CODE:
2805 NV x, y, w, h; 3325 NV x, y, w, h;
2806 SV *draw_x_sv = GvSV (draw_x_gv); 3326 SV *draw_x_sv = GvSV (draw_x_gv);
2807 SV *draw_y_sv = GvSV (draw_y_gv); 3327 SV *draw_y_sv = GvSV (draw_y_gv);
2808 SV *draw_w_sv = GvSV (draw_w_gv); 3328 SV *draw_w_sv = GvSV (draw_w_gv);
2809 SV *draw_h_sv = GvSV (draw_h_gv); 3329 SV *draw_h_sv = GvSV (draw_h_gv);
2810 SV *hover;
2811 double draw_x, draw_y, draw_w, draw_h; 3330 double draw_x, draw_y;
2812 3331
2813 if (!SvROK (self)) 3332 if (!SvROK (self))
2814 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3333 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2815 3334
2816 hv = (HV *)SvRV (self); 3335 hv = (HV *)SvRV (self);
2817 3336
2818 if (SvTYPE (hv) != SVt_PVHV) 3337 if (SvTYPE (hv) != SVt_PVHV)
2819 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3338 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2820 3339
2821 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.;
2822 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.;
2823 3342
2824 if (!h || !w) 3343 if (!h || !w)
2844 { 3363 {
2845 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3364 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2846 3365
2847 if (svp && SvTRUE (*svp)) 3366 if (svp && SvTRUE (*svp))
2848 { 3367 {
2849 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3368 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2850 glEnable (GL_BLEND); 3369 glEnable (GL_BLEND);
2851 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3370 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2852 glBegin (GL_QUADS); 3371 glBegin (GL_QUADS);
2853 glVertex2f (0, 0); 3372 glVertex2f (0, 0);
2854 glVertex2f (w, 0); 3373 glVertex2f (w, 0);
2857 glEnd (); 3376 glEnd ();
2858 glDisable (GL_BLEND); 3377 glDisable (GL_BLEND);
2859 } 3378 }
2860 } 3379 }
2861#if 0 3380#if 0
2862 if ($ENV{CFPLUS_DEBUG} & 1) { 3381 // draw borders, for debugging
2863 glPushMatrix; 3382 glPushMatrix ();
2864 glColor 1, 1, 0, 1; 3383 glColor4f (1., 1., 0., 1.);
2865 glTranslate 0.375, 0.375; 3384 glTranslatef (.5, .5, 0.);
2866 glBegin GL_LINE_LOOP; 3385 glBegin (GL_LINE_LOOP);
2867 glVertex 0 , 0; 3386 glVertex2f (0 , 0);
2868 glVertex $self->{w} - 1, 0; 3387 glVertex2f (w - 1, 0);
2869 glVertex $self->{w} - 1, $self->{h} - 1; 3388 glVertex2f (w - 1, h - 1);
2870 glVertex 0 , $self->{h} - 1; 3389 glVertex2f (0 , h - 1);
2871 glEnd; 3390 glEnd ();
2872 glPopMatrix; 3391 glPopMatrix ();
2873 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2874 }
2875#endif 3392#endif
2876 PUSHMARK (SP); 3393 PUSHMARK (SP);
2877 XPUSHs (self); 3394 XPUSHs (self);
2878 PUTBACK; 3395 PUTBACK;
2879 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