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.211 by root, Sat Jul 28 00:45:28 2007 UTC vs.
Revision 1.293 by root, Thu Dec 17 02:49:38 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>
27#include <stdio.h> 32#include <stdio.h>
28#include <stdlib.h> 33#include <stdlib.h>
34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 36
30#include <SDL.h> 37#include <SDL.h>
31#include <SDL_thread.h> 38#include <SDL_thread.h>
32#include <SDL_endian.h> 39#include <SDL_endian.h>
33#include <SDL_image.h> 40#include <SDL_image.h>
34#include <SDL_mixer.h> 41#include <SDL_mixer.h>
35#include <SDL_opengl.h> 42#include <SDL_opengl.h>
36 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
37#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
38#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
39 51
40#include <glib/gmacros.h> 52#include <glib/gmacros.h>
41 53
42#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
43 66
44#ifndef _WIN32 67#ifndef _WIN32
45# include <sys/types.h> 68# include <sys/types.h>
46# include <sys/socket.h> 69# include <sys/socket.h>
47# include <netinet/in.h> 70# include <netinet/in.h>
48# include <netinet/tcp.h> 71# include <netinet/tcp.h>
49# include <inttypes.h> 72# include <inttypes.h>
50#endif 73#endif
51 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
52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53 85
54#define FOW_DARKNESS 32 86#define FOW_DARKNESS 64
55 87
56#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
58 90
59#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
60 92
61#if 0 93/* mask out modifiers we are not interested in */
62# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
63#else 95
64# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
65#endif 97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
66 101
67static AV *texture_av; 102static AV *texture_av;
68 103
69static struct 104static struct
70{ 105{
107 av_push (texture_av, (SV *)(size_t)name); 142 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 143 glDeleteTextures (1, &name);
109} 144}
110 145
111#include "texcache.c" 146#include "texcache.c"
147#include "rendercache.c"
112 148
113#include "pango-font.c" 149#include "pango-font.c"
114#include "pango-fontmap.c" 150#include "pango-fontmap.c"
115#include "pango-render.c" 151#include "pango-render.c"
116 152
153typedef IV DC__Channel;
154typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 155typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 156typedef Mix_Music *DC__MixMusic;
119 157
120typedef PangoFontDescription *CFPlus__Font; 158typedef PangoFontDescription *DC__Font;
121 159
122static int 160static int
123shape_attr_p (PangoLayoutRun *run) 161shape_attr_p (PangoLayoutRun *run)
124{ 162{
125 GSList *attrs = run->item->analysis.extra_attrs; 163 GSList *attrs = run->item->analysis.extra_attrs;
139 177
140typedef struct cf_layout { 178typedef struct cf_layout {
141 PangoLayout *pl; 179 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 180 float r, g, b, a; // default color for rgba mode
143 int base_height; 181 int base_height;
144 CFPlus__Font font; 182 DC__Font font;
183 rc_t *rc;
145} *CFPlus__Layout; 184} *DC__Layout;
146 185
147static CFPlus__Font default_font; 186static DC__Font default_font;
148static PangoContext *opengl_context; 187static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 188static PangoFontMap *opengl_fontmap;
150 189
151static void 190static void
152substitute_func (FcPattern *pattern, gpointer data) 191substitute_func (FcPattern *pattern, gpointer data)
157#endif 196#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 197 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 198}
160 199
161static void 200static void
162layout_update_font (CFPlus__Layout self) 201layout_update_font (DC__Layout self)
163{ 202{
164 /* 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
165 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
166 */ 205 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
168 207
169 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 210
172 pango_layout_set_font_description (self->pl, font); 211 pango_layout_set_font_description (self->pl, font);
173} 212}
174 213
175static void 214static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 215layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 216{
178 PangoRectangle rect; 217 PangoRectangle rect;
179 218
180 // get_pixel_* wrongly rounds down 219 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 220 pango_layout_get_extents (self->pl, 0, &rect);
192 231
193typedef uint16_t tileid; 232typedef uint16_t tileid;
194typedef uint16_t faceid; 233typedef uint16_t faceid;
195 234
196typedef struct { 235typedef struct {
197 int name; 236 GLuint name;
198 int w, h; 237 int w, h;
199 float s, t; 238 float s, t;
200 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
201 tileid smoothtile; 240 tileid smoothtile;
202 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
203} maptex; 243} maptex;
204 244
205typedef struct { 245typedef struct {
206 uint32_t player; 246 uint32_t player;
207 tileid tile[3]; 247 tileid tile[3];
220 int faces; tileid *face2tile; // [faceid] 260 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 261 int texs; maptex *tex; // [tileid]
222 262
223 int32_t rows; 263 int32_t rows;
224 maprow *row; 264 maprow *row;
225} *CFPlus__Map; 265} *DC__Map;
226 266
227static char * 267static char *
228prepend (char *ptr, int sze, int inc) 268prepend (char *ptr, int sze, int inc)
229{ 269{
230 char *p; 270 char *p;
268 self->texs *= 2; 308 self->texs *= 2;
269 } 309 }
270} 310}
271 311
272static maprow * 312static maprow *
273map_get_row (CFPlus__Map self, int y) 313map_get_row (DC__Map self, int y)
274{ 314{
275 if (0 > y) 315 if (0 > y)
276 { 316 {
277 int extend = - y + MAP_EXTEND_Y; 317 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 318 Prepend (maprow, self->row, self->rows, extend);
316 356
317 return row->col + (x - row->c0); 357 return row->col + (x - row->c0);
318} 358}
319 359
320static mapcell * 360static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 361map_get_cell (DC__Map self, int x, int y)
322{ 362{
323 return row_get_cell (map_get_row (self, y), x); 363 return row_get_cell (map_get_row (self, y), x);
324} 364}
325 365
326static void 366static void
327map_clear (CFPlus__Map self) 367map_clear (DC__Map self)
328{ 368{
329 int r; 369 int r;
330 370
331 for (r = 0; r < self->rows; r++) 371 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 372 Safefree (self->row[r].col);
339 self->oy = 0; 379 self->oy = 0;
340 self->row = 0; 380 self->row = 0;
341 self->rows = 0; 381 self->rows = 0;
342} 382}
343 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
344static void 394static void
345map_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)
346{ 396{
347 int x, y; 397 int x, y;
348 maprow *row; 398 maprow *row;
349 mapcell *cell; 399 mapcell *cell;
350 400
362 if (x >= row->c1) 412 if (x >= row->c1)
363 break; 413 break;
364 414
365 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
366 416
367 cell->darkness = 0; 417 CELL_CLEAR (cell);
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
371 } 418 }
372 } 419 }
373} 420}
374 421
375typedef struct { 422typedef struct {
429 n |= n >> 16; 476 n |= n >> 16;
430 477
431 return n + 1; 478 return n + 1;
432} 479}
433 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
434/* SDL should provide this, really. */ 492/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 493#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 494#define SDLK_MODIFIER_MAX 314
437 495
438/******************************************************************************/ 496/******************************************************************************/
476 return 0; 534 return 0;
477 535
478 return 1; 536 return 1;
479} 537}
480 538
481MODULE = 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
482 592
483PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
484 594
485BOOT: 595BOOT:
486{ 596{
487 HV *stash = gv_stashpv ("CFPlus", 1); 597 HV *stash = gv_stashpv ("DC", 1);
488 static const struct { 598 static const struct {
489 const char *name; 599 const char *name;
490 IV iv; 600 IV iv;
491 } *civ, const_iv[] = { 601 } *civ, const_iv[] = {
492# define const_iv(name) { # name, (IV)name } 602# define const_iv(name) { # name, (IV)name }
514 624
515 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
518 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),
519 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
520 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
521 const_iv (SDLK_KP2), 683 const_iv (SDLK_KP2),
522 const_iv (SDLK_KP3), 684 const_iv (SDLK_KP3),
523 const_iv (SDLK_KP4), 685 const_iv (SDLK_KP4),
595 const_iv (KMOD_LMETA), 757 const_iv (KMOD_LMETA),
596 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
597 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
598 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
599 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)
600# undef const_iv 795# undef const_iv
601 }; 796 };
602 797
603 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; )
604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
622 817
623NV floor (NV x) 818NV floor (NV x)
624 819
625NV ceil (NV x) 820NV ceil (NV x)
626 821
822IV minpot (UV n)
823
824IV popcount (UV n)
825
627void 826void
628pango_init () 827pango_init ()
629 CODE: 828 CODE:
630{ 829{
631 opengl_fontmap = pango_opengl_font_map_new (); 830 opengl_fontmap = pango_opengl_font_map_new ();
632 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);
633 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
634} 838}
635 839
636char *
637SDL_GetError () 840char *SDL_GetError ()
638 841
639int 842void SDL_braino ()
640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
641 843
642void 844int SDL_Init (U32 flags)
845
846int SDL_InitSubSystem (U32 flags)
847
848void SDL_QuitSubSystem (U32 flags)
849
643SDL_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
644 860
645void 861void
646SDL_ListModes (int rgb, int alpha) 862SDL_ListModes (int rgb, int alpha)
647 PPCODE: 863 PPCODE:
648{ 864{
660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 876 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
663 879
664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 880 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
665#if SDL_VERSION_ATLEAST(1,2,10)
666 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
667 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 881 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
669 882
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 883 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 884
672 if (m && m != (SDL_Rect **)-1) 885 if (m && m != (SDL_Rect **)-1)
673 while (*m) 886 while (*m)
674 { 887 {
675 if ((*m)->w >= 640 && (*m)->h >= 480) 888 if ((*m)->w >= 400 && (*m)->h >= 300)
676 { 889 {
677 AV *av = newAV (); 890 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 891 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 892 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 893 av_push (av, newSViv (rgb));
704 917
705 if (RETVAL) 918 if (RETVAL)
706 { 919 {
707 av_clear (texture_av); 920 av_clear (texture_av);
708 921
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 922 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710#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);
711#include "glfunc.h" 924#include "glfunc.h"
712#undef GL_FUNC 925#undef GL_FUNC
713 } 926 }
714} 927}
721char * 934char *
722SDL_GetKeyName (int sym) 935SDL_GetKeyName (int sym)
723 936
724int 937int
725SDL_GetAppState () 938SDL_GetAppState ()
939
940int
941SDL_GetModState ()
726 942
727void 943void
728poll_events () 944poll_events ()
729 PPCODE: 945 PPCODE:
730{ 946{
740 { 956 {
741 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
742 case SDL_KEYUP: 958 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 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);
746 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 */
747 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 964 break;
749 965
750 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
769 x = ev.motion.x; 985 x = ev.motion.x;
770 y = ev.motion.y; 986 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 988 }
773 989
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 996 }
781 break; 997 break;
782 998
783 case SDL_MOUSEBUTTONDOWN: 999 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 1000 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1001 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 1002
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1003 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1004 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1005 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1006 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1011 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1012 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 1013 break;
798 } 1014 }
799 1015
800 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))));
801 } 1017 }
802} 1018}
803 1019
804int 1020int
805Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1021Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 1022 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 1023 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 1024 Mix_ChannelFinished (channel_finished);
809 1025
810void 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}
1041
1042void
811Mix_CloseAudio () 1043Mix_CloseAudio ()
812 1044
813int 1045int
814Mix_AllocateChannels (int numchans = -1) 1046Mix_AllocateChannels (int numchans = -1)
1047
1048const char *
1049Mix_GetError ()
815 1050
816void 1051void
817lowdelay (int fd, int val = 1) 1052lowdelay (int fd, int val = 1)
818 CODE: 1053 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1054 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
845 } 1080 }
846 } 1081 }
847#endif 1082#endif
848} 1083}
849 1084
850void 1085int
851add_font (char *file) 1086add_font (char *file)
852 CODE: 1087 CODE:
853 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT:
1090 RETVAL
854 1091
855void 1092void
856load_image_inline (SV *image_) 1093load_image_inline (SV *image_)
857 ALIAS: 1094 ALIAS:
858 load_image_file = 1 1095 load_image_file = 1
861 STRLEN image_len; 1098 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 1099 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 1100 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 1101 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 1102 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 1103 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 1104 : SDL_RWFromConstMem (image, image_len);
868 1105
869 if (!rw) 1106 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 1107 croak ("load_image: %s", SDL_GetError ());
871 1108
944void 1181void
945error (char *message) 1182error (char *message)
946 CODE: 1183 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1184 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1185#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1186 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1187#endif
951 1188
952void 1189void
953fatal (char *message) 1190fatal (char *message)
954 CODE: 1191 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1192 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1193#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1194 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1195#endif
959 _exit (1); 1196 _exit (1);
960 1197
961void 1198void
962_exit (int retval = 0) 1199_exit (int retval = 0)
974#if DEBUG 1211#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
976#endif 1213#endif
977} 1214}
978 1215
979MODULE = 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
980 1224
981PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
982 1226
983CFPlus::Font 1227DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1228new_from_file (SV *class, char *path, int id = 0)
985 CODE: 1229 CODE:
986{ 1230{
987 int count; 1231 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1232 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
991} 1235}
992 OUTPUT: 1236 OUTPUT:
993 RETVAL 1237 RETVAL
994 1238
995void 1239void
996DESTROY (CFPlus::Font self) 1240DESTROY (DC::Font self)
997 CODE: 1241 CODE:
998 pango_font_description_free (self); 1242 pango_font_description_free (self);
999 1243
1000void 1244void
1001make_default (CFPlus::Font self) 1245make_default (DC::Font self)
1002 PROTOTYPE: $ 1246 PROTOTYPE: $
1003 CODE: 1247 CODE:
1004 default_font = self; 1248 default_font = self;
1005 1249
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1250MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1251
1008PROTOTYPES: DISABLE 1252PROTOTYPES: DISABLE
1009 1253
1010void 1254void
1011reset_glyph_cache () 1255glyph_cache_backup ()
1012 PROTOTYPE: 1256 PROTOTYPE:
1013 CODE: 1257 CODE:
1258 tc_backup ();
1259
1260void
1261glyph_cache_restore ()
1262 PROTOTYPE:
1263 CODE:
1014 tc_clear (); 1264 tc_restore ();
1015 1265
1016CFPlus::Layout 1266DC::Layout
1017new (SV *class) 1267new (SV *class)
1018 CODE: 1268 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1269 New (0, RETVAL, 1, struct cf_layout);
1020 1270
1021 RETVAL->pl = pango_layout_new (opengl_context); 1271 RETVAL->pl = pango_layout_new (opengl_context);
1023 RETVAL->g = 1.; 1273 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1274 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1275 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1276 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1277 RETVAL->font = 0;
1278 RETVAL->rc = rc_alloc ();
1028 1279
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1280 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1281 layout_update_font (RETVAL);
1031 OUTPUT: 1282 OUTPUT:
1032 RETVAL 1283 RETVAL
1033 1284
1034void 1285void
1035DESTROY (CFPlus::Layout self) 1286DESTROY (DC::Layout self)
1036 CODE: 1287 CODE:
1037 g_object_unref (self->pl); 1288 g_object_unref (self->pl);
1289 rc_free (self->rc);
1038 Safefree (self); 1290 Safefree (self);
1039 1291
1040void 1292void
1041set_text (CFPlus::Layout self, SV *text_) 1293set_text (DC::Layout self, SV *text_)
1042 CODE: 1294 CODE:
1043{ 1295{
1044 STRLEN textlen; 1296 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1297 char *text = SvPVutf8 (text_, textlen);
1046 1298
1047 pango_layout_set_text (self->pl, text, textlen); 1299 pango_layout_set_text (self->pl, text, textlen);
1048} 1300}
1049 1301
1050void 1302void
1051set_markup (CFPlus::Layout self, SV *text_) 1303set_markup (DC::Layout self, SV *text_)
1052 CODE: 1304 CODE:
1053{ 1305{
1054 STRLEN textlen; 1306 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1307 char *text = SvPVutf8 (text_, textlen);
1056 1308
1057 pango_layout_set_markup (self->pl, text, textlen); 1309 pango_layout_set_markup (self->pl, text, textlen);
1058} 1310}
1059 1311
1060void 1312void
1061set_shapes (CFPlus::Layout self, ...) 1313set_shapes (DC::Layout self, ...)
1062 CODE: 1314 CODE:
1063{ 1315{
1064 PangoAttrList *attrs = 0; 1316 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1317 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1318 const char *pos = text;
1101 if (attrs) 1353 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1354 pango_layout_set_attributes (self->pl, attrs);
1103} 1355}
1104 1356
1105void 1357void
1106get_shapes (CFPlus::Layout self) 1358get_shapes (DC::Layout self)
1107 PPCODE: 1359 PPCODE:
1108{ 1360{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1361 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1362
1111 do 1363 do
1112 { 1364 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1365 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1366
1115 if (run && shape_attr_p (run)) 1367 if (run && shape_attr_p (run))
1116 { 1368 {
1117 PangoRectangle extents; 1369 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1370 pango_layout_iter_get_run_extents (iter, 0, &extents);
1126 1378
1127 pango_layout_iter_free (iter); 1379 pango_layout_iter_free (iter);
1128} 1380}
1129 1381
1130int 1382int
1131has_wrapped (CFPlus::Layout self) 1383has_wrapped (DC::Layout self)
1132 CODE: 1384 CODE:
1133{ 1385{
1134 int lines = 1; 1386 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1387 const char *text = pango_layout_get_text (self->pl);
1136 1388
1141} 1393}
1142 OUTPUT: 1394 OUTPUT:
1143 RETVAL 1395 RETVAL
1144 1396
1145SV * 1397SV *
1146get_text (CFPlus::Layout self) 1398get_text (DC::Layout self)
1147 CODE: 1399 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1400 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1401 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1402 OUTPUT:
1151 RETVAL 1403 RETVAL
1152 1404
1153void 1405void
1154set_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.)
1155 CODE: 1407 CODE:
1156 self->r = r; 1408 self->r = r;
1157 self->g = g; 1409 self->g = g;
1158 self->b = b; 1410 self->b = b;
1159 self->a = a; 1411 self->a = a;
1160 1412
1161void 1413void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1414set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1415 CODE:
1164 if (self->font != font) 1416 if (self->font != font)
1165 { 1417 {
1166 self->font = font; 1418 self->font = font;
1167 layout_update_font (self); 1419 layout_update_font (self);
1168 } 1420 }
1169 1421
1170void 1422void
1171set_height (CFPlus::Layout self, int base_height) 1423set_height (DC::Layout self, int base_height)
1172 CODE: 1424 CODE:
1173 if (self->base_height != base_height) 1425 if (self->base_height != base_height)
1174 { 1426 {
1175 self->base_height = base_height; 1427 self->base_height = base_height;
1176 layout_update_font (self); 1428 layout_update_font (self);
1177 } 1429 }
1178 1430
1179void 1431void
1180set_width (CFPlus::Layout self, int max_width = -1) 1432set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1433 CODE:
1182 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);
1183 1435
1184void 1436void
1185set_indent (CFPlus::Layout self, int indent) 1437set_indent (DC::Layout self, int indent)
1186 CODE: 1438 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1439 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1440
1189void 1441void
1190set_spacing (CFPlus::Layout self, int spacing) 1442set_spacing (DC::Layout self, int spacing)
1191 CODE: 1443 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1444 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1445
1194void 1446void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1447set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1448 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1449 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1450 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1451 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1452 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1453 : PANGO_ELLIPSIZE_NONE
1202 ); 1454 );
1203 1455
1204void 1456void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1457set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1458 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1459 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1460
1209void 1461void
1210size (CFPlus::Layout self) 1462size (DC::Layout self)
1211 PPCODE: 1463 PPCODE:
1212{ 1464{
1213 int w, h; 1465 int w, h;
1214 1466
1215 layout_get_pixel_size (self, &w, &h); 1467 layout_get_pixel_size (self, &w, &h);
1218 PUSHs (sv_2mortal (newSViv (w))); 1470 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1471 PUSHs (sv_2mortal (newSViv (h)));
1220} 1472}
1221 1473
1222int 1474int
1223descent (CFPlus::Layout self) 1475descent (DC::Layout self)
1224 CODE: 1476 CODE:
1225{ 1477{
1226 PangoRectangle rect; 1478 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1479 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1480 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1481 RETVAL = PANGO_DESCENT (rect);
1230} 1482}
1231 OUTPUT: 1483 OUTPUT:
1232 RETVAL 1484 RETVAL
1233 1485
1234int 1486int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1487xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1488 CODE:
1237{ 1489{
1238 int index, trailing; 1490 int index, trailing;
1239 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);
1240 RETVAL = index + trailing; 1492 RETVAL = index + trailing;
1241} 1493}
1242 OUTPUT: 1494 OUTPUT:
1243 RETVAL 1495 RETVAL
1244 1496
1245void 1497void
1246cursor_pos (CFPlus::Layout self, int index) 1498cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1499 PPCODE:
1248{ 1500{
1249 PangoRectangle strong_pos; 1501 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1502 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1503
1252 EXTEND (SP, 3); 1504 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1505 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1506 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1507 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1508}
1257 1509
1258void 1510void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1511index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1512 PPCODE:
1261{ 1513{
1262 int line, x; 1514 int line, x;
1263 1515
1264 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)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1518 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1519 --line;
1520#endif
1267 EXTEND (SP, 2); 1521 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1522 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1523 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1524}
1271 1525
1272void 1526void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1527line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1528 PPCODE:
1275{ 1529{
1276 PangoLayoutLine *lp; 1530 PangoLayoutLine *lp;
1277 int index, trailing; 1531 int index, trailing;
1278 1532
1279 if (line < 0) 1533 if (line < 0)
1280 XSRETURN_EMPTY; 1534 XSRETURN_EMPTY;
1281 1535
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1536 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1537 XSRETURN_EMPTY; /* do better */
1284 1538
1285 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);
1286 1540
1287 EXTEND (SP, 2); 1541 EXTEND (SP, 2);
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1547 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1548 }
1295} 1549}
1296 1550
1297void 1551void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1552render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1553 CODE:
1554 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1555 pango_opengl_render_layout_subpixel (
1301 self->pl, 1556 self->pl,
1557 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1558 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1559 self->r, self->g, self->b, self->a,
1304 flags 1560 flags
1305 ); 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);
1306 1565
1307MODULE = 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
1308 1586
1309PROTOTYPES: ENABLE 1587PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1588
1313void 1589void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1590pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1591 CODE:
1316{ 1592{
1343 HV *hv = (HV *)SvRV (self); 1619 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1620 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1621 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1622 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1623
1624 if (name <= 0)
1625 XSRETURN_EMPTY;
1626
1348 if (items < 5) 1627 if (items < 5)
1349 { 1628 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1629 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1630 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1631 }
1379 glDisable (GL_ALPHA_TEST); 1658 glDisable (GL_ALPHA_TEST);
1380 glDisable (GL_BLEND); 1659 glDisable (GL_BLEND);
1381 } 1660 }
1382} 1661}
1383 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
1384IV 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)
1385 CODE: 1693 CODE:
1386{ 1694{
1387 GLint width; 1695 GLint width;
1388 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);
1390 RETVAL = width > 0; 1698 RETVAL = width > 0;
1391} 1699}
1392 OUTPUT: 1700 OUTPUT:
1393 RETVAL 1701 RETVAL
1394 1702
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1703MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1704
1397PROTOTYPES: DISABLE 1705PROTOTYPES: DISABLE
1398 1706
1399CFPlus::Map 1707DC::Map
1400new (SV *class) 1708new (SV *class)
1401 CODE: 1709 CODE:
1402 New (0, RETVAL, 1, struct map); 1710 New (0, RETVAL, 1, struct map);
1403 RETVAL->x = 0; 1711 RETVAL->x = 0;
1404 RETVAL->y = 0; 1712 RETVAL->y = 0;
1412 RETVAL->row = 0; 1720 RETVAL->row = 0;
1413 OUTPUT: 1721 OUTPUT:
1414 RETVAL 1722 RETVAL
1415 1723
1416void 1724void
1417DESTROY (CFPlus::Map self) 1725DESTROY (DC::Map self)
1418 CODE: 1726 CODE:
1419{ 1727{
1420 map_clear (self); 1728 map_clear (self);
1421 Safefree (self->face2tile); 1729 Safefree (self->face2tile);
1422 Safefree (self->tex); 1730 Safefree (self->tex);
1423 Safefree (self); 1731 Safefree (self);
1424} 1732}
1425 1733
1426void 1734void
1427resize (CFPlus::Map self, int map_width, int map_height) 1735resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1736 CODE:
1429 self->w = map_width; 1737 self->w = map_width;
1430 self->h = map_height; 1738 self->h = map_height;
1431 1739
1432void 1740void
1433clear (CFPlus::Map self) 1741clear (DC::Map self)
1434 CODE: 1742 CODE:
1435 map_clear (self); 1743 map_clear (self);
1436 1744
1437void 1745void
1438set_tileid (CFPlus::Map self, int face, int tile) 1746set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1747 CODE:
1440{ 1748{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1749 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1750 need_texid (self, tile);
1443} 1751}
1444 1752
1445void 1753void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1754set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1755 CODE:
1448{ 1756{
1449 tileid texid; 1757 tileid texid;
1450 maptex *tex; 1758 maptex *tex;
1451 1759
1464 tex->smoothtile = self->face2tile [smooth]; 1772 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1773 tex->smoothlevel = level;
1466} 1774}
1467 1775
1468void 1776void
1469set_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)
1470 CODE: 1778 CODE:
1471{ 1779{
1472 need_texid (self, texid); 1780 need_texid (self, texid);
1473 1781
1474 { 1782 {
1493 // use uglier nearest interpolation because linear suffers 1801 // use uglier nearest interpolation because linear suffers
1494 // from transparent color bleeding and ugly wrapping effects. 1802 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1803 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1804}
1497 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
1498int 1826int
1499ox (CFPlus::Map self) 1827ox (DC::Map self)
1500 ALIAS: 1828 ALIAS:
1501 oy = 1 1829 oy = 1
1502 x = 2 1830 x = 2
1503 y = 3 1831 y = 3
1504 w = 4 1832 w = 4
1515 } 1843 }
1516 OUTPUT: 1844 OUTPUT:
1517 RETVAL 1845 RETVAL
1518 1846
1519void 1847void
1520scroll (CFPlus::Map self, int dx, int dy) 1848scroll (DC::Map self, int dx, int dy)
1521 CODE: 1849 CODE:
1522{ 1850{
1523 if (dx > 0) 1851 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 1852 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 1853 else if (dx < 0)
1540 self->rows += MAP_EXTEND_Y; 1868 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 1869 self->y += MAP_EXTEND_Y;
1542 } 1870 }
1543} 1871}
1544 1872
1545void 1873SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 1874map1a_update (DC::Map self, SV *data_, int extmap)
1547 CODE: 1875 CODE:
1548{ 1876{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1877 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 1878 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 1879 mapcell *cell;
1552 int x, y, flags; 1880 int x, y, z, flags;
1881 AV *missing = newAV ();
1882 RETVAL = newRV_noinc ((SV *)missing);
1553 1883
1554 while (data < data_end - 1) 1884 while (data < data_end - 1)
1555 { 1885 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 1886 flags = (data [0] << 8) + data [1]; data += 2;
1557 1887
1577 uint8_t ext, cmd; 1907 uint8_t ext, cmd;
1578 1908
1579 do 1909 do
1580 { 1910 {
1581 ext = *data++; 1911 ext = *data++;
1582 cmd = ext & 0x3f; 1912 cmd = ext & 0x7f;
1583 1913
1584 if (cmd < 4) 1914 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1; 1915 cell->darkness = 255 - ext * 64 + 1;
1586 else if (cmd == 5) // health 1916 else if (cmd == 5) // health
1587 { 1917 {
1590 } 1920 }
1591 else if (cmd == 6) // monster width 1921 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1; 1922 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47) 1923 else if (cmd == 0x47)
1594 { 1924 {
1595 if (*data == 4) 1925 if (*data == 1) cell->player = data [1];
1596 ; // 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);
1597 1929
1598 data += *data + 1; 1930 data += *data + 1;
1599 } 1931 }
1600 else if (cmd == 8) // cell flags 1932 else if (cmd == 8) // cell flags
1601 cell->flags = *data++; 1933 cell->flags = *data++;
1608 } 1940 }
1609 else 1941 else
1610 cell->darkness = *data++ + 1; 1942 cell->darkness = *data++ + 1;
1611 } 1943 }
1612 1944
1945 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 1946 if (flags & (4 >> z))
1614 { 1947 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 1948 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 1949 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face]; 1950 cell->tile [z] = self->face2tile [face];
1951
1952 if (cell->tile [z])
1953 {
1954 maptex *tex = self->tex + cell->tile [z];
1955 tex->unused = 0;
1956 if (!tex->name)
1957 av_push (missing, newSViv (cell->tile [z]));
1958
1959 if (tex->smoothtile)
1960 {
1961 maptex *smooth = self->tex + tex->smoothtile;
1962 smooth->unused = 0;
1963 if (!smooth->name)
1964 av_push (missing, newSViv (tex->smoothtile));
1965 }
1966 }
1618 } 1967 }
1619
1620 if (flags & 2)
1621 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [1] = self->face2tile [face];
1625 }
1626
1627 if (flags & 1)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [2] = self->face2tile [face];
1632 }
1633 } 1968 }
1634 else 1969 else
1635 cell->darkness = 0; 1970 CELL_CLEAR (cell);
1636 } 1971 }
1637} 1972}
1973 OUTPUT:
1974 RETVAL
1638 1975
1639SV * 1976SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1977mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 1978 CODE:
1642{ 1979{
1643 int x1, x; 1980 int x1, x;
1644 int y1, y; 1981 int y1, y;
1645 int z; 1982 int z;
1690} 2027}
1691 OUTPUT: 2028 OUTPUT:
1692 RETVAL 2029 RETVAL
1693 2030
1694void 2031void
1695draw (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)
1696 CODE: 2033 CODE:
1697{ 2034{
2035 int x, y, z;
2036
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2037 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 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
1700 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)
1701 smooth_key skey; 2040 smooth_key skey;
1702 int x, y, z; 2041 int pl_x, pl_y;
1703 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;
1704 2047
2048 pl_tex.name = 0;
2049
1705 // thats current max. sorry. 2050 // that's current max. sorry.
1706 if (sw > 255) sw = 255; 2051 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 2052 if (sh > 255) sh = 255;
1708 2053
1709 // clear key, in case of extra padding 2054 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 2055 memset (&skey, 0, sizeof (skey));
1711 2056
1712 glColor4ub (255, 255, 255, 255); 2057 memset (&key, 0, sizeof (key));
1713 2058 key.r = 255;
1714 glEnable (GL_BLEND); 2059 key.g = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2060 key.b = 255;
1716 glEnable (GL_TEXTURE_2D); 2061 key.a = 255;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2062 key.mode = GL_QUADS;
1718 2063 key.format = GL_T2F_V3F;
1719 glBegin (GL_QUADS);
1720
1721 last_name = 0;
1722 2064
1723 mx += self->x; 2065 mx += self->x;
1724 my += self->y; 2066 my += self->y;
1725 2067
1726 // first pass: determine smooth_max 2068 // first pass: determine smooth_max
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 2085 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 2086 self->tex [cell->tile [2]].smoothlevel));
1745 } 2087 }
1746 } 2088 }
1747 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
1748 for (z = 0; z <= 2; z++) 2097 for (z = 0; z <= 2; z++)
1749 { 2098 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 2099 memset (smooth_level, 0, sizeof (smooth_level));
2100 key.texname = -1;
1751 2101
1752 for (y = 0; y < sh; y++) 2102 for (y = 0; y < sh; y++)
1753 if (0 <= y + my && y + my < self->rows) 2103 if (0 <= y + my && y + my < self->rows)
1754 { 2104 {
1755 maprow *row = self->row + (y + my); 2105 maprow *row = self->row + (y + my);
1761 tileid tile = cell->tile [z]; 2111 tileid tile = cell->tile [z];
1762 2112
1763 if (tile) 2113 if (tile)
1764 { 2114 {
1765 maptex tex = self->tex [tile]; 2115 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 2116 int px, py;
1767 int py = (y + 1) * T - tex.h;
1768 2117
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 2118 if (key.texname != tex.name)
1772 { 2119 {
2120 self->tex [tile].unused = 0;
2121
1773 if (!tex.name) 2122 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 2123 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1775 2124
1776 glEnd (); 2125 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2126 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 2127 }
1780 2128
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2129 px = (x + 1) * T - tex.w;
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2130 py = (y + 1) * T - tex.h;
1783 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1784 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1785 2131
1786 if (cell->flags && z == 2) 2132 if (expect_false (cell->player == player) && expect_false (z == 2))
1787 { 2133 {
1788 if (cell->flags & 1) 2134 pl_x = px;
2135 pl_y = py;
2136 pl_tex = tex;
1789 { 2137 continue;
1790 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32;
1793
1794 glEnd ();
1795 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1796 glBegin (GL_QUADS);
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1802 }
1803 } 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);
1804 2144
1805 // update smooth hash 2145 // update smooth hash
1806 if (tex.smoothtile) 2146 if (tex.smoothtile)
1807 { 2147 {
1808 skey.tile = tex.smoothtile; 2148 skey.tile = tex.smoothtile;
1839 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);
1840 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);
1841 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);
1842 } 2182 }
1843 } 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 }
1844 } 2221 }
1845 } 2222 }
2223
2224 rc_draw (rc);
2225 rc_clear (rc);
1846 2226
1847 // go through all smoothlevels, lowest to highest, then draw. 2227 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 2228 // this is basically counting sort
1849 { 2229 {
1850 int w, b; 2230 int w, b;
1851 2231
2232 glEnable (GL_TEXTURE_2D);
2233 glBegin (GL_QUADS);
1852 for (w = 0; w < 256 / 32; ++w) 2234 for (w = 0; w < 256 / 32; ++w)
1853 { 2235 {
1854 uint32_t smask = smooth_level [w]; 2236 uint32_t smask = smooth_level [w];
1855 if (smask) 2237 if (smask)
1856 for (b = 0; b < 32; ++b) 2238 for (b = 0; b < 32; ++b)
1875 int border = bits & 15; 2257 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2258 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row 2259 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column 2260 float dy = tex.t * .5f ; // 2 images/column
1879 2261
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name) 2262 if (tex.name)
1883 { 2263 {
2264 // this time avoiding texture state changes
2265 // save gobs of state changes.
1884 if (!tex.name) 2266 if (key.texname != tex.name)
1885 continue; // smoothing not yet available 2267 {
2268 self->tex [skey->tile].unused = 0;
1886 2269
1887 glEnd (); 2270 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2271 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2272 glBegin (GL_QUADS);
1890 } 2273 }
1891 2274
1892 if (border) 2275 if (border)
1893 { 2276 {
1894 float ox = border * dx; 2277 float ox = border * dx;
1895 2278
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2279 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2280 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2281 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2282 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1900 } 2283 }
1901 2284
1902 if (corner) 2285 if (corner)
1903 { 2286 {
1904 float ox = corner * dx; 2287 float ox = corner * dx;
1905 2288
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2289 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2290 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2291 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2292 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2293 }
1910 } 2294 }
1911 } 2295 }
1912 } 2296 }
1913 } 2297 }
1914 } 2298 }
2299
2300 glEnd ();
2301 glDisable (GL_TEXTURE_2D);
2302 key.texname = -1;
1915 } 2303 }
1916 2304
1917 hv_clear (smooth); 2305 hv_clear (smooth);
1918 } 2306 }
1919 2307
1920 glEnd (); 2308 if (pl_tex.name)
2309 {
2310 maptex tex = pl_tex;
2311 int px = pl_x + sdx;
2312 int py = pl_y + sdy;
1921 2313
1922 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
1923 glDisable (GL_BLEND); 2328 glDisable (GL_BLEND);
2329 rc_free (rc);
2330 rc_free (rc_ov);
1924 2331
1925 // top layer: overlays such as the health bar 2332 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2333 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2334 if (0 <= y + my && y + my < self->rows)
1928 { 2335 {
1933 { 2340 {
1934 mapcell *cell = row->col + (x + mx - row->c0); 2341 mapcell *cell = row->col + (x + mx - row->c0);
1935 2342
1936 int px = x * T; 2343 int px = x * T;
1937 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 }
1938 2351
1939 if (cell->stat_hp) 2352 if (cell->stat_hp)
1940 { 2353 {
1941 int width = cell->stat_width * T; 2354 int width = cell->stat_width * T;
1942 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1953 } 2366 }
1954 } 2367 }
1955} 2368}
1956 2369
1957void 2370void
1958draw_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)
1959 CODE: 2372 CODE:
1960{ 2373{
1961 static float color[16][3] = { 2374 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2375 { 0.00F, 0.00F, 0.00F },
1963 { 1.00F, 1.00F, 1.00F }, 2376 { 1.00F, 1.00F, 1.00F },
1982 }; 2395 };
1983 2396
1984 int x, y; 2397 int x, y;
1985 2398
1986 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 */
1987 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1988 glEnable (GL_BLEND); 2407 glEnable (GL_BLEND);
1989 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2408 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1990 glBegin (GL_QUADS); 2409 glBegin (GL_QUADS);
1991 2410
1992 for (y = 0; y < h; y++) 2411 for (y = 0; y < h; y++)
1999 float *c = color [m & 15]; 2418 float *c = color [m & 15];
2000 2419
2001 float tx1 = m & 0x40 ? 0.5 : 0.; 2420 float tx1 = m & 0x40 ? 0.5 : 0.;
2002 float tx2 = tx1 + 0.5; 2421 float tx2 = tx1 + 0.5;
2003 2422
2004 glColor4f (c[0], c[1], c[2], 0.75); 2423 glColor4f (c[0], c[1], c[2], 1);
2005 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2006 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2007 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2008 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2427 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2009 } 2428 }
2013 glDisable (GL_BLEND); 2432 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2433 glDisable (GL_TEXTURE_2D);
2015} 2434}
2016 2435
2017void 2436void
2018fow_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)
2019 PPCODE: 2438 PPCODE:
2020{ 2439{
2021 int x, y; 2440 int x, y;
2022 int sw1 = sw + 2; 2441 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2442 int sh1 = sh + 2;
2031 SvCUR_set (darkness3_sv, sw34 * sh3); 2450 SvCUR_set (darkness3_sv, sw34 * sh3);
2032 2451
2033 mx += self->x - 1; 2452 mx += self->x - 1;
2034 my += self->y - 1; 2453 my += self->y - 1;
2035 2454
2036 memset (darkness1, 255, sw1 * sh1); 2455 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2037 2456
2038 for (y = 0; y < sh1; y++) 2457 for (y = 0; y < sh1; y++)
2039 if (0 <= y + my && y + my < self->rows) 2458 if (0 <= y + my && y + my < self->rows)
2040 { 2459 {
2041 maprow *row = self->row + (y + my); 2460 maprow *row = self->row + (y + my);
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2513 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2514 PUSHs (darkness3_sv);
2096} 2515}
2097 2516
2098SV * 2517SV *
2099get_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)
2100 CODE: 2519 CODE:
2101{ 2520{
2102 int x, y, x1, y1; 2521 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2522 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2523 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2161 else 2580 else
2162 *data++ = 0; 2581 *data++ = 0;
2163 } 2582 }
2164 } 2583 }
2165 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 {
2166 SvPOK_only (data_sv); 2588 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2589 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2590 }
2591
2168 RETVAL = data_sv; 2592 RETVAL = data_sv;
2169} 2593}
2170 OUTPUT: 2594 OUTPUT:
2171 RETVAL 2595 RETVAL
2172 2596
2173void 2597void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2598set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2599 PPCODE:
2176{ 2600{
2177 int x, y, z; 2601 int x, y, z;
2178 int w, h; 2602 int w, h;
2179 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;
2180 2614
2181 if (*data++ != 0) 2615 if (*data++ != 0)
2182 return; /* version mismatch */ 2616 XSRETURN_EMPTY; /* version mismatch */
2183 2617
2184 w = *data++ << 8; w |= *data++; 2618 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2619 h = *data++ << 8; h |= *data++;
2186 2620
2187 // 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
2199 { 2633 {
2200 maprow *row = map_get_row (self, y); 2634 maprow *row = map_get_row (self, y);
2201 2635
2202 for (x = x0; x < x1; x++) 2636 for (x = x0; x < x1; x++)
2203 { 2637 {
2638 uint8_t flags;
2639
2640 if (data + 7 >= end)
2641 XSRETURN_EMPTY;
2642
2204 uint8_t flags = *data++; 2643 flags = *data++;
2205 2644
2206 if (flags) 2645 if (flags)
2207 { 2646 {
2208 mapcell *cell = row_get_cell (row, x); 2647 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2648 tileid tile[3] = { 0, 0, 0 };
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2651 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2652 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2653
2215 if (cell->darkness == 0) 2654 if (cell->darkness == 0)
2216 { 2655 {
2217 cell->darkness = 0; 2656 /*cell->darkness = 0;*/
2657 EXTEND (SP, 3);
2218 2658
2219 for (z = 0; z <= 2; z++) 2659 for (z = 0; z <= 2; z++)
2220 { 2660 {
2221 tileid t = tile [z]; 2661 tileid t = tile [z];
2222 2662
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2663 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2664 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2665 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2666 need_texid (self, t);
2227 } 2667 }
2228 2668
2229 cell->tile [z] = t; 2669 cell->tile [z] = t;
2230 } 2670 }
2232 } 2672 }
2233 } 2673 }
2234 } 2674 }
2235} 2675}
2236 2676
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2677MODULE = Deliantra::Client PACKAGE = DC::RW
2238 2678
2239PROTOTYPES: DISABLE 2679DC::RW
2240
2241CFPlus::MixChunk
2242new (SV *class, SV *data_sv) 2680new (SV *class, SV *data_sv)
2243 CODE: 2681 CODE:
2244{ 2682{
2245 STRLEN datalen; 2683 STRLEN datalen;
2246 char *data = SvPVbyte (data_sv, datalen); 2684 char *data = SvPVbyte (data_sv, datalen);
2247 2685
2248 RETVAL = Mix_LoadWAV_RW (SDL_RWFromConstMem (data, datalen), 1); 2686 RETVAL = SDL_RWFromConstMem (data, datalen);
2249} 2687}
2250 OUTPUT: 2688 OUTPUT:
2251 RETVAL 2689 RETVAL
2252 2690
2253CFPlus::MixChunk 2691DC::RW
2254new_from_file (SV *class, char *path) 2692new_from_file (SV *class, const char *path, const char *mode = "rb")
2255 CODE: 2693 CODE:
2256 RETVAL = Mix_LoadWAV (path); 2694 RETVAL = SDL_RWFromFile (path, mode);
2257 OUTPUT: 2695 OUTPUT:
2258 RETVAL 2696 RETVAL
2259 2697
2698# fails on win32:
2699# dc.xs(2268) : error C2059: syntax error : '('
2260void 2700#void
2701#close (DC::RW self)
2702# CODE:
2703# (self->(close)) (self);
2704
2705MODULE = Deliantra::Client PACKAGE = DC::Channel
2706
2707PROTOTYPES: DISABLE
2708
2709DC::Channel
2710find ()
2711 CODE:
2712{
2713 RETVAL = Mix_GroupAvailable (-1);
2714
2715 if (RETVAL < 0)
2716 {
2717 RETVAL = Mix_GroupOldest (-1);
2718
2719 if (RETVAL < 0)
2720 XSRETURN_UNDEF;
2721
2722 Mix_HaltChannel (RETVAL);
2723 }
2724
2725 Mix_UnregisterAllEffects (RETVAL);
2726 Mix_Volume (RETVAL, 128);
2727}
2728 OUTPUT:
2729 RETVAL
2730
2731void
2732halt (DC::Channel self)
2733 CODE:
2734 Mix_HaltChannel (self);
2735
2736void
2737expire (DC::Channel self, int ticks = -1)
2738 CODE:
2739 Mix_ExpireChannel (self, ticks);
2740
2741void
2742fade_out (DC::Channel self, int ticks = -1)
2743 CODE:
2744 Mix_FadeOutChannel (self, ticks);
2745
2746int
2747volume (DC::Channel self, int volume)
2748 CODE:
2749 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2750 OUTPUT:
2751 RETVAL
2752
2753void
2754unregister_all_effects (DC::Channel self)
2755 CODE:
2756 Mix_UnregisterAllEffects (self);
2757
2758void
2759set_panning (DC::Channel self, int left, int right)
2760 CODE:
2761 left = CLAMP (left , 0, 255);
2762 right = CLAMP (right, 0, 255);
2763 Mix_SetPanning (self, left, right);
2764
2765void
2766set_distance (DC::Channel self, int distance)
2767 CODE:
2768 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2769
2770void
2771set_position (DC::Channel self, int angle, int distance)
2772 CODE:
2773
2774void
2775set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2776 CODE:
2777{
2778 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2779 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2780 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2781}
2782
2783void
2784set_reverse_stereo (DC::Channel self, int flip)
2785 CODE:
2786 Mix_SetReverseStereo (self, flip);
2787
2788MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2789
2790PROTOTYPES: DISABLE
2791
2792DC::MixChunk
2793new (SV *class, DC::RW rwops)
2794 CODE:
2795 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2796 OUTPUT:
2797 RETVAL
2798
2799void
2261DESTROY (CFPlus::MixChunk self) 2800DESTROY (DC::MixChunk self)
2262 CODE: 2801 CODE:
2263 Mix_FreeChunk (self); 2802 Mix_FreeChunk (self);
2264 2803
2265int 2804int
2266volume (CFPlus::MixChunk self, int volume = -1) 2805volume (DC::MixChunk self, int volume = -1)
2267 CODE: 2806 CODE:
2807 if (items > 1)
2808 volume = CLAMP (volume, 0, 128);
2268 RETVAL = Mix_VolumeChunk (self, volume); 2809 RETVAL = Mix_VolumeChunk (self, volume);
2269 OUTPUT: 2810 OUTPUT:
2270 RETVAL 2811 RETVAL
2271 2812
2272int 2813DC::Channel
2273play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2814play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2274 CODE: 2815 CODE:
2816{
2275 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2817 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2818
2819 if (RETVAL < 0)
2820 XSRETURN_UNDEF;
2821
2822 if (channel < 0)
2823 {
2824 Mix_UnregisterAllEffects (RETVAL);
2825 Mix_Volume (RETVAL, 128);
2826 }
2827}
2276 OUTPUT: 2828 OUTPUT:
2277 RETVAL 2829 RETVAL
2278 2830
2279MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2831MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2280 2832
2281int 2833int
2282volume (int volume = -1) 2834volume (int volume = -1)
2283 PROTOTYPE: ;$ 2835 PROTOTYPE: ;$
2284 CODE: 2836 CODE:
2837 if (items > 0)
2838 volume = CLAMP (volume, 0, 128);
2285 RETVAL = Mix_VolumeMusic (volume); 2839 RETVAL = Mix_VolumeMusic (volume);
2286 OUTPUT: 2840 OUTPUT:
2287 RETVAL 2841 RETVAL
2288 2842
2289int 2843void
2290fade_out (int ms) 2844fade_out (int ms)
2291 CODE: 2845 CODE:
2292 RETVAL = Mix_FadeOutMusic (ms); 2846 Mix_FadeOutMusic (ms);
2847
2848void
2849halt ()
2850 CODE:
2851 Mix_HaltMusic ();
2852
2853DC::MixMusic
2854new (SV *class, DC::RW rwops)
2855 CODE:
2856 RETVAL = Mix_LoadMUS_RW (rwops);
2293 OUTPUT: 2857 OUTPUT:
2294 RETVAL 2858 RETVAL
2295 2859
2296CFPlus::MixMusic
2297new_from_file (SV *class, char *path)
2298 CODE:
2299 RETVAL = Mix_LoadMUS (path);
2300 OUTPUT:
2301 RETVAL
2302
2303void 2860void
2304DESTROY (CFPlus::MixMusic self) 2861DESTROY (DC::MixMusic self)
2305 CODE: 2862 CODE:
2306 Mix_FreeMusic (self); 2863 Mix_FreeMusic (self);
2307 2864
2308int 2865int
2309play (CFPlus::MixMusic self, int loops = -1) 2866play (DC::MixMusic self, int loops = -1)
2310 CODE: 2867 CODE:
2311 RETVAL = Mix_PlayMusic (self, loops); 2868 RETVAL = Mix_PlayMusic (self, loops);
2312 OUTPUT: 2869 OUTPUT:
2313 RETVAL 2870 RETVAL
2314 2871
2315int 2872void
2316fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2873fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2317 CODE: 2874 CODE:
2318 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2875 Mix_FadeInMusicPos (self, loops, ms, position);
2319 OUTPUT:
2320 RETVAL
2321 2876
2322MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2877MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2323 2878
2324PROTOTYPES: ENABLE 2879PROTOTYPES: ENABLE
2325 2880
2326BOOT: 2881BOOT:
2327{ 2882{
2328 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2883 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2329 static const struct { 2884 static const struct {
2330 const char *name; 2885 const char *name;
2331 IV iv; 2886 IV iv;
2332 } *civ, const_iv[] = { 2887 } *civ, const_iv[] = {
2333# define const_iv(name) { # name, (IV)name } 2888# define const_iv(name) { # name, (IV)name }
2334 const_iv (GL_VENDOR), 2889 const_iv (GL_VENDOR),
2335 const_iv (GL_VERSION), 2890 const_iv (GL_VERSION),
2336 const_iv (GL_EXTENSIONS), 2891 const_iv (GL_EXTENSIONS),
2892 const_iv (GL_MAX_TEXTURE_UNITS),
2337 const_iv (GL_COLOR_MATERIAL), 2893 const_iv (GL_COLOR_MATERIAL),
2338 const_iv (GL_SMOOTH), 2894 const_iv (GL_SMOOTH),
2339 const_iv (GL_FLAT), 2895 const_iv (GL_FLAT),
2340 const_iv (GL_DITHER), 2896 const_iv (GL_DITHER),
2341 const_iv (GL_BLEND), 2897 const_iv (GL_BLEND),
2353 const_iv (GL_ZERO), 2909 const_iv (GL_ZERO),
2354 const_iv (GL_SRC_ALPHA), 2910 const_iv (GL_SRC_ALPHA),
2355 const_iv (GL_DST_ALPHA), 2911 const_iv (GL_DST_ALPHA),
2356 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2912 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2357 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),
2358 const_iv (GL_SRC_ALPHA_SATURATE), 2918 const_iv (GL_SRC_ALPHA_SATURATE),
2359 const_iv (GL_RGB), 2919 const_iv (GL_RGB),
2360 const_iv (GL_RGBA), 2920 const_iv (GL_RGBA),
2361 const_iv (GL_RGBA4), 2921 const_iv (GL_RGBA4),
2362 const_iv (GL_RGBA8), 2922 const_iv (GL_RGBA8),
2368 const_iv (GL_INTENSITY), 2928 const_iv (GL_INTENSITY),
2369 const_iv (GL_LUMINANCE), 2929 const_iv (GL_LUMINANCE),
2370 const_iv (GL_LUMINANCE_ALPHA), 2930 const_iv (GL_LUMINANCE_ALPHA),
2371 const_iv (GL_FLOAT), 2931 const_iv (GL_FLOAT),
2372 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),
2373 const_iv (GL_COMPILE), 2939 const_iv (GL_COMPILE),
2374 const_iv (GL_PROXY_TEXTURE_1D), 2940 const_iv (GL_PROXY_TEXTURE_1D),
2375 const_iv (GL_PROXY_TEXTURE_2D), 2941 const_iv (GL_PROXY_TEXTURE_2D),
2376 const_iv (GL_TEXTURE_1D), 2942 const_iv (GL_TEXTURE_1D),
2377 const_iv (GL_TEXTURE_2D), 2943 const_iv (GL_TEXTURE_2D),
2416 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2982 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2417 const_iv (GL_POINT_SMOOTH_HINT), 2983 const_iv (GL_POINT_SMOOTH_HINT),
2418 const_iv (GL_LINE_SMOOTH_HINT), 2984 const_iv (GL_LINE_SMOOTH_HINT),
2419 const_iv (GL_POLYGON_SMOOTH_HINT), 2985 const_iv (GL_POLYGON_SMOOTH_HINT),
2420 const_iv (GL_GENERATE_MIPMAP_HINT), 2986 const_iv (GL_GENERATE_MIPMAP_HINT),
2987 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2421 const_iv (GL_FASTEST), 2988 const_iv (GL_FASTEST),
2422 const_iv (GL_DONT_CARE), 2989 const_iv (GL_DONT_CARE),
2423 const_iv (GL_NICEST), 2990 const_iv (GL_NICEST),
2424 const_iv (GL_V2F), 2991 const_iv (GL_V2F),
2425 const_iv (GL_V3F), 2992 const_iv (GL_V3F),
2426 const_iv (GL_T2F_V3F), 2993 const_iv (GL_T2F_V3F),
2427 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),
2428# undef const_iv 2998# undef const_iv
2429 }; 2999 };
2430 3000
2431 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; )
2432 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2433 3003
2434 texture_av = newAV (); 3004 texture_av = newAV ();
2435 AvREAL_off (texture_av); 3005 AvREAL_off (texture_av);
2436} 3006}
2437 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
2438char * 3017char *
2439gl_vendor () 3018gl_vendor ()
2440 CODE: 3019 CODE:
2441 RETVAL = (char *)glGetString (GL_VENDOR); 3020 RETVAL = (char *)glGetString (GL_VENDOR);
2442 OUTPUT: 3021 OUTPUT:
2491 3070
2492void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3071void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2493 CODE: 3072 CODE:
2494 gl_BlendFuncSeparate (sa, da, saa, daa); 3073 gl_BlendFuncSeparate (sa, da, saa, daa);
2495 3074
3075# void glBlendEquation (int se)
3076
2496void glDepthMask (int flag) 3077void glDepthMask (int flag)
2497 3078
2498void glLogicOp (int opcode) 3079void glLogicOp (int opcode)
2499 3080
2500void glColorMask (int red, int green, int blue, int alpha) 3081void glColorMask (int red, int green, int blue, int alpha)
2534void glRotate (float angle, float x, float y, float z) 3115void glRotate (float angle, float x, float y, float z)
2535 CODE: 3116 CODE:
2536 glRotatef (angle, x, y, z); 3117 glRotatef (angle, x, y, z);
2537 3118
2538void 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: @
2539 ALIAS: 3121 ALIAS:
2540 glColor_premultiply = 1 3122 glColor_premultiply = 1
2541 CODE: 3123 CODE:
2542 if (ix) 3124 if (ix)
2543 { 3125 {
2563 3145
2564void glRect (float x1, float y1, float x2, float y2) 3146void glRect (float x1, float y1, float x2, float y2)
2565 CODE: 3147 CODE:
2566 glRectf (x1, y1, x2, y2); 3148 glRectf (x1, y1, x2, y2);
2567 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
2568PROTOTYPES: ENABLE 3159PROTOTYPES: ENABLE
2569 3160
2570void glBegin (int mode) 3161void glBegin (int mode)
2571 3162
2572void glEnd () 3163void glEnd ()
2604void 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)
2605 CODE: 3196 CODE:
2606 if (gl.SeparableFilter2D) 3197 if (gl.SeparableFilter2D)
2607 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3198 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2608 3199
2609void 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)
2610 3201
2611void 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)
2612 3203
2613void glDrawPixels (int width, int height, int format, int type, char *pixels) 3204void glDrawPixels (int width, int height, int format, int type, char *pixels)
2614 3205
2640 3231
2641void glEndList () 3232void glEndList ()
2642 3233
2643void glCallList (int list) 3234void glCallList (int list)
2644 3235
2645MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3236MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2646 3237
2647PROTOTYPES: DISABLE 3238PROTOTYPES: DISABLE
2648 3239
2649void 3240void
2650find_widget (SV *self, NV x, NV y) 3241find_widget (SV *self, NV x, NV y)
2654 XPUSHs (self); 3245 XPUSHs (self);
2655} 3246}
2656 3247
2657BOOT: 3248BOOT:
2658{ 3249{
2659 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3250 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2660 3251
2661 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);
2662 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);
2663 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);
2664 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);
2665} 3256}
2666 3257
2667void 3258void
2668draw (SV *self) 3259draw (SV *self)
2669 CODE: 3260 CODE:
2673 NV x, y, w, h; 3264 NV x, y, w, h;
2674 SV *draw_x_sv = GvSV (draw_x_gv); 3265 SV *draw_x_sv = GvSV (draw_x_gv);
2675 SV *draw_y_sv = GvSV (draw_y_gv); 3266 SV *draw_y_sv = GvSV (draw_y_gv);
2676 SV *draw_w_sv = GvSV (draw_w_gv); 3267 SV *draw_w_sv = GvSV (draw_w_gv);
2677 SV *draw_h_sv = GvSV (draw_h_gv); 3268 SV *draw_h_sv = GvSV (draw_h_gv);
2678 SV *hover;
2679 double draw_x, draw_y, draw_w, draw_h; 3269 double draw_x, draw_y;
2680 3270
2681 if (!SvROK (self)) 3271 if (!SvROK (self))
2682 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3272 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2683 3273
2684 hv = (HV *)SvRV (self); 3274 hv = (HV *)SvRV (self);
2685 3275
2686 if (SvTYPE (hv) != SVt_PVHV) 3276 if (SvTYPE (hv) != SVt_PVHV)
2687 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3277 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2688 3278
2689 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.;
2690 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.;
2691 3281
2692 if (!h || !w) 3282 if (!h || !w)
2712 { 3302 {
2713 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3303 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2714 3304
2715 if (svp && SvTRUE (*svp)) 3305 if (svp && SvTRUE (*svp))
2716 { 3306 {
2717 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);
2718 glEnable (GL_BLEND); 3308 glEnable (GL_BLEND);
2719 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3309 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2720 glBegin (GL_QUADS); 3310 glBegin (GL_QUADS);
2721 glVertex2f (0, 0); 3311 glVertex2f (0, 0);
2722 glVertex2f (w, 0); 3312 glVertex2f (w, 0);
2725 glEnd (); 3315 glEnd ();
2726 glDisable (GL_BLEND); 3316 glDisable (GL_BLEND);
2727 } 3317 }
2728 } 3318 }
2729#if 0 3319#if 0
2730 if ($ENV{CFPLUS_DEBUG} & 1) { 3320 // draw borders, for debugging
2731 glPushMatrix; 3321 glPushMatrix ();
2732 glColor 1, 1, 0, 1; 3322 glColor4f (1., 1., 0., 1.);
2733 glTranslate 0.375, 0.375; 3323 glTranslatef (.5, .5, 0.);
2734 glBegin GL_LINE_LOOP; 3324 glBegin (GL_LINE_LOOP);
2735 glVertex 0 , 0; 3325 glVertex2f (0 , 0);
2736 glVertex $self->{w} - 1, 0; 3326 glVertex2f (w - 1, 0);
2737 glVertex $self->{w} - 1, $self->{h} - 1; 3327 glVertex2f (w - 1, h - 1);
2738 glVertex 0 , $self->{h} - 1; 3328 glVertex2f (0 , h - 1);
2739 glEnd; 3329 glEnd ();
2740 glPopMatrix; 3330 glPopMatrix ();
2741 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2742 }
2743#endif 3331#endif
2744 PUSHMARK (SP); 3332 PUSHMARK (SP);
2745 XPUSHs (self); 3333 XPUSHs (self);
2746 PUTBACK; 3334 PUTBACK;
2747 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